diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 9d4402180..5e051781f 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -41,10 +41,9 @@ add_custom_command( DEPENDS icons/hicolor_apps_scalable_transmission.svg icons/lock.svg - icons/preferences-other-symbolic.svg - icons/ratio.svg - icons/turtle-silhouette.svg - icons/turtle.svg + icons/options-symbolic.svg + icons/ratio-symbolic.svg + icons/turtle-symbolic.svg transmission-ui.xml transmission.gresource.xml WORKING_DIRECTORY diff --git a/gtk/MainWindow.cc b/gtk/MainWindow.cc index bf42aa73d..af26ef349 100644 --- a/gtk/MainWindow.cc +++ b/gtk/MainWindow.cc @@ -220,10 +220,8 @@ void MainWindow::Impl::status_menu_toggled_cb(Gtk::CheckMenuItem* menu_item, std void MainWindow::Impl::syncAltSpeedButton() { bool const b = gtr_pref_flag_get(TR_KEY_alt_speed_enabled); - char const* const stock = b ? "alt-speed-on" : "alt-speed-off"; - alt_speed_button_->set_active(b); - alt_speed_image_->set_from_icon_name(stock, Gtk::BuiltinIconSize::ICON_SIZE_MENU); + alt_speed_image_->set_from_icon_name("turtle-symbolic", Gtk::BuiltinIconSize::ICON_SIZE_MENU); alt_speed_button_->set_halign(Gtk::ALIGN_CENTER); alt_speed_button_->set_valign(Gtk::ALIGN_CENTER); alt_speed_button_->set_tooltip_text(fmt::format( @@ -482,7 +480,7 @@ MainWindow::Impl::Impl(MainWindow& window, Glib::RefPtr const& /* gear */ auto* gear_button = Gtk::make_managed(); - gear_button->add(*Gtk::make_managed("preferences-other", Gtk::ICON_SIZE_MENU)); + gear_button->add(*Gtk::make_managed("options-symbolic", Gtk::ICON_SIZE_MENU)); gear_button->set_tooltip_text(_("Options")); gear_button->set_relief(Gtk::RELIEF_NONE); options_menu_ = createOptionsMenu(); @@ -522,7 +520,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("ratio", Gtk::ICON_SIZE_MENU)); + ratio_button->add(*Gtk::make_managed("ratio-symbolic", 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/preferences-other-symbolic.svg b/gtk/icons/options-symbolic.svg similarity index 100% rename from gtk/icons/preferences-other-symbolic.svg rename to gtk/icons/options-symbolic.svg diff --git a/gtk/icons/ratio-symbolic.svg b/gtk/icons/ratio-symbolic.svg new file mode 100644 index 000000000..178fa411c --- /dev/null +++ b/gtk/icons/ratio-symbolic.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk/icons/ratio.svg b/gtk/icons/ratio.svg deleted file mode 100644 index 8e3c0ca3f..000000000 --- a/gtk/icons/ratio.svg +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/gtk/icons/turtle-silhouette.svg b/gtk/icons/turtle-symbolic.svg similarity index 100% rename from gtk/icons/turtle-silhouette.svg rename to gtk/icons/turtle-symbolic.svg diff --git a/gtk/icons/turtle.svg b/gtk/icons/turtle.svg deleted file mode 100644 index 9e875b8b5..000000000 --- a/gtk/icons/turtle.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/gtk/transmission.gresource.xml b/gtk/transmission.gresource.xml index 807fe3f7a..bd31b8558 100644 --- a/gtk/transmission.gresource.xml +++ b/gtk/transmission.gresource.xml @@ -2,11 +2,10 @@ icons/lock.svg - icons/preferences-other-symbolic.svg - icons/ratio.svg + icons/options-symbolic.svg + icons/ratio-symbolic.svg + icons/turtle-symbolic.svg icons/hicolor_apps_scalable_transmission.svg - icons/turtle-silhouette.svg - icons/turtle.svg transmission-ui.xml