optimised all PNGs + switching to OpenSans font

ozmartian · Dec 31, 2016 · 6c60fe8 · 6c60fe8
1 parent 62424f0
commit 6c60fe8
Show file tree

Hide file tree

Showing 12 changed files with 27,881 additions and 18,472 deletions.
diff --git a/fonts/OpenSans.ttf b/fonts/OpenSans.ttf
diff --git a/images/clipindex.png b/images/clipindex.png
diff --git a/images/filmstrip.png b/images/filmstrip.png
diff --git a/images/knob.png b/images/knob.png
diff --git a/images/muted.png b/images/muted.png
diff --git a/images/novideo.png b/images/novideo.png
diff --git a/images/runtime.png b/images/runtime.png
diff --git a/images/unmuted.png b/images/unmuted.png
diff --git a/images/vidcutter.png b/images/vidcutter.png
diff --git a/resources.py b/resources.py
diff --git a/resources.qrc b/resources.qrc
@@ -2,7 +2,7 @@
   <qresource>
     <file>fonts/DroidSansMono.ttf</file>
     <file>fonts/HelveticaNeue.ttf</file>
-    <file>images/clipindex.png</file>
+    <file>fonts/OpenSans.ttf</file>
     <file>images/filmstrip.png</file>
     <file>images/handle.png</file>
     <file>images/knob.png</file>

diff --git a/vidcutter.py b/vidcutter.py
@@ -71,10 +71,10 @@ def __init__(self, parent):
         self.videoService = VideoService(self)
 
         QFontDatabase.addApplicationFont(MainWindow.get_path('fonts/DroidSansMono.ttf'))
-        QFontDatabase.addApplicationFont(MainWindow.get_path('fonts/HelveticaNeue.ttf'))
+        QFontDatabase.addApplicationFont(MainWindow.get_path('fonts/OpenSans.ttf'))
 
         fontSize = 12 if sys.platform == 'darwin' else 10
-        appFont = QFont('Helvetica Neue', fontSize, 300)
+        appFont = QFont('Open Sans', fontSize, 300)
         qApp.setFont(appFont)
 
         self.clipTimes = []
@@ -93,8 +93,8 @@ def __init__(self, parent):
         self.toolbar.setStyleSheet('''QToolBar { spacing:10px; }
             QToolBar QToolButton { border:1px solid transparent; min-width:95px; font-size:11pt; font-weight:400;
                 border-radius:5px; padding:1px 2px; color:#444; }
-            QToolBar QToolButton:hover { border:1px inset #6A4572; color:#6A4572; background-color:rgba(255, 255, 255, 0.65); }
-            QToolBar QToolButton:pressed { border:1px inset #FAFAFA; color:#6A4572; background-color:rgba(106, 69, 114, 0.4); }
+            QToolBar QToolButton:hover { border:1px inset #6A4572; color:#6A4572; background-color:rgba(255, 255, 255, 0.85); }
+            QToolBar QToolButton:pressed { border:1px inset #6A4572; color:#6A4572; background-color:rgba(255, 255, 255, 0.25); }
             QToolBar QToolButton:disabled { color:#999; }''')
         self.initToolbar()
 
@@ -387,7 +387,7 @@ def aboutInfo(self) -> None:
     a:hover { text-decoration:underline; }
 </style>
 <div style="min-width:650px;">
-<p style="font-size:26pt; font-weight:bold;">%s</p>
+<p style="font-size:26pt; font-weight:bold; color:#6A4572;">%s</p>
 <p>
     <span style="font-size:13pt;"><b>Version: %s</b></span>
     <span style="font-size:10pt;position:relative;left:5px;">( %s )</span>