Skip to content

Commit 549542a

Browse files
committed
accessx: Convert icons from pixbuf to cairo surfaces
This improves support for HiDPI displays. It also fixes some deprecation warnings, adds auto-resizing, and updates the main applet icon.
1 parent 3aaeec3 commit 549542a

File tree

151 files changed

+581
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+581
-354
lines changed

accessx-status/applet.c

Lines changed: 359 additions & 283 deletions
Large diffs are not rendered by default.

accessx-status/applet.h

Lines changed: 51 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,56 @@
2424

2525
#include <mate-panel-applet.h>
2626

27-
#define ACCESSX_APPLET "ax-applet"
28-
#define ACCESSX_BASE_ICON "ax-base"
29-
#define ACCESSX_ACCEPT_BASE "ax-accept"
30-
#define ACCESSX_REJECT_BASE "ax-reject"
31-
#define MOUSEKEYS_BASE_ICON "ax-mouse-base"
32-
#define MOUSEKEYS_BUTTON_LEFT "ax-button-left"
33-
#define MOUSEKEYS_BUTTON_MIDDLE "ax-button-middle"
34-
#define MOUSEKEYS_BUTTON_RIGHT "ax-button-right"
35-
#define MOUSEKEYS_DOT_LEFT "ax-dot-left"
36-
#define MOUSEKEYS_DOT_MIDDLE "ax-dot-middle"
37-
#define MOUSEKEYS_DOT_RIGHT "ax-dot-right"
38-
#define SHIFT_KEY_ICON "ax-shift-key"
39-
#define CONTROL_KEY_ICON "ax-control-key"
40-
#define ALT_KEY_ICON "ax-alt-key"
41-
#define META_KEY_ICON "ax-meta-key"
42-
#define SUPER_KEY_ICON "ax-super-key"
43-
#define HYPER_KEY_ICON "ax-hyper-key"
44-
#define ALTGRAPH_KEY_ICON "ax-altgraph-key"
45-
#define SLOWKEYS_IDLE_ICON "ax-sk-idle"
46-
#define SLOWKEYS_PENDING_ICON "ax-sk-pending"
47-
#define SLOWKEYS_ACCEPT_ICON "ax-sk-accept"
48-
#define SLOWKEYS_REJECT_ICON "ax-sk-reject"
49-
#define BOUNCEKEYS_ICON "ax-bouncekeys"
50-
51-
#define STATUS_APPLET_ICON_SIZE GTK_ICON_SIZE_LARGE_TOOLBAR
27+
#define ACCESSX_APPLET "preferences-desktop-accessibility"
28+
29+
#define ACCESSX_BASE_ICON "mate-ax-key-none"
30+
#define ACCESSX_BASE_ICON_BASE "mate-ax-key-base"
31+
#define ACCESSX_BASE_ICON_INVERSE "mate-ax-key-inverse"
32+
#define ACCESSX_ACCEPT_BASE "mate-ax-key-yes"
33+
#define ACCESSX_REJECT_BASE "mate-ax-key-no"
34+
35+
#define MOUSEKEYS_BASE_ICON "mate-mousekeys-base"
36+
#define MOUSEKEYS_BUTTON_LEFT "mate-mousekeys-pressed-left"
37+
#define MOUSEKEYS_BUTTON_MIDDLE "mate-mousekeys-pressed-middle"
38+
#define MOUSEKEYS_BUTTON_RIGHT "mate-mousekeys-pressed-right"
39+
#define MOUSEKEYS_DOT_LEFT "mate-mousekeys-default-left"
40+
#define MOUSEKEYS_DOT_MIDDLE "mate-mousekeys-default-middle"
41+
#define MOUSEKEYS_DOT_RIGHT "mate-mousekeys-default-right"
42+
43+
#define SHIFT_KEY_ICON "mate-sticky-shift-none"
44+
#define SHIFT_KEY_ICON_LATCHED "mate-sticky-shift-latched"
45+
#define SHIFT_KEY_ICON_LOCKED "mate-sticky-shift-locked"
46+
47+
#define CONTROL_KEY_ICON "mate-sticky-ctrl-none"
48+
#define CONTROL_KEY_ICON_LATCHED "mate-sticky-ctrl-latched"
49+
#define CONTROL_KEY_ICON_LOCKED "mate-sticky-ctrl-locked"
50+
51+
#define ALT_KEY_ICON "mate-sticky-alt-none"
52+
#define ALT_KEY_ICON_LATCHED "mate-sticky-alt-latched"
53+
#define ALT_KEY_ICON_LOCKED "mate-sticky-alt-locked"
54+
55+
#define META_KEY_ICON "mate-sticky-meta-none"
56+
#define META_KEY_ICON_LATCHED "mate-sticky-meta-latched"
57+
#define META_KEY_ICON_LOCKED "mate-sticky-meta-locked"
58+
59+
#define HYPER_KEY_ICON "mate-sticky-hyper-none"
60+
#define HYPER_KEY_ICON_LATCHED "mate-sticky-hyper-latched"
61+
#define HYPER_KEY_ICON_LOCKED "mate-sticky-hyper-locked"
62+
63+
#define SUPER_KEY_ICON "mate-sticky-super-none"
64+
#define SUPER_KEY_ICON_LATCHED "mate-sticky-super-latched"
65+
#define SUPER_KEY_ICON_LOCKED "mate-sticky-super-locked"
66+
67+
#define ALTGRAPH_KEY_ICON "mate-sticky-alt-none"
68+
#define ALTGRAPH_KEY_ICON_LATCHED "mate-sticky-alt-latched"
69+
#define ALTGRAPH_KEY_ICON_LOCKED "mate-sticky-alt-locked"
70+
71+
#define SLOWKEYS_IDLE_ICON "mate-ax-slowkeys"
72+
#define SLOWKEYS_PENDING_ICON "mate-ax-slowkeys-pending"
73+
#define SLOWKEYS_ACCEPT_ICON "mate-ax-slowkeys-yes"
74+
#define SLOWKEYS_REJECT_ICON "mate-ax-slowkeys-no"
75+
76+
#define BOUNCEKEYS_ICON "mate-ax-bouncekeys"
5277

5378
typedef enum {
5479
ACCESSX_STATUS_ERROR_NONE = 0,
@@ -73,7 +98,7 @@ typedef struct {
7398
GtkWidget* alt_graph_indicator;
7499
MatePanelAppletOrient orient;
75100
GtkIconFactory* icon_factory;
76-
gboolean initialized;
101+
gboolean initialized;
77102
XkbDescRec* xkb;
78103
Display* xkb_display;
79104
AccessxStatusErrorType error_type;

accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ _Description=Keyboard Accessibility Status Applet Factory
77
[AccessxStatusApplet]
88
_Name=Keyboard Accessibility Status
99
_Description=Shows the status of keyboard accessibility features
10-
Icon=mate-ax-applet
10+
Icon=preferences-desktop-accessibility
1111
MateComponentId=OAFIID:MATE_AccessxStatusApplet
1212
X-MATE-Bugzilla-Bugzilla=MATE
1313
X-MATE-Bugzilla-Product=mate-applets
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
accessx_status_iconsdir = $(iconsdir)/hicolor/16x16/apps
2+
accessx_status_icons_DATA = \
3+
mate-ax-key-base.png \
4+
mate-ax-key-inverse.png \
5+
mate-ax-key-none.png \
6+
mate-ax-key-yes.png \
7+
mate-ax-key-no.png \
8+
mate-mousekeys-base.png \
9+
mate-mousekeys-pressed-left.png \
10+
mate-mousekeys-pressed-middle.png \
11+
mate-mousekeys-pressed-right.png \
12+
mate-mousekeys-default-left.png \
13+
mate-mousekeys-default-middle.png \
14+
mate-mousekeys-default-right.png \
15+
mate-sticky-shift-none.png \
16+
mate-sticky-shift-latched.png \
17+
mate-sticky-shift-locked.png \
18+
mate-sticky-ctrl-none.png \
19+
mate-sticky-ctrl-latched.png \
20+
mate-sticky-ctrl-locked.png \
21+
mate-sticky-alt-none.png \
22+
mate-sticky-alt-latched.png \
23+
mate-sticky-alt-locked.png \
24+
mate-sticky-meta-latched.png \
25+
mate-sticky-meta-locked.png \
26+
mate-sticky-meta-none.png \
27+
mate-sticky-hyper-latched.png \
28+
mate-sticky-hyper-locked.png \
29+
mate-sticky-hyper-none.png \
30+
mate-sticky-super-latched.png \
31+
mate-sticky-super-locked.png \
32+
mate-sticky-super-none.png \
33+
mate-ax-slowkeys.png \
34+
mate-ax-slowkeys-pending.png \
35+
mate-ax-slowkeys-yes.png \
36+
mate-ax-slowkeys-no.png \
37+
mate-ax-bouncekeys.png
38+
39+
EXTRA_DIST = \
40+
$(accessx_status_icons_DATA)
41+
1.88 KB
1.87 KB

0 commit comments

Comments
 (0)