From acac19dcc37c940bc30226ee252b852b424b59df Mon Sep 17 00:00:00 2001 From: Balthasar Reuter Date: Thu, 10 Jan 2019 20:53:10 +0100 Subject: [PATCH] Renamed stylesheets to match a common pattern --- photobooth/gui/Qt5Gui/__init__.py | 8 ++++---- .../Qt5Gui/images/{arrow.png => arrow-1024x600.png} | Bin .../images/{small-arrow.png => arrow-800x600.png} | Bin .../images/{camera.png => camera-1024x600.png} | Bin .../images/{small-camera.png => camera-800x600.png} | Bin .../stylesheets/{dark.qss => dark-1024x600.qss} | 4 ++-- .../{small-dark.qss => dark-800x600.qss} | 4 ++-- .../stylesheets/{pastel.qss => pastel-1024x600.qss} | 4 ++-- .../{small-pastel.qss => pastel-800x600.qss} | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) rename photobooth/gui/Qt5Gui/images/{arrow.png => arrow-1024x600.png} (100%) rename photobooth/gui/Qt5Gui/images/{small-arrow.png => arrow-800x600.png} (100%) rename photobooth/gui/Qt5Gui/images/{camera.png => camera-1024x600.png} (100%) rename photobooth/gui/Qt5Gui/images/{small-camera.png => camera-800x600.png} (100%) rename photobooth/gui/Qt5Gui/stylesheets/{dark.qss => dark-1024x600.qss} (96%) rename photobooth/gui/Qt5Gui/stylesheets/{small-dark.qss => dark-800x600.qss} (96%) rename photobooth/gui/Qt5Gui/stylesheets/{pastel.qss => pastel-1024x600.qss} (96%) rename photobooth/gui/Qt5Gui/stylesheets/{small-pastel.qss => pastel-800x600.qss} (96%) diff --git a/photobooth/gui/Qt5Gui/__init__.py b/photobooth/gui/Qt5Gui/__init__.py index b14ad75..a6c0d97 100644 --- a/photobooth/gui/Qt5Gui/__init__.py +++ b/photobooth/gui/Qt5Gui/__init__.py @@ -19,9 +19,9 @@ # Available style sheets as tuples of (style name, style file) styles = (('default', 'stylesheets/default.qss'), - ('dark', 'stylesheets/dark.qss'), - ('dark (800*600)', 'stylesheets/small-dark.qss'), - ('pastel', 'stylesheets/pastel.qss'), - ('pastel (800*600)', 'stylesheets/small-pastel.qss')) + ('dark (1024 x 600 px)', 'stylesheets/dark-1024x600.qss'), + ('dark (800 x 600 px)', 'stylesheets/dark-800x600.qss'), + ('pastel (1024 x 600 px)', 'stylesheets/pastel-1024x600.qss'), + ('pastel (800 x 600 px)', 'stylesheets/pastel-800x600.qss')) from .PyQt5Gui import PyQt5Gui # noqa diff --git a/photobooth/gui/Qt5Gui/images/arrow.png b/photobooth/gui/Qt5Gui/images/arrow-1024x600.png similarity index 100% rename from photobooth/gui/Qt5Gui/images/arrow.png rename to photobooth/gui/Qt5Gui/images/arrow-1024x600.png diff --git a/photobooth/gui/Qt5Gui/images/small-arrow.png b/photobooth/gui/Qt5Gui/images/arrow-800x600.png similarity index 100% rename from photobooth/gui/Qt5Gui/images/small-arrow.png rename to photobooth/gui/Qt5Gui/images/arrow-800x600.png diff --git a/photobooth/gui/Qt5Gui/images/camera.png b/photobooth/gui/Qt5Gui/images/camera-1024x600.png similarity index 100% rename from photobooth/gui/Qt5Gui/images/camera.png rename to photobooth/gui/Qt5Gui/images/camera-1024x600.png diff --git a/photobooth/gui/Qt5Gui/images/small-camera.png b/photobooth/gui/Qt5Gui/images/camera-800x600.png similarity index 100% rename from photobooth/gui/Qt5Gui/images/small-camera.png rename to photobooth/gui/Qt5Gui/images/camera-800x600.png diff --git a/photobooth/gui/Qt5Gui/stylesheets/dark.qss b/photobooth/gui/Qt5Gui/stylesheets/dark-1024x600.qss similarity index 96% rename from photobooth/gui/Qt5Gui/stylesheets/dark.qss rename to photobooth/gui/Qt5Gui/stylesheets/dark-1024x600.qss index 8f7c5ef..6f4148e 100644 --- a/photobooth/gui/Qt5Gui/stylesheets/dark.qss +++ b/photobooth/gui/Qt5Gui/stylesheets/dark-1024x600.qss @@ -30,7 +30,7 @@ QPushButton:pressed { /* Idle Screen */ QFrame#IdleMessage { - background-image: url(photobooth/gui/Qt5Gui/images/arrow.png); + background-image: url(photobooth/gui/Qt5Gui/images/arrow-1024x600.png); background-repeat: no-repeat; padding: 80px 400px 120px 80px; } @@ -96,7 +96,7 @@ QFrame#CountdownMessage { /* Pose Screen */ QFrame#PoseMessage { - background-image: url(photobooth/gui/Qt5Gui/images/camera.png); + background-image: url(photobooth/gui/Qt5Gui/images/camera-1024x600.png); background-repeat: no-repeat; padding: 380px 80px 80px 80px; } diff --git a/photobooth/gui/Qt5Gui/stylesheets/small-dark.qss b/photobooth/gui/Qt5Gui/stylesheets/dark-800x600.qss similarity index 96% rename from photobooth/gui/Qt5Gui/stylesheets/small-dark.qss rename to photobooth/gui/Qt5Gui/stylesheets/dark-800x600.qss index 65ad473..61b237c 100644 --- a/photobooth/gui/Qt5Gui/stylesheets/small-dark.qss +++ b/photobooth/gui/Qt5Gui/stylesheets/dark-800x600.qss @@ -30,7 +30,7 @@ QPushButton:pressed { /* Idle Screen */ QFrame#IdleMessage { - background-image: url(photobooth/gui/Qt5Gui/images/small-arrow.png); + background-image: url(photobooth/gui/Qt5Gui/images/arrow-800x600.png); background-repeat: no-repeat; padding: 80px 40px 60px 40px; } @@ -95,7 +95,7 @@ QFrame#CountdownMessage { /* Pose Screen */ QFrame#PoseMessage { - background-image: url(photobooth/gui/Qt5Gui/images/small-camera.png); + background-image: url(photobooth/gui/Qt5Gui/images/camera-800x600.png); background-repeat: no-repeat; padding: 280px 80px 80px 80px; } diff --git a/photobooth/gui/Qt5Gui/stylesheets/pastel.qss b/photobooth/gui/Qt5Gui/stylesheets/pastel-1024x600.qss similarity index 96% rename from photobooth/gui/Qt5Gui/stylesheets/pastel.qss rename to photobooth/gui/Qt5Gui/stylesheets/pastel-1024x600.qss index 956e9c3..a660228 100644 --- a/photobooth/gui/Qt5Gui/stylesheets/pastel.qss +++ b/photobooth/gui/Qt5Gui/stylesheets/pastel-1024x600.qss @@ -30,7 +30,7 @@ QPushButton:pressed { /* Idle Screen */ QFrame#IdleMessage { - background-image: url(photobooth/gui/Qt5Gui/images/arrow.png); + background-image: url(photobooth/gui/Qt5Gui/images/arrow-1024x600.png); background-repeat: no-repeat; padding: 80px 400px 120px 80px; } @@ -96,7 +96,7 @@ QFrame#CountdownMessage { /* Pose Screen */ QFrame#PoseMessage { - background-image: url(photobooth/gui/Qt5Gui/images/camera.png); + background-image: url(photobooth/gui/Qt5Gui/images/camera-1024x600.png); background-repeat: no-repeat; padding: 380px 80px 80px 80px; } diff --git a/photobooth/gui/Qt5Gui/stylesheets/small-pastel.qss b/photobooth/gui/Qt5Gui/stylesheets/pastel-800x600.qss similarity index 96% rename from photobooth/gui/Qt5Gui/stylesheets/small-pastel.qss rename to photobooth/gui/Qt5Gui/stylesheets/pastel-800x600.qss index 6016c2b..6420299 100644 --- a/photobooth/gui/Qt5Gui/stylesheets/small-pastel.qss +++ b/photobooth/gui/Qt5Gui/stylesheets/pastel-800x600.qss @@ -30,7 +30,7 @@ QPushButton:pressed { /* Idle Screen */ QFrame#IdleMessage { - background-image: url(photobooth/gui/Qt5Gui/images/small-arrow.png); + background-image: url(photobooth/gui/Qt5Gui/images/arrow-800x600.png); background-repeat: no-repeat; padding: 80px 40px 60px 40px; } @@ -95,7 +95,7 @@ QFrame#CountdownMessage { /* Pose Screen */ QFrame#PoseMessage { - background-image: url(photobooth/gui/Qt5Gui/images/small-camera.png); + background-image: url(photobooth/gui/Qt5Gui/images/camera-800x600.png); background-repeat: no-repeat; padding: 280px 80px 80px 80px; }