[shotwell] Make all stock icons symbolic
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Make all stock icons symbolic
- Date: Sun, 29 Apr 2018 14:35:27 +0000 (UTC)
commit 2fc29ce0789cb811f240c62c1cccda0200147594
Author: Jens Georg <mail jensge org>
Date: Wed Mar 28 21:13:38 2018 +0200
Make all stock icons symbolic
icons/pin-toolbar.svg | 528 --------------------------------------
org.gnome.Shotwell.gresource.xml | 1 -
src/AppWindow.vala | 4 +-
src/CollectionPage.vala | 4 +-
src/PhotoPage.vala | 4 +-
src/Resources.vala | 33 ++--
src/SearchFilter.vala | 2 +-
src/SlideshowPage.vala | 12 +-
src/camera/ImportPage.vala | 2 +-
src/library/ImportQueuePage.vala | 2 +-
src/searches/SearchesBranch.vala | 2 +-
ui/collection.ui | 6 +-
ui/offline.ui | 2 +-
ui/trash.ui | 2 +-
14 files changed, 37 insertions(+), 567 deletions(-)
---
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index 02be61f..c9d3d0a 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -64,7 +64,6 @@
<file>icons/one-face.png</file>
<file>icons/one-star.svg</file>
<file>icons/one-tag.png</file>
- <file>icons/pin-toolbar.svg</file>
<file>icons/publish.png</file>
<file>icons/redeye.png</file>
<file>icons/rejected.svg</file>
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index a2d8681..d950c51 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -43,13 +43,13 @@ public class FullscreenWindow : PageWindow {
// restore pin state
is_toolbar_dismissal_enabled = Config.Facade.get_instance().get_pin_toolbar_state();
- pin_button.set_icon_name("pin-toolbar");
+ pin_button.set_icon_name("view-pin-symbolic");
pin_button.set_label(_("Pin Toolbar"));
pin_button.set_tooltip_text(_("Pin the toolbar open"));
pin_button.set_active(!is_toolbar_dismissal_enabled);
pin_button.clicked.connect(update_toolbar_dismissal);
- close_button.set_icon_name("view-restore");
+ close_button.set_icon_name("view-restore-symbolic");
close_button.set_tooltip_text(_("Leave fullscreen"));
close_button.set_action_name ("win.LeaveFullscreen");
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index 2b308b9..4206ec8 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -702,7 +702,7 @@ public abstract class CollectionPage : MediaPage {
Gtk.ToolButton? rotate_button = this.builder.get_object ("ToolRotate") as Gtk.ToolButton;
if (rotate_button != null) {
rotate_button.set_action_name ("win.RotateCounterclockwise");
- rotate_button.set_icon_name ("object-rotate-left");
+ rotate_button.set_icon_name (Resources.COUNTERCLOCKWISE);
rotate_button.set_tooltip_text (Resources.ROTATE_CCW_TOOLTIP);
}
@@ -713,7 +713,7 @@ public abstract class CollectionPage : MediaPage {
Gtk.ToolButton? rotate_button = this.builder.get_object ("ToolRotate") as Gtk.ToolButton;
if (rotate_button != null) {
rotate_button.set_action_name ("win.RotateClockwise");
- rotate_button.set_icon_name ("object-rotate-right");
+ rotate_button.set_icon_name (Resources.CLOCKWISE);
rotate_button.set_tooltip_text (Resources.ROTATE_CW_TOOLTIP);
}
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index d926d63..e82efde 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -540,13 +540,13 @@ public abstract class EditingHostPage : SinglePhotoPage {
// previous button
prev_button.set_tooltip_text(_("Previous photo"));
- prev_button.set_icon_name("go-previous");
+ prev_button.set_icon_name("go-previous-symbolic");
prev_button.clicked.connect(on_previous_photo);
toolbar.insert(prev_button, -1);
// next button
next_button.set_tooltip_text(_("Next photo"));
- next_button.set_icon_name("go-next");
+ next_button.set_icon_name("go-next-symbolic");
next_button.clicked.connect(on_next_photo);
toolbar.insert(next_button, -1);
}
diff --git a/src/Resources.vala b/src/Resources.vala
index 2de7f93..c5173eb 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -66,25 +66,24 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
""";
- public const string CLOCKWISE = "object-rotate-right";
- public const string COUNTERCLOCKWISE = "object-rotate-left";
- public const string HFLIP = "object-flip-horizontal";
- public const string VFLIP = "object-flip-vertical";
+ public const string CLOCKWISE = "object-rotate-right-symbolic";
+ public const string COUNTERCLOCKWISE = "object-rotate-left-symbolic";
+ public const string HFLIP = "object-flip-horizontal-symbolic";
+ public const string VFLIP = "object-flip-vertical-symbolic";
public const string CROP = "shotwell-crop";
public const string STRAIGHTEN = "shotwell-straighten";
public const string REDEYE = "shotwell-redeye";
public const string ADJUST = "image-adjust";
- public const string PIN_TOOLBAR = "shotwell-pin-toolbar";
public const string MAKE_PRIMARY = "shotwell-make-primary";
public const string IMPORT = "import";
public const string IMPORT_ALL = "import-all";
public const string ENHANCE = "shotwell-auto-enhance";
public const string CROP_PIVOT_RETICLE = "shotwell-crop-pivot-reticle";
- public const string PUBLISH = "applications-internet";
+ public const string PUBLISH = "web-browser-symbolic";
public const string MERGE = "shotwell-merge-events";
- public const string GO_NEXT = "go-next";
- public const string GO_PREVIOUS = "go-previous";
+ public const string GO_NEXT = "go-next-symbolic";
+ public const string GO_PREVIOUS = "go-previous-symbolic";
//public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
@@ -111,13 +110,13 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string ICON_NO_EVENT = "no-event";
public const string ICON_ONE_TAG = "one-tag";
public const string ICON_TAGS = "multiple-tags";
- public const string ICON_FOLDER = "folder";
- public const string ICON_FOLDER_DOCUMENTS = "folder-documents";
- public const string ICON_IMPORTING = "go-down";
- public const string ICON_LAST_IMPORT = "document-open-recent";
- public const string ICON_MISSING_FILES = "process-stop";
- public const string ICON_PHOTOS = "shotwell";
- public const string ICON_SINGLE_PHOTO = "image-x-generic";
+ public const string ICON_FOLDER = "folder-symbolic";
+ public const string ICON_FOLDER_DOCUMENTS = "folder-documents-symbolic";
+ public const string ICON_IMPORTING = "go-down-symbolic";
+ public const string ICON_LAST_IMPORT = "document-open-recent-symbolic";
+ public const string ICON_MISSING_FILES = "process-stop-symbolic";
+ public const string ICON_PHOTOS = "shotwell-symbolic";
+ public const string ICON_SINGLE_PHOTO = "image-x-generic-symbolic";
public const string ICON_FILTER_PHOTOS = "filter-photos";
public const string ICON_FILTER_PHOTOS_DISABLED = "filter-photos-disabled";
public const string ICON_FILTER_VIDEOS = "filter-videos";
@@ -126,8 +125,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string ICON_FILTER_RAW_DISABLED = "filter-raw-disabled";
public const string ICON_FILTER_FLAGGED = "filter-flagged";
public const string ICON_FILTER_FLAGGED_DISABLED = "filter-flagged-disabled";
- public const string ICON_TRASH_EMPTY = "user-trash";
- public const string ICON_TRASH_FULL = "user-trash-full";
+ public const string ICON_TRASH_EMPTY = "user-trash-symbolic";
+ public const string ICON_TRASH_FULL = "user-trash-full-symbolic";
public const string ICON_VIDEOS_PAGE = "videos-page";
public const string ICON_FLAGGED_PAGE = "flag-page";
public const string ICON_FLAGGED_TRINKET = "flag-trinket.png";
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index 44f5b34..6f6c3ef 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -857,7 +857,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
button = new Gtk.ToggleButton();
button.set_always_show_image(true);
- Gtk.Image? image = new Gtk.Image.from_icon_name("edit-find", Gtk.IconSize.SMALL_TOOLBAR);
+ Gtk.Image? image = new Gtk.Image.from_icon_name("edit-find-symbolic",
Gtk.IconSize.SMALL_TOOLBAR);
image.set_margin_end(6);
button.set_image(image);
button.set_can_focus(false);
diff --git a/src/SlideshowPage.vala b/src/SlideshowPage.vala
index fcb6430..62cd3fe 100644
--- a/src/SlideshowPage.vala
+++ b/src/SlideshowPage.vala
@@ -132,28 +132,28 @@ class SlideshowPage : SinglePhotoPage {
// add toolbar buttons
Gtk.ToolButton previous_button = new Gtk.ToolButton(null, _("Back"));
- previous_button.set_icon_name("go-previous");
+ previous_button.set_icon_name("go-previous-symbolic");
previous_button.set_tooltip_text(_("Go to the previous photo"));
previous_button.clicked.connect(on_previous_photo);
toolbar.insert(previous_button, -1);
play_pause_button = new Gtk.ToolButton(null, _("Pause"));
- play_pause_button.set_icon_name("media-playback-pause");
+ play_pause_button.set_icon_name("media-playback-pause-symbolic");
play_pause_button.set_tooltip_text(_("Pause the slideshow"));
play_pause_button.clicked.connect(on_play_pause);
toolbar.insert(play_pause_button, -1);
Gtk.ToolButton next_button = new Gtk.ToolButton(null, _("Next"));
- next_button.set_icon_name("go-next");
+ next_button.set_icon_name("go-next-symbolic");
next_button.set_tooltip_text(_("Go to the next photo"));
next_button.clicked.connect(on_next_photo);
toolbar.insert(next_button, -1);
settings_button = new Gtk.ToolButton(null, null);
- settings_button.set_icon_name("preferences-system");
+ settings_button.set_icon_name("preferences-system-symbolic");
settings_button.set_label(_("Settings"));
settings_button.set_tooltip_text(_("Change slideshow settings"));
settings_button.clicked.connect(on_change_settings);
@@ -240,11 +240,11 @@ class SlideshowPage : SinglePhotoPage {
private void on_play_pause() {
if (playing) {
- play_pause_button.set_icon_name("media-playback-start");
+ play_pause_button.set_icon_name("media-playback-start-symbolic");
play_pause_button.set_label(_("Play"));
play_pause_button.set_tooltip_text(_("Continue the slideshow"));
} else {
- play_pause_button.set_icon_name("media-playback-pause");
+ play_pause_button.set_icon_name("media-playback-pause-symbolic");
play_pause_button.set_label(_("Pause"));
play_pause_button.set_tooltip_text(_("Pause the slideshow"));
}
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index f7698a6..6970cfa 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -802,7 +802,7 @@ public class ImportPage : CheckerboardPage {
// Find button
Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton();
- find_button.set_icon_name("edit-find");
+ find_button.set_icon_name("edit-find-symbolic");
find_button.set_action_name ("win.CommonDisplaySearchbar");
toolbar.insert(find_button, -1);
diff --git a/src/library/ImportQueuePage.vala b/src/library/ImportQueuePage.vala
index feb525d..1a14472 100644
--- a/src/library/ImportQueuePage.vala
+++ b/src/library/ImportQueuePage.vala
@@ -29,7 +29,7 @@ public class ImportQueuePage : SinglePhotoPage {
// Stop button
Gtk.ToolButton stop_button = new Gtk.ToolButton(null, null);
- stop_button.set_icon_name("stop");
+ stop_button.set_icon_name("process-stop-symbolic");
stop_button.set_action_name ("win.Stop");
toolbar.insert(stop_button, -1);
diff --git a/src/searches/SearchesBranch.vala b/src/searches/SearchesBranch.vala
index caf8ac6..22a38e2 100644
--- a/src/searches/SearchesBranch.vala
+++ b/src/searches/SearchesBranch.vala
@@ -89,7 +89,7 @@ public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntry,
Sidebar.DestroyableEntry {
- private static string single_search_icon = "edit-find";
+ private static string single_search_icon = "edit-find-symbolic";
private SavedSearch search;
diff --git a/ui/collection.ui b/ui/collection.ui
index 212d5b9..89a3aa2 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -150,7 +150,7 @@
<property name="action_name">win.RotateClockwise</property>
<property name="label" translatable="yes">Rotate</property>
<property name="use_underline">True</property>
- <property name="icon_name">object-rotate-right</property>
+ <property name="icon_name">object-rotate-right-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -191,7 +191,7 @@
<property name="action_name">win.Publish</property>
<property name="label" translatable="yes">Publish</property>
<property name="use_underline">True</property>
- <property name="icon_name">applications-internet</property>
+ <property name="icon_name">web-browser-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
@@ -216,7 +216,7 @@
<property name="action_name">win.CommonDisplaySearchbar</property>
<property name="label" translatable="yes">Find</property>
<property name="use_underline">True</property>
- <property name="icon_name">edit-find</property>
+ <property name="icon_name">edit-find-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/ui/offline.ui b/ui/offline.ui
index f419315..3daefca 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -238,7 +238,7 @@
<property name="action_name">win.CommonDisplaySearchbar</property>
<property name="label" translatable="yes">Find</property>
<property name="use_underline">True</property>
- <property name="icon_name">edit-find</property>
+ <property name="icon_name">edit-find-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/ui/trash.ui b/ui/trash.ui
index ed49d28..1dc188d 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -311,7 +311,7 @@
<property name="action_name">win.CommonDisplaySearchbar</property>
<property name="label" translatable="yes">Find</property>
<property name="use_underline">True</property>
- <property name="icon_name">edit-find</property>
+ <property name="icon_name">edit-find-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
