v1.2: added 'General Functions' menu with shortcut to close window; c…

…reated subfolders that contain the scrambles and icons
AnnikaStein · Aug 28, 2019 · ce40d56 · ce40d56
1 parent 8206479
commit ce40d56
Show file tree

Hide file tree

Showing 40 changed files with 79 additions and 43 deletions.
diff --git a/newscrambles1.txt → FirstLayerScrambles/newscrambles1.txt b/newscrambles1.txt → FirstLayerScrambles/newscrambles1.txt
diff --git a/newscrambles2.txt → FirstLayerScrambles/newscrambles2.txt b/newscrambles2.txt → FirstLayerScrambles/newscrambles2.txt
diff --git a/newscrambles3.txt → FirstLayerScrambles/newscrambles3.txt b/newscrambles3.txt → FirstLayerScrambles/newscrambles3.txt
diff --git a/newscrambles4.txt → FirstLayerScrambles/newscrambles4.txt b/newscrambles4.txt → FirstLayerScrambles/newscrambles4.txt
diff --git a/newscrambles5.txt → FirstLayerScrambles/newscrambles5.txt b/newscrambles5.txt → FirstLayerScrambles/newscrambles5.txt
diff --git a/newscrambles6.txt → FirstLayerScrambles/newscrambles6.txt b/newscrambles6.txt → FirstLayerScrambles/newscrambles6.txt
diff --git a/newscrambles7.txt → FirstLayerScrambles/newscrambles7.txt b/newscrambles7.txt → FirstLayerScrambles/newscrambles7.txt
diff --git a/favicon.ico → Icons/favicon.ico b/favicon.ico → Icons/favicon.ico
diff --git a/logo.pdn → Icons/logo.pdn b/logo.pdn → Icons/logo.pdn
diff --git a/logo.png → Icons/logo.png b/logo.png → Icons/logo.png
diff --git a/logogreen.png → Icons/logogreen.png b/logogreen.png → Icons/logogreen.png
diff --git a/logogreenicon.png → Icons/logogreenicon.png b/logogreenicon.png → Icons/logogreenicon.png
diff --git a/logoicon.png → Icons/logoicon.png b/logoicon.png → Icons/logoicon.png
diff --git a/logored.png → Icons/logored.png b/logored.png → Icons/logored.png
diff --git a/logoredicon.png → Icons/logoredicon.png b/logoredicon.png → Icons/logoredicon.png
diff --git a/l4c.txt → Last2LayerScrambles/l4c.txt b/l4c.txt → Last2LayerScrambles/l4c.txt
diff --git a/l5c.txt → Last2LayerScrambles/l5c.txt b/l5c.txt → Last2LayerScrambles/l5c.txt
diff --git a/p3s.txt → Last2LayerScrambles/p3s.txt b/p3s.txt → Last2LayerScrambles/p3s.txt
diff --git a/phu.txt → Last2LayerScrambles/phu.txt b/phu.txt → Last2LayerScrambles/phu.txt
diff --git a/phzpure.txt → Last2LayerScrambles/phzpure.txt b/phzpure.txt → Last2LayerScrambles/phzpure.txt
diff --git a/pi3s.txt → Last2LayerScrambles/pi3s.txt b/pi3s.txt → Last2LayerScrambles/pi3s.txt
diff --git a/pihu.txt → Last2LayerScrambles/pihu.txt b/pihu.txt → Last2LayerScrambles/pihu.txt
diff --git a/pihz.txt → Last2LayerScrambles/pihz.txt b/pihz.txt → Last2LayerScrambles/pihz.txt
diff --git a/pio.txt → Last2LayerScrambles/pio.txt b/pio.txt → Last2LayerScrambles/pio.txt
diff --git a/piswirl.txt → Last2LayerScrambles/piswirl.txt b/piswirl.txt → Last2LayerScrambles/piswirl.txt
diff --git a/pivu.txt → Last2LayerScrambles/pivu.txt b/pivu.txt → Last2LayerScrambles/pivu.txt
diff --git a/piwat.txt → Last2LayerScrambles/piwat.txt b/piwat.txt → Last2LayerScrambles/piwat.txt
diff --git a/pix.txt → Last2LayerScrambles/pix.txt b/pix.txt → Last2LayerScrambles/pix.txt
diff --git a/pizconj.txt → Last2LayerScrambles/pizconj.txt b/pizconj.txt → Last2LayerScrambles/pizconj.txt
diff --git a/po.txt → Last2LayerScrambles/po.txt b/po.txt → Last2LayerScrambles/po.txt
diff --git a/pswirl.txt → Last2LayerScrambles/pswirl.txt b/pswirl.txt → Last2LayerScrambles/pswirl.txt
diff --git a/pvu.txt → Last2LayerScrambles/pvu.txt b/pvu.txt → Last2LayerScrambles/pvu.txt
diff --git a/pwat.txt → Last2LayerScrambles/pwat.txt b/pwat.txt → Last2LayerScrambles/pwat.txt
diff --git a/px.txt → Last2LayerScrambles/px.txt b/px.txt → Last2LayerScrambles/px.txt
diff --git a/pzconj.txt → Last2LayerScrambles/pzconj.txt b/pzconj.txt → Last2LayerScrambles/pzconj.txt
diff --git a/MainWindow.py b/MainWindow.py
diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@ by Annika Stein (also known as HugaCuba on social media such as
 ![SkewbSkills Logo](logogreen.png)
 
 # What's new?
+Release of 1.2:
++ Create subfolders that contain the scrambles and icons
 Release of v1.1:
 + Better way to generate the first layer trainer scrambles, less code, less 
 disk space - faster in general.
@@ -80,7 +82,7 @@ Besides that, there is always the option to download the sources and run
 
 If I'm informed correctly, it should already be possible for linux users to 
 run python files, only the package 'PyQt5' has to be installed besides the 
-standard libraries (in our case: 'random' and 'sys').
+standard libraries (in our case: 'random', 'sys' and 'os').
 
 # Usage
 After opening SkewbSkills, type 'H' or choose Help from the menubar to get 

diff --git a/SkewbSkills.spec b/SkewbSkills.spec
@@ -30,4 +30,4 @@ exe = EXE(pyz,
           upx=True,
           upx_exclude=[],
           runtime_tmpdir=None,
-          console=False , icon='favicon.ico')
+          console=False , icon='Icons\\favicon.ico')
diff --git a/SkewbSkillsFilesv1.2.zip b/SkewbSkillsFilesv1.2.zip
diff --git a/doc.txt b/doc.txt
@@ -272,4 +272,11 @@
         Help button / window
         Shortcuts added for both modes
         Scrambles are generated way faster, using less disk space
-    Used "pyinstaller -w -F -n SkewbSkills -i favicon.ico MainWindow.py" to generate executable
+    Used "pyinstaller -w -F -n SkewbSkills -i favicon.ico MainWindow.py" to generate executable
+
+28.08.2019:
+    added 'General Functions' menu with shortcut to close the window
+    create subfolders where the .txt files are located and work with those
+        instead of having all files in only one folder (requested by Elias)
+    create new exe and release new zip-folder, marked as v1. with
+        "pyinstaller -w -F -n SkewbSkills -i Icons/favicon.ico MainWindow.py"