Merge pull request #168 from mathoudebine/fix/theme-cleanup

Clean themes by removing unused entries (will be picked from default.yaml)
mathoudebine · Feb 19, 2023 · 0186fb0 · 0186fb0
2 parents fd40db5 + 6087dec
commit 0186fb0
Show file tree

Hide file tree

Showing 82 changed files with 456 additions and 1,833 deletions.
diff --git a/.github/workflows/themes-screenshot.yml b/.github/workflows/themes-screenshot.yml
@@ -39,20 +39,22 @@ jobs:
       run: |
         for dir in res/themes/*/
         do
-          # Keep only folder name
-          theme=`basename ${dir%*/}`
-        
-          # Setup selected theme in config.yaml
-          echo "Using theme $theme"
-          sed -i "/THEME:/c\  THEME: $theme" config.yaml
-  
-          # Run system-monitor for 5 seconds
-          python3 main.py > output.log 2>&1 &
-          sleep 5
-          killall -9 python3
-
-          # Rename screen capture
-          cp screencap.png screenshot-$theme.png
+          if test -f "$dir/theme.yaml"; then        
+            # Keep only folder name
+            theme=`basename ${dir%*/}`
+          
+            # Setup selected theme in config.yaml
+            echo "Using theme $theme"
+            sed -i "/THEME:/c\  THEME: $theme" config.yaml
+    
+            # Run system-monitor for 5 seconds
+            python3 main.py > output.log 2>&1 &
+            sleep 5
+            killall -9 python3
+
+            # Rename screen capture
+            cp screencap.png screenshot-$theme.png
+          fi
         done
 
     - name: Archive screenshots

diff --git a/...themes/3.5inchTheme1_theme_background.png → ...amples/3.5inchTheme1_theme_background.png b/...themes/3.5inchTheme1_theme_background.png → ...amples/3.5inchTheme1_theme_background.png
diff --git a/res/themes/3.5inchTheme1_theme_example.png → ... examples/3.5inchTheme1_theme_example.png b/res/themes/3.5inchTheme1_theme_example.png → ... examples/3.5inchTheme1_theme_example.png
diff --git a/res/themes/A EVA UI 001_theme_background.png → ...xamples/A EVA UI 001_theme_background.png b/res/themes/A EVA UI 001_theme_background.png → ...xamples/A EVA UI 001_theme_background.png
diff --git a/res/themes/A EVA UI 001_theme_example.png → ...e examples/A EVA UI 001_theme_example.png b/res/themes/A EVA UI 001_theme_example.png → ...e examples/A EVA UI 001_theme_example.png
diff --git a/res/themes/A EVA UI 002_theme_background.png → ...xamples/A EVA UI 002_theme_background.png b/res/themes/A EVA UI 002_theme_background.png → ...xamples/A EVA UI 002_theme_background.png
diff --git a/res/themes/A EVA UI 002_theme_example.png → ...e examples/A EVA UI 002_theme_example.png b/res/themes/A EVA UI 002_theme_example.png → ...e examples/A EVA UI 002_theme_example.png
diff --git a/res/themes/A cyberpunk_theme_background.png → ...examples/A cyberpunk_theme_background.png b/res/themes/A cyberpunk_theme_background.png → ...examples/A cyberpunk_theme_background.png
diff --git a/res/themes/A cyberpunk_theme_example.png → ...me examples/A cyberpunk_theme_example.png b/res/themes/A cyberpunk_theme_example.png → ...me examples/A cyberpunk_theme_example.png
diff --git a/res/themes/AORUS_theme_background.png → ...Theme examples/AORUS_theme_background.png b/res/themes/AORUS_theme_background.png → ...Theme examples/AORUS_theme_background.png
diff --git a/res/themes/AORUS_theme_example.png → .../--Theme examples/AORUS_theme_example.png b/res/themes/AORUS_theme_example.png → .../--Theme examples/AORUS_theme_example.png
diff --git a/res/themes/B cyberpunk_theme_background.png → ...examples/B cyberpunk_theme_background.png b/res/themes/B cyberpunk_theme_background.png → ...examples/B cyberpunk_theme_background.png
diff --git a/res/themes/B cyberpunk_theme_example.png → ...me examples/B cyberpunk_theme_example.png b/res/themes/B cyberpunk_theme_example.png → ...me examples/B cyberpunk_theme_example.png
diff --git a/res/themes/CartoonTheme_background.png → ...heme examples/CartoonTheme_background.png b/res/themes/CartoonTheme_background.png → ...heme examples/CartoonTheme_background.png
diff --git a/res/themes/DeepSpaceTheme_background.png → ...me examples/DeepSpaceTheme_background.png b/res/themes/DeepSpaceTheme_background.png → ...me examples/DeepSpaceTheme_background.png
diff --git a/res/themes/Dragon Ball_theme_background.png → ...examples/Dragon Ball_theme_background.png b/res/themes/Dragon Ball_theme_background.png → ...examples/Dragon Ball_theme_background.png
diff --git a/res/themes/Dragon Ball_theme_example.png → ...me examples/Dragon Ball_theme_example.png b/res/themes/Dragon Ball_theme_example.png → ...me examples/Dragon Ball_theme_example.png
diff --git a/res/themes/Earth theme_theme_background.png → ...examples/Earth theme_theme_background.png b/res/themes/Earth theme_theme_background.png → ...examples/Earth theme_theme_background.png
diff --git a/res/themes/Earth theme_theme_example.png → ...me examples/Earth theme_theme_example.png b/res/themes/Earth theme_theme_example.png → ...me examples/Earth theme_theme_example.png
diff --git a/res/themes/ElectronTheme_background.png → ...eme examples/ElectronTheme_background.png b/res/themes/ElectronTheme_background.png → ...eme examples/ElectronTheme_background.png
diff --git a/res/themes/Gradient_theme_background.png → ...me examples/Gradient_theme_background.png b/res/themes/Gradient_theme_background.png → ...me examples/Gradient_theme_background.png
diff --git a/res/themes/Gradient_theme_example.png → ...Theme examples/Gradient_theme_example.png b/res/themes/Gradient_theme_example.png → ...Theme examples/Gradient_theme_example.png
diff --git a/res/themes/GreenRingTheme_background.png → ...me examples/GreenRingTheme_background.png b/res/themes/GreenRingTheme_background.png → ...me examples/GreenRingTheme_background.png
diff --git a/...s/LandscapeDeepSpace_theme_background.png → ...s/LandscapeDeepSpace_theme_background.png b/...s/LandscapeDeepSpace_theme_background.png → ...s/LandscapeDeepSpace_theme_background.png
diff --git a/...emes/LandscapeDeepSpace_theme_example.png → ...ples/LandscapeDeepSpace_theme_example.png b/...emes/LandscapeDeepSpace_theme_example.png → ...ples/LandscapeDeepSpace_theme_example.png
diff --git a/...andscapeSimplePurple_theme_background.png → ...andscapeSimplePurple_theme_background.png b/...andscapeSimplePurple_theme_background.png → ...andscapeSimplePurple_theme_background.png
diff --git a/...s/LandscapeSimplePurple_theme_example.png → ...s/LandscapeSimplePurple_theme_example.png b/...s/LandscapeSimplePurple_theme_example.png → ...s/LandscapeSimplePurple_theme_example.png
diff --git a/...LandscapeSimpleWhite_theme_background.png → ...LandscapeSimpleWhite_theme_background.png b/...LandscapeSimpleWhite_theme_background.png → ...LandscapeSimpleWhite_theme_background.png
diff --git a/...es/LandscapeSimpleWhite_theme_example.png → ...es/LandscapeSimpleWhite_theme_example.png b/...es/LandscapeSimpleWhite_theme_example.png → ...es/LandscapeSimpleWhite_theme_example.png
diff --git a/...andscapeTechnologyCh_theme_background.png → ...andscapeTechnologyCh_theme_background.png b/...andscapeTechnologyCh_theme_background.png → ...andscapeTechnologyCh_theme_background.png
diff --git a/...s/LandscapeTechnologyCh_theme_example.png → ...s/LandscapeTechnologyCh_theme_example.png b/...s/LandscapeTechnologyCh_theme_example.png → ...s/LandscapeTechnologyCh_theme_example.png
diff --git a/.../LandscapeTechnology_theme_background.png → .../LandscapeTechnology_theme_background.png b/.../LandscapeTechnology_theme_background.png → .../LandscapeTechnology_theme_background.png
diff --git a/...mes/LandscapeTechnology_theme_example.png → ...les/LandscapeTechnology_theme_example.png b/...mes/LandscapeTechnology_theme_example.png → ...les/LandscapeTechnology_theme_example.png
diff --git a/res/themes/MagicBlue_theme_background.png → ...e examples/MagicBlue_theme_background.png b/res/themes/MagicBlue_theme_background.png → ...e examples/MagicBlue_theme_background.png
diff --git a/res/themes/MagicBlue_theme_example.png → ...heme examples/MagicBlue_theme_example.png b/res/themes/MagicBlue_theme_example.png → ...heme examples/MagicBlue_theme_example.png
diff --git a/res/themes/NZXT_BLUR_theme_background.png → ...e examples/NZXT_BLUR_theme_background.png b/res/themes/NZXT_BLUR_theme_background.png → ...e examples/NZXT_BLUR_theme_background.png
diff --git a/res/themes/NZXT_BLUR_theme_example.png → ...heme examples/NZXT_BLUR_theme_example.png b/res/themes/NZXT_BLUR_theme_example.png → ...heme examples/NZXT_BLUR_theme_example.png
diff --git a/res/themes/NZXT_C_theme_background.png → ...heme examples/NZXT_C_theme_background.png b/res/themes/NZXT_C_theme_background.png → ...heme examples/NZXT_C_theme_background.png
diff --git a/res/themes/NZXT_C_theme_example.png → ...--Theme examples/NZXT_C_theme_example.png b/res/themes/NZXT_C_theme_example.png → ...--Theme examples/NZXT_C_theme_example.png
diff --git a/res/themes/NZXT_T_theme_background.png → ...heme examples/NZXT_T_theme_background.png b/res/themes/NZXT_T_theme_background.png → ...heme examples/NZXT_T_theme_background.png
diff --git a/res/themes/NZXT_T_theme_example.png → ...--Theme examples/NZXT_T_theme_example.png b/res/themes/NZXT_T_theme_example.png → ...--Theme examples/NZXT_T_theme_example.png
diff --git a/res/themes/NZXT_W_theme_background.png → ...heme examples/NZXT_W_theme_background.png b/res/themes/NZXT_W_theme_background.png → ...heme examples/NZXT_W_theme_background.png
diff --git a/res/themes/NZXT_W_theme_example.png → ...--Theme examples/NZXT_W_theme_example.png b/res/themes/NZXT_W_theme_example.png → ...--Theme examples/NZXT_W_theme_example.png
diff --git a/res/themes/OnePiece_theme_background.png → ...me examples/OnePiece_theme_background.png b/res/themes/OnePiece_theme_background.png → ...me examples/OnePiece_theme_background.png
diff --git a/res/themes/OnePiece_theme_example.png → ...Theme examples/OnePiece_theme_example.png b/res/themes/OnePiece_theme_example.png → ...Theme examples/OnePiece_theme_example.png
diff --git a/...themes/Pikachu theme_theme_background.png → ...amples/Pikachu theme_theme_background.png b/...themes/Pikachu theme_theme_background.png → ...amples/Pikachu theme_theme_background.png
diff --git a/res/themes/Pikachu theme_theme_example.png → ... examples/Pikachu theme_theme_example.png b/res/themes/Pikachu theme_theme_example.png → ... examples/Pikachu theme_theme_example.png
diff --git a/res/themes/PointerTheme_background.png → ...heme examples/PointerTheme_background.png b/res/themes/PointerTheme_background.png → ...heme examples/PointerTheme_background.png
diff --git a/res/themes/ROG2_theme_background.png → ...-Theme examples/ROG2_theme_background.png b/res/themes/ROG2_theme_background.png → ...-Theme examples/ROG2_theme_background.png
diff --git a/res/themes/ROG2_theme_example.png → ...s/--Theme examples/ROG2_theme_example.png b/res/themes/ROG2_theme_example.png → ...s/--Theme examples/ROG2_theme_example.png
diff --git a/res/themes/SuperRayTheme_background.png → ...eme examples/SuperRayTheme_background.png b/res/themes/SuperRayTheme_background.png → ...eme examples/SuperRayTheme_background.png
diff --git a/res/themes/Turing_theme_background.png → ...heme examples/Turing_theme_background.png b/res/themes/Turing_theme_background.png → ...heme examples/Turing_theme_background.png
diff --git a/res/themes/Turing_theme_example.png → ...--Theme examples/Turing_theme_example.png b/res/themes/Turing_theme_example.png → ...--Theme examples/Turing_theme_example.png
diff --git a/res/themes/XuanFangTheme_background.png → ...eme examples/XuanFangTheme_background.png b/res/themes/XuanFangTheme_background.png → ...eme examples/XuanFangTheme_background.png
diff --git a/...emes/blank for image_theme_background.png → ...ples/blank for image_theme_background.png b/...emes/blank for image_theme_background.png → ...ples/blank for image_theme_background.png
diff --git a/res/themes/blank for image_theme_example.png → ...xamples/blank for image_theme_example.png b/res/themes/blank for image_theme_example.png → ...xamples/blank for image_theme_example.png
diff --git a/res/themes/gundam1_theme_background.png → ...eme examples/gundam1_theme_background.png b/res/themes/gundam1_theme_background.png → ...eme examples/gundam1_theme_background.png
diff --git a/res/themes/gundam1_theme_example.png → ...-Theme examples/gundam1_theme_example.png b/res/themes/gundam1_theme_example.png → ...-Theme examples/gundam1_theme_example.png
diff --git a/res/themes/msi_theme_background.png → ...--Theme examples/msi_theme_background.png b/res/themes/msi_theme_background.png → ...--Theme examples/msi_theme_background.png
diff --git a/res/themes/msi_theme_example.png → ...es/--Theme examples/msi_theme_example.png b/res/themes/msi_theme_example.png → ...es/--Theme examples/msi_theme_example.png
diff --git a/res/themes/note_theme_background.png → ...-Theme examples/note_theme_background.png b/res/themes/note_theme_background.png → ...-Theme examples/note_theme_background.png
diff --git a/res/themes/note_theme_example.png → ...s/--Theme examples/note_theme_example.png b/res/themes/note_theme_example.png → ...s/--Theme examples/note_theme_example.png
diff --git a/res/themes/rogwhitetext_theme_background.png → ...xamples/rogwhitetext_theme_background.png b/res/themes/rogwhitetext_theme_background.png → ...xamples/rogwhitetext_theme_background.png
diff --git a/res/themes/rogwhitetext_theme_example.png → ...e examples/rogwhitetext_theme_example.png b/res/themes/rogwhitetext_theme_example.png → ...e examples/rogwhitetext_theme_example.png
diff --git a/res/themes/spiderman_theme_background.png → ...e examples/spiderman_theme_background.png b/res/themes/spiderman_theme_background.png → ...e examples/spiderman_theme_background.png
diff --git a/res/themes/spiderman_theme_example.png → ...heme examples/spiderman_theme_example.png b/res/themes/spiderman_theme_example.png → ...heme examples/spiderman_theme_example.png
diff --git a/res/themes/theme 03_theme_background.png → ...me examples/theme 03_theme_background.png b/res/themes/theme 03_theme_background.png → ...me examples/theme 03_theme_background.png
diff --git a/res/themes/theme 03_theme_example.png → ...Theme examples/theme 03_theme_example.png b/res/themes/theme 03_theme_example.png → ...Theme examples/theme 03_theme_example.png
diff --git a/res/themes/theme 06_theme_background.png → ...me examples/theme 06_theme_background.png b/res/themes/theme 06_theme_background.png → ...me examples/theme 06_theme_background.png
diff --git a/res/themes/theme 06_theme_example.png → ...Theme examples/theme 06_theme_example.png b/res/themes/theme 06_theme_example.png → ...Theme examples/theme 06_theme_example.png