ui update. communication between login screen and main app added

src/loginscreen.py

@@ -6,37 +6,44 @@ import os
 
 
 class LoginScreen(QtGui.QWidget):
-    def setupUi(self, Form):
+
-        Form.setObjectName("Form")
+    def __init__(self):
-        Form.resize(400, 200)
+        super(LoginScreen, self).__init__()
-        Form.setMinimumSize(QtCore.QSize(400, 200))
+        self.initUI()
-        Form.setMaximumSize(QtCore.QSize(400, 200))
+
-        Form.setBaseSize(QtCore.QSize(400, 200))
+    def initUI(self):
-        self.new_profile = QtGui.QPushButton(Form)
+        self.setObjectName("login")
+        self.resize(400, 200)
+        self.setMinimumSize(QtCore.QSize(400, 200))
+        self.setMaximumSize(QtCore.QSize(400, 200))
+        self.setBaseSize(QtCore.QSize(400, 200))
+        self.new_profile = QtGui.QPushButton(self)
         self.new_profile.setGeometry(QtCore.QRect(20, 150, 171, 27))
         self.new_profile.setObjectName("new_profile")
-        self.label = QtGui.QLabel(Form)
+        self.new_profile.clicked.connect(self.create_profile)
+        self.label = QtGui.QLabel(self)
         self.label.setGeometry(QtCore.QRect(20, 70, 101, 17))
         self.label.setObjectName("label")
-        self.new_name = QtGui.QPlainTextEdit(Form)
+        self.new_name = QtGui.QPlainTextEdit(self)
         self.new_name.setGeometry(QtCore.QRect(20, 100, 171, 31))
         self.new_name.setObjectName("new_name")
-        self.load_profile = QtGui.QPushButton(Form)
+        self.load_profile = QtGui.QPushButton(self)
         self.load_profile.setGeometry(QtCore.QRect(220, 150, 161, 27))
         self.load_profile.setObjectName("load_profile")
-        self.default = QtGui.QCheckBox(Form)
+        self.load_profile.clicked.connect(self.load_ex_profile)
+        self.default = QtGui.QCheckBox(self)
         self.default.setGeometry(QtCore.QRect(220, 110, 131, 22))
         self.default.setObjectName("default")
-        self.groupBox = QtGui.QGroupBox(Form)
+        self.groupBox = QtGui.QGroupBox(self)
         self.groupBox.setGeometry(QtCore.QRect(210, 40, 181, 151))
         self.groupBox.setObjectName("groupBox")
         self.comboBox = QtGui.QComboBox(self.groupBox)
         self.comboBox.setGeometry(QtCore.QRect(10, 30, 161, 27))
         self.comboBox.setObjectName("comboBox")
-        self.groupBox_2 = QtGui.QGroupBox(Form)
+        self.groupBox_2 = QtGui.QGroupBox(self)
         self.groupBox_2.setGeometry(QtCore.QRect(10, 40, 191, 151))
         self.groupBox_2.setObjectName("groupBox_2")
-        self.toxygen = QtGui.QLabel(Form)
+        self.toxygen = QtGui.QLabel(self)
         self.groupBox.raise_()
         self.groupBox_2.raise_()
         self.comboBox.raise_()
@@ -50,25 +57,56 @@ class LoginScreen(QtGui.QWidget):
         font.setPointSize(16)
         self.toxygen.setFont(font)
         self.toxygen.setObjectName("toxygen")
+        self.type = 0
+        self.number = -1
+        self.load_as_default = False
+        self.name = None
+        self.retranslateUi()
+        QtCore.QMetaObject.connectSlotsByName(self)
+        self.center()
 
-        self.retranslateUi(Form)
+    def center(self):
-        QtCore.QMetaObject.connectSlotsByName(Form)
+        qr = self.frameGeometry()
+        cp = QtGui.QDesktopWidget().availableGeometry().center()
+        qr.moveCenter(cp)
+        self.move(qr.topLeft())
 
-    def retranslateUi(self, Form):
+    def retranslateUi(self):
-        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Log in", None, QtGui.QApplication.UnicodeUTF8))
+        self.setWindowTitle(QtGui.QApplication.translate("login", "Log in", None, QtGui.QApplication.UnicodeUTF8))
-        self.new_profile.setText(QtGui.QApplication.translate("Form", "Create", None, QtGui.QApplication.UnicodeUTF8))
+        self.new_profile.setText(QtGui.QApplication.translate("login", "Create", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("Form", "Profile name:", None, QtGui.QApplication.UnicodeUTF8))
+        self.label.setText(QtGui.QApplication.translate("login", "Profile name:", None, QtGui.QApplication.UnicodeUTF8))
-        self.load_profile.setText(QtGui.QApplication.translate("Form", "Load profile", None, QtGui.QApplication.UnicodeUTF8))
+        self.load_profile.setText(QtGui.QApplication.translate("login", "Load profile", None, QtGui.QApplication.UnicodeUTF8))
-        self.default.setText(QtGui.QApplication.translate("Form", "Use as default", None, QtGui.QApplication.UnicodeUTF8))
+        self.default.setText(QtGui.QApplication.translate("login", "Use as default", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox.setTitle(QtGui.QApplication.translate("Form", "Load existing profile", None, QtGui.QApplication.UnicodeUTF8))
+        self.groupBox.setTitle(QtGui.QApplication.translate("login", "Load existing profile", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox_2.setTitle(QtGui.QApplication.translate("Form", "Create new profile", None, QtGui.QApplication.UnicodeUTF8))
+        self.groupBox_2.setTitle(QtGui.QApplication.translate("login", "Create new profile", None, QtGui.QApplication.UnicodeUTF8))
-        self.toxygen.setText(QtGui.QApplication.translate("Form", "toxygen", None, QtGui.QApplication.UnicodeUTF8))
+        self.toxygen.setText(QtGui.QApplication.translate("login", "toxygen", None, QtGui.QApplication.UnicodeUTF8))
+
+    def create_profile(self):
+        self.type = 1
+        self.name = self.new_name.toPlainText()
+        self.close()
+
+    def load_ex_profile(self):
+        if not self.create_only:
+            self.type = 2
+            self.number = self.comboBox.currentIndex()
+            self.load_as_default = self.default.isChecked()
+            self.close()
 
     def update_select(self, data):
         list_of_profiles = []
         for elem in data:
             list_of_profiles.append(self.tr(elem))
         self.comboBox.addItems(list_of_profiles)
+        self.create_only = not list_of_profiles
+
+    def update_on_close(self, func):
+        self.onclose = func
+
+    def closeEvent(self, event):
+        self.onclose(self.type, self.number, self.load_as_default, self.name)
+        event.accept()
+
 
 if __name__ == '__main__':
     app = QtGui.QApplication(sys.argv)

src/main.py

@@ -1,27 +1,64 @@
 from loginscreen import LoginScreen
 from settings import Settings
+from mainscreen import MainWindow
 from profile import Profile
 import sys
 from PySide import QtCore, QtGui
 
 
-if __name__ == '__main__':
+class login(object):
+    def __init__(self, arr):
+        self.arr = arr
+
+    def login_screen_close(self, t, number=-1, default=False, name=None):
+        print str(t), str(number), str(default), str(name)
+        self.t = t
+        self.num = number
+        self.default = default
+        self.name = name
+
+    def get_data(self):
+        return self.arr[self.num]
+
+
+def main():
     app = QtGui.QApplication(sys.argv)
+    app.setWindowIcon(QtGui.QIcon('images/icon.png'))
     settings = Settings()
     if not settings['auto_profile']:
         # show login screen if default profile not found
         ls = LoginScreen()
-        win = QtGui.QMainWindow()
+        ls.setWindowIconText("Toxygen")
-        ls.setupUi(win)
         profiles = Profile.find_profiles()
         ls.update_select(map(lambda x: x[1], profiles))
-        win.show()
+        _login = login(profiles)
+        ls.update_on_close(_login.login_screen_close)
+        ls.show()
         app.connect(app, QtCore.SIGNAL("lastWindowClosed()"), app, QtCore.SLOT("quit()"))
         app.exec_()
-        # TODO: get result from loginscreen
+        if not _login.t:
-        # add new default profile (if needed)
+            return
-        # save selected profile to open
+        elif _login.t == 1:  # create new profile
-        # create new profile?
+            # TODO: add creation of new profile
+            path = Settings.get_default_path()
+            name = _login.name if _login.name else 'Toxygen User'
+            return
+        else:  # load existing profile
+            path, name = _login.get_data()
+            if _login.default:
+                settings['auto_profile'] = (path, name)
+                settings.save()
     else:
         path, name = settings['auto_profile']
+    # loading profile
+    print str(path), str(name)
+    data = Profile.open_profile(path, name)
+    ms = MainWindow()
+    ms.show()
+    app.connect(app, QtCore.SIGNAL("lastWindowClosed()"), app, QtCore.SLOT("quit()"))
+    app.exec_()
     # TODO: open mainscreen
+
+
+if __name__ == '__main__':
+    main()