diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index fa3159b5b..9d4402180 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -40,13 +40,13 @@ add_custom_command( transmission.gresource.xml DEPENDS icons/hicolor_apps_scalable_transmission.svg - icons/lock.png - icons/ratio.png - icons/turtle-blue.png - icons/turtle-grey.png - icons/utilities.png - transmission.gresource.xml + icons/lock.svg + icons/preferences-other-symbolic.svg + icons/ratio.svg + icons/turtle-silhouette.svg + icons/turtle.svg transmission-ui.xml + transmission.gresource.xml WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/gtk/MainWindow.cc b/gtk/MainWindow.cc index 1fc348303..903673aa9 100644 --- a/gtk/MainWindow.cc +++ b/gtk/MainWindow.cc @@ -521,7 +521,7 @@ MainWindow::Impl::Impl(MainWindow& window, Glib::RefPtr const& /* ratio selector */ auto* ratio_button = Gtk::make_managed(); ratio_button->set_tooltip_text(_("Statistics")); - ratio_button->add(*Gtk::make_managed("view-statistics", Gtk::ICON_SIZE_MENU)); + ratio_button->add(*Gtk::make_managed("ratio", Gtk::ICON_SIZE_MENU)); ratio_button->set_relief(Gtk::RELIEF_NONE); ratio_button->signal_clicked().connect([this, ratio_button]() { onYinYangClicked(ratio_button); }); status_->add(*ratio_button); diff --git a/gtk/icons/SOURCES.md b/gtk/icons/SOURCES.md new file mode 100644 index 000000000..b63a06b51 --- /dev/null +++ b/gtk/icons/SOURCES.md @@ -0,0 +1,12 @@ +# Icon Sources + +| Name | Source | Author | License | +|---|---|---|---| +| lock.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/objects/u1F512-lock.svg) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) | +| ratio.svg | [forum.transmissionbt](https://forum.transmissionbt.com/viewtopic.php?p=42307#p42307) | [Jakub Steiner](https://jimmac.eu/) | [SPDX: CC-BY-SA-2.5](https://spdx.org/licenses/CC-BY-SA-2.5.html) | +| turtle-silhouette.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/nature/u1F422-turtle.svg) (derived from) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) | +| turtle.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/nature/u1F422-turtle.svg) (derived from) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) | + +# Notes + +transmission.ico created with https://www.npmjs.com/package/svg-to-ico diff --git a/gtk/icons/lock.png b/gtk/icons/lock.png deleted file mode 100644 index 3132da128..000000000 Binary files a/gtk/icons/lock.png and /dev/null differ diff --git a/gtk/icons/lock.svg b/gtk/icons/lock.svg new file mode 100644 index 000000000..a02955f98 --- /dev/null +++ b/gtk/icons/lock.svg @@ -0,0 +1 @@ + diff --git a/gtk/icons/preferences-other-symbolic.svg b/gtk/icons/preferences-other-symbolic.svg new file mode 100644 index 000000000..bfe1fd8c8 --- /dev/null +++ b/gtk/icons/preferences-other-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/gtk/icons/ratio.png b/gtk/icons/ratio.png deleted file mode 100644 index 5c02ec4d3..000000000 Binary files a/gtk/icons/ratio.png and /dev/null differ diff --git a/gtk/ratio.svg b/gtk/icons/ratio.svg similarity index 100% rename from gtk/ratio.svg rename to gtk/icons/ratio.svg diff --git a/gtk/icons/transmission.ico b/gtk/icons/transmission.ico new file mode 100644 index 000000000..553aa027b Binary files /dev/null and b/gtk/icons/transmission.ico differ diff --git a/gtk/icons/turtle-blue.png b/gtk/icons/turtle-blue.png deleted file mode 100644 index 7100076f6..000000000 Binary files a/gtk/icons/turtle-blue.png and /dev/null differ diff --git a/gtk/icons/turtle-grey.png b/gtk/icons/turtle-grey.png deleted file mode 100644 index f09cd1002..000000000 Binary files a/gtk/icons/turtle-grey.png and /dev/null differ diff --git a/gtk/icons/turtle-silhouette.svg b/gtk/icons/turtle-silhouette.svg new file mode 100644 index 000000000..790ffc0a9 --- /dev/null +++ b/gtk/icons/turtle-silhouette.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/gtk/icons/turtle.svg b/gtk/icons/turtle.svg new file mode 100644 index 000000000..9e875b8b5 --- /dev/null +++ b/gtk/icons/turtle.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/gtk/icons/utilities.png b/gtk/icons/utilities.png deleted file mode 100644 index 5eafeee0b..000000000 Binary files a/gtk/icons/utilities.png and /dev/null differ diff --git a/gtk/transmission.gresource.xml b/gtk/transmission.gresource.xml index cdc384e11..807fe3f7a 100644 --- a/gtk/transmission.gresource.xml +++ b/gtk/transmission.gresource.xml @@ -1,12 +1,12 @@ + icons/lock.svg + icons/preferences-other-symbolic.svg + icons/ratio.svg icons/hicolor_apps_scalable_transmission.svg - icons/lock.png - icons/ratio.png - icons/turtle-blue.png - icons/turtle-grey.png - icons/utilities.png + icons/turtle-silhouette.svg + icons/turtle.svg transmission-ui.xml diff --git a/gtk/transmission.ico b/gtk/transmission.ico deleted file mode 100644 index 58a5b6aff..000000000 Binary files a/gtk/transmission.ico and /dev/null differ diff --git a/gtk/transmission.png b/gtk/transmission.png deleted file mode 100644 index 53c629ca3..000000000 Binary files a/gtk/transmission.png and /dev/null differ diff --git a/gtk/transmission.rc b/gtk/transmission.rc index 511a6a648..53e96b0a1 100644 --- a/gtk/transmission.rc +++ b/gtk/transmission.rc @@ -1 +1 @@ -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "transmission.ico" +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "./icons/transmission.ico" diff --git a/gtk/utilities.png b/gtk/utilities.png deleted file mode 100644 index bbff275e2..000000000 Binary files a/gtk/utilities.png and /dev/null differ diff --git a/qt/icons/SOURCES.md b/qt/icons/SOURCES.md index 7d665f0f7..a37207765 100644 --- a/qt/icons/SOURCES.md +++ b/qt/icons/SOURCES.md @@ -6,8 +6,7 @@ | lock.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/objects/u1F512-lock.svg) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) | | turtle-silhouette.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/nature/u1F422-turtle.svg) (derived from) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) | | turtle.svg | [fxemoji](https://github.com/mozilla/fxemoji/blob/gh-pages/svgs/nature/u1F422-turtle.svg) (derived from) | Mozilla Foundation | [SPDX: CC-BY-4.0](https://spdx.org/licenses/CC-BY-4.0.html) | -| yin-yang.svg | [wikimedia](https://commons.wikimedia.org/wiki/File:Yin_and_Yang_symbol.svg) | Klem | [SPDX: CC-SPDX](https://spdx.org/licenses/CC-PDDC.html) | - +| yin-yang.svg | [forum.transmissionbt](https://forum.transmissionbt.com/viewtopic.php?p=42307#p42307) | [Jakub Steiner](https://jimmac.eu/) | [SPDX: CC-BY-SA-2.5](https://spdx.org/licenses/CC-BY-SA-2.5.html) | # Notes diff --git a/qt/icons/yin-yang.svg b/qt/icons/yin-yang.svg index 2d1b1a611..8e3c0ca3f 100644 --- a/qt/icons/yin-yang.svg +++ b/qt/icons/yin-yang.svg @@ -1,6 +1,193 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + +