Merge branch 'icons'

Author: coldfix

.appveyor.yml

@@ -18,6 +18,18 @@ test_script:
   - pip install -e .
   - pip install flake8 pyinstaller
   - flake8
+
+  # Create single file EXE redistributable:
+  - choco install -y imagemagick
+  - refreshenv
+  - set "PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%"
+  - magick -background none steam_acolyte/acolyte.svg -resize 16x16 _16.ico
+  - magick -background none steam_acolyte/acolyte.svg -resize 32x32 _32.ico
+  - magick -background none steam_acolyte/acolyte.svg -resize 48x48 _48.ico
+  - magick -background none steam_acolyte/acolyte.svg -resize 64x64 _64.ico
+  - magick -background none steam_acolyte/acolyte.svg -resize 128x128 _128.ico
+  - magick -background none steam_acolyte/acolyte.svg -resize 256x256 _256.ico
+  - magick -background none _16.ico _32.ico _48.ico _64.ico _128.ico _256.ico acolyte.ico
   - pyinstaller steam-acolyte.spec
   - move dist\steam-acolyte.exe dist\acolyte-%APPVEYOR_REPO_TAG_NAME%.exe
 

MANIFEST.in

@@ -1,3 +1,3 @@
 include README.rst
 include UNLICENSE
-recursive-include steam_acolyte *.css
+recursive-include steam_acolyte *.css *.svg

steam-acolyte.spec

@@ -1,10 +1,11 @@
 # vim: ft=python
 from PyInstaller.utils.hooks import collect_data_files
 
+import sys
+import os
+
 
 def get_version():
-    import sys
-    import os
     if sys.platform != 'win32':
         return None
     from PyInstaller.utils.win32.versioninfo import (
@@ -75,6 +76,6 @@ exe = EXE(
     [],
     name='steam-acolyte',
     console=False,
-    icon=None,
+    icon='acolyte.ico' if os.path.isfile('acolyte.ico') else None,
     version=get_version(),
 )

steam_acolyte/acolyte.svg

@@ -9,6 +9,7 @@
 
 Options:
     -r ROOT, --root ROOT        Steam root path
+    --theme NAME                Choose theme
 """
 
 from steam_acolyte import __version__
@@ -39,11 +40,12 @@ def main(args=None):
         steam.run()
         steam.store_login_cookie()
     else:
-        run_gui(steam)
+        run_gui(steam, theme_name=opts['--theme'])
 
 
-def run_gui(steam):
+def run_gui(steam, theme_name):
     from steam_acolyte.window import create_login_dialog
+    from steam_acolyte.theme import load_theme
     import signal
     app = QApplication([])
     sys.excepthook = except_handler
@@ -54,7 +56,8 @@ def run_gui(steam):
     # http://stackoverflow.com/questions/4938723/what-is-the-correct-way-to-make-my-pyqt-application-quit-when-killed-from-the-console
     signal.signal(signal.SIGINT, interrupt_handler)
     safe_timer(50, lambda: None)
-    steam.login_window = create_login_dialog(steam)
+    theme = load_theme(steam, theme_name)
+    steam.login_window = create_login_dialog(steam, theme)
     steam.login_window.show()
     return app.exec_()
 

steam_acolyte/app.py

@@ -0,0 +1,59 @@
+
+from PyQt5.QtGui import QIcon
+
+from importlib_resources import read_text, path
+
+import os
+from types import SimpleNamespace
+
+
+def builtin_theme(steam):
+    return SimpleNamespace(
+        window_style = read_text(__package__, 'window.css'),
+        window_icon = load_icon_resource('acolyte.svg'),
+        delete_icon = load_icon_resource('delete.svg'),
+        user_icon = load_icon_resource('user.svg', 32, 32),
+        plus_icon = load_icon_resource('plus.svg', 32, 32),
+    )
+
+
+def steam_theme(steam):
+    return SimpleNamespace(
+        window_style = read_text('steam_acolyte', 'window.css'),
+        window_icon = load_icon_file(os.path.join(
+            steam.data, 'public', 'steam_tray.ico')),
+        delete_icon = load_icon_file(os.path.join(
+            steam.data, 'clientui', 'images', 'icons',
+            'stop_loading.png')),
+        user_icon = load_icon_file(os.path.join(
+            steam.data, 'clientui', 'images', 'icons',
+            'nav_profile_idle.png'), 32, 32),
+        plus_icon = load_icon_file(os.path.join(
+            steam.data, 'clientui', 'images', 'icons',
+            'nav_customize.png'), 32, 32),
+    )
+
+
+THEMES = {
+    'default': builtin_theme,
+    'steam': steam_theme,
+}
+
+
+def load_theme(steam, theme_name):
+    theme_name = theme_name or 'default'
+    if theme_name not in THEMES:
+        print('Warning: unknown theme {!r}'.format(theme_name))
+        theme_name = 'default'
+    return THEMES[theme_name](steam)
+
+
+def load_icon_file(filename, *size):
+    if os.path.isfile(filename):
+        icon = QIcon(filename)
+        return icon.pixmap(*size) if size else icon
+
+
+def load_icon_resource(name, *size):
+    with path(__package__, name) as p:
+        return load_icon_file(str(p), *size)