Skip to content

Commit 8d13d38

Browse files
clefebvreclefebvre
committed
Switch to XApp symbolic icons
1 parent 20c2ffa commit 8d13d38

File tree

5 files changed

+31
-33
lines changed

5 files changed

+31
-33
lines changed

‎plugins/housekeeping/csd-disk-space.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ ldsm_notify_for_mount (LdsmMountInfo *mount,
353353
}
354354
g_free (free_space_str);
355355

356-
notification = notify_notification_new (summary, body, "drive-harddisk-symbolic");
356+
notification = notify_notification_new (summary, body, "xapp-drive-harddisk-symbolic");
357357
g_free (summary);
358358
g_free (body);
359359

‎plugins/media-keys/csd-media-keys-manager.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -450,14 +450,14 @@ get_icon_name_for_volume (gboolean muted,
450450
gboolean is_mic)
451451
{
452452
static const char *icon_names[] = {
453-
"audio-volume-muted-symbolic",
454-
"audio-volume-low-symbolic",
455-
"audio-volume-medium-symbolic",
456-
"audio-volume-high-symbolic",
457-
"microphone-sensitivity-muted-symbolic",
458-
"microphone-sensitivity-low-symbolic",
459-
"microphone-sensitivity-medium-symbolic",
460-
"microphone-sensitivity-high-symbolic",
453+
"xapp-audio-volume-muted-symbolic",
454+
"xapp-audio-volume-low-symbolic",
455+
"xapp-audio-volume-medium-symbolic",
456+
"xapp-audio-volume-high-symbolic",
457+
"xapp-microphone-sensitivity-muted-symbolic",
458+
"xapp-microphone-sensitivity-low-symbolic",
459+
"xapp-microphone-sensitivity-medium-symbolic",
460+
"xapp-microphone-sensitivity-high-symbolic",
461461
NULL
462462
};
463463
int n;
@@ -646,7 +646,7 @@ do_eject_action (CsdMediaKeysManager *manager)
646646
}
647647

648648
/* Show the dialogue */
649-
show_osd (manager, "media-eject-symbolic", _("Eject"), -1, OSD_ALL_OUTPUTS_X, OSD_ALL_OUTPUTS_Y);
649+
show_osd (manager, "xapp-media-eject-symbolic", _("Eject"), -1, OSD_ALL_OUTPUTS_X, OSD_ALL_OUTPUTS_Y);
650650

651651
/* Clean up the drive selection and exit if no suitable
652652
* drives are found */
@@ -702,10 +702,10 @@ do_touchpad_osd_action (CsdMediaKeysManager *manager, gboolean state)
702702
const char *label;
703703

704704
if (state) {
705-
icon = "input-touchpad-symbolic";
705+
icon = "xapp-input-touchpad-symbolic";
706706
label = _("Enabled");
707707
} else {
708-
icon = "touchpad-disabled-symbolic";
708+
icon = "xapp-touchpad-disabled-symbolic";
709709
label = _("Disabled");
710710
}
711711

@@ -1246,7 +1246,7 @@ csd_media_player_key_pressed (CsdMediaKeysManager *manager,
12461246
if (!have_listeners) {
12471247
if (!mpris_controller_key (manager->priv->mpris_controller, key)) {
12481248
/* Popup a dialog with an (/) icon */
1249-
show_osd (manager, "action-unavailable-symbolic", _("Unavailable"), -1, OSD_ALL_OUTPUTS_X, OSD_ALL_OUTPUTS_Y);
1249+
show_osd (manager, "xapp-sign-forbidden-symbolic", _("Unavailable"), -1, OSD_ALL_OUTPUTS_X, OSD_ALL_OUTPUTS_Y);
12501250
}
12511251
return TRUE;
12521252
}
@@ -1342,10 +1342,10 @@ do_video_rotate_lock_action (CsdMediaKeysManager *manager,
13421342
g_object_unref (settings);
13431343

13441344
if (locked) {
1345-
icon = "rotation-locked-symbolic";
1345+
icon = "xapp-rotation-locked-symbolic";
13461346
label = _("Rotation Locked");
13471347
} else {
1348-
icon = "rotation-allowed-symbolic";
1348+
icon = "xapp-rotation-allowed-symbolic";
13491349
label = _("Rotation Allowed");
13501350
}
13511351

@@ -1510,7 +1510,7 @@ update_screen_cb (GObject *source_object,
15101510

15111511
/* update the dialog with the new value */
15121512
g_variant_get (variant, "(uii)", &percentage, &outx, &outy);
1513-
show_osd (manager, "display-brightness-symbolic", NULL, percentage, outx, outy);
1513+
show_osd (manager, "xapp-display-brightness-symbolic", NULL, percentage, outx, outy);
15141514
g_variant_unref (variant);
15151515
}
15161516

@@ -1592,7 +1592,7 @@ update_keyboard_cb (GObject *source_object,
15921592

15931593
/* update the dialog with the new value */
15941594
g_variant_get (new_percentage, "(u)", &percentage);
1595-
show_osd (manager, "keyboard-brightness-symbolic", NULL, percentage, OSD_ALL_OUTPUTS_X, OSD_ALL_OUTPUTS_Y);
1595+
show_osd (manager, "xapp-keyboard-brightness-symbolic", NULL, percentage, OSD_ALL_OUTPUTS_X, OSD_ALL_OUTPUTS_Y);
15961596
g_variant_unref (new_percentage);
15971597
}
15981598

‎plugins/power/gpm-common.c‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
167167
/* get the icon from some simple rules */
168168
if (kind == UP_DEVICE_KIND_LINE_POWER) {
169169
if (use_symbolic)
170-
g_string_append (filename, "ac-adapter-symbolic;");
170+
g_string_append (filename, "xapp-battery-ac-symbolic;");
171171
g_string_append (filename, "ac-adapter;");
172172

173173
} else if (kind == UP_DEVICE_KIND_MONITOR) {
@@ -180,7 +180,7 @@ gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
180180
kind_str = up_device_kind_to_string (kind);
181181
if (!is_present) {
182182
if (use_symbolic)
183-
g_string_append (filename, "battery-missing-symbolic;");
183+
g_string_append (filename, "xapp-battery-missing-symbolic;");
184184
g_string_append_printf (filename, "gpm-%s-missing;", kind_str);
185185
g_string_append_printf (filename, "gpm-%s-000;", kind_str);
186186
g_string_append (filename, "battery-missing;");
@@ -189,16 +189,14 @@ gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
189189
switch (state) {
190190
case UP_DEVICE_STATE_EMPTY:
191191
if (use_symbolic)
192-
g_string_append (filename, "battery-empty-symbolic;");
192+
g_string_append (filename, "xapp-battery-level-0-symbolic;");
193193
g_string_append_printf (filename, "gpm-%s-empty;", kind_str);
194194
g_string_append_printf (filename, "gpm-%s-000;", kind_str);
195195
g_string_append (filename, "battery-empty;");
196196
break;
197197
case UP_DEVICE_STATE_FULLY_CHARGED:
198198
if (use_symbolic) {
199-
g_string_append (filename, "battery-level-100-charged-symbolic;");
200-
g_string_append (filename, "battery-full-charged-symbolic;");
201-
g_string_append (filename, "battery-full-charging-symbolic;");
199+
g_string_append (filename, "xapp-battery-level-100-charged-symbolic;");
202200
}
203201
g_string_append_printf (filename, "gpm-%s-full;", kind_str);
204202
g_string_append_printf (filename, "gpm-%s-100;", kind_str);
@@ -211,8 +209,8 @@ gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
211209
index_str = gpm_upower_get_device_icon_index (device);
212210
precise_str = gpm_upower_get_precise_icon_index (device);
213211
if (use_symbolic) {
214-
g_string_append_printf (filename, "battery-level-%s-charging-symbolic;", precise_str);
215-
g_string_append_printf (filename, "battery-%s-charging-symbolic;", suffix_str);
212+
g_string_append_printf (filename, "xapp-battery-level-%s-charging-symbolic;", precise_str);
213+
g_string_append_printf (filename, "xapp-battery-%s-charging-symbolic;", suffix_str);
216214
}
217215
g_string_append_printf (filename, "gpm-%s-%s-charging;", kind_str, index_str);
218216
g_string_append_printf (filename, "battery-%s-charging;", suffix_str);
@@ -223,8 +221,8 @@ gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
223221
index_str = gpm_upower_get_device_icon_index (device);
224222
precise_str = gpm_upower_get_precise_icon_index (device);
225223
if (use_symbolic) {
226-
g_string_append_printf (filename, "battery-level-%s-symbolic;", precise_str);
227-
g_string_append_printf (filename, "battery-%s-symbolic;", suffix_str);
224+
g_string_append_printf (filename, "xapp-battery-level-%s-symbolic;", precise_str);
225+
g_string_append_printf (filename, "xapp-battery-%s-symbolic;", suffix_str);
228226
}
229227
g_string_append_printf (filename, "gpm-%s-%s;", kind_str, index_str);
230228
g_string_append_printf (filename, "battery-%s;", suffix_str);
@@ -233,7 +231,7 @@ gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
233231
case UP_DEVICE_STATE_LAST:
234232
default:
235233
if (use_symbolic)
236-
g_string_append (filename, "battery-missing-symbolic;");
234+
g_string_append (filename, "xapp-battery-missing-symbolic;");
237235
g_string_append (filename, "gpm-battery-missing;");
238236
g_string_append (filename, "battery-missing;");
239237
}

‎plugins/print-notifications/csd-print-notifications-manager.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ show_notification (gpointer user_data)
268268

269269
notification = notify_notification_new (data->primary_text,
270270
data->secondary_text,
271-
"printer-symbolic");
271+
"xapp-printer-symbolic");
272272

273273
notify_notification_set_app_name (notification, _("Printers"));
274274
notify_notification_set_hint (notification,
@@ -842,7 +842,7 @@ process_cups_notification (CsdPrintNotificationsManager *manager,
842842

843843
notification = notify_notification_new ( _(statuses_first[j]),
844844
second_row,
845-
"printer-symbolic");
845+
"xapp-printer-symbolic");
846846
notify_notification_set_app_name (notification, _("Printers"));
847847
notify_notification_set_hint (notification,
848848
"resident",
@@ -932,7 +932,7 @@ process_cups_notification (CsdPrintNotificationsManager *manager,
932932

933933
notification = notify_notification_new (first_row,
934934
second_row,
935-
"printer-symbolic");
935+
"xapp-printer-symbolic");
936936
notify_notification_set_app_name (notification, _("Printers"));
937937
notify_notification_set_hint (notification,
938938
"resident",
@@ -975,7 +975,7 @@ process_cups_notification (CsdPrintNotificationsManager *manager,
975975
NotifyNotification *notification;
976976
notification = notify_notification_new (primary_text,
977977
secondary_text,
978-
"printer-symbolic");
978+
"xapp-printer-symbolic");
979979
notify_notification_set_app_name (notification, _("Printers"));
980980
notify_notification_set_hint (notification, "transient", g_variant_new_boolean (TRUE));
981981
notify_notification_show (notification, NULL);

‎plugins/print-notifications/csd-printer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ handle_method_call (GDBusConnection *connection,
10271027
NotifyNotification *notification;
10281028
notification = notify_notification_new (primary_text,
10291029
secondary_text,
1030-
"printer-symbolic");
1030+
"xapp-printer-symbolic");
10311031
notify_notification_set_app_name (notification, _("Printers"));
10321032
notify_notification_set_hint (notification, "transient", g_variant_new_boolean (TRUE));
10331033

0 commit comments

Comments
 (0)