Finish QDialog to QMainWindow transition

agateau · Oct 12, 2011 · 1a99be5 · 1a99be5
1 parent 6183e80
commit 1a99be5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 135 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,5 @@
 all:
 	pyuic4 addtaskdialog.ui -o ui_addtaskdialog.py
-	pyuic4 logdialog.ui -o ui_logdialog.py
 	pyuic4 mainwindow.ui -o ui_mainwindow.py
 
 clean:

diff --git a/logdialog.ui b/logdialog.ui
diff --git a/logdialog.py → mainwindow.py b/logdialog.py → mainwindow.py
@@ -20,9 +20,9 @@
 QUERY_PROJECT = 1
 QUERY_DONE = 2
 
-class LogDialog(QMainWindow):
+class MainWindow(QMainWindow):
     def __init__(self):
-        super(LogDialog, self).__init__()
+        super(MainWindow, self).__init__()
         self.ui = Ui_MainWindow()
         self.ui.setupUi(self)
         self.centralWidget().layout().setMargin(0)

diff --git a/mainwindow.ui b/mainwindow.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>QYLog</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">

diff --git a/qylog.py b/qylog.py
@@ -15,15 +15,15 @@
 from yokadi import db
 
 import qymain
-from logdialog import LogDialog
+from mainwindow import MainWindow
 
 def main(argv):
     app = QApplication(argv)
     parser = qymain.createOptionParser()
     options, args = parser.parse_args(argv)
     db.connectDatabase(options.filename)
 
-    dlg = LogDialog()
+    dlg = MainWindow()
     dlg.show()
     return app.exec_()