Commit cd579e99c5b04efaa6efa4d2ccdb99d2171fa400
1 parent
bdae8089
Exists in
master
and in
4 other branches
Implementing PF/PA keys on keypad.
Showing
2 changed files
with
16 additions
and
16 deletions
Show diff stats
keypad/00-right.xml
@@ -35,62 +35,62 @@ | @@ -35,62 +35,62 @@ | ||
35 | 35 | ||
36 | <button width='2'> | 36 | <button width='2'> |
37 | <attribute name="label" translatable="no">PF1</attribute> | 37 | <attribute name="label" translatable="no">PF1</attribute> |
38 | - <attribute name="action"></attribute> | 38 | + <attribute name="action">win.pfkey(1)</attribute> |
39 | </button> | 39 | </button> |
40 | 40 | ||
41 | <button width='2'> | 41 | <button width='2'> |
42 | <attribute name="label" translatable="no">PF2</attribute> | 42 | <attribute name="label" translatable="no">PF2</attribute> |
43 | - <attribute name="action"></attribute> | 43 | + <attribute name="action">win.pfkey(2)</attribute> |
44 | </button> | 44 | </button> |
45 | 45 | ||
46 | <button width='2'> | 46 | <button width='2'> |
47 | <attribute name="label" translatable="no">PF3</attribute> | 47 | <attribute name="label" translatable="no">PF3</attribute> |
48 | - <attribute name="action"></attribute> | 48 | + <attribute name="action">win.pfkey(3)</attribute> |
49 | </button> | 49 | </button> |
50 | 50 | ||
51 | <button width='2'> | 51 | <button width='2'> |
52 | <attribute name="label" translatable="no">PF4</attribute> | 52 | <attribute name="label" translatable="no">PF4</attribute> |
53 | - <attribute name="action"></attribute> | 53 | + <attribute name="action">win.pfkey(4)</attribute> |
54 | </button> | 54 | </button> |
55 | 55 | ||
56 | <button width='2'> | 56 | <button width='2'> |
57 | <attribute name="label" translatable="no">PF5</attribute> | 57 | <attribute name="label" translatable="no">PF5</attribute> |
58 | - <attribute name="action"></attribute> | 58 | + <attribute name="action">win.pfkey(5)</attribute> |
59 | </button> | 59 | </button> |
60 | 60 | ||
61 | <button width='2'> | 61 | <button width='2'> |
62 | <attribute name="label" translatable="no">PF6</attribute> | 62 | <attribute name="label" translatable="no">PF6</attribute> |
63 | - <attribute name="action"></attribute> | 63 | + <attribute name="action">win.pfkey(6)</attribute> |
64 | </button> | 64 | </button> |
65 | 65 | ||
66 | <button width='2'> | 66 | <button width='2'> |
67 | <attribute name="label" translatable="no">PF7</attribute> | 67 | <attribute name="label" translatable="no">PF7</attribute> |
68 | - <attribute name="action"></attribute> | 68 | + <attribute name="action">win.pfkey(7)</attribute> |
69 | </button> | 69 | </button> |
70 | 70 | ||
71 | <button width='2'> | 71 | <button width='2'> |
72 | <attribute name="label" translatable="no">PF8</attribute> | 72 | <attribute name="label" translatable="no">PF8</attribute> |
73 | - <attribute name="action"></attribute> | 73 | + <attribute name="action">win.pfkey(8)</attribute> |
74 | </button> | 74 | </button> |
75 | 75 | ||
76 | <button width='2'> | 76 | <button width='2'> |
77 | <attribute name="label" translatable="no">PF9</attribute> | 77 | <attribute name="label" translatable="no">PF9</attribute> |
78 | - <attribute name="action"></attribute> | 78 | + <attribute name="action">win.pfkey(9)</attribute> |
79 | </button> | 79 | </button> |
80 | 80 | ||
81 | <button width='2'> | 81 | <button width='2'> |
82 | <attribute name="label" translatable="no">PF10</attribute> | 82 | <attribute name="label" translatable="no">PF10</attribute> |
83 | - <attribute name="action"></attribute> | 83 | + <attribute name="action">win.pfkey(10)</attribute> |
84 | </button> | 84 | </button> |
85 | 85 | ||
86 | <button width='2'> | 86 | <button width='2'> |
87 | <attribute name="label" translatable="no">PF11</attribute> | 87 | <attribute name="label" translatable="no">PF11</attribute> |
88 | - <attribute name="action"></attribute> | 88 | + <attribute name="action">win.pfkey(11)</attribute> |
89 | </button> | 89 | </button> |
90 | 90 | ||
91 | <button width='2'> | 91 | <button width='2'> |
92 | <attribute name="label" translatable="no">PF12</attribute> | 92 | <attribute name="label" translatable="no">PF12</attribute> |
93 | - <attribute name="action"></attribute> | 93 | + <attribute name="action">win.pfkey(12)</attribute> |
94 | </button> | 94 | </button> |
95 | 95 | ||
96 | \ <button column='2' width='2'> | 96 | \ <button column='2' width='2'> |
@@ -120,17 +120,17 @@ | @@ -120,17 +120,17 @@ | ||
120 | 120 | ||
121 | <button width='2' column='0'> | 121 | <button width='2' column='0'> |
122 | <attribute name="label" translatable="no">PA1</attribute> | 122 | <attribute name="label" translatable="no">PA1</attribute> |
123 | - <attribute name="action"></attribute> | 123 | + <attribute name="action">win.pakey(1)</attribute> |
124 | </button> | 124 | </button> |
125 | 125 | ||
126 | <button width='2'> | 126 | <button width='2'> |
127 | <attribute name="label" translatable="no">PA2</attribute> | 127 | <attribute name="label" translatable="no">PA2</attribute> |
128 | - <attribute name="action"></attribute> | 128 | + <attribute name="action">win.pakey(2)</attribute> |
129 | </button> | 129 | </button> |
130 | 130 | ||
131 | <button width='2'> | 131 | <button width='2'> |
132 | <attribute name="label" translatable="no">PA3</attribute> | 132 | <attribute name="label" translatable="no">PA3</attribute> |
133 | - <attribute name="action"></attribute> | 133 | + <attribute name="action">win.pakey(3)</attribute> |
134 | </button> | 134 | </button> |
135 | 135 | ||
136 | <button width='3'> | 136 | <button width='3'> |
src/objects/keypad/widget.c
@@ -45,7 +45,7 @@ | @@ -45,7 +45,7 @@ | ||
45 | } | 45 | } |
46 | 46 | ||
47 | if(element->action && *element->action) { | 47 | if(element->action && *element->action) { |
48 | - gtk_actionable_set_action_name(GTK_ACTIONABLE(button),g_intern_string(element->action)); | 48 | + gtk_actionable_set_detailed_action_name(GTK_ACTIONABLE(button),element->action); |
49 | } | 49 | } |
50 | 50 | ||
51 | gtk_button_set_relief(GTK_BUTTON(button),GTK_RELIEF_NORMAL); | 51 | gtk_button_set_relief(GTK_BUTTON(button),GTK_RELIEF_NORMAL); |