Merge lp:~ghugesss/xpad/context into lp:xpad

[Sagar Ghuge]

Fix : Port Xpad toolbar icons to newer version Edit

Unmerged revisions

814. By Sagar Ghuge on 2017-01-03

Port Xpad toolbar icons to newer version Edit

=== modified file 'ChangeLog'
--- ChangeLog	2016-06-11 12:27:04 +0000
+++ ChangeLog	2017-01-03 02:21:04 +0000
@@ -2,6 +2,7 @@
 * Fix: Typos - Found by Lintian and reported by jcfp (#1591368)
 * Fix: Desktop file - added keywords for the desktop file (#1591368)
 * Fix: Makefile - distclean function did not do its job properly, leading to a configure issue, reported and fixed by jcfp (#1591497)
+* Fix: Port Xpad toolbar icons to newer version Edit (#1653563)
 
 Version 4.8
 * Fix: Autostart - Pads did not hide on startup when set in the preferences due to the tray icon not being recognized properly (#1560019)

=== modified file 'src/xpad-toolbar.c'
--- src/xpad-toolbar.c	2014-12-22 19:24:35 +0000
+++ src/xpad-toolbar.c	2017-01-03 02:21:04 +0000
@@ -76,18 +76,18 @@
 
 static const XpadToolbarButton buttons[] =
 {
-	{"Clear", "edit-clear", ACTIVATE_CLEAR, XPAD_BUTTON_TYPE_BUTTON, N_("Clear Pad Contents"), N_("Add C_lear button")},
-	{"Close", "window-close", ACTIVATE_CLOSE, XPAD_BUTTON_TYPE_BUTTON, N_("Close and Save Pad"), N_("Add _Close button")},
-	{"Copy", "edit-copy", ACTIVATE_COPY, XPAD_BUTTON_TYPE_BUTTON, N_("Copy to Clipboard"), N_("Add C_opy button")},
-	{"Cut", "edit-cut", ACTIVATE_CUT, XPAD_BUTTON_TYPE_BUTTON, N_("Cut to Clipboard"), N_("Add C_ut button")},
-	{"Delete", "edit-delete", ACTIVATE_DELETE, XPAD_BUTTON_TYPE_BUTTON, N_("Delete Pad"), N_("Add _Delete button")},
-	{"New", "document-new", ACTIVATE_NEW, XPAD_BUTTON_TYPE_BUTTON, N_("Open New Pad"), N_("Add _New button")},
-	{"Paste", "edit-paste", ACTIVATE_PASTE, XPAD_BUTTON_TYPE_BUTTON, N_("Paste from Clipboard"), N_("Add Pa_ste button")},
-	{"Preferences", "preferences-system", ACTIVATE_PREFERENCES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Preferences"), N_("Add Pr_eferences button")},
-	{"Properties", "document-properties", ACTIVATE_PROPERTIES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Pad Properties"), N_("Add Proper_ties button")},
-	{"Redo", "edit-redo", ACTIVATE_REDO, XPAD_BUTTON_TYPE_BUTTON, N_("Redo"), N_("Add _Redo button")},
-	{"Quit", "application-exit", ACTIVATE_QUIT, XPAD_BUTTON_TYPE_BUTTON, N_("Close All Pads"), N_("Add Close _All button")},
-	{"Undo", "edit-undo", ACTIVATE_UNDO, XPAD_BUTTON_TYPE_BUTTON, N_("Undo"), N_("Add _Undo button")},
+	{"Clear", "edit-clear-symbolic", ACTIVATE_CLEAR, XPAD_BUTTON_TYPE_BUTTON, N_("Clear Pad Contents"), N_("Add C_lear button")},
+	{"Close", "window-close-symbolic", ACTIVATE_CLOSE, XPAD_BUTTON_TYPE_BUTTON, N_("Close and Save Pad"), N_("Add _Close button")},
+	{"Copy", "edit-copy-symbolic", ACTIVATE_COPY, XPAD_BUTTON_TYPE_BUTTON, N_("Copy to Clipboard"), N_("Add C_opy button")},
+	{"Cut", "edit-cut-symbolic", ACTIVATE_CUT, XPAD_BUTTON_TYPE_BUTTON, N_("Cut to Clipboard"), N_("Add C_ut button")},
+	{"Delete", "edit-delete-symbolic", ACTIVATE_DELETE, XPAD_BUTTON_TYPE_BUTTON, N_("Delete Pad"), N_("Add _Delete button")},
+	{"New", "document-new-symbolic", ACTIVATE_NEW, XPAD_BUTTON_TYPE_BUTTON, N_("Open New Pad"), N_("Add _New button")},
+	{"Paste", "edit-paste-symbolic", ACTIVATE_PASTE, XPAD_BUTTON_TYPE_BUTTON, N_("Paste from Clipboard"), N_("Add Pa_ste button")},
+	{"Preferences", "preferences-system-symbolic", ACTIVATE_PREFERENCES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Preferences"), N_("Add Pr_eferences button")},
+	{"Properties", "document-properties-symbolic", ACTIVATE_PROPERTIES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Pad Properties"), N_("Add Proper_ties button")},
+	{"Redo", "edit-redo-symbolic", ACTIVATE_REDO, XPAD_BUTTON_TYPE_BUTTON, N_("Redo"), N_("Add _Redo button")},
+	{"Quit", "application-exit-symbolic", ACTIVATE_QUIT, XPAD_BUTTON_TYPE_BUTTON, N_("Close All Pads"), N_("Add Close _All button")},
+	{"Undo", "edit-undo-symbolic", ACTIVATE_UNDO, XPAD_BUTTON_TYPE_BUTTON, N_("Undo"), N_("Add _Undo button")},
 	{"Separator", NULL, 0, XPAD_BUTTON_TYPE_SEPARATOR, NULL, N_("Add Se_parator")}
 };