More minor fixes

Mitnitsky · May 28, 2019 · a65fd12 · a65fd12
1 parent 4b86543
commit a65fd12
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ __pycache__/
 faculty_example.json
 # Project
 settings.cfg
+*.iss
 *.dps
 *.spec
 *..spec

diff --git a/Ui_main_heb.py b/Ui_main_heb.py
@@ -765,7 +765,7 @@ def retranslateUi(self, MainWindow):
         self.project_of_in_7.setValue(0.0)
         self.sport_label_7.setText(_translate("MainWindow", "ספורט:"))
         self.sport_of_in_7.setValue(0.0)
-        self.english_checkbox_7.setText(_translate("MainWindow", "פתור באנגלית"))
+        self.english_checkbox_7.setText(_translate("MainWindow", "פטור מאנגלית"))
         self.deg_points_label.setToolTip(_translate("MainWindow", "<html><head/><body><p>יש למלא</p></body></html>"))
         self.deg_points_label.setText(_translate("MainWindow", "נקודות לתואר:"))
         self.deg_points_in.setValue(0)

diff --git a/main.py b/main.py
@@ -46,4 +46,4 @@ def checkSettingsFile():
         # Windows case
         app.setStyle('Fusion')
     application = MyWindow()
-    exit(app.exec())
+    app.exec_()
diff --git a/py_install_build.bat b/py_install_build.bat
@@ -1,8 +1,8 @@
 python -OO -m PyInstaller main.py ^
 	--clean ^
+        -D ^
         --name "Degree Planner" ^
         --add-data images/;images ^
-        --add-data settings.json;settings.json ^
         --add-data db/;db ^
 	    -i images/main_icon.ico ^
 	    -c ^

diff --git a/pyinstaller_build.sh b/pyinstaller_build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-python -OO -m PyInstaller main.py \
+pyinstaller main.py \
         --clean \
 	-D \
 	--name degreePlanner \

diff --git a/settings.json b/settings.json
@@ -1,6 +1,6 @@
 {
     "save_file": "/home/vov4ik/Projects/DegreePlaner/my_save.dps",
-    "language": "heb",
+    "language": "eng",
     "dimensions": [
         {
             "width": 1724,
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ __pycache__/ @@
     faculty_example.json
     # Project
     settings.cfg
+    *.iss
     *.dps
     *.spec
     *..spec
@@ Expand Down @@