[vidalia-svn] r3017: Create the control panel's menubar as a parentless QMenuBar, (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-08-29 12:03:27 -0400 (Fri, 29 Aug 2008)
New Revision: 3017

Modified:
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/mainwindow.ui
Log:
Create the control panel's menubar as a parentless QMenuBar, so it is visible
even if the control panel is not the topmost window. Fixes ticket #286.


Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-08-28 04:12:42 UTC (rev 3016)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-08-29 16:03:27 UTC (rev 3017)
@@ -410,7 +410,7 @@
   
   /* The File, Help, and Configure menus will get merged into the application
    * menu by Qt. */
-  QMenuBar *menuBar = new QMenuBar();
+  QMenuBar *menuBar = new QMenuBar(0);
   QMenu *fileMenu = menuBar->addMenu(tr("File"));
   fileMenu->addAction(_exitAct);
   
@@ -431,8 +431,6 @@
   _helpAct->setText(tr("Vidalia Help"));
   helpMenu->addAction(_helpAct);
   helpMenu->addAction(_aboutAct);
-  
-  setMenuBar(menuBar);
 #endif
 }
 

Modified: vidalia/trunk/src/vidalia/mainwindow.ui
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.ui	2008-08-28 04:12:42 UTC (rev 3016)
+++ vidalia/trunk/src/vidalia/mainwindow.ui	2008-08-29 16:03:27 UTC (rev 3017)
@@ -538,16 +538,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menubar" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>568</width>
-     <height>22</height>
-    </rect>
-   </property>
-  </widget>
   <widget class="QStatusBar" name="statusbar" />
  </widget>
  <customwidgets>