0.1.9.1 release

jsmolka · Dec 12, 2018 · ac87f02 · ac87f02
1 parent 01e7d94
commit ac87f02
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/egg-player.pri b/egg-player.pri
@@ -1,6 +1,6 @@
 RC_ICONS = resource/images/egg/egg.ico
 
-VERSION = 0.1.9.0
+VERSION = 0.1.9.1
 
 QMAKE_TARGET             = Egg Player
 QMAKE_TARGET_PRODUCT     = Egg Player

diff --git a/resource/css/bar.css b/resource/css/bar.css
@@ -3,7 +3,9 @@
  * values can and should changed through the config. The following values will
  * be replaced by config values.
  * - groove-size-duration
- * - groove-size-volume
+ * - groove-size-duration-half
+ * - groove-size-volume 
+ * - groove-size-volume-half
  * - handle-size
  * - handle-size-half
  * - handle-size-pressed
@@ -23,16 +25,20 @@ LockableIconButton[locked=true] {
     background: rgba(255, 255, 255, 0.3);
 }
 
-Slider::sub-page {
+DurationSlider::sub-page {
 	background: white;
+	border-top-left-radius: groove-size-duration-half;
+	border-bottom-left-radius: groove-size-duration-half;
 }
 
-Slider::add-page {
-	background: rgb(150, 150, 150);
+DurationSlider::add-page {
+	background: rgba(150, 150, 150, 0.6);
+	border-top-right-radius: groove-size-duration-half;
+	border-bottom-right-radius: groove-size-duration-half;
 }
 
 DurationSlider::groove:horizontal {
-	background: rgb(150, 150, 150);
+	background: transparent;
 	height: groove-size-duration;
 }
 
@@ -58,7 +64,27 @@ DurationSlider::handle:horizontal:pressed {
 	border-radius: handle-size-pressed-half;
 }
 
+VolumeSlider::sub-page {
+	background: white;
+	border-top-left-radius: groove-size-volume-half;
+	border-bottom-left-radius: groove-size-volume-half;
+}
+
+VolumeSlider::add-page {
+	background: transparent;
+	border-top-right-radius: groove-size-volume-half;
+	border-bottom-right-radius: groove-size-volume-half;
+}
+
 VolumeSlider::groove:horizontal {
-    background: rgb(150, 150, 150);
-    height: groove-size-volume;
+	background: rgba(150, 150, 150, 0.6);
+	height: groove-size-volume;
+	border-radius: groove-size-volume-half; 
+}
+
+VolumeSlider::handle:horizontal {
+	background: white;
+	width: groove-size-volume;
+	height: groove-size-volume;
+	border-radius: groove-size-volume-half;
 }
diff --git a/src/widgets/barwidget.cpp b/src/widgets/barwidget.cpp
@@ -189,7 +189,9 @@ void BarWidget::initStyle()
     const int iconSize = cfg_bar.iconSize();
 
     setStyleSheet(FileUtil::read(constants::css::Bar)
+        .replace("groove-size-duration-half", QString::number(grooveSizeDuration / 2))
         .replace("groove-size-duration", QString::number(grooveSizeDuration))
+        .replace("groove-size-volume-half", QString::number(grooveSizeVolume / 2))
         .replace("groove-size-volume", QString::number(grooveSizeVolume))
         .replace("handle-size-pressed-half", QString::number(handleSizePressed / 2))
         .replace("handle-size-pressed", QString::number(handleSizePressed))