[vidalia-svn] r2367: Apply the changes for settings pages in the same order in wh (in vidalia/trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-03-01 17:11:52 -0500 (Sat, 01 Mar 2008)
New Revision: 2367

Modified:
   vidalia/trunk/
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/config/configpagestack.cpp
   vidalia/trunk/src/vidalia/config/configpagestack.h
Log:
 r153@lysithea:  edmanm | 2008-03-01 17:11:45 -0500
  Apply the changes for settings pages in the same order in which the pages
  appear in the Settings dialog. The only two pages for which this matters
  are the 'Network' and 'Sharing' pages. Fixes arma's ticket #336.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r153] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2008-03-01 17:58:23 UTC (rev 2366)
+++ vidalia/trunk/CHANGELOG	2008-03-01 22:11:52 UTC (rev 2367)
@@ -28,6 +28,9 @@
     will no longer be able to reconnect.
   o Don't let users save an empty string for a Tor executable in the Settings
     dialog.
+  o Apply the changes for settings pages in the same order in which the pages
+    appear in the Settings dialog. The only two pages for which this matters
+    are the 'Network' and 'Sharing' pages. (Ticket #336)
   o Old Jabber clients apparently use port 5223 for encrypted connections. So,
     include that port as part of the "Instant Messaging" exit policy checkbox.
     (Ticket #333)

Modified: vidalia/trunk/src/vidalia/config/configpagestack.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/configpagestack.cpp	2008-03-01 17:58:23 UTC (rev 2366)
+++ vidalia/trunk/src/vidalia/config/configpagestack.cpp	2008-03-01 22:11:52 UTC (rev 2367)
@@ -56,3 +56,15 @@
   setCurrentWidget(_pages.value(pageAction));
 }
 
+/** Returns a list of all pages in the stack. The order of the pages in the
+ * returned QList is the same as the order in which the pages were initially
+ * added to the stack. */
+QList<ConfigPage *>
+ConfigPageStack::pages() const
+{
+  QList<ConfigPage *> pages;
+  for (int i = 0; i < count(); i++)
+    pages << dynamic_cast<ConfigPage *>(widget(i));
+  return pages;
+}
+

Modified: vidalia/trunk/src/vidalia/config/configpagestack.h
===================================================================
--- vidalia/trunk/src/vidalia/config/configpagestack.h	2008-03-01 17:58:23 UTC (rev 2366)
+++ vidalia/trunk/src/vidalia/config/configpagestack.h	2008-03-01 22:11:52 UTC (rev 2367)
@@ -37,10 +37,12 @@
   void setCurrentPage(ConfigPage *page);
   /** Sets the current config page index and checks its action. */
   void setCurrentIndex(int index);
+  
+  /** Returns a list of all pages in the stack. The order of the pages in the
+   * returned QList is the same as the order in which the pages were
+   * initially added to the stack. */
+  QList<ConfigPage *> pages() const;
 
-  /** Returns a list of all pages in the stack. */
-  QList<ConfigPage*> pages() { return _pages.values(); }
-  
 public slots:
   /** Displays the page associated with the activated action. */
   void showPage(QAction *pageAction);