[Foo2zjs-commits] r83 - trunk/hannah

[white at alioth.debian.org]

Author: white
Date: 2007-09-28 12:48:45 +0000 (Fri, 28 Sep 2007)
New Revision: 83

Modified:
   trunk/hannah/gui.cpp
Log:
Make the menu show up

Modified: trunk/hannah/gui.cpp
===================================================================
--- trunk/hannah/gui.cpp	2007-09-28 12:42:23 UTC (rev 82)
+++ trunk/hannah/gui.cpp	2007-09-28 12:48:45 UTC (rev 83)
@@ -88,27 +88,35 @@
         downloadButton->setFont(QFont("Times", 18));
         exitButton->setFont(QFont("Times", 18));
 
-        mainLayout->addWidget(hp2600Button, 0, 0);
-        mainLayout->addWidget(hp1600Button, 1, 0);
-        mainLayout->addWidget(hp1020Button, 2, 0);
-        mainLayout->addWidget(hp1018Button, 3, 0);
-        mainLayout->addWidget(hp1005Button, 4, 0);
-        mainLayout->addWidget(hp1000Button, 5, 0);
-        mainLayout->addWidget(minolta2530Button, 6, 0);
-        mainLayout->addWidget(minolta2490Button, 7, 0);
-        mainLayout->addWidget(minolta2480Button, 8, 0);
-        mainLayout->addWidget(minolta2430Button, 9, 0);
-        mainLayout->addWidget(minolta2300Button, 10, 0);
-        mainLayout->addWidget(minolta2200Button, 11, 0);
-        mainLayout->addWidget(minoltaproButton, 12, 0);
-        mainLayout->addWidget(samsung3160Button, 13, 0);
-        mainLayout->addWidget(samsung600Button, 14, 0);
-        mainLayout->addWidget(samsung300Button, 15, 0);
-        mainLayout->addWidget(xerox6115Button, 16, 0);
-        mainLayout->addWidget(xerox6110Button, 17, 0);
-        mainLayout->addWidget(allButton, 18, 0);
-        mainLayout->addWidget(downloadButton, 19, 0);
-        mainLayout->addWidget(exitButton, 20, 0);
+        QMenuBar *menubar = new QMenuBar;
+        QMenu *menu = new QMenu;
+        menubar->addMenu(menu);
+        QAction *about = new QAction(tr("About Hannah"), this);
+        menu = menubar->addMenu(tr("Help"));
+        menu->addAction(about);
+
+	mainLayout->addWidget(menubar, 0, 0);
+        mainLayout->addWidget(hp2600Button, 1, 0);
+        mainLayout->addWidget(hp1600Button, 2, 0);
+        mainLayout->addWidget(hp1020Button, 3, 0);
+        mainLayout->addWidget(hp1018Button, 4, 0);
+        mainLayout->addWidget(hp1005Button, 5, 0);
+        mainLayout->addWidget(hp1000Button, 6, 0);
+        mainLayout->addWidget(minolta2530Button, 7, 0);
+        mainLayout->addWidget(minolta2490Button, 8, 0);
+        mainLayout->addWidget(minolta2480Button, 9, 0);
+        mainLayout->addWidget(minolta2430Button, 10, 0);
+        mainLayout->addWidget(minolta2300Button, 11, 0);
+        mainLayout->addWidget(minolta2200Button, 12, 0);
+        mainLayout->addWidget(minoltaproButton, 13, 0);
+        mainLayout->addWidget(samsung3160Button, 14, 0);
+        mainLayout->addWidget(samsung600Button, 15, 0);
+        mainLayout->addWidget(samsung300Button, 16, 0);
+        mainLayout->addWidget(xerox6115Button, 17, 0);
+        mainLayout->addWidget(xerox6110Button, 18, 0);
+        mainLayout->addWidget(allButton, 19, 0);
+        mainLayout->addWidget(downloadButton, 20, 0);
+        mainLayout->addWidget(exitButton, 21, 0);
         setMinimumSize(600, 700);
         setLayout(mainLayout);
 
@@ -133,12 +141,6 @@
         buttonGroup->addButton(xerox6115Button, 16);
         buttonGroup->addButton(xerox6110Button, 17);
 
-        QMenuBar *menubar = new QMenuBar;
-        QMenu *menu = new QMenu;
-        menubar->addMenu(menu);
-        QAction *about = new QAction(tr("About Hannah"), this);
-        menu = menubar->addMenu(tr("&Help"));
-        menu->addAction(about);
 };
 
 void MainWindow::setCheckBoxes(int state)