Merge branch 'jb51471' into 'master'

Update audio controls See merge request mer-core/embedlite-components!89
sailfishos · Oct 20, 2020 · 2698c4e · 2698c4e
2 parents 899e097 + 3fc7689
commit 2698c4e
Show file tree

Hide file tree

Showing 28 changed files with 325 additions and 101 deletions.
diff --git a/embedlite-components.pro b/embedlite-components.pro
@@ -9,5 +9,6 @@ OTHER_FILES += \
     jsscripts/sync/*.js \
     jscomps/*.js \
     jscomps/*.jsm \
-    overrides/* \
+    overrides/*.* \
+    overrides/images/* \
     configure.ac
diff --git a/link_to_system.sh b/link_to_system.sh
@@ -86,15 +86,22 @@ ln -s $(pwd)/overrides/aboutCertError.xhtml $TARGET_DIR/chrome/chrome/content/
 ln -s $(pwd)/overrides/netError.xhtml $TARGET_DIR/chrome/chrome/content/
 ln -s $(pwd)/overrides/netError.css $TARGET_DIR/chrome/chrome/skin/
 ln -s $(pwd)/overrides/touchcontrols.css $TARGET_DIR/chrome/chrome/skin/
-ln -s $(pwd)/overrides/images/mute-hdpi.png $TARGET_DIR/chrome/chrome/skin/images/
-ln -s $(pwd)/overrides/images/pause-hdpi.png $TARGET_DIR/chrome/chrome/skin/images/
-ln -s $(pwd)/overrides/images/play-hdpi.png $TARGET_DIR/chrome/chrome/skin/images/
-ln -s $(pwd)/overrides/images/unmute-hdpi.png $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/clicktoplay-bgtexture.png $TARGET_DIR/chrome/chrome/skin/images/
 ln -s $(pwd)/overrides/images/error.png $TARGET_DIR/chrome/chrome/skin/images/
-ln -s $(pwd)/overrides/images/exitfullscreen-hdpi.png $TARGET_DIR/chrome/chrome/skin/images/
-ln -s $(pwd)/overrides/images/fullscreen-hdpi.png $TARGET_DIR/chrome/chrome/skin/images/
-ln -s $(pwd)/overrides/images/throbber.png $TARGET_DIR/chrome/chrome/skin/images/
-ln -s $(pwd)/overrides/images/scrubber-hdpi.png $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/icon-m-pause.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/icon-m-play.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/icon-m-speaker-mute.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/icon-m-speaker-on.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videoClickToPlayButton.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-cast-active.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-cast-ready.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-exitfullscreen.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-fullscreen.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-mute.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-pause.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-play.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-scrubber.svg $TARGET_DIR/chrome/chrome/skin/images/
+ln -s $(pwd)/overrides/images/videocontrols-unmute.svg $TARGET_DIR/chrome/chrome/skin/images/
 
 rm -rf $TARGET_DIR/chrome/en-US/locale/branding;
 rm -rf $TARGET_DIR/chrome/en-US/locale/en-US/browser;

diff --git a/overrides/Makefile.am b/overrides/Makefile.am
@@ -12,16 +12,23 @@ chromeskin_manifest_DATA = \
 
 chromeskinimages_manifestdir=$(libdir)/mozembedlite/chrome/chrome/skin/images
 chromeskinimages_manifest_DATA = \
-	images/error.png \
-	images/exitfullscreen-hdpi.png \
-	images/fullscreen-hdpi.png \
-	images/mute-hdpi.png \
-	images/pause-hdpi.png \
-	images/play-hdpi.png \
-	images/scrubber-hdpi.png \
-	images/throbber.png \
-	images/unmute-hdpi.png \
-	$(NULL)
+        images/clicktoplay-bgtexture.png \
+        images/error.png \
+        images/icon-m-pause.svg \
+        images/icon-m-play.svg \
+        images/icon-m-speaker-mute.svg \
+        images/icon-m-speaker-on.svg \
+        images/videoClickToPlayButton.svg \
+        images/videocontrols-cast-active.svg \
+        images/videocontrols-cast-ready.svg \
+        images/videocontrols-exitfullscreen.svg \
+        images/videocontrols-fullscreen.svg \
+        images/videocontrols-mute.svg \
+        images/videocontrols-pause.svg \
+        images/videocontrols-play.svg \
+        images/videocontrols-scrubber.svg \
+        images/videocontrols-unmute.svg \
+        $(NULL)
 
 manifestsscript_manifestdir=$(libdir)/mozembedlite/chrome
 manifestsscript_manifest_DATA = \

diff --git a/overrides/images/clicktoplay-bgtexture.png b/overrides/images/clicktoplay-bgtexture.png
diff --git a/overrides/images/error.png b/overrides/images/error.png
diff --git a/overrides/images/exitfullscreen-hdpi.png b/overrides/images/exitfullscreen-hdpi.png
diff --git a/overrides/images/fullscreen-hdpi.png b/overrides/images/fullscreen-hdpi.png
diff --git a/overrides/images/icon-m-pause.svg b/overrides/images/icon-m-pause.svg
diff --git a/overrides/images/icon-m-play.svg b/overrides/images/icon-m-play.svg
diff --git a/overrides/images/icon-m-speaker-mute.svg b/overrides/images/icon-m-speaker-mute.svg
diff --git a/overrides/images/icon-m-speaker-on.svg b/overrides/images/icon-m-speaker-on.svg
diff --git a/overrides/images/mute-hdpi.png b/overrides/images/mute-hdpi.png
diff --git a/overrides/images/pause-hdpi.png b/overrides/images/pause-hdpi.png
diff --git a/overrides/images/play-hdpi.png b/overrides/images/play-hdpi.png
diff --git a/overrides/images/scrubber-hdpi.png b/overrides/images/scrubber-hdpi.png
diff --git a/overrides/images/throbber.png b/overrides/images/throbber.png
diff --git a/overrides/images/unmute-hdpi.png b/overrides/images/unmute-hdpi.png
diff --git a/overrides/images/videoClickToPlayButton.svg b/overrides/images/videoClickToPlayButton.svg
diff --git a/overrides/images/videocontrols-cast-active.svg b/overrides/images/videocontrols-cast-active.svg
diff --git a/overrides/images/videocontrols-cast-ready.svg b/overrides/images/videocontrols-cast-ready.svg
diff --git a/overrides/images/videocontrols-exitfullscreen.svg b/overrides/images/videocontrols-exitfullscreen.svg
diff --git a/overrides/images/videocontrols-fullscreen.svg b/overrides/images/videocontrols-fullscreen.svg
diff --git a/overrides/images/videocontrols-mute.svg b/overrides/images/videocontrols-mute.svg
diff --git a/overrides/images/videocontrols-pause.svg b/overrides/images/videocontrols-pause.svg