Merge pull request #165 from Floskinner/gui

New Feature: GUI hinzufügen
timreibe · May 29, 2021 · 372857f · 372857f
2 parents 757f7b3 + 996a6ca
commit 372857f
Show file tree

Hide file tree

Showing 20 changed files with 2,519 additions and 29 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -22,6 +22,8 @@ jobs:
           pip install -r requirements.txt
       - name: Build Windows
         run: pyinstaller --clean --noconfirm specs/windows-terminservice.spec
+      - name: Build Windows GUI
+        run: pyinstaller --clean --noconfirm specs/windows-terminservice-gui.spec
   build-linux:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -16,6 +16,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/[email protected]
+      - name: tagname
+        uses: olegtarasov/[email protected]
+
       - name: Setup Python
         uses: actions/[email protected]
         with:
@@ -24,33 +27,57 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
+      
       - name: Build Windows
         run: pyinstaller --clean --noconfirm specs/windows-terminservice.spec
+      - name: Build Windows GUI
+        run: pyinstaller --clean --noconfirm specs/windows-terminservice-gui.spec
+
       - name: Chocolatey install innosetup
         uses: crazy-max/[email protected]
         with:
           # Arguments to pass to Chocolatey
           args: install innosetup --install-arguments="'/DIR=../innosetup'" --force
-      - name: tagname
-        uses: olegtarasov/[email protected]
-      - name: Run innosetup
+
+      - name: Innosetup windows-terminservice
         # Run innosetup and set application version to git tag
         run: ../innosetup/ISCC.exe specs/windows-terminservice.iss /DApplicationVersion=${{ env.GIT_TAG_NAME }}
-      - name: Zip
+      - name: Innosetup windows-terminservice-gui
+        # Run innosetup and set application version to git tag
+        run: ../innosetup/ISCC.exe specs/windows-terminservice-gui.iss /DApplicationVersion=${{ env.GIT_TAG_NAME }}
+
+      - name: Zip Windows
         uses: papeloto/action-zip@v1
         with:
-          files: dist/
+          files: dist/windows-terminservice
           dest: vaccipy-windows.zip
+      - name: Zip Windows gui
+        uses: papeloto/action-zip@v1
+        with:
+          files: dist/windows-terminservice-gui
+          dest: vaccipy-windows-gui.zip
+
       - name: Store windows zip as build artifact
         uses: actions/upload-artifact@v2
         with:
           name: vaccipy-windows
           path: vaccipy-windows.zip
+      - name: Store windows gui zip as build artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: vaccipy-windows-gui
+          path: vaccipy-windows-gui.zip
+
       - name: Store windows installer as build artifact
         uses: actions/upload-artifact@v2
         with:
           name: vaccipy-windows-installer
           path: installers/vaccipy_installer.exe
+      - name: Store windows gui installer as build artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: vaccipy-windows-gui-installer
+          path: installers/vaccipy_gui_installer.exe
 
   build-linux:
     runs-on: ubuntu-latest
@@ -72,7 +99,7 @@ jobs:
         with:
           files: dist/
           dest: vaccipy-ubuntu.zip
-      - name: Store windows build artifact
+      - name: Store ubuntu build artifact
         uses: actions/upload-artifact@v2
         with:
           name: vaccipy-ubuntu
@@ -90,5 +117,7 @@ jobs:
           prerelease: false
           files: |
             vaccipy-windows-installer/vaccipy_installer.exe
+            vaccipy-windows-gui-installer/vaccipy_gui_installer.exe
             vaccipy-windows/vaccipy-windows.zip
+            vaccipy-windows-gui/vaccipy-windows-gui.zip
             vaccipy-ubuntu/vaccipy-ubuntu.zip
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ log/
 
 # data
 kontaktdaten.json
+zeitspanne.json
 
 #building: 
 installer/

diff --git a/docs/distribution.md b/docs/distribution.md
@@ -52,14 +52,21 @@ Schritte zum Erstellen einer Distribution:
     Nachdem mit pyinstaller die Distribution erstellt wurde, ist diese in im `dist/` folder zu finden.  
 
 
-#### Windows
+#### Windows Konsolenanwendung
 
 .spec Datei erstellen und anschließend Distribution erstellen:  
 ```shell
 pyi-makespec main.py --specpath "specs//" --add-binary "..\tools\chromedriver\chromedriver-windows.exe;tools\chromedriver\" --name windows-terminservice --hidden-import plyer.platforms.win.notification --hidden-import cloudscraper --add-data "../tools/cloudscraper;./cloudscraper/" --icon "..images\spritze.ico"
 
 pyinstaller --clean specs/windows-terminservice.spec
 ```
+#### Windows GUI
+
+```shell
+pyi-makespec gui.py --specpath "specs//" --add-binary "..\tools\chromedriver\chromedriver-windows.exe;tools\chromedriver\" --add-binary "..\tools\gui\kontaktdaten.ui;tools\gui\" --add-binary "..\tools\gui\main.ui;tools\gui\" --add-binary "..\tools\gui\terminsuche.ui;tools\gui\" --add-binary "..\tools\gui\uhrzeiten.ui;tools\gui\" --add-binary "..\images\spritze.ico;images\" --name windows-terminservice-gui --hidden-import plyer.platforms.win.notification --hidden-import cloudscraper --add-data "../tools/cloudscraper;./cloudscraper/" --icon "..\images\spritze.ico" --windowed
+
+pyinstaller --clean specs/windows-terminservice-gui.spec
+```
 
 #### Linux
 ```shell