Skip to content

Commit c41ba63

Browse files
committed
Switch to xapp-symbolic-icons (XSI)
1 parent 383bca0 commit c41ba63

17 files changed

+84
-84
lines changed

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 12),
1313
libgtk-3-dev,
1414
libgtksourceview-4-dev,
1515
libpeas-dev,
16-
libxapp-dev (>= 3.0),
16+
libxapp-dev (>= 1.9),
1717
libx11-dev,
1818
libxml2-dev,
1919
python3,
@@ -31,7 +31,7 @@ Depends: iso-codes,
3131
python3,
3232
python3-gi,
3333
gir1.2-gtksource-4,
34-
xapps-common (>= 3.0.0)
34+
xapps-common (>= 1.9.0)
3535
Description: Text editor
3636
Xed is a text editor which supports most standard editor features,
3737
extending this basic functionality with other features not usually

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ libpeas = dependency('libpeas-1.0', version: '>= 1.12.0')
3434
libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.12.0')
3535
gir_dep = dependency('gobject-introspection-1.0', version: '>= 1.42.0', required: false)
3636
gmodule = dependency('gmodule-2.0')
37-
xapp = dependency('xapp', version: '>= 3.0.0')
37+
xapp = dependency('xapp', version: '>= 1.9.0')
3838
X11 = dependency('x11')
3939
pango = dependency('pango')
4040

plugins/filebrowser/xed-file-browser-plugin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ on_selection_changed_cb (GtkTreeSelection *selection,
436436

437437
static GtkActionEntry extra_actions[] =
438438
{
439-
{"SetActiveRoot", "xapp-go-jump-symbolic", N_("_Set root to active document"),
439+
{"SetActiveRoot", "xsi-go-jump-symbolic", N_("_Set root to active document"),
440440
NULL,
441441
N_("Set the root to the active document location"),
442442
G_CALLBACK (on_action_set_active_root)}

plugins/filebrowser/xed-file-browser-widget.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -755,27 +755,27 @@ static const GtkActionEntry tree_actions_selection[] =
755755
{
756756
{"FileMoveToTrash", "user-trash", N_("_Move to Trash"), NULL,
757757
N_("Move selected file or folder to trash"), G_CALLBACK (on_action_file_move_to_trash)},
758-
{"FileDelete", "xapp-edit-delete-symbolic", N_("_Delete"), NULL,
758+
{"FileDelete", "xsi-edit-delete-symbolic", N_("_Delete"), NULL,
759759
N_("Delete selected file or folder"), G_CALLBACK (on_action_file_delete)}
760760
};
761761

762762
static const GtkActionEntry tree_actions_file_selection[] =
763763
{
764-
{"FileOpen", "xapp-document-open-symbolic", N_("_Open"), NULL,
764+
{"FileOpen", "xsi-document-open-symbolic", N_("_Open"), NULL,
765765
N_("Open selected file"), G_CALLBACK (on_action_file_open)}
766766
};
767767

768768
static const GtkActionEntry tree_actions[] =
769769
{
770-
{"DirectoryUp", "xapp-go-up-symbolic", N_("Up"), NULL,
770+
{"DirectoryUp", "xsi-go-up-symbolic", N_("Up"), NULL,
771771
N_("Open the parent folder"), G_CALLBACK (on_action_directory_up)}
772772
};
773773

774774
static const GtkActionEntry tree_actions_single_most_selection[] =
775775
{
776-
{"DirectoryNew", "xapp-folder-new-symbolic", N_("_New Folder"), NULL,
776+
{"DirectoryNew", "xsi-folder-new-symbolic", N_("_New Folder"), NULL,
777777
N_("Add new empty folder"), G_CALLBACK (on_action_directory_new)},
778-
{"FileNew", "xapp-document-new-symbolic", N_("New F_ile"), NULL,
778+
{"FileNew", "xsi-document-new-symbolic", N_("New F_ile"), NULL,
779779
N_("Add new empty file"), G_CALLBACK (on_action_file_new)}
780780
};
781781

@@ -787,13 +787,13 @@ static const GtkActionEntry tree_actions_single_selection[] =
787787

788788
static const GtkActionEntry tree_actions_sensitive[] =
789789
{
790-
{"DirectoryPrevious", "xapp-go-previous-symbolic", N_("_Previous Location"), NULL,
790+
{"DirectoryPrevious", "xsi-go-previous-symbolic", N_("_Previous Location"), NULL,
791791
N_("Go to the previous visited location"), G_CALLBACK (on_action_directory_previous)},
792-
{"DirectoryNext", "xapp-go-next-symbolic", N_("_Next Location"), NULL,
792+
{"DirectoryNext", "xsi-go-next-symbolic", N_("_Next Location"), NULL,
793793
N_("Go to the next visited location"), G_CALLBACK (on_action_directory_next)},
794-
{"DirectoryRefresh", "xapp-view-refresh-symbolic", N_("Re_fresh View"), NULL,
794+
{"DirectoryRefresh", "xsi-view-refresh-symbolic", N_("Re_fresh View"), NULL,
795795
N_("Refresh the view"), G_CALLBACK (on_action_directory_refresh)},
796-
{"DirectoryOpen", "xapp-folder-open-symbolic", N_("_View Folder"), NULL,
796+
{"DirectoryOpen", "xsi-folder-open-symbolic", N_("_View Folder"), NULL,
797797
N_("View folder in file manager"), G_CALLBACK (on_action_directory_open)}
798798
};
799799

@@ -807,7 +807,7 @@ static const GtkToggleActionEntry tree_actions_toggle[] =
807807

808808
static const GtkActionEntry bookmark_actions[] =
809809
{
810-
{"BookmarkOpen", "xapp-folder-open-symbolic", N_("_View Folder"), NULL,
810+
{"BookmarkOpen", "xsi-folder-open-symbolic", N_("_View Folder"), NULL,
811811
N_("View folder in file manager"), G_CALLBACK (on_action_bookmark_open)}
812812
};
813813

plugins/spell/xed-spell-plugin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void inline_checker_cb (GtkAction *action,
8282
static const GtkActionEntry action_entries[] =
8383
{
8484
{ "CheckSpell",
85-
"xapp-check-spelling-symbolic",
85+
"xsi-check-spelling-symbolic",
8686
N_("_Check Spelling..."),
8787
"<shift>F7",
8888
N_("Check the current document for incorrect spelling"),

plugins/taglist/xed-taglist-plugin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ xed_taglist_plugin_activate (XedWindowActivatable *activatable)
107107
priv->taglist_panel = xed_taglist_plugin_panel_new (priv->window, data_dir);
108108
g_free (data_dir);
109109

110-
xed_panel_add_item (side_panel, priv->taglist_panel, _("Tags"), "xapp-list-add-symbolic");
110+
xed_panel_add_item (side_panel, priv->taglist_panel, _("Tags"), "xsi-list-add-symbolic");
111111
}
112112

113113
static void

xed/resources/ui/xed-preferences-dialog.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@
13811381
<object class="GtkImage" id="image1">
13821382
<property name="visible">True</property>
13831383
<property name="can_focus">False</property>
1384-
<property name="icon_name">xapp-list-add-symbolic</property>
1384+
<property name="icon_name">xsi-list-add-symbolic</property>
13851385
</object>
13861386
</child>
13871387
</object>
@@ -1401,7 +1401,7 @@
14011401
<object class="GtkImage" id="image2">
14021402
<property name="visible">True</property>
14031403
<property name="can_focus">False</property>
1404-
<property name="icon_name">xapp-list-remove-symbolic</property>
1404+
<property name="icon_name">xsi-list-remove-symbolic</property>
14051405
</object>
14061406
</child>
14071407
</object>

xed/resources/ui/xed-searchbar.ui

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<object class="GtkImage" id="image4">
127127
<property name="visible">True</property>
128128
<property name="can_focus">False</property>
129-
<property name="icon_name">xapp-use-regex-symbolic</property>
129+
<property name="icon_name">xsi-use-regex-symbolic</property>
130130
</object>
131131
</child>
132132
</object>
@@ -147,7 +147,7 @@
147147
<object class="GtkImage" id="image1">
148148
<property name="visible">True</property>
149149
<property name="can_focus">False</property>
150-
<property name="icon_name">xapp-text-case-symbolic</property>
150+
<property name="icon_name">xsi-text-case-symbolic</property>
151151
</object>
152152
</child>
153153
</object>
@@ -168,7 +168,7 @@
168168
<object class="GtkImage" id="image5">
169169
<property name="visible">True</property>
170170
<property name="can_focus">False</property>
171-
<property name="icon_name">xapp-search-entire-word-symbolic</property>
171+
<property name="icon_name">xsi-search-entire-word-symbolic</property>
172172
</object>
173173
</child>
174174
</object>
@@ -189,7 +189,7 @@
189189
<object class="GtkImage" id="image3">
190190
<property name="visible">True</property>
191191
<property name="can_focus">False</property>
192-
<property name="icon_name">xapp-search-wrap-symbolic</property>
192+
<property name="icon_name">xsi-search-wrap-symbolic</property>
193193
</object>
194194
</child>
195195
</object>
@@ -223,7 +223,7 @@
223223
<property name="visible">True</property>
224224
<property name="can_focus">False</property>
225225
<property name="pixel_size">12</property>
226-
<property name="icon_name">xapp-window-close-symbolic</property>
226+
<property name="icon_name">xsi-window-close-symbolic</property>
227227
<property name="icon_size">0</property>
228228
</object>
229229
</child>

xed/resources/ui/xed-status-menu-button.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<object class="GtkImage" id="arrow">
3838
<property name="visible">True</property>
3939
<property name="valign">baseline</property>
40-
<property name="icon_name">xapp-pan-down-symbolic</property>
40+
<property name="icon_name">xsi-pan-down-symbolic</property>
4141
</object>
4242
<packing>
4343
<property name="expand">False</property>

xed/xed-close-button.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ xed_close_button_init (XedCloseButton *button)
4949
{
5050
GtkWidget *image;
5151

52-
image = gtk_image_new_from_icon_name ("xapp-window-close-symbolic", GTK_ICON_SIZE_MENU);
52+
image = gtk_image_new_from_icon_name ("xsi-window-close-symbolic", GTK_ICON_SIZE_MENU);
5353
gtk_widget_show (image);
5454

5555
gtk_container_add (GTK_CONTAINER (button), image);

0 commit comments

Comments
 (0)