[vidalia-svn] r2555: Patch from Domenik Bork to change the ordering of the 'Servi (in vidalia/trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-06 17:21:49 -0400 (Tue, 06 May 2008)
New Revision: 2555

Modified:
   vidalia/trunk/
   vidalia/trunk/src/vidalia/config/configdialog.cpp
   vidalia/trunk/src/vidalia/config/servicepage.cpp
Log:
 r273@rae:  edmanm | 2008-05-06 17:21:49 -0400
 Patch from Domenik Bork to change the ordering of the 'Services' tab in the
 config dialog. Also changes the resize behavior of the column headers in the
 hidden services table.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r273] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/trunk/src/vidalia/config/configdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/configdialog.cpp	2008-05-06 12:39:49 UTC (rev 2554)
+++ vidalia/trunk/src/vidalia/config/configdialog.cpp	2008-05-06 21:21:49 UTC (rev 2555)
@@ -80,7 +80,11 @@
   ui.stackPages->add(new ServerPage(ui.stackPages),
                      createPageAction(QIcon(IMAGE_SERVER),
                                       tr("Sharing"), grp));
-  
+
+  ui.stackPages->add(new ServicePage(ui.stackPages),
+                       createPageAction(QIcon(IMAGE_SERVICE),
+                                        tr("Services"), grp));
+
   ui.stackPages->add(new AppearancePage(ui.stackPages),
                      createPageAction(QIcon(IMAGE_APPEARANCE),
                                       tr("Appearance"), grp));
@@ -88,10 +92,6 @@
   ui.stackPages->add(new AdvancedPage(ui.stackPages),
                      createPageAction(QIcon(IMAGE_ADVANCED),
                                       tr("Advanced"), grp));
-  
-  ui.stackPages->add(new ServicePage(ui.stackPages),
-                       createPageAction(QIcon(IMAGE_SERVICE),
-                                        tr("Services"), grp));
   foreach (ConfigPage *page, ui.stackPages->pages()) {
     connect(page, SIGNAL(helpRequested(QString)),
             this, SLOT(help(QString)));

Modified: vidalia/trunk/src/vidalia/config/servicepage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/servicepage.cpp	2008-05-06 12:39:49 UTC (rev 2554)
+++ vidalia/trunk/src/vidalia/config/servicepage.cpp	2008-05-06 21:21:49 UTC (rev 2555)
@@ -47,6 +47,10 @@
   ui.serviceWidget->horizontalHeader()->resizeSection(2, 100);
   ui.serviceWidget->horizontalHeader()->resizeSection(3, 120);
   ui.serviceWidget->horizontalHeader()->resizeSection(4, 60);
+  ui.serviceWidget->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+  ui.serviceWidget->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
+  ui.serviceWidget->horizontalHeader()->setResizeMode(2, QHeaderView::Stretch);
+  ui.serviceWidget->horizontalHeader()->setResizeMode(3, QHeaderView::Stretch);
   ui.serviceWidget->verticalHeader()->hide();
 
   connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addService()));