diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 22fd0da4df..bb7ef2a1d0 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -146,18 +146,25 @@ set(qstyle_resource_files "styles/images/left-128.png" "styles/images/left-16.png" "styles/images/left-32.png" + "styles/images/media-pause-128.png" "styles/images/media-pause-16.png" "styles/images/media-pause-32.png" + "styles/images/media-play-128.png" "styles/images/media-play-16.png" "styles/images/media-play-32.png" + "styles/images/media-seek-backward-128.png" "styles/images/media-seek-backward-16.png" "styles/images/media-seek-backward-32.png" + "styles/images/media-seek-forward-128.png" "styles/images/media-seek-forward-16.png" "styles/images/media-seek-forward-32.png" + "styles/images/media-skip-backward-128.png" "styles/images/media-skip-backward-16.png" "styles/images/media-skip-backward-32.png" + "styles/images/media-skip-forward-128.png" "styles/images/media-skip-forward-16.png" "styles/images/media-skip-forward-32.png" + "styles/images/media-stop-128.png" "styles/images/media-stop-16.png" "styles/images/media-stop-32.png" "styles/images/media-volume-16.png" diff --git a/src/widgets/styles/images/media-pause-128.png b/src/widgets/styles/images/media-pause-128.png new file mode 100644 index 0000000000..c9779fdf02 Binary files /dev/null and b/src/widgets/styles/images/media-pause-128.png differ diff --git a/src/widgets/styles/images/media-pause-16.png b/src/widgets/styles/images/media-pause-16.png index 6cb1fd7f63..0028de3051 100644 Binary files a/src/widgets/styles/images/media-pause-16.png and b/src/widgets/styles/images/media-pause-16.png differ diff --git a/src/widgets/styles/images/media-pause-32.png b/src/widgets/styles/images/media-pause-32.png index 3f172a04d6..0a566d3efc 100644 Binary files a/src/widgets/styles/images/media-pause-32.png and b/src/widgets/styles/images/media-pause-32.png differ diff --git a/src/widgets/styles/images/media-pause.svg b/src/widgets/styles/images/media-pause.svg new file mode 100644 index 0000000000..3c063ac657 --- /dev/null +++ b/src/widgets/styles/images/media-pause.svg @@ -0,0 +1,76 @@ + +image/svg+xml + + + diff --git a/src/widgets/styles/images/media-play-128.png b/src/widgets/styles/images/media-play-128.png new file mode 100644 index 0000000000..21d801adf8 Binary files /dev/null and b/src/widgets/styles/images/media-play-128.png differ diff --git a/src/widgets/styles/images/media-play-16.png b/src/widgets/styles/images/media-play-16.png index d7ee3ccbe3..b7936a7ada 100644 Binary files a/src/widgets/styles/images/media-play-16.png and b/src/widgets/styles/images/media-play-16.png differ diff --git a/src/widgets/styles/images/media-play-32.png b/src/widgets/styles/images/media-play-32.png index af8d2f7ba5..84410ef027 100644 Binary files a/src/widgets/styles/images/media-play-32.png and b/src/widgets/styles/images/media-play-32.png differ diff --git a/src/widgets/styles/images/media-play.svg b/src/widgets/styles/images/media-play.svg new file mode 100644 index 0000000000..bcc43b1ca4 --- /dev/null +++ b/src/widgets/styles/images/media-play.svg @@ -0,0 +1,74 @@ + +image/svg+xml + + + diff --git a/src/widgets/styles/images/media-seek-backward-128.png b/src/widgets/styles/images/media-seek-backward-128.png new file mode 100644 index 0000000000..0d1f99f81b Binary files /dev/null and b/src/widgets/styles/images/media-seek-backward-128.png differ diff --git a/src/widgets/styles/images/media-seek-backward-16.png b/src/widgets/styles/images/media-seek-backward-16.png index b8a8ea42d1..9300ebb4ff 100644 Binary files a/src/widgets/styles/images/media-seek-backward-16.png and b/src/widgets/styles/images/media-seek-backward-16.png differ diff --git a/src/widgets/styles/images/media-seek-backward-32.png b/src/widgets/styles/images/media-seek-backward-32.png index a21d1372fe..062b06a7db 100644 Binary files a/src/widgets/styles/images/media-seek-backward-32.png and b/src/widgets/styles/images/media-seek-backward-32.png differ diff --git a/src/widgets/styles/images/media-seek-backward.svg b/src/widgets/styles/images/media-seek-backward.svg new file mode 100644 index 0000000000..18ea999586 --- /dev/null +++ b/src/widgets/styles/images/media-seek-backward.svg @@ -0,0 +1,79 @@ + +image/svg+xml + + + diff --git a/src/widgets/styles/images/media-seek-forward-128.png b/src/widgets/styles/images/media-seek-forward-128.png new file mode 100644 index 0000000000..0b880a3a76 Binary files /dev/null and b/src/widgets/styles/images/media-seek-forward-128.png differ diff --git a/src/widgets/styles/images/media-seek-forward-16.png b/src/widgets/styles/images/media-seek-forward-16.png index 3c900dcb62..f5e58514a5 100644 Binary files a/src/widgets/styles/images/media-seek-forward-16.png and b/src/widgets/styles/images/media-seek-forward-16.png differ diff --git a/src/widgets/styles/images/media-seek-forward-32.png b/src/widgets/styles/images/media-seek-forward-32.png index 4f8d370fa1..a60fd9f504 100644 Binary files a/src/widgets/styles/images/media-seek-forward-32.png and b/src/widgets/styles/images/media-seek-forward-32.png differ diff --git a/src/widgets/styles/images/media-seek-forward.svg b/src/widgets/styles/images/media-seek-forward.svg new file mode 100644 index 0000000000..f164a311ba --- /dev/null +++ b/src/widgets/styles/images/media-seek-forward.svg @@ -0,0 +1,78 @@ + +image/svg+xml + + + diff --git a/src/widgets/styles/images/media-skip-backward-128.png b/src/widgets/styles/images/media-skip-backward-128.png new file mode 100644 index 0000000000..0bf74d1f53 Binary files /dev/null and b/src/widgets/styles/images/media-skip-backward-128.png differ diff --git a/src/widgets/styles/images/media-skip-backward-16.png b/src/widgets/styles/images/media-skip-backward-16.png index f5b3f4f56d..b44ac470ec 100644 Binary files a/src/widgets/styles/images/media-skip-backward-16.png and b/src/widgets/styles/images/media-skip-backward-16.png differ diff --git a/src/widgets/styles/images/media-skip-backward-32.png b/src/widgets/styles/images/media-skip-backward-32.png index 1d338035ef..699834310c 100644 Binary files a/src/widgets/styles/images/media-skip-backward-32.png and b/src/widgets/styles/images/media-skip-backward-32.png differ diff --git a/src/widgets/styles/images/media-skip-backward.svg b/src/widgets/styles/images/media-skip-backward.svg new file mode 100644 index 0000000000..c20a65d1ae --- /dev/null +++ b/src/widgets/styles/images/media-skip-backward.svg @@ -0,0 +1,84 @@ + +image/svg+xml + + + diff --git a/src/widgets/styles/images/media-skip-forward-128.png b/src/widgets/styles/images/media-skip-forward-128.png new file mode 100644 index 0000000000..29298f9849 Binary files /dev/null and b/src/widgets/styles/images/media-skip-forward-128.png differ diff --git a/src/widgets/styles/images/media-skip-forward-16.png b/src/widgets/styles/images/media-skip-forward-16.png index 27e205b02f..742276d071 100644 Binary files a/src/widgets/styles/images/media-skip-forward-16.png and b/src/widgets/styles/images/media-skip-forward-16.png differ diff --git a/src/widgets/styles/images/media-skip-forward-32.png b/src/widgets/styles/images/media-skip-forward-32.png index a583fa1b11..eab6bc1206 100644 Binary files a/src/widgets/styles/images/media-skip-forward-32.png and b/src/widgets/styles/images/media-skip-forward-32.png differ diff --git a/src/widgets/styles/images/media-skip-forward.svg b/src/widgets/styles/images/media-skip-forward.svg new file mode 100644 index 0000000000..2585c026fc --- /dev/null +++ b/src/widgets/styles/images/media-skip-forward.svg @@ -0,0 +1,84 @@ + +image/svg+xml + + + diff --git a/src/widgets/styles/images/media-stop-128.png b/src/widgets/styles/images/media-stop-128.png new file mode 100644 index 0000000000..680d40697c Binary files /dev/null and b/src/widgets/styles/images/media-stop-128.png differ diff --git a/src/widgets/styles/images/media-stop-16.png b/src/widgets/styles/images/media-stop-16.png index 9ce035d696..e047c2bf6b 100644 Binary files a/src/widgets/styles/images/media-stop-16.png and b/src/widgets/styles/images/media-stop-16.png differ diff --git a/src/widgets/styles/images/media-stop-32.png b/src/widgets/styles/images/media-stop-32.png index aae24ba925..6ba9d25d4b 100644 Binary files a/src/widgets/styles/images/media-stop-32.png and b/src/widgets/styles/images/media-stop-32.png differ diff --git a/src/widgets/styles/images/media-stop.svg b/src/widgets/styles/images/media-stop.svg new file mode 100644 index 0000000000..5b7f804ebc --- /dev/null +++ b/src/widgets/styles/images/media-stop.svg @@ -0,0 +1,69 @@ + +image/svg+xml + + + diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 87c494f203..c0294fc1c5 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -5522,7 +5522,6 @@ static constexpr auto titleBarSizes = {16, 32, 48}; static constexpr auto toolBarExtHSizes = {8, 16, 32}; static constexpr auto toolBarExtVSizes = {5, 10, 20}; static constexpr auto pngIconSizes = {16, 32, 128}; -static constexpr auto mediaIconSizes = {16, 32}; #endif // imageformat_png /*! \reimp */ @@ -6044,25 +6043,25 @@ QIcon QCommonStylePrivate::iconFromResourceTheme(QCommonStyle::StandardPixmap st addIconFiles(u"stop-", {24, 32}, icon); break; case QStyle::SP_MediaPlay: - addIconFiles(u"media-play-", mediaIconSizes, icon); + addIconFiles(u"media-play-", pngIconSizes, icon); break; case QStyle::SP_MediaPause: - addIconFiles(u"media-pause-", mediaIconSizes, icon); + addIconFiles(u"media-pause-", pngIconSizes, icon); break; case QStyle::SP_MediaStop: - addIconFiles(u"media-stop-", mediaIconSizes, icon); + addIconFiles(u"media-stop-", pngIconSizes, icon); break; case QStyle::SP_MediaSeekForward: - addIconFiles(u"media-seek-forward-", mediaIconSizes, icon); + addIconFiles(u"media-seek-forward-", pngIconSizes, icon); break; case QStyle::SP_MediaSeekBackward: - addIconFiles(u"media-seek-backward-", mediaIconSizes, icon); + addIconFiles(u"media-seek-backward-", pngIconSizes, icon); break; case QStyle::SP_MediaSkipForward: - addIconFiles(u"media-skip-forward-", mediaIconSizes, icon); + addIconFiles(u"media-skip-forward-", pngIconSizes, icon); break; case QStyle::SP_MediaSkipBackward: - addIconFiles(u"media-skip-backward-", mediaIconSizes, icon); + addIconFiles(u"media-skip-backward-", pngIconSizes, icon); break; case QStyle::SP_MediaVolume: addIconFiles(u"media-volume-", {16}, icon);