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

Proposed by Sagar Ghuge
Status: Needs review
Proposed branch: lp:~ghugesss/xpad/context
Merge into: lp:xpad
Diff against target: 45 lines (+13/-12)
2 files modified
ChangeLog (+1/-0)
src/xpad-toolbar.c (+12/-12)
To merge this branch: bzr merge lp:~ghugesss/xpad/context
Reviewer Review Type Date Requested Status
Arthur Borsboom Pending
Review via email: mp+313978@code.launchpad.net

Description of the change

Fix : Port Xpad toolbar icons to newer version Edit

To post a comment you must log in.

Unmerged revisions

814. By Sagar Ghuge

Port Xpad toolbar icons to newer version Edit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2016-06-11 12:27:04 +0000
3+++ ChangeLog 2017-01-03 02:21:04 +0000
4@@ -2,6 +2,7 @@
5 * Fix: Typos - Found by Lintian and reported by jcfp (#1591368)
6 * Fix: Desktop file - added keywords for the desktop file (#1591368)
7 * Fix: Makefile - distclean function did not do its job properly, leading to a configure issue, reported and fixed by jcfp (#1591497)
8+* Fix: Port Xpad toolbar icons to newer version Edit (#1653563)
9
10 Version 4.8
11 * Fix: Autostart - Pads did not hide on startup when set in the preferences due to the tray icon not being recognized properly (#1560019)
12
13=== modified file 'src/xpad-toolbar.c'
14--- src/xpad-toolbar.c 2014-12-22 19:24:35 +0000
15+++ src/xpad-toolbar.c 2017-01-03 02:21:04 +0000
16@@ -76,18 +76,18 @@
17
18 static const XpadToolbarButton buttons[] =
19 {
20- {"Clear", "edit-clear", ACTIVATE_CLEAR, XPAD_BUTTON_TYPE_BUTTON, N_("Clear Pad Contents"), N_("Add C_lear button")},
21- {"Close", "window-close", ACTIVATE_CLOSE, XPAD_BUTTON_TYPE_BUTTON, N_("Close and Save Pad"), N_("Add _Close button")},
22- {"Copy", "edit-copy", ACTIVATE_COPY, XPAD_BUTTON_TYPE_BUTTON, N_("Copy to Clipboard"), N_("Add C_opy button")},
23- {"Cut", "edit-cut", ACTIVATE_CUT, XPAD_BUTTON_TYPE_BUTTON, N_("Cut to Clipboard"), N_("Add C_ut button")},
24- {"Delete", "edit-delete", ACTIVATE_DELETE, XPAD_BUTTON_TYPE_BUTTON, N_("Delete Pad"), N_("Add _Delete button")},
25- {"New", "document-new", ACTIVATE_NEW, XPAD_BUTTON_TYPE_BUTTON, N_("Open New Pad"), N_("Add _New button")},
26- {"Paste", "edit-paste", ACTIVATE_PASTE, XPAD_BUTTON_TYPE_BUTTON, N_("Paste from Clipboard"), N_("Add Pa_ste button")},
27- {"Preferences", "preferences-system", ACTIVATE_PREFERENCES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Preferences"), N_("Add Pr_eferences button")},
28- {"Properties", "document-properties", ACTIVATE_PROPERTIES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Pad Properties"), N_("Add Proper_ties button")},
29- {"Redo", "edit-redo", ACTIVATE_REDO, XPAD_BUTTON_TYPE_BUTTON, N_("Redo"), N_("Add _Redo button")},
30- {"Quit", "application-exit", ACTIVATE_QUIT, XPAD_BUTTON_TYPE_BUTTON, N_("Close All Pads"), N_("Add Close _All button")},
31- {"Undo", "edit-undo", ACTIVATE_UNDO, XPAD_BUTTON_TYPE_BUTTON, N_("Undo"), N_("Add _Undo button")},
32+ {"Clear", "edit-clear-symbolic", ACTIVATE_CLEAR, XPAD_BUTTON_TYPE_BUTTON, N_("Clear Pad Contents"), N_("Add C_lear button")},
33+ {"Close", "window-close-symbolic", ACTIVATE_CLOSE, XPAD_BUTTON_TYPE_BUTTON, N_("Close and Save Pad"), N_("Add _Close button")},
34+ {"Copy", "edit-copy-symbolic", ACTIVATE_COPY, XPAD_BUTTON_TYPE_BUTTON, N_("Copy to Clipboard"), N_("Add C_opy button")},
35+ {"Cut", "edit-cut-symbolic", ACTIVATE_CUT, XPAD_BUTTON_TYPE_BUTTON, N_("Cut to Clipboard"), N_("Add C_ut button")},
36+ {"Delete", "edit-delete-symbolic", ACTIVATE_DELETE, XPAD_BUTTON_TYPE_BUTTON, N_("Delete Pad"), N_("Add _Delete button")},
37+ {"New", "document-new-symbolic", ACTIVATE_NEW, XPAD_BUTTON_TYPE_BUTTON, N_("Open New Pad"), N_("Add _New button")},
38+ {"Paste", "edit-paste-symbolic", ACTIVATE_PASTE, XPAD_BUTTON_TYPE_BUTTON, N_("Paste from Clipboard"), N_("Add Pa_ste button")},
39+ {"Preferences", "preferences-system-symbolic", ACTIVATE_PREFERENCES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Preferences"), N_("Add Pr_eferences button")},
40+ {"Properties", "document-properties-symbolic", ACTIVATE_PROPERTIES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Pad Properties"), N_("Add Proper_ties button")},
41+ {"Redo", "edit-redo-symbolic", ACTIVATE_REDO, XPAD_BUTTON_TYPE_BUTTON, N_("Redo"), N_("Add _Redo button")},
42+ {"Quit", "application-exit-symbolic", ACTIVATE_QUIT, XPAD_BUTTON_TYPE_BUTTON, N_("Close All Pads"), N_("Add Close _All button")},
43+ {"Undo", "edit-undo-symbolic", ACTIVATE_UNDO, XPAD_BUTTON_TYPE_BUTTON, N_("Undo"), N_("Add _Undo button")},
44 {"Separator", NULL, 0, XPAD_BUTTON_TYPE_SEPARATOR, NULL, N_("Add Se_parator")}
45 };
46

Subscribers

People subscribed via source and target branches