[vidalia-svn] r3966: Made the toolbar and dock widgets untoggleable. (vidalia/branches/extension-api/src/vidalia)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-07-16 17:23:18 -0400 (Thu, 16 Jul 2009)
New Revision: 3966

Modified:
   vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
   vidalia/branches/extension-api/src/vidalia/MainWindow.h
Log:
Made the toolbar and dock widgets untoggleable.

Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-07-14 21:42:02 UTC (rev 3965)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-07-16 21:23:18 UTC (rev 3966)
@@ -526,6 +526,12 @@
   _newIdentityAct32->setIcon(QIcon(IMG_IDENTITY_32));
 }
 
+QMenu*
+MainWindow::createPopupMenu()
+{
+  return NULL;
+}
+
 /** Creates a tray icon with a context menu and adds it to the system
  * notification area. */
 void
@@ -1062,8 +1068,8 @@
       /* XXX: This might need to be smarter if we ever start connecting other
        * slots to these triggered() and clicked() signals. */
       QObject::disconnect(_startStopAct, SIGNAL(triggered()), this, 0);
+      QObject::disconnect(_startStopAct32, SIGNAL(triggered()), this, 0);
       connect(_startStopAct, SIGNAL(triggered()), this, SLOT(start()));
-      QObject::disconnect(_startStopAct32, SIGNAL(triggered()), this, 0);
       connect(_startStopAct32, SIGNAL(triggered()), this, SLOT(start()));
       setStartupProgressVisible(false);
   } else if (status == Stopping) {
@@ -1090,8 +1096,8 @@
       /* XXX: This might need to be smarter if we ever start connecting other
        * slots to these triggered() and clicked() signals. */
       QObject::disconnect(_startStopAct, SIGNAL(triggered()), this, 0);
+      QObject::disconnect(_startStopAct32, SIGNAL(triggered()), this, 0);
       connect(_startStopAct, SIGNAL(triggered()), this, SLOT(stop()));
-      QObject::disconnect(_startStopAct32, SIGNAL(triggered()), this, 0);
       connect(_startStopAct32, SIGNAL(triggered()), this, SLOT(stop()));
   } else if (status == Starting)  {
       statusText = tr("Starting the Tor software");

Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.h	2009-07-14 21:42:02 UTC (rev 3965)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.h	2009-07-16 21:23:18 UTC (rev 3966)
@@ -183,6 +183,8 @@
   };
   /** Create the actions on the tray menu or menubar */
   void createActions();
+  /** Override the parent function in order to remove it */
+  QMenu* createPopupMenu();
   /** Creates a tray icon with a context menu and adds it to the system
    * notification area. We also set up an application menubar. */
   void createTrayIcon();