Changeset 81

Timestamp:

01/13/06 02:43:50 (3 years ago)

Author:

edmanm

Message:

Make Vidalia's name appear properly-cased on Mac;
Let Vidalia have a menu in the menubar on Mac.

Location:

trunk/src

Files:

• Vidalia.pro (added)
• gui/main.cpp (modified) (1 diff)
• gui/mainwindow.cpp (modified) (2 diffs)
• gui/mainwindow.h (modified) (3 diffs)

trunk/src/gui/main.cpp

@@ -51 +51 @@
   
   MainWindow mainWin; 
-
   return app.exec();
 }

trunk/src/gui/mainwindow.cpp

@@ -33 +33 @@
   createActions();
   createMenus();
- 
+  
   /* Create a new TorControl object, used to communicate with and manipulate Tor */
   _torControl = new TorControl();
@@ -96 +96 @@
   _toolsMenu->addAction(_bandwidthAct);
   _toolsMenu->addAction(_messageAct);
+
+#if defined(Q_WS_MAC)
+  /* The File, Help, and Configure menus will get merged into the application
+   * menu by Qt. */
+  _menuBar = new QMenuBar();
+  _fileMenu = _menuBar->addMenu(tr("File"));
+  _fileMenu->addAction(_exitAct);
+  _torMenu = _menuBar->addMenu(tr("Tor"));
+  _torMenu->addAction(_startAct);
+  _torMenu->addAction(_stopAct);
+  _torMenu->addAction(_configAct);
+  _menuBar->addMenu(_toolsMenu);
+  _helpMenu = _menuBar->addMenu(tr("Help"));
+  _helpMenu->addAction(_aboutAct);
+#endif
 }
 

trunk/src/gui/mainwindow.h

@@ -48 +48 @@
   void createMenus();
   void createActions();
+  void createMenuBar();
 
   TorControl* _torControl;
@@ -55 +56 @@
   QMenu* _trayMenu;
   QMenu* _toolsMenu;
- 
+
   QAction* _startAct;
   QAction* _stopAct;
@@ -63 +64 @@
   QAction* _bandwidthAct;
   QAction* _messageAct;
+
+/* GUI elements unique on Mac so we can use the system menubar */
+#if defined(Q_WS_MAC)
+  QMenuBar* _menuBar;
+  QMenu* _fileMenu;
+  QMenu* _torMenu;
+  QMenu* _helpMenu;
+#endif
 };