Skip to content

Commit 342ebb5

Browse files
clefebvreclefebvre
committed
Switch to XApp symbolic icons
1 parent ddbf00b commit 342ebb5

File tree

11 files changed

+59
-59
lines changed

11 files changed

+59
-59
lines changed

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Build-Depends: debhelper-compat (= 12),
2121
libspectre-dev,
2222
libtiff-dev,
2323
libwebkit2gtk-4.1-dev (>= 2.4.3),
24-
libxapp-dev (>= 2.5.0),
24+
libxapp-dev (>= 3.0.0),
2525
libx11-dev,
2626
libxml2-dev,
2727
lsb-release,

‎meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ gtk = dependency('gtk+-' + gtk_api_version, version: '>= ' + gtk_version)
5050
ice = dependency('ice')
5151
sm = dependency('sm')
5252
X11 = dependency('x11')
53-
xapp = dependency('xapp', version: '>= 2.5.0')
53+
xapp = dependency('xapp', version: '>= 3.0.0')
5454
xml = dependency('libxml-2.0', version: '>= 2.5.0')
5555
zlib = dependency('zlib')
5656
libsecret = dependency('libsecret-1', version: '>= 0.5', required: get_option('keyring'))

‎previewer/ev-previewer-window.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,23 +278,23 @@ static const GtkActionEntry action_entries[] = {
278278
{ "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
279279
NULL,
280280
G_CALLBACK (ev_previewer_window_close) },
281-
{ "GoPreviousPage", "go-previous-symbolic", N_("_Previous Page"), "<control>Page_Up",
281+
{ "GoPreviousPage", "xapp-go-previous-symbolic", N_("_Previous Page"), "<control>Page_Up",
282282
N_("Go to the previous page"),
283283
G_CALLBACK (ev_previewer_window_previous_page) },
284-
{ "GoNextPage", "go-next-symbolic", N_("_Next Page"), "<control>Page_Down",
284+
{ "GoNextPage", "xapp-go-next-symbolic", N_("_Next Page"), "<control>Page_Down",
285285
N_("Go to the next page"),
286286
G_CALLBACK (ev_previewer_window_next_page) },
287-
{ "ViewZoomIn", "zoom-in-symbolic", NULL, "<control>plus",
287+
{ "ViewZoomIn", "xapp-zoom-in-symbolic", NULL, "<control>plus",
288288
N_("Enlarge the document"),
289289
G_CALLBACK (ev_previewer_window_zoom_in) },
290-
{ "ViewZoomOut", "zoom-out-symbolic", NULL, "<control>minus",
290+
{ "ViewZoomOut", "xapp-zoom-out-symbolic", NULL, "<control>minus",
291291
N_("Shrink the document"),
292292
G_CALLBACK (ev_previewer_window_zoom_out) },
293-
{ "ViewZoomReset", "zoom-original-symbolic", NULL, "<control>0",
293+
{ "ViewZoomReset", "xapp-zoom-original-symbolic", NULL, "<control>0",
294294
N_("Original size"),
295295
G_CALLBACK (ev_previewer_window_zoom_reset) },
296296
/* translators: Print document currently shown in the Print Preview window */
297-
{ "PreviewPrint", "document-print-symbolic", N_("Print"), NULL,
297+
{ "PreviewPrint", "xapp-document-print-symbolic", N_("Print"), NULL,
298298
N_("Print this document"),
299299
G_CALLBACK (ev_previewer_window_print) }
300300
};
@@ -338,10 +338,10 @@ static const GtkActionEntry accel_entries[] = {
338338
};
339339

340340
static const GtkToggleActionEntry toggle_action_entries[] = {
341-
{ "ViewBestFit", "zoom-fit-best-symbolic", N_("_Best Fit"), NULL,
341+
{ "ViewBestFit", "xapp-zoom-fit-best-symbolic", N_("_Best Fit"), NULL,
342342
N_("Make the current document fill the window"),
343343
G_CALLBACK (ev_previewer_window_zoom_best_fit) },
344-
{ "ViewPageWidth", "view-paged-symbolic", N_("Fit Page _Width"), NULL,
344+
{ "ViewPageWidth", "xapp-view-paged-symbolic", N_("Fit Page _Width"), NULL,
345345
N_("Make the current document fill the window width"),
346346
G_CALLBACK (ev_previewer_window_zoom_page_width) }
347347
};

‎shell/eggfindbar.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,15 +332,15 @@ egg_find_bar_init (EggFindBar *find_bar)
332332
gtk_widget_show (priv->find_entry);
333333

334334
/* Prev */
335-
arrow = gtk_image_new_from_icon_name ("pan-start-symbolic", GTK_ICON_SIZE_BUTTON);
335+
arrow = gtk_image_new_from_icon_name ("xapp-pan-start-symbolic", GTK_ICON_SIZE_BUTTON);
336336
priv->previous_button = gtk_tool_button_new (arrow, Q_("Find Pre_vious"));
337337
gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->previous_button), TRUE);
338338
gtk_tool_item_set_is_important (priv->previous_button, TRUE);
339339
gtk_widget_set_tooltip_text (GTK_WIDGET (priv->previous_button),
340340
_("Find previous occurrence of the search string"));
341341

342342
/* Next */
343-
arrow = gtk_image_new_from_icon_name ("pan-end-symbolic", GTK_ICON_SIZE_BUTTON);
343+
arrow = gtk_image_new_from_icon_name ("xapp-pan-end-symbolic", GTK_ICON_SIZE_BUTTON);
344344
priv->next_button = gtk_tool_button_new (arrow, Q_("Find Ne_xt"));
345345
gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->next_button), TRUE);
346346
gtk_tool_item_set_is_important (priv->next_button, TRUE);
@@ -376,7 +376,7 @@ egg_find_bar_init (EggFindBar *find_bar)
376376
gtk_tool_item_set_expand (priv->close_separator, TRUE);
377377

378378
/* Close button */
379-
cross = gtk_image_new_from_icon_name ("window-close-symbolic",
379+
cross = gtk_image_new_from_icon_name ("xapp-window-close-symbolic",
380380
GTK_ICON_SIZE_BUTTON);
381381
priv->close_button = gtk_tool_button_new (cross, NULL);
382382

‎shell/ev-history-action-widget.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ ev_history_action_widget_create_button (EvHistoryActionWidget *history_widget,
211211
switch (action_button)
212212
{
213213
case EV_HISTORY_ACTION_BUTTON_BACK:
214-
icon_name = "go-previous-symbolic";
214+
icon_name = "xapp-go-previous-symbolic";
215215
tooltip_text = _("Go to previous history item");
216216
break;
217217
case EV_HISTORY_ACTION_BUTTON_FORWARD:
218-
icon_name = "go-next-symbolic";
218+
icon_name = "xapp-go-next-symbolic";
219219
tooltip_text = _("Go to next history item");
220220
break;
221221
}

‎shell/ev-sidebar-bookmarks.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ ev_bookmarks_popup_cmd_remove_bookmark (GtkAction *action,
152152
}
153153

154154
static const GtkActionEntry popup_entries[] = {
155-
{ "OpenBookmark", "document-open-symbolic", N_("_Open Bookmark"), NULL,
155+
{ "OpenBookmark", "xapp-document-open-symbolic", N_("_Open Bookmark"), NULL,
156156
NULL, G_CALLBACK (ev_bookmarks_popup_cmd_open_bookmark) },
157157
{ "RenameBookmark", NULL, N_("_Rename Bookmark"), NULL,
158158
NULL, G_CALLBACK (ev_bookmarks_popup_cmd_rename_bookmark) },
@@ -483,15 +483,15 @@ ev_sidebar_bookmarks_init (EvSidebarBookmarks *sidebar_bookmarks)
483483
gtk_style_context_add_class (gtk_widget_get_style_context (hbox), "linked");
484484
gtk_widget_show (hbox);
485485

486-
priv->add_button = gtk_button_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
486+
priv->add_button = gtk_button_new_from_icon_name ("xapp-list-add-symbolic", GTK_ICON_SIZE_BUTTON);
487487
g_signal_connect (priv->add_button, "clicked",
488488
G_CALLBACK (ev_sidebar_bookmarks_add_clicked),
489489
sidebar_bookmarks);
490490
gtk_widget_set_sensitive (priv->add_button, FALSE);
491491
gtk_box_pack_start (GTK_BOX (hbox), priv->add_button, FALSE, FALSE, 0);
492492
gtk_widget_show (priv->add_button);
493493

494-
priv->del_button = gtk_button_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
494+
priv->del_button = gtk_button_new_from_icon_name ("xapp-list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
495495
g_signal_connect (priv->del_button, "clicked",
496496
G_CALLBACK (ev_sidebar_bookmarks_del_clicked),
497497
sidebar_bookmarks);

‎shell/ev-sidebar-thumbnails.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails)
949949

950950
button = gtk_button_new ();
951951
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
952-
image = gtk_image_new_from_icon_name ("zoom-out-symbolic", GTK_ICON_SIZE_BUTTON);
952+
image = gtk_image_new_from_icon_name ("xapp-zoom-out-symbolic", GTK_ICON_SIZE_BUTTON);
953953
gtk_container_add (GTK_CONTAINER (button), image);
954954
gtk_widget_show (image);
955955

@@ -962,7 +962,7 @@ ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails)
962962

963963
button = gtk_button_new ();
964964
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
965-
image = gtk_image_new_from_icon_name ("zoom-in-symbolic", GTK_ICON_SIZE_BUTTON);
965+
image = gtk_image_new_from_icon_name ("xapp-zoom-in-symbolic", GTK_ICON_SIZE_BUTTON);
966966
gtk_container_add (GTK_CONTAINER (button), image);
967967
gtk_widget_show (image);
968968

@@ -975,7 +975,7 @@ ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails)
975975

976976
button = gtk_button_new ();
977977
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
978-
image = gtk_image_new_from_icon_name ("zoom-original-symbolic", GTK_ICON_SIZE_BUTTON);
978+
image = gtk_image_new_from_icon_name ("xapp-zoom-original-symbolic", GTK_ICON_SIZE_BUTTON);
979979
gtk_container_add (GTK_CONTAINER (button), image);
980980
gtk_widget_show (image);
981981

‎shell/ev-sidebar.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
367367
TRUE, TRUE, 12);
368368
gtk_widget_show (ev_sidebar->priv->label);
369369

370-
arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
370+
arrow = gtk_image_new_from_icon_name ("xapp-pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
371371
gtk_box_pack_end (GTK_BOX (select_hbox), arrow, FALSE, TRUE, 0);
372372
gtk_widget_show (arrow);
373373

@@ -378,7 +378,7 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
378378
gtk_widget_set_halign (ev_sidebar->priv->select_button, GTK_ALIGN_CENTER);
379379
gtk_widget_show (ev_sidebar->priv->select_button);
380380

381-
close_button = gtk_button_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON);
381+
close_button = gtk_button_new_from_icon_name ("xapp-window-close-symbolic", GTK_ICON_SIZE_BUTTON);
382382
gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
383383
g_signal_connect (close_button, "clicked",
384384
G_CALLBACK (ev_sidebar_close_clicked_cb),

‎shell/ev-toolbar.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ setup_preset_buttons (EvToolbar *ev_toolbar)
125125
/* Page preset button */
126126
ev_toolbar->priv->page_preset_button = gtk_toggle_button_new ();
127127
gtk_widget_set_valign (ev_toolbar->priv->page_preset_button, GTK_ALIGN_CENTER);
128-
image = gtk_image_new_from_icon_name ("view-paged-symbolic", GTK_ICON_SIZE_MENU);
128+
image = gtk_image_new_from_icon_name ("xapp-view-paged-symbolic", GTK_ICON_SIZE_MENU);
129129
gtk_style_context_add_class (gtk_widget_get_style_context (ev_toolbar->priv->page_preset_button), "flat");
130130
gtk_button_set_focus_on_click (GTK_BUTTON (ev_toolbar->priv->page_preset_button), FALSE);
131131

@@ -139,7 +139,7 @@ setup_preset_buttons (EvToolbar *ev_toolbar)
139139
/* Reader preset button */
140140
ev_toolbar->priv->reader_preset_button = gtk_toggle_button_new ();
141141
gtk_widget_set_valign (ev_toolbar->priv->reader_preset_button, GTK_ALIGN_CENTER);
142-
image = gtk_image_new_from_icon_name ("view-continuous-symbolic", GTK_ICON_SIZE_MENU);
142+
image = gtk_image_new_from_icon_name ("xapp-view-continuous-symbolic", GTK_ICON_SIZE_MENU);
143143
gtk_style_context_add_class (gtk_widget_get_style_context (ev_toolbar->priv->reader_preset_button), "flat");
144144
gtk_button_set_focus_on_click (GTK_BUTTON (ev_toolbar->priv->reader_preset_button), FALSE);
145145

@@ -161,7 +161,7 @@ create_sidepane_button (GtkAction *action)
161161

162162
button = gtk_toggle_button_new();
163163
gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
164-
image = gtk_image_new_from_icon_name ("view-left-pane-symbolic", GTK_ICON_SIZE_MENU);
164+
image = gtk_image_new_from_icon_name ("xapp-view-left-pane-symbolic", GTK_ICON_SIZE_MENU);
165165
gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
166166

167167
gtk_button_set_image (GTK_BUTTON (button), image);

0 commit comments

Comments
 (0)