Added dimensions save function

Mitnitsky · May 17, 2019 · 3b69b97 · 3b69b97
1 parent 9979fa3
commit 3b69b97
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/settings.cfg → 1.cfg b/settings.cfg → 1.cfg
diff --git a/Ui_main_ui_eng.py b/Ui_main_ui_eng.py
@@ -11,8 +11,9 @@
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
+        width, height = loadDimensions()
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1696, 601)
+        MainWindow.resize(width, height)
         MainWindow.setLayoutDirection(QtCore.Qt.RightToLeft)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
@@ -804,4 +805,12 @@ def retranslateUi(self, MainWindow):
         self.actionUpdate_Courses_DB.setText(_translate("MainWindow", "Update Courses"))
         self.actionInfo.setText(_translate("MainWindow", "Info"))
 
-
+def loadDimensions():
+        try:
+            filename = open("dimensions.cfg", "r")
+            width = filename.readline()
+            height = filename.readline()
+            filename.close()
+            return int(width.split("=")[1]), int(height.split("=")[1])
+        except (FileNotFoundError, ValueError):
+            return 1320,565
diff --git a/Ui_main_ui_heb.py b/Ui_main_ui_heb.py
@@ -11,8 +11,9 @@
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
+        width, height = loadDimensions()
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1696, 601)
+        MainWindow.resize(width, height)
         MainWindow.setLayoutDirection(QtCore.Qt.RightToLeft)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
@@ -822,4 +823,13 @@ def createRemoveLineButton(line):
                     "Form",
                     "<html><head/><body><p><span style=\" font-size:12pt; font-weight:600;\">איפוס שורה</span></p></body></html>"
             ))
-    return semester_table_remove_line
+    return semester_table_remove_line
+
+def loadDimensions():
+        try:
+            file = open("dimensions.cfg", "r")
+            width = file.readline()
+            height = file.readline()
+            return int(width.split("=")[1]), int(height.split("=")[1])
+        except FileNotFoundError:
+            return 1320,565
diff --git a/dimensions.cfg b/dimensions.cfg
@@ -0,0 +1,2 @@
+width=1542
+height=697
diff --git a/lng.cfg b/lng.cfg
@@ -1 +1 @@
-language=heb
+language=eng
diff --git a/logic.py b/logic.py
@@ -54,6 +54,8 @@ def __init__(self):
                     self.addSemester()
                     self.saved = True
         except FileNotFoundError:
+            if self.ui.courses_tab_widget.count() == 0:
+                self.addSemester()
             self.update_allowed = True
             self.saved = True
             pass
@@ -82,8 +84,15 @@ def closeEvent(self, event):
                 return
         if self.searchWindow:
             self.searchWindow.close()
+        self.saveWindowDimensions()
         return super().closeEvent(event)
 
+    def saveWindowDimensions(self):
+        filename = open("dimensions.cfg", "w+")
+        filename.write("width="+str(self.width())+"\n")
+        filename.write("height="+str(self.height())+"\n")
+
+
     def loadLanguage(self):
         try:
             filename = open("lng.cfg", "r")
@@ -791,7 +800,7 @@ def removeSemester(self, i, force=False):
             if not self.checkIfRowIsEmpty(table, row):
                 emptySemester = False
                 break
-        if force or emptySemester  or (self.english_ui and self.my_close("semester", "Remove non-empty semester?")) or self.my_close("semester", "למחוק סמסטר בעל תוכן?"):
+        if force or emptySemester  or (self.english_ui and self.my_close("semester", "Remove non-empty semester?")) or (not self.english_ui and self.my_close("semester", "למחוק סמסטר בעל תוכן?")):
             self.ui.courses_tab_widget.removeTab(i)
             if self.ui.courses_tab_widget.count() == 0:
                 self.addSemester()