Merge lp:~valavanisalex/inkscape/fix-793086 into lp:~inkscape.dev/inkscape/trunk
- fix-793086
- Merge into trunk
Proposed by
Alex Valavanis
Status: | Merged |
---|---|
Merged at revision: | 10277 |
Proposed branch: | lp:~valavanisalex/inkscape/fix-793086 |
Merge into: | lp:~inkscape.dev/inkscape/trunk |
Diff against target: |
2446 lines (+276/-416) 29 files modified
src/dialogs/clonetiler.cpp (+88/-115) src/dialogs/export.cpp (+3/-5) src/dialogs/find.cpp (+54/-58) src/dialogs/item-properties.cpp (+4/-6) src/dialogs/spellcheck.cpp (+8/-10) src/dialogs/text-edit.cpp (+6/-8) src/dialogs/xml-tree.cpp (+8/-14) src/ege-adjustment-action.cpp (+1/-6) src/ege-select-one-action.cpp (+1/-3) src/libgdl/gdl-dock-bar.c (+1/-10) src/libgdl/gdl-dock-item-grip.c (+4/-13) src/libgdl/gdl-switcher.c (+3/-16) src/widgets/button.cpp (+10/-24) src/widgets/button.h (+2/-4) src/widgets/desktop-widget.cpp (+9/-12) src/widgets/desktop-widget.h (+0/-2) src/widgets/gradient-selector.cpp (+2/-3) src/widgets/gradient-toolbar.cpp (+5/-13) src/widgets/gradient-vector.cpp (+2/-3) src/widgets/paint-selector.cpp (+12/-14) src/widgets/sp-color-icc-selector.cpp (+10/-13) src/widgets/sp-color-icc-selector.h (+0/-2) src/widgets/sp-color-notebook.cpp (+4/-9) src/widgets/sp-color-scales.cpp (+26/-28) src/widgets/sp-color-scales.h (+0/-2) src/widgets/sp-color-wheel-selector.cpp (+2/-4) src/widgets/sp-color-wheel-selector.h (+0/-2) src/widgets/spw-utilities.cpp (+1/-3) src/widgets/toolbox.cpp (+10/-14) |
To merge this branch: | bzr merge lp:~valavanisalex/inkscape/fix-793086 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Inkscape Developers | Pending | ||
Review via email: mp+63487@code.launchpad.net |
Commit message
Description of the change
I have replaced all usage of the deprecated GtkTooltips API. Again, this is a relatively big change, so I'd appreciate it if someone could check that I haven't broken anything and consider merging it into trunk.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'src/dialogs/clonetiler.cpp' |
2 | --- src/dialogs/clonetiler.cpp 2011-06-04 02:45:55 +0000 |
3 | +++ src/dialogs/clonetiler.cpp 2011-06-05 13:32:27 +0000 |
4 | @@ -1517,12 +1517,12 @@ |
5 | prefs->setBool(prefs_path + attr, gtk_toggle_button_get_active(tb)); |
6 | } |
7 | |
8 | -static GtkWidget * clonetiler_checkbox(GtkTooltips *tt, const char *tip, const char *attr) |
9 | +static GtkWidget * clonetiler_checkbox(const char *tip, const char *attr) |
10 | { |
11 | GtkWidget *hb = gtk_hbox_new(FALSE, VB_MARGIN); |
12 | |
13 | GtkWidget *b = gtk_check_button_new (); |
14 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, tip, NULL); |
15 | + gtk_widget_set_tooltip_text (b, tip); |
16 | |
17 | Inkscape::Preferences *prefs = Inkscape::Preferences::get(); |
18 | bool value = prefs->getBool(prefs_path + attr); |
19 | @@ -1544,7 +1544,7 @@ |
20 | prefs->setDouble(prefs_path + pref, adj->value); |
21 | } |
22 | |
23 | -static GtkWidget * clonetiler_spinbox(GtkTooltips *tt, const char *tip, const char *attr, double lower, double upper, const gchar *suffix, bool exponent = false) |
24 | +static GtkWidget * clonetiler_spinbox(const char *tip, const char *attr, double lower, double upper, const gchar *suffix, bool exponent = false) |
25 | { |
26 | GtkWidget *hb = gtk_hbox_new(FALSE, 0); |
27 | |
28 | @@ -1563,7 +1563,7 @@ |
29 | sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 0.1, 1); |
30 | } |
31 | |
32 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), sb, tip, NULL); |
33 | + gtk_widget_set_tooltip_text (sb, tip); |
34 | gtk_entry_set_width_chars (GTK_ENTRY (sb), 4); |
35 | gtk_box_pack_start (GTK_BOX (hb), sb, FALSE, FALSE, SB_MARGIN); |
36 | |
37 | @@ -1834,8 +1834,6 @@ |
38 | g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg); |
39 | g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_transientize_callback), &wd); |
40 | |
41 | - GtkTooltips *tt = gtk_tooltips_new(); |
42 | - |
43 | GtkWidget *mainbox = gtk_vbox_new(FALSE, 4); |
44 | gtk_container_set_border_width (GTK_CONTAINER (mainbox), 6); |
45 | gtk_container_add (GTK_CONTAINER (dlg), mainbox); |
46 | @@ -1854,7 +1852,7 @@ |
47 | * http://www.clarku.edu/~djoyce/wallpaper/seventeen.html (English vocabulary); or |
48 | * http://membres.lycos.fr/villemingerard/Geometri/Sym1D.htm (French vocabulary). |
49 | */ |
50 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), om, _("Select one of the 17 symmetry groups for the tiling"), NULL); |
51 | + gtk_widget_set_tooltip_text (om, _("Select one of the 17 symmetry groups for the tiling")); |
52 | gtk_box_pack_start (GTK_BOX (vb), om, FALSE, FALSE, SB_MARGIN); |
53 | |
54 | GtkWidget *m = gtk_menu_new (); |
55 | @@ -1927,7 +1925,7 @@ |
56 | } |
57 | |
58 | { |
59 | - GtkWidget *l = clonetiler_spinbox (tt, |
60 | + GtkWidget *l = clonetiler_spinbox ( |
61 | // xgettext:no-c-format |
62 | _("Horizontal shift per row (in % of tile width)"), "shiftx_per_j", |
63 | -10000, 10000, "%"); |
64 | @@ -1935,7 +1933,7 @@ |
65 | } |
66 | |
67 | { |
68 | - GtkWidget *l = clonetiler_spinbox (tt, |
69 | + GtkWidget *l = clonetiler_spinbox ( |
70 | // xgettext:no-c-format |
71 | _("Horizontal shift per column (in % of tile width)"), "shiftx_per_i", |
72 | -10000, 10000, "%"); |
73 | @@ -1943,8 +1941,7 @@ |
74 | } |
75 | |
76 | { |
77 | - GtkWidget *l = clonetiler_spinbox (tt, |
78 | - _("Randomize the horizontal shift by this percentage"), "shiftx_rand", |
79 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the horizontal shift by this percentage"), "shiftx_rand", |
80 | 0, 1000, "%"); |
81 | clonetiler_table_attach (table, l, 0, 2, 4); |
82 | } |
83 | @@ -1960,7 +1957,7 @@ |
84 | } |
85 | |
86 | { |
87 | - GtkWidget *l = clonetiler_spinbox (tt, |
88 | + GtkWidget *l = clonetiler_spinbox ( |
89 | // xgettext:no-c-format |
90 | _("Vertical shift per row (in % of tile height)"), "shifty_per_j", |
91 | -10000, 10000, "%"); |
92 | @@ -1968,7 +1965,7 @@ |
93 | } |
94 | |
95 | { |
96 | - GtkWidget *l = clonetiler_spinbox (tt, |
97 | + GtkWidget *l = clonetiler_spinbox ( |
98 | // xgettext:no-c-format |
99 | _("Vertical shift per column (in % of tile height)"), "shifty_per_i", |
100 | -10000, 10000, "%"); |
101 | @@ -1976,7 +1973,7 @@ |
102 | } |
103 | |
104 | { |
105 | - GtkWidget *l = clonetiler_spinbox (tt, |
106 | + GtkWidget *l = clonetiler_spinbox ( |
107 | _("Randomize the vertical shift by this percentage"), "shifty_rand", |
108 | 0, 1000, "%"); |
109 | clonetiler_table_attach (table, l, 0, 3, 4); |
110 | @@ -1991,14 +1988,14 @@ |
111 | } |
112 | |
113 | { |
114 | - GtkWidget *l = clonetiler_spinbox (tt, |
115 | + GtkWidget *l = clonetiler_spinbox ( |
116 | _("Whether rows are spaced evenly (1), converge (<1) or diverge (>1)"), "shifty_exp", |
117 | 0, 10, "", true); |
118 | clonetiler_table_attach (table, l, 0, 4, 2); |
119 | } |
120 | |
121 | { |
122 | - GtkWidget *l = clonetiler_spinbox (tt, |
123 | + GtkWidget *l = clonetiler_spinbox ( |
124 | _("Whether columns are spaced evenly (1), converge (<1) or diverge (>1)"), "shiftx_exp", |
125 | 0, 10, "", true); |
126 | clonetiler_table_attach (table, l, 0, 4, 3); |
127 | @@ -2013,12 +2010,12 @@ |
128 | } |
129 | |
130 | { |
131 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of shifts for each row"), "shifty_alternate"); |
132 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of shifts for each row"), "shifty_alternate"); |
133 | clonetiler_table_attach (table, l, 0, 5, 2); |
134 | } |
135 | |
136 | { |
137 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of shifts for each column"), "shiftx_alternate"); |
138 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of shifts for each column"), "shiftx_alternate"); |
139 | clonetiler_table_attach (table, l, 0, 5, 3); |
140 | } |
141 | |
142 | @@ -2031,12 +2028,12 @@ |
143 | } |
144 | |
145 | { |
146 | - GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the shifts for each row"), "shifty_cumulate"); |
147 | + GtkWidget *l = clonetiler_checkbox (_("Cumulate the shifts for each row"), "shifty_cumulate"); |
148 | clonetiler_table_attach (table, l, 0, 6, 2); |
149 | } |
150 | |
151 | { |
152 | - GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the shifts for each column"), "shiftx_cumulate"); |
153 | + GtkWidget *l = clonetiler_checkbox (_("Cumulate the shifts for each column"), "shiftx_cumulate"); |
154 | clonetiler_table_attach (table, l, 0, 6, 3); |
155 | } |
156 | |
157 | @@ -2049,12 +2046,12 @@ |
158 | } |
159 | |
160 | { |
161 | - GtkWidget *l = clonetiler_checkbox (tt, _("Exclude tile height in shift"), "shifty_excludeh"); |
162 | + GtkWidget *l = clonetiler_checkbox (_("Exclude tile height in shift"), "shifty_excludeh"); |
163 | clonetiler_table_attach (table, l, 0, 7, 2); |
164 | } |
165 | |
166 | { |
167 | - GtkWidget *l = clonetiler_checkbox (tt, _("Exclude tile width in shift"), "shiftx_excludew"); |
168 | + GtkWidget *l = clonetiler_checkbox (_("Exclude tile width in shift"), "shiftx_excludew"); |
169 | clonetiler_table_attach (table, l, 0, 7, 3); |
170 | } |
171 | |
172 | @@ -2077,7 +2074,7 @@ |
173 | } |
174 | |
175 | { |
176 | - GtkWidget *l = clonetiler_spinbox (tt, |
177 | + GtkWidget *l = clonetiler_spinbox ( |
178 | // xgettext:no-c-format |
179 | _("Horizontal scale per row (in % of tile width)"), "scalex_per_j", |
180 | -100, 1000, "%"); |
181 | @@ -2085,7 +2082,7 @@ |
182 | } |
183 | |
184 | { |
185 | - GtkWidget *l = clonetiler_spinbox (tt, |
186 | + GtkWidget *l = clonetiler_spinbox ( |
187 | // xgettext:no-c-format |
188 | _("Horizontal scale per column (in % of tile width)"), "scalex_per_i", |
189 | -100, 1000, "%"); |
190 | @@ -2093,8 +2090,7 @@ |
191 | } |
192 | |
193 | { |
194 | - GtkWidget *l = clonetiler_spinbox (tt, |
195 | - _("Randomize the horizontal scale by this percentage"), "scalex_rand", |
196 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the horizontal scale by this percentage"), "scalex_rand", |
197 | 0, 1000, "%"); |
198 | clonetiler_table_attach (table, l, 0, 2, 4); |
199 | } |
200 | @@ -2108,7 +2104,7 @@ |
201 | } |
202 | |
203 | { |
204 | - GtkWidget *l = clonetiler_spinbox (tt, |
205 | + GtkWidget *l = clonetiler_spinbox ( |
206 | // xgettext:no-c-format |
207 | _("Vertical scale per row (in % of tile height)"), "scaley_per_j", |
208 | -100, 1000, "%"); |
209 | @@ -2116,7 +2112,7 @@ |
210 | } |
211 | |
212 | { |
213 | - GtkWidget *l = clonetiler_spinbox (tt, |
214 | + GtkWidget *l = clonetiler_spinbox ( |
215 | // xgettext:no-c-format |
216 | _("Vertical scale per column (in % of tile height)"), "scaley_per_i", |
217 | -100, 1000, "%"); |
218 | @@ -2124,8 +2120,7 @@ |
219 | } |
220 | |
221 | { |
222 | - GtkWidget *l = clonetiler_spinbox (tt, |
223 | - _("Randomize the vertical scale by this percentage"), "scaley_rand", |
224 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the vertical scale by this percentage"), "scaley_rand", |
225 | 0, 1000, "%"); |
226 | clonetiler_table_attach (table, l, 0, 3, 4); |
227 | } |
228 | @@ -2139,15 +2134,13 @@ |
229 | } |
230 | |
231 | { |
232 | - GtkWidget *l = clonetiler_spinbox (tt, |
233 | - _("Whether row scaling is uniform (1), converge (<1) or diverge (>1)"), "scaley_exp", |
234 | + GtkWidget *l = clonetiler_spinbox (_("Whether row scaling is uniform (1), converge (<1) or diverge (>1)"), "scaley_exp", |
235 | 0, 10, "", true); |
236 | clonetiler_table_attach (table, l, 0, 4, 2); |
237 | } |
238 | |
239 | { |
240 | - GtkWidget *l = clonetiler_spinbox (tt, |
241 | - _("Whether column scaling is uniform (1), converge (<1) or diverge (>1)"), "scalex_exp", |
242 | + GtkWidget *l = clonetiler_spinbox (_("Whether column scaling is uniform (1), converge (<1) or diverge (>1)"), "scalex_exp", |
243 | 0, 10, "", true); |
244 | clonetiler_table_attach (table, l, 0, 4, 3); |
245 | } |
246 | @@ -2161,15 +2154,13 @@ |
247 | } |
248 | |
249 | { |
250 | - GtkWidget *l = clonetiler_spinbox (tt, |
251 | - _("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scaley_log", |
252 | + GtkWidget *l = clonetiler_spinbox (_("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scaley_log", |
253 | 0, 10, "", false); |
254 | clonetiler_table_attach (table, l, 0, 5, 2); |
255 | } |
256 | |
257 | { |
258 | - GtkWidget *l = clonetiler_spinbox (tt, |
259 | - _("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scalex_log", |
260 | + GtkWidget *l = clonetiler_spinbox (_("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scalex_log", |
261 | 0, 10, "", false); |
262 | clonetiler_table_attach (table, l, 0, 5, 3); |
263 | } |
264 | @@ -2183,12 +2174,12 @@ |
265 | } |
266 | |
267 | { |
268 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of scales for each row"), "scaley_alternate"); |
269 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of scales for each row"), "scaley_alternate"); |
270 | clonetiler_table_attach (table, l, 0, 6, 2); |
271 | } |
272 | |
273 | { |
274 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of scales for each column"), "scalex_alternate"); |
275 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of scales for each column"), "scalex_alternate"); |
276 | clonetiler_table_attach (table, l, 0, 6, 3); |
277 | } |
278 | |
279 | @@ -2201,12 +2192,12 @@ |
280 | } |
281 | |
282 | { |
283 | - GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the scales for each row"), "scaley_cumulate"); |
284 | + GtkWidget *l = clonetiler_checkbox (_("Cumulate the scales for each row"), "scaley_cumulate"); |
285 | clonetiler_table_attach (table, l, 0, 7, 2); |
286 | } |
287 | |
288 | { |
289 | - GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the scales for each column"), "scalex_cumulate"); |
290 | + GtkWidget *l = clonetiler_checkbox (_("Cumulate the scales for each column"), "scalex_cumulate"); |
291 | clonetiler_table_attach (table, l, 0, 7, 3); |
292 | } |
293 | |
294 | @@ -2229,7 +2220,7 @@ |
295 | } |
296 | |
297 | { |
298 | - GtkWidget *l = clonetiler_spinbox (tt, |
299 | + GtkWidget *l = clonetiler_spinbox ( |
300 | // xgettext:no-c-format |
301 | _("Rotate tiles by this angle for each row"), "rotate_per_j", |
302 | -180, 180, "°"); |
303 | @@ -2237,7 +2228,7 @@ |
304 | } |
305 | |
306 | { |
307 | - GtkWidget *l = clonetiler_spinbox (tt, |
308 | + GtkWidget *l = clonetiler_spinbox ( |
309 | // xgettext:no-c-format |
310 | _("Rotate tiles by this angle for each column"), "rotate_per_i", |
311 | -180, 180, "°"); |
312 | @@ -2245,8 +2236,7 @@ |
313 | } |
314 | |
315 | { |
316 | - GtkWidget *l = clonetiler_spinbox (tt, |
317 | - _("Randomize the rotation angle by this percentage"), "rotate_rand", |
318 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the rotation angle by this percentage"), "rotate_rand", |
319 | 0, 100, "%"); |
320 | clonetiler_table_attach (table, l, 0, 2, 4); |
321 | } |
322 | @@ -2260,12 +2250,12 @@ |
323 | } |
324 | |
325 | { |
326 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the rotation direction for each row"), "rotate_alternatej"); |
327 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the rotation direction for each row"), "rotate_alternatej"); |
328 | clonetiler_table_attach (table, l, 0, 3, 2); |
329 | } |
330 | |
331 | { |
332 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the rotation direction for each column"), "rotate_alternatei"); |
333 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the rotation direction for each column"), "rotate_alternatei"); |
334 | clonetiler_table_attach (table, l, 0, 3, 3); |
335 | } |
336 | |
337 | @@ -2278,12 +2268,12 @@ |
338 | } |
339 | |
340 | { |
341 | - GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the rotation for each row"), "rotate_cumulatej"); |
342 | + GtkWidget *l = clonetiler_checkbox (_("Cumulate the rotation for each row"), "rotate_cumulatej"); |
343 | clonetiler_table_attach (table, l, 0, 4, 2); |
344 | } |
345 | |
346 | { |
347 | - GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the rotation for each column"), "rotate_cumulatei"); |
348 | + GtkWidget *l = clonetiler_checkbox (_("Cumulate the rotation for each column"), "rotate_cumulatei"); |
349 | clonetiler_table_attach (table, l, 0, 4, 3); |
350 | } |
351 | |
352 | @@ -2307,22 +2297,19 @@ |
353 | } |
354 | |
355 | { |
356 | - GtkWidget *l = clonetiler_spinbox (tt, |
357 | - _("Blur tiles by this percentage for each row"), "blur_per_j", |
358 | + GtkWidget *l = clonetiler_spinbox (_("Blur tiles by this percentage for each row"), "blur_per_j", |
359 | 0, 100, "%"); |
360 | clonetiler_table_attach (table, l, 0, 2, 2); |
361 | } |
362 | |
363 | { |
364 | - GtkWidget *l = clonetiler_spinbox (tt, |
365 | - _("Blur tiles by this percentage for each column"), "blur_per_i", |
366 | + GtkWidget *l = clonetiler_spinbox (_("Blur tiles by this percentage for each column"), "blur_per_i", |
367 | 0, 100, "%"); |
368 | clonetiler_table_attach (table, l, 0, 2, 3); |
369 | } |
370 | |
371 | { |
372 | - GtkWidget *l = clonetiler_spinbox (tt, |
373 | - _("Randomize the tile blur by this percentage"), "blur_rand", |
374 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the tile blur by this percentage"), "blur_rand", |
375 | 0, 100, "%"); |
376 | clonetiler_table_attach (table, l, 0, 2, 4); |
377 | } |
378 | @@ -2336,12 +2323,12 @@ |
379 | } |
380 | |
381 | { |
382 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of blur change for each row"), "blur_alternatej"); |
383 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of blur change for each row"), "blur_alternatej"); |
384 | clonetiler_table_attach (table, l, 0, 3, 2); |
385 | } |
386 | |
387 | { |
388 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of blur change for each column"), "blur_alternatei"); |
389 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of blur change for each column"), "blur_alternatei"); |
390 | clonetiler_table_attach (table, l, 0, 3, 3); |
391 | } |
392 | |
393 | @@ -2356,22 +2343,19 @@ |
394 | } |
395 | |
396 | { |
397 | - GtkWidget *l = clonetiler_spinbox (tt, |
398 | - _("Decrease tile opacity by this percentage for each row"), "opacity_per_j", |
399 | + GtkWidget *l = clonetiler_spinbox (_("Decrease tile opacity by this percentage for each row"), "opacity_per_j", |
400 | 0, 100, "%"); |
401 | clonetiler_table_attach (table, l, 0, 4, 2); |
402 | } |
403 | |
404 | { |
405 | - GtkWidget *l = clonetiler_spinbox (tt, |
406 | - _("Decrease tile opacity by this percentage for each column"), "opacity_per_i", |
407 | + GtkWidget *l = clonetiler_spinbox (_("Decrease tile opacity by this percentage for each column"), "opacity_per_i", |
408 | 0, 100, "%"); |
409 | clonetiler_table_attach (table, l, 0, 4, 3); |
410 | } |
411 | |
412 | { |
413 | - GtkWidget *l = clonetiler_spinbox (tt, |
414 | - _("Randomize the tile opacity by this percentage"), "opacity_rand", |
415 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the tile opacity by this percentage"), "opacity_rand", |
416 | 0, 100, "%"); |
417 | clonetiler_table_attach (table, l, 0, 4, 4); |
418 | } |
419 | @@ -2385,12 +2369,12 @@ |
420 | } |
421 | |
422 | { |
423 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of opacity change for each row"), "opacity_alternatej"); |
424 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of opacity change for each row"), "opacity_alternatej"); |
425 | clonetiler_table_attach (table, l, 0, 5, 2); |
426 | } |
427 | |
428 | { |
429 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of opacity change for each column"), "opacity_alternatei"); |
430 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of opacity change for each column"), "opacity_alternatei"); |
431 | clonetiler_table_attach (table, l, 0, 5, 3); |
432 | } |
433 | } |
434 | @@ -2428,22 +2412,19 @@ |
435 | } |
436 | |
437 | { |
438 | - GtkWidget *l = clonetiler_spinbox (tt, |
439 | - _("Change the tile hue by this percentage for each row"), "hue_per_j", |
440 | + GtkWidget *l = clonetiler_spinbox (_("Change the tile hue by this percentage for each row"), "hue_per_j", |
441 | -100, 100, "%"); |
442 | clonetiler_table_attach (table, l, 0, 2, 2); |
443 | } |
444 | |
445 | { |
446 | - GtkWidget *l = clonetiler_spinbox (tt, |
447 | - _("Change the tile hue by this percentage for each column"), "hue_per_i", |
448 | + GtkWidget *l = clonetiler_spinbox (_("Change the tile hue by this percentage for each column"), "hue_per_i", |
449 | -100, 100, "%"); |
450 | clonetiler_table_attach (table, l, 0, 2, 3); |
451 | } |
452 | |
453 | { |
454 | - GtkWidget *l = clonetiler_spinbox (tt, |
455 | - _("Randomize the tile hue by this percentage"), "hue_rand", |
456 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the tile hue by this percentage"), "hue_rand", |
457 | 0, 100, "%"); |
458 | clonetiler_table_attach (table, l, 0, 2, 4); |
459 | } |
460 | @@ -2458,22 +2439,19 @@ |
461 | } |
462 | |
463 | { |
464 | - GtkWidget *l = clonetiler_spinbox (tt, |
465 | - _("Change the color saturation by this percentage for each row"), "saturation_per_j", |
466 | + GtkWidget *l = clonetiler_spinbox (_("Change the color saturation by this percentage for each row"), "saturation_per_j", |
467 | -100, 100, "%"); |
468 | clonetiler_table_attach (table, l, 0, 3, 2); |
469 | } |
470 | |
471 | { |
472 | - GtkWidget *l = clonetiler_spinbox (tt, |
473 | - _("Change the color saturation by this percentage for each column"), "saturation_per_i", |
474 | + GtkWidget *l = clonetiler_spinbox (_("Change the color saturation by this percentage for each column"), "saturation_per_i", |
475 | -100, 100, "%"); |
476 | clonetiler_table_attach (table, l, 0, 3, 3); |
477 | } |
478 | |
479 | { |
480 | - GtkWidget *l = clonetiler_spinbox (tt, |
481 | - _("Randomize the color saturation by this percentage"), "saturation_rand", |
482 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the color saturation by this percentage"), "saturation_rand", |
483 | 0, 100, "%"); |
484 | clonetiler_table_attach (table, l, 0, 3, 4); |
485 | } |
486 | @@ -2487,22 +2465,19 @@ |
487 | } |
488 | |
489 | { |
490 | - GtkWidget *l = clonetiler_spinbox (tt, |
491 | - _("Change the color lightness by this percentage for each row"), "lightness_per_j", |
492 | + GtkWidget *l = clonetiler_spinbox (_("Change the color lightness by this percentage for each row"), "lightness_per_j", |
493 | -100, 100, "%"); |
494 | clonetiler_table_attach (table, l, 0, 4, 2); |
495 | } |
496 | |
497 | { |
498 | - GtkWidget *l = clonetiler_spinbox (tt, |
499 | - _("Change the color lightness by this percentage for each column"), "lightness_per_i", |
500 | + GtkWidget *l = clonetiler_spinbox (_("Change the color lightness by this percentage for each column"), "lightness_per_i", |
501 | -100, 100, "%"); |
502 | clonetiler_table_attach (table, l, 0, 4, 3); |
503 | } |
504 | |
505 | { |
506 | - GtkWidget *l = clonetiler_spinbox (tt, |
507 | - _("Randomize the color lightness by this percentage"), "lightness_rand", |
508 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the color lightness by this percentage"), "lightness_rand", |
509 | 0, 100, "%"); |
510 | clonetiler_table_attach (table, l, 0, 4, 4); |
511 | } |
512 | @@ -2516,12 +2491,12 @@ |
513 | } |
514 | |
515 | { |
516 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of color changes for each row"), "color_alternatej"); |
517 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of color changes for each row"), "color_alternatej"); |
518 | clonetiler_table_attach (table, l, 0, 5, 2); |
519 | } |
520 | |
521 | { |
522 | - GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of color changes for each column"), "color_alternatei"); |
523 | + GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of color changes for each column"), "color_alternatei"); |
524 | clonetiler_table_attach (table, l, 0, 5, 3); |
525 | } |
526 | |
527 | @@ -2540,7 +2515,7 @@ |
528 | g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE)); |
529 | bool old = prefs->getBool(prefs_path + "dotrace"); |
530 | gtk_toggle_button_set_active ((GtkToggleButton *) b, old); |
531 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("For each clone, pick a value from the drawing in that clone's location and apply it to the clone"), NULL); |
532 | + gtk_widget_set_tooltip_text (b, _("For each clone, pick a value from the drawing in that clone's location and apply it to the clone")); |
533 | gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0); |
534 | |
535 | gtk_signal_connect(GTK_OBJECT(b), "toggled", |
536 | @@ -2566,7 +2541,7 @@ |
537 | GtkWidget* radio; |
538 | { |
539 | radio = gtk_radio_button_new_with_label (NULL, _("Color")); |
540 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the visible color and opacity"), NULL); |
541 | + gtk_widget_set_tooltip_text (radio, _("Pick the visible color and opacity")); |
542 | clonetiler_table_attach (table, radio, 0.0, 1, 1); |
543 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", |
544 | GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_COLOR)); |
545 | @@ -2574,7 +2549,7 @@ |
546 | } |
547 | { |
548 | radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("Opacity")); |
549 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the total accumulated opacity"), NULL); |
550 | + gtk_widget_set_tooltip_text (radio, _("Pick the total accumulated opacity")); |
551 | clonetiler_table_attach (table, radio, 0.0, 2, 1); |
552 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", |
553 | GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_OPACITY)); |
554 | @@ -2582,7 +2557,7 @@ |
555 | } |
556 | { |
557 | radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("R")); |
558 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Red component of the color"), NULL); |
559 | + gtk_widget_set_tooltip_text (radio, _("Pick the Red component of the color")); |
560 | clonetiler_table_attach (table, radio, 0.0, 1, 2); |
561 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", |
562 | GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_R)); |
563 | @@ -2590,7 +2565,7 @@ |
564 | } |
565 | { |
566 | radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("G")); |
567 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Green component of the color"), NULL); |
568 | + gtk_widget_set_tooltip_text (radio, _("Pick the Green component of the color")); |
569 | clonetiler_table_attach (table, radio, 0.0, 2, 2); |
570 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", |
571 | GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_G)); |
572 | @@ -2598,7 +2573,7 @@ |
573 | } |
574 | { |
575 | radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("B")); |
576 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Blue component of the color"), NULL); |
577 | + gtk_widget_set_tooltip_text (radio, _("Pick the Blue component of the color")); |
578 | clonetiler_table_attach (table, radio, 0.0, 3, 2); |
579 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", |
580 | GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_B)); |
581 | @@ -2606,7 +2581,7 @@ |
582 | } |
583 | { |
584 | radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), C_("Clonetiler color hue", "H")); |
585 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the hue of the color"), NULL); |
586 | + gtk_widget_set_tooltip_text (radio, _("Pick the hue of the color")); |
587 | clonetiler_table_attach (table, radio, 0.0, 1, 3); |
588 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", |
589 | GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_H)); |
590 | @@ -2614,7 +2589,7 @@ |
591 | } |
592 | { |
593 | radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), C_("Clonetiler color saturation", "S")); |
594 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the saturation of the color"), NULL); |
595 | + gtk_widget_set_tooltip_text (radio, _("Pick the saturation of the color")); |
596 | clonetiler_table_attach (table, radio, 0.0, 2, 3); |
597 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", |
598 | GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_S)); |
599 | @@ -2622,7 +2597,7 @@ |
600 | } |
601 | { |
602 | radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), C_("Clonetiler color lightness", "L")); |
603 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the lightness of the color"), NULL); |
604 | + gtk_widget_set_tooltip_text (radio, _("Pick the lightness of the color")); |
605 | clonetiler_table_attach (table, radio, 0.0, 3, 3); |
606 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", |
607 | GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_L)); |
608 | @@ -2646,8 +2621,7 @@ |
609 | clonetiler_table_attach (table, l, 1.0, 1, 1); |
610 | } |
611 | { |
612 | - GtkWidget *l = clonetiler_spinbox (tt, |
613 | - _("Shift the mid-range of the picked value upwards (>0) or downwards (<0)"), "gamma_picked", |
614 | + GtkWidget *l = clonetiler_spinbox (_("Shift the mid-range of the picked value upwards (>0) or downwards (<0)"), "gamma_picked", |
615 | -10, 10, ""); |
616 | clonetiler_table_attach (table, l, 0.0, 1, 2); |
617 | } |
618 | @@ -2658,8 +2632,7 @@ |
619 | clonetiler_table_attach (table, l, 1.0, 1, 3); |
620 | } |
621 | { |
622 | - GtkWidget *l = clonetiler_spinbox (tt, |
623 | - _("Randomize the picked value by this percentage"), "rand_picked", |
624 | + GtkWidget *l = clonetiler_spinbox (_("Randomize the picked value by this percentage"), "rand_picked", |
625 | 0, 100, "%"); |
626 | clonetiler_table_attach (table, l, 0.0, 1, 4); |
627 | } |
628 | @@ -2670,7 +2643,7 @@ |
629 | clonetiler_table_attach (table, l, 1.0, 2, 1); |
630 | } |
631 | { |
632 | - GtkWidget *l = clonetiler_checkbox (tt, _("Invert the picked value"), "invert_picked"); |
633 | + GtkWidget *l = clonetiler_checkbox (_("Invert the picked value"), "invert_picked"); |
634 | clonetiler_table_attach (table, l, 0.0, 2, 2); |
635 | } |
636 | } |
637 | @@ -2689,7 +2662,7 @@ |
638 | GtkWidget *b = gtk_check_button_new_with_label (_("Presence")); |
639 | bool old = prefs->getBool(prefs_path + "pick_to_presence", true); |
640 | gtk_toggle_button_set_active ((GtkToggleButton *) b, old); |
641 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Each clone is created with the probability determined by the picked value in that point"), NULL); |
642 | + gtk_widget_set_tooltip_text (b, _("Each clone is created with the probability determined by the picked value in that point")); |
643 | clonetiler_table_attach (table, b, 0.0, 1, 1); |
644 | gtk_signal_connect(GTK_OBJECT(b), "toggled", |
645 | GTK_SIGNAL_FUNC(clonetiler_pick_to), (gpointer) "pick_to_presence"); |
646 | @@ -2699,7 +2672,7 @@ |
647 | GtkWidget *b = gtk_check_button_new_with_label (_("Size")); |
648 | bool old = prefs->getBool(prefs_path + "pick_to_size"); |
649 | gtk_toggle_button_set_active ((GtkToggleButton *) b, old); |
650 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Each clone's size is determined by the picked value in that point"), NULL); |
651 | + gtk_widget_set_tooltip_text (b, _("Each clone's size is determined by the picked value in that point")); |
652 | clonetiler_table_attach (table, b, 0.0, 2, 1); |
653 | gtk_signal_connect(GTK_OBJECT(b), "toggled", |
654 | GTK_SIGNAL_FUNC(clonetiler_pick_to), (gpointer) "pick_to_size"); |
655 | @@ -2709,7 +2682,7 @@ |
656 | GtkWidget *b = gtk_check_button_new_with_label (_("Color")); |
657 | bool old = prefs->getBool(prefs_path + "pick_to_color", 0); |
658 | gtk_toggle_button_set_active ((GtkToggleButton *) b, old); |
659 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Each clone is painted by the picked color (the original must have unset fill or stroke)"), NULL); |
660 | + gtk_widget_set_tooltip_text (b, _("Each clone is painted by the picked color (the original must have unset fill or stroke)")); |
661 | clonetiler_table_attach (table, b, 0.0, 1, 2); |
662 | gtk_signal_connect(GTK_OBJECT(b), "toggled", |
663 | GTK_SIGNAL_FUNC(clonetiler_pick_to), (gpointer) "pick_to_color"); |
664 | @@ -2719,7 +2692,7 @@ |
665 | GtkWidget *b = gtk_check_button_new_with_label (_("Opacity")); |
666 | bool old = prefs->getBool(prefs_path + "pick_to_opacity", 0); |
667 | gtk_toggle_button_set_active ((GtkToggleButton *) b, old); |
668 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Each clone's opacity is determined by the picked value in that point"), NULL); |
669 | + gtk_widget_set_tooltip_text (b, _("Each clone's opacity is determined by the picked value in that point")); |
670 | clonetiler_table_attach (table, b, 0.0, 2, 2); |
671 | gtk_signal_connect(GTK_OBJECT(b), "toggled", |
672 | GTK_SIGNAL_FUNC(clonetiler_pick_to), (gpointer) "pick_to_opacity"); |
673 | @@ -2746,7 +2719,7 @@ |
674 | int value = prefs->getInt(prefs_path + "jmax", 2); |
675 | gtk_adjustment_set_value (GTK_ADJUSTMENT (a), value); |
676 | GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0, 0); |
677 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), sb, _("How many rows in the tiling"), NULL); |
678 | + gtk_widget_set_tooltip_text (sb, _("How many rows in the tiling")); |
679 | gtk_entry_set_width_chars (GTK_ENTRY (sb), 5); |
680 | gtk_box_pack_start (GTK_BOX (hb), sb, TRUE, TRUE, 0); |
681 | |
682 | @@ -2766,7 +2739,7 @@ |
683 | int value = prefs->getInt(prefs_path + "imax", 2); |
684 | gtk_adjustment_set_value (GTK_ADJUSTMENT (a), value); |
685 | GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0, 0); |
686 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), sb, _("How many columns in the tiling"), NULL); |
687 | + gtk_widget_set_tooltip_text (sb, _("How many columns in the tiling")); |
688 | gtk_entry_set_width_chars (GTK_ENTRY (sb), 5); |
689 | gtk_box_pack_start (GTK_BOX (hb), sb, TRUE, TRUE, 0); |
690 | |
691 | @@ -2796,7 +2769,7 @@ |
692 | gtk_adjustment_set_value (GTK_ADJUSTMENT (a), units); |
693 | |
694 | GtkWidget *e = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0 , 2); |
695 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), e, _("Width of the rectangle to be filled"), NULL); |
696 | + gtk_widget_set_tooltip_text (e, _("Width of the rectangle to be filled")); |
697 | gtk_entry_set_width_chars (GTK_ENTRY (e), 5); |
698 | gtk_box_pack_start (GTK_BOX (hb), e, TRUE, TRUE, 0); |
699 | gtk_signal_connect(GTK_OBJECT(a), "value_changed", |
700 | @@ -2821,7 +2794,7 @@ |
701 | |
702 | |
703 | GtkWidget *e = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0 , 2); |
704 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), e, _("Height of the rectangle to be filled"), NULL); |
705 | + gtk_widget_set_tooltip_text (e, _("Height of the rectangle to be filled")); |
706 | gtk_entry_set_width_chars (GTK_ENTRY (e), 5); |
707 | gtk_box_pack_start (GTK_BOX (hb), e, TRUE, TRUE, 0); |
708 | gtk_signal_connect(GTK_OBJECT(a), "value_changed", |
709 | @@ -2837,7 +2810,7 @@ |
710 | GtkWidget* radio; |
711 | { |
712 | radio = gtk_radio_button_new_with_label (NULL, _("Rows, columns: ")); |
713 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Create the specified number of rows and columns"), NULL); |
714 | + gtk_widget_set_tooltip_text (radio, _("Create the specified number of rows and columns")); |
715 | clonetiler_table_attach (table, radio, 0.0, 1, 1); |
716 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", GTK_SIGNAL_FUNC (clonetiler_switch_to_create), (gpointer) dlg); |
717 | } |
718 | @@ -2847,7 +2820,7 @@ |
719 | } |
720 | { |
721 | radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("Width, height: ")); |
722 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Fill the specified width and height with the tiling"), NULL); |
723 | + gtk_widget_set_tooltip_text (radio, _("Fill the specified width and height with the tiling")); |
724 | clonetiler_table_attach (table, radio, 0.0, 2, 1); |
725 | gtk_signal_connect (GTK_OBJECT (radio), "toggled", GTK_SIGNAL_FUNC (clonetiler_switch_to_fill), (gpointer) dlg); |
726 | } |
727 | @@ -2866,7 +2839,7 @@ |
728 | GtkWidget *b = gtk_check_button_new_with_label (_("Use saved size and position of the tile")); |
729 | bool keepbbox = prefs->getBool(prefs_path + "keepbbox", true); |
730 | gtk_toggle_button_set_active ((GtkToggleButton *) b, keepbbox); |
731 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Pretend that the size and position of the tile are the same as the last time you tiled it (if any), instead of using the current size"), NULL); |
732 | + gtk_widget_set_tooltip_text (b, _("Pretend that the size and position of the tile are the same as the last time you tiled it (if any), instead of using the current size")); |
733 | gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0); |
734 | |
735 | gtk_signal_connect(GTK_OBJECT(b), "toggled", |
736 | @@ -2892,7 +2865,7 @@ |
737 | GtkWidget *l = gtk_label_new (""); |
738 | gtk_label_set_markup_with_mnemonic (GTK_LABEL(l), _(" <b>_Create</b> ")); |
739 | gtk_container_add (GTK_CONTAINER(b), l); |
740 | - gtk_tooltips_set_tip (tt, b, _("Create and tile the clones of the selection"), NULL); |
741 | + gtk_widget_set_tooltip_text (b, _("Create and tile the clones of the selection")); |
742 | gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (clonetiler_apply), NULL); |
743 | gtk_box_pack_end (GTK_BOX (hb), b, FALSE, FALSE, 0); |
744 | } |
745 | @@ -2908,14 +2881,14 @@ |
746 | // http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png |
747 | // So unclumping is the process of spreading a number of objects out more evenly. |
748 | GtkWidget *b = gtk_button_new_with_mnemonic (_(" _Unclump ")); |
749 | - gtk_tooltips_set_tip (tt, b, _("Spread out clones to reduce clumping; can be applied repeatedly"), NULL); |
750 | + gtk_widget_set_tooltip_text (b, _("Spread out clones to reduce clumping; can be applied repeatedly")); |
751 | gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (clonetiler_unclump), NULL); |
752 | gtk_box_pack_end (GTK_BOX (sb), b, FALSE, FALSE, 0); |
753 | } |
754 | |
755 | { |
756 | GtkWidget *b = gtk_button_new_with_mnemonic (_(" Re_move ")); |
757 | - gtk_tooltips_set_tip (tt, b, _("Remove existing tiled clones of the selected object (siblings only)"), NULL); |
758 | + gtk_widget_set_tooltip_text (b, _("Remove existing tiled clones of the selected object (siblings only)")); |
759 | gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (clonetiler_remove), NULL); |
760 | gtk_box_pack_end (GTK_BOX (sb), b, FALSE, FALSE, 0); |
761 | } |
762 | @@ -2933,7 +2906,7 @@ |
763 | { |
764 | GtkWidget *b = gtk_button_new_with_mnemonic (_(" R_eset ")); |
765 | // TRANSLATORS: "change" is a noun here |
766 | - gtk_tooltips_set_tip (tt, b, _("Reset all shifts, scales, rotates, opacity and color changes in the dialog to zero"), NULL); |
767 | + gtk_widget_set_tooltip_text (b, _("Reset all shifts, scales, rotates, opacity and color changes in the dialog to zero")); |
768 | gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (clonetiler_reset), NULL); |
769 | gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0); |
770 | } |
771 | |
772 | === modified file 'src/dialogs/export.cpp' |
773 | --- src/dialogs/export.cpp 2011-06-04 02:45:55 +0000 |
774 | +++ src/dialogs/export.cpp 2011-06-05 13:32:27 +0000 |
775 | @@ -450,8 +450,6 @@ |
776 | g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_unhide", |
777 | G_CALLBACK (sp_dialog_unhide), dlg); |
778 | |
779 | - GtkTooltips *tt = gtk_tooltips_new(); |
780 | - |
781 | Gtk::VBox *vb = new Gtk::VBox(false, 3); |
782 | vb->set_border_width(3); |
783 | gtk_container_add (GTK_CONTAINER (dlg), GTK_WIDGET(vb->gobj())); |
784 | @@ -625,7 +623,7 @@ |
785 | gtk_widget_set_sensitive(GTK_WIDGET(be), TRUE); |
786 | gtk_object_set_data(GTK_OBJECT(dlg), "batch_checkbox", be); |
787 | batch_box->pack_start(*Glib::wrap(be), false, false); |
788 | - gtk_tooltips_set_tip(tt, be, _("Export each selected object into its own PNG file, using export hints if any (caution, overwrites without asking!)"), NULL); |
789 | + gtk_widget_set_tooltip_text(be, _("Export each selected object into its own PNG file, using export hints if any (caution, overwrites without asking!)")); |
790 | batch_box->show_all(); |
791 | g_signal_connect(G_OBJECT(be), "toggled", GTK_SIGNAL_FUNC(batch_export_clicked), dlg); |
792 | vb->pack_start(*batch_box); |
793 | @@ -637,7 +635,7 @@ |
794 | gtk_widget_set_sensitive(GTK_WIDGET(he), TRUE); |
795 | gtk_object_set_data(GTK_OBJECT(dlg), "hide_checkbox", he); |
796 | hide_box->pack_start(*Glib::wrap(he), false, false); |
797 | - gtk_tooltips_set_tip(tt, he, _("In the exported image, hide all objects except those that are selected"), NULL); |
798 | + gtk_widget_set_tooltip_text(he, _("In the exported image, hide all objects except those that are selected")); |
799 | hide_box->show_all(); |
800 | vb->pack_start(*hide_box); |
801 | } |
802 | @@ -658,7 +656,7 @@ |
803 | image_label->pack_start(*l); |
804 | |
805 | b->add(*image_label); |
806 | - gtk_tooltips_set_tip (tt, GTK_WIDGET(b->gobj()), _("Export the bitmap file with these settings"), NULL); |
807 | + gtk_widget_set_tooltip_text (GTK_WIDGET(b->gobj()), _("Export the bitmap file with these settings")); |
808 | gtk_signal_connect ( GTK_OBJECT (b->gobj()), "clicked", |
809 | GTK_SIGNAL_FUNC (sp_export_export_clicked), dlg ); |
810 | bb->pack_end(*b, false, false, 0); |
811 | |
812 | === modified file 'src/dialogs/find.cpp' |
813 | --- src/dialogs/find.cpp 2011-06-04 02:45:55 +0000 |
814 | +++ src/dialogs/find.cpp 2011-06-05 13:32:27 +0000 |
815 | @@ -412,7 +412,7 @@ |
816 | #define FIND_LABELWIDTH 80 |
817 | |
818 | void |
819 | -sp_find_new_searchfield (GtkWidget *dlg, GtkWidget *vb, const gchar *label, const gchar *id, GtkTooltips *tt, const gchar *tip) |
820 | +sp_find_new_searchfield (GtkWidget *dlg, GtkWidget *vb, const gchar *label, const gchar *id, const gchar *tip) |
821 | { |
822 | GtkWidget *hb = gtk_hbox_new (FALSE, 0); |
823 | GtkWidget *l = gtk_label_new_with_mnemonic (label); |
824 | @@ -424,7 +424,7 @@ |
825 | gtk_entry_set_max_length (GTK_ENTRY (tf), 64); |
826 | gtk_box_pack_start (GTK_BOX (hb), tf, TRUE, TRUE, 0); |
827 | gtk_object_set_data (GTK_OBJECT (dlg), id, tf); |
828 | - gtk_tooltips_set_tip (tt, tf, tip, NULL); |
829 | + gtk_widget_set_tooltip_text (tf, tip); |
830 | g_signal_connect ( G_OBJECT (tf), "activate", G_CALLBACK (sp_find_dialog_find), dlg ); |
831 | gtk_label_set_mnemonic_widget (GTK_LABEL(l), tf); |
832 | |
833 | @@ -432,10 +432,10 @@ |
834 | } |
835 | |
836 | void |
837 | -sp_find_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, GtkTooltips *tt, const gchar *tip, void (*function) (GObject *, GObject *)) |
838 | +sp_find_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, const gchar *tip, void (*function) (GObject *, GObject *)) |
839 | { |
840 | GtkWidget *b = gtk_button_new_with_mnemonic (label); |
841 | - gtk_tooltips_set_tip (tt, b, tip, NULL); |
842 | + gtk_widget_set_tooltip_text (b, tip); |
843 | gtk_box_pack_start (GTK_BOX (hb), b, TRUE, TRUE, 0); |
844 | g_signal_connect ( G_OBJECT (b), "clicked", G_CALLBACK (function), dlg ); |
845 | gtk_widget_show (b); |
846 | @@ -483,7 +483,7 @@ |
847 | |
848 | GtkWidget * |
849 | sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active, |
850 | - GtkTooltips *tt, const gchar *tip, |
851 | + const gchar *tip, |
852 | const gchar *label, |
853 | void (*toggled)(GtkToggleButton *, gpointer)) |
854 | { |
855 | @@ -495,7 +495,7 @@ |
856 | gtk_widget_show (b); |
857 | gtk_toggle_button_set_active ((GtkToggleButton *) b, active); |
858 | gtk_object_set_data (GTK_OBJECT (w), data, b); |
859 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, tip, NULL); |
860 | + gtk_widget_set_tooltip_text (b, tip); |
861 | if (toggled) |
862 | gtk_signal_connect (GTK_OBJECT (b), "toggled", GTK_SIGNAL_FUNC (toggled), w); |
863 | gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0); |
864 | @@ -506,7 +506,7 @@ |
865 | |
866 | GtkWidget * |
867 | sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, gboolean active, |
868 | - GtkTooltips *tt, const gchar *tip, |
869 | + const gchar *tip, |
870 | const gchar *label, |
871 | void (*toggled)(GtkToggleButton *, gpointer), guint indent) |
872 | { |
873 | @@ -520,7 +520,7 @@ |
874 | gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0); |
875 | } |
876 | |
877 | - GtkWidget *c = sp_find_types_checkbox (w, data, active, tt, tip, label, toggled); |
878 | + GtkWidget *c = sp_find_types_checkbox (w, data, active, tip, label, toggled); |
879 | gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0); |
880 | |
881 | return hb; |
882 | @@ -530,8 +530,6 @@ |
883 | GtkWidget * |
884 | sp_find_types () |
885 | { |
886 | - GtkTooltips *tt = gtk_tooltips_new (); |
887 | - |
888 | GtkWidget *vb = gtk_vbox_new (FALSE, 4); |
889 | gtk_widget_show (vb); |
890 | |
891 | @@ -547,7 +545,7 @@ |
892 | gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0); |
893 | } |
894 | |
895 | - GtkWidget *alltypes = sp_find_types_checkbox (vb, "all", TRUE, tt, _("Search in all object types"), _("All types"), toggle_alltypes); |
896 | + GtkWidget *alltypes = sp_find_types_checkbox (vb, "all", TRUE, _("Search in all object types"), _("All types"), toggle_alltypes); |
897 | gtk_box_pack_start (GTK_BOX (hb), alltypes, FALSE, FALSE, 0); |
898 | |
899 | gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0); |
900 | @@ -558,7 +556,7 @@ |
901 | gtk_widget_show (vb_all); |
902 | |
903 | { |
904 | - GtkWidget *c = sp_find_types_checkbox_indented (vb, "shapes", FALSE, tt, _("Search all shapes"), _("All shapes"), toggle_shapes, 10); |
905 | + GtkWidget *c = sp_find_types_checkbox_indented (vb, "shapes", FALSE, _("Search all shapes"), _("All shapes"), toggle_shapes, 10); |
906 | gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
907 | } |
908 | |
909 | @@ -575,22 +573,22 @@ |
910 | } |
911 | |
912 | { |
913 | - GtkWidget *c = sp_find_types_checkbox (vb, "rects", FALSE, tt, _("Search rectangles"), _("Rectangles"), NULL); |
914 | - gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0); |
915 | - } |
916 | - |
917 | - { |
918 | - GtkWidget *c = sp_find_types_checkbox (vb, "ellipses", FALSE, tt, _("Search ellipses, arcs, circles"), _("Ellipses"), NULL); |
919 | - gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0); |
920 | - } |
921 | - |
922 | - { |
923 | - GtkWidget *c = sp_find_types_checkbox (vb, "stars", FALSE, tt, _("Search stars and polygons"), _("Stars"), NULL); |
924 | - gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0); |
925 | - } |
926 | - |
927 | - { |
928 | - GtkWidget *c = sp_find_types_checkbox (vb, "spirals", FALSE, tt, _("Search spirals"), _("Spirals"), NULL); |
929 | + GtkWidget *c = sp_find_types_checkbox (vb, "rects", FALSE, _("Search rectangles"), _("Rectangles"), NULL); |
930 | + gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0); |
931 | + } |
932 | + |
933 | + { |
934 | + GtkWidget *c = sp_find_types_checkbox (vb, "ellipses", FALSE, _("Search ellipses, arcs, circles"), _("Ellipses"), NULL); |
935 | + gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0); |
936 | + } |
937 | + |
938 | + { |
939 | + GtkWidget *c = sp_find_types_checkbox (vb, "stars", FALSE, _("Search stars and polygons"), _("Stars"), NULL); |
940 | + gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0); |
941 | + } |
942 | + |
943 | + { |
944 | + GtkWidget *c = sp_find_types_checkbox (vb, "spirals", FALSE, _("Search spirals"), _("Spirals"), NULL); |
945 | gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0); |
946 | } |
947 | |
948 | @@ -603,34 +601,34 @@ |
949 | { |
950 | // TRANSLATORS: polyline is a set of connected straight line segments |
951 | // http://www.w3.org/TR/SVG11/shapes.html#PolylineElement |
952 | - GtkWidget *c = sp_find_types_checkbox_indented (vb, "paths", TRUE, tt, _("Search paths, lines, polylines"), _("Paths"), NULL, 10); |
953 | - gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
954 | - } |
955 | - |
956 | - { |
957 | - GtkWidget *c = sp_find_types_checkbox_indented (vb, "texts", TRUE, tt, _("Search text objects"), _("Texts"), NULL, 10); |
958 | - gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
959 | - } |
960 | - |
961 | - { |
962 | - GtkWidget *c = sp_find_types_checkbox_indented (vb, "groups", TRUE, tt, _("Search groups"), _("Groups"), NULL, 10); |
963 | - gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
964 | - } |
965 | - |
966 | - { |
967 | - GtkWidget *c = sp_find_types_checkbox_indented (vb, "clones", TRUE, tt, _("Search clones"), |
968 | + GtkWidget *c = sp_find_types_checkbox_indented (vb, "paths", TRUE, _("Search paths, lines, polylines"), _("Paths"), NULL, 10); |
969 | + gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
970 | + } |
971 | + |
972 | + { |
973 | + GtkWidget *c = sp_find_types_checkbox_indented (vb, "texts", TRUE, _("Search text objects"), _("Texts"), NULL, 10); |
974 | + gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
975 | + } |
976 | + |
977 | + { |
978 | + GtkWidget *c = sp_find_types_checkbox_indented (vb, "groups", TRUE, _("Search groups"), _("Groups"), NULL, 10); |
979 | + gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
980 | + } |
981 | + |
982 | + { |
983 | + GtkWidget *c = sp_find_types_checkbox_indented (vb, "clones", TRUE, _("Search clones"), |
984 | //TRANSLATORS: "Clones" is a noun indicating type of object to find |
985 | C_("Find dialog","Clones"), NULL, 10); |
986 | gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
987 | } |
988 | |
989 | { |
990 | - GtkWidget *c = sp_find_types_checkbox_indented (vb, "images", TRUE, tt, _("Search images"), _("Images"), NULL, 10); |
991 | + GtkWidget *c = sp_find_types_checkbox_indented (vb, "images", TRUE, _("Search images"), _("Images"), NULL, 10); |
992 | gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
993 | } |
994 | |
995 | { |
996 | - GtkWidget *c = sp_find_types_checkbox_indented (vb, "offsets", TRUE, tt, _("Search offset objects"), _("Offsets"), NULL, 10); |
997 | + GtkWidget *c = sp_find_types_checkbox_indented (vb, "offsets", TRUE, _("Search offset objects"), _("Offsets"), NULL, 10); |
998 | gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0); |
999 | } |
1000 | |
1001 | @@ -687,18 +685,16 @@ |
1002 | g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg); |
1003 | g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg); |
1004 | |
1005 | - GtkTooltips *tt = gtk_tooltips_new (); |
1006 | - |
1007 | gtk_container_set_border_width (GTK_CONTAINER (dlg), 4); |
1008 | |
1009 | /* Toplevel vbox */ |
1010 | GtkWidget *vb = gtk_vbox_new (FALSE, 0); |
1011 | gtk_container_add (GTK_CONTAINER (dlg), vb); |
1012 | |
1013 | - sp_find_new_searchfield (dlg, vb, _("_Text:"), "text", tt, _("Find objects by their text content (exact or partial match)")); |
1014 | - sp_find_new_searchfield (dlg, vb, _("_ID:"), "id", tt, _("Find objects by the value of the id attribute (exact or partial match)")); |
1015 | - sp_find_new_searchfield (dlg, vb, _("_Style:"), "style", tt, _("Find objects by the value of the style attribute (exact or partial match)")); |
1016 | - sp_find_new_searchfield (dlg, vb, _("_Attribute:"), "attr", tt ,_("Find objects by the name of an attribute (exact or partial match)")); |
1017 | + sp_find_new_searchfield (dlg, vb, _("_Text:"), "text", _("Find objects by their text content (exact or partial match)")); |
1018 | + sp_find_new_searchfield (dlg, vb, _("_ID:"), "id", _("Find objects by the value of the id attribute (exact or partial match)")); |
1019 | + sp_find_new_searchfield (dlg, vb, _("_Style:"), "style", _("Find objects by the value of the style attribute (exact or partial match)")); |
1020 | + sp_find_new_searchfield (dlg, vb, _("_Attribute:"), "attr", _("Find objects by the name of an attribute (exact or partial match)")); |
1021 | |
1022 | gtk_widget_show_all (vb); |
1023 | |
1024 | @@ -716,7 +712,7 @@ |
1025 | gtk_widget_show (b); |
1026 | gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE); |
1027 | gtk_object_set_data (GTK_OBJECT (dlg), "inselection", b); |
1028 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Limit search to the current selection"), NULL); |
1029 | + gtk_widget_set_tooltip_text (b, _("Limit search to the current selection")); |
1030 | gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0); |
1031 | } |
1032 | |
1033 | @@ -725,7 +721,7 @@ |
1034 | gtk_widget_show (b); |
1035 | gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE); |
1036 | gtk_object_set_data (GTK_OBJECT (dlg), "inlayer", b); |
1037 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Limit search to the current layer"), NULL); |
1038 | + gtk_widget_set_tooltip_text (b, _("Limit search to the current layer")); |
1039 | gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0); |
1040 | } |
1041 | |
1042 | @@ -734,7 +730,7 @@ |
1043 | gtk_widget_show (b); |
1044 | gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE); |
1045 | gtk_object_set_data (GTK_OBJECT (dlg), "includehidden", b); |
1046 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Include hidden objects in search"), NULL); |
1047 | + gtk_widget_set_tooltip_text (b, _("Include hidden objects in search")); |
1048 | gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0); |
1049 | } |
1050 | |
1051 | @@ -743,7 +739,7 @@ |
1052 | gtk_widget_show (b); |
1053 | gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE); |
1054 | gtk_object_set_data (GTK_OBJECT (dlg), "includelocked", b); |
1055 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Include locked objects in search"), NULL); |
1056 | + gtk_widget_set_tooltip_text (b, _("Include locked objects in search")); |
1057 | gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0); |
1058 | } |
1059 | } |
1060 | @@ -754,8 +750,8 @@ |
1061 | gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0); |
1062 | |
1063 | // TRANSLATORS: "Clear" is a verb here |
1064 | - sp_find_new_button (dlg, hb, _("_Clear"), tt, _("Clear values"), sp_find_dialog_reset); |
1065 | - sp_find_new_button (dlg, hb, _("_Find"), tt, _("Select objects matching all of the fields you filled in"), sp_find_dialog_find); |
1066 | + sp_find_new_button (dlg, hb, _("_Clear"), _("Clear values"), sp_find_dialog_reset); |
1067 | + sp_find_new_button (dlg, hb, _("_Find"), _("Select objects matching all of the fields you filled in"), sp_find_dialog_find); |
1068 | } |
1069 | } |
1070 | |
1071 | |
1072 | === modified file 'src/dialogs/item-properties.cpp' |
1073 | --- src/dialogs/item-properties.cpp 2011-06-03 10:44:52 +0000 |
1074 | +++ src/dialogs/item-properties.cpp 2011-06-05 13:32:27 +0000 |
1075 | @@ -89,8 +89,6 @@ |
1076 | GtkWidget *spw, *vb, *t, *cb, *l, *f, *tf, *pb, *int_expander, *int_label; |
1077 | GtkTextBuffer *desc_buffer; |
1078 | |
1079 | - GtkTooltips *tt = gtk_tooltips_new(); |
1080 | - |
1081 | /* Create container widget */ |
1082 | spw = sp_widget_new_global (INKSCAPE); |
1083 | gtk_signal_connect ( GTK_OBJECT (spw), "modify_selection", |
1084 | @@ -120,7 +118,7 @@ |
1085 | |
1086 | /* Create the entry box for the object id */ |
1087 | tf = gtk_entry_new (); |
1088 | - gtk_tooltips_set_tip (tt, tf, _("The id= attribute (only letters, digits, and the characters .-_: allowed)"), NULL); |
1089 | + gtk_widget_set_tooltip_text (tf, _("The id= attribute (only letters, digits, and the characters .-_: allowed)")); |
1090 | gtk_entry_set_max_length (GTK_ENTRY (tf), 64); |
1091 | gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 0, 1, |
1092 | (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), |
1093 | @@ -152,7 +150,7 @@ |
1094 | |
1095 | /* Create the entry box for the object label */ |
1096 | tf = gtk_entry_new (); |
1097 | - gtk_tooltips_set_tip (tt, tf, _("A freeform label for the object"), NULL); |
1098 | + gtk_widget_set_tooltip_text (tf, _("A freeform label for the object")); |
1099 | gtk_entry_set_max_length (GTK_ENTRY (tf), 256); |
1100 | gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 1, 2, |
1101 | (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), |
1102 | @@ -214,7 +212,7 @@ |
1103 | |
1104 | /* Hide */ |
1105 | cb = gtk_check_button_new_with_mnemonic (_("_Hide")); |
1106 | - gtk_tooltips_set_tip (tt, cb, _("Check to make the object invisible"), NULL); |
1107 | + gtk_widget_set_tooltip_text (cb, _("Check to make the object invisible")); |
1108 | gtk_table_attach ( GTK_TABLE (t), cb, 0, 1, 0, 1, |
1109 | (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), |
1110 | (GtkAttachOptions)0, 0, 0 ); |
1111 | @@ -224,7 +222,7 @@ |
1112 | /* Lock */ |
1113 | // TRANSLATORS: "Lock" is a verb here |
1114 | cb = gtk_check_button_new_with_mnemonic (_("L_ock")); |
1115 | - gtk_tooltips_set_tip (tt, cb, _("Check to make the object insensitive (not selectable by mouse)"), NULL); |
1116 | + gtk_widget_set_tooltip_text (cb, _("Check to make the object insensitive (not selectable by mouse)")); |
1117 | gtk_table_attach ( GTK_TABLE (t), cb, 1, 2, 0, 1, |
1118 | (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), |
1119 | (GtkAttachOptions)0, 0, 0 ); |
1120 | |
1121 | === modified file 'src/dialogs/spellcheck.cpp' |
1122 | --- src/dialogs/spellcheck.cpp 2011-06-04 02:45:55 +0000 |
1123 | +++ src/dialogs/spellcheck.cpp 2011-06-05 13:32:27 +0000 |
1124 | @@ -185,10 +185,10 @@ |
1125 | } |
1126 | |
1127 | void |
1128 | -sp_spellcheck_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, GtkTooltips *tt, const gchar *tip, void (*function) (GObject *, GObject *), const gchar *cookie) |
1129 | +sp_spellcheck_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, const gchar *tip, void (*function) (GObject *, GObject *), const gchar *cookie) |
1130 | { |
1131 | GtkWidget *b = gtk_button_new_with_mnemonic (label); |
1132 | - gtk_tooltips_set_tip (tt, b, tip, NULL); |
1133 | + gtk_widget_set_tooltip_text (b, tip); |
1134 | gtk_box_pack_start (GTK_BOX (hb), b, TRUE, TRUE, 0); |
1135 | g_signal_connect ( G_OBJECT (b), "clicked", G_CALLBACK (function), dlg ); |
1136 | gtk_object_set_data (GTK_OBJECT (dlg), cookie, b); |
1137 | @@ -926,8 +926,6 @@ |
1138 | g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg); |
1139 | g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg); |
1140 | |
1141 | - GtkTooltips *tt = gtk_tooltips_new (); |
1142 | - |
1143 | gtk_container_set_border_width (GTK_CONTAINER (dlg), 4); |
1144 | |
1145 | /* Toplevel vbox */ |
1146 | @@ -971,18 +969,18 @@ |
1147 | |
1148 | { |
1149 | GtkWidget *hb = gtk_hbox_new (FALSE, 0); |
1150 | - sp_spellcheck_new_button (dlg, hb, _("_Accept"), tt, _("Accept the chosen suggestion"), |
1151 | + sp_spellcheck_new_button (dlg, hb, _("_Accept"), _("Accept the chosen suggestion"), |
1152 | sp_spellcheck_accept, "b_accept"); |
1153 | - sp_spellcheck_new_button (dlg, hb, _("_Ignore once"), tt, _("Ignore this word only once"), |
1154 | + sp_spellcheck_new_button (dlg, hb, _("_Ignore once"), _("Ignore this word only once"), |
1155 | sp_spellcheck_ignore_once, "b_ignore_once"); |
1156 | - sp_spellcheck_new_button (dlg, hb, _("_Ignore"), tt, _("Ignore this word in this session"), |
1157 | + sp_spellcheck_new_button (dlg, hb, _("_Ignore"), _("Ignore this word in this session"), |
1158 | sp_spellcheck_ignore, "b_ignore"); |
1159 | gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0); |
1160 | } |
1161 | |
1162 | { |
1163 | GtkWidget *hb = gtk_hbox_new (FALSE, 0); |
1164 | - sp_spellcheck_new_button (dlg, hb, _("A_dd to dictionary:"), tt, _("Add this word to the chosen dictionary"), |
1165 | + sp_spellcheck_new_button (dlg, hb, _("A_dd to dictionary:"), _("Add this word to the chosen dictionary"), |
1166 | sp_spellcheck_add, "b_add"); |
1167 | GtkComboBox *cbox = GTK_COMBO_BOX (gtk_combo_box_new_text()); |
1168 | gtk_combo_box_append_text (cbox, _lang); |
1169 | @@ -1006,9 +1004,9 @@ |
1170 | |
1171 | { |
1172 | GtkWidget *hb = gtk_hbox_new (FALSE, 0); |
1173 | - sp_spellcheck_new_button (dlg, hb, _("_Stop"), tt, _("Stop the check"), |
1174 | + sp_spellcheck_new_button (dlg, hb, _("_Stop"), _("Stop the check"), |
1175 | sp_spellcheck_stop, "b_stop"); |
1176 | - sp_spellcheck_new_button (dlg, hb, _("_Start"), tt, _("Start the check"), |
1177 | + sp_spellcheck_new_button (dlg, hb, _("_Start"), _("Start the check"), |
1178 | sp_spellcheck_start, "b_start"); |
1179 | gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0); |
1180 | } |
1181 | |
1182 | === modified file 'src/dialogs/text-edit.cpp' |
1183 | --- src/dialogs/text-edit.cpp 2011-04-18 21:36:02 +0000 |
1184 | +++ src/dialogs/text-edit.cpp 2011-06-05 13:32:27 +0000 |
1185 | @@ -188,8 +188,6 @@ |
1186 | |
1187 | gtk_window_set_policy (GTK_WINDOW (dlg), TRUE, TRUE, FALSE); |
1188 | |
1189 | - GtkTooltips *tt = gtk_tooltips_new(); |
1190 | - |
1191 | // box containing the notebook and the bottom buttons |
1192 | GtkWidget *mainvb = gtk_vbox_new (FALSE, 0); |
1193 | gtk_container_add (GTK_CONTAINER (dlg), mainvb); |
1194 | @@ -240,7 +238,7 @@ |
1195 | // TODO - replace with Inkscape-specific call |
1196 | GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_LEFT, GTK_ICON_SIZE_LARGE_TOOLBAR ); |
1197 | GtkWidget *b = group = gtk_radio_button_new (NULL); |
1198 | - gtk_tooltips_set_tip (tt, b, _("Align lines left"), NULL); |
1199 | + gtk_widget_set_tooltip_text (b, _("Align lines left")); |
1200 | gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE); |
1201 | g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg); |
1202 | gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE ); |
1203 | @@ -255,7 +253,7 @@ |
1204 | GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_CENTER, GTK_ICON_SIZE_LARGE_TOOLBAR ); |
1205 | GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); |
1206 | /* TRANSLATORS: `Center' here is a verb. */ |
1207 | - gtk_tooltips_set_tip (tt, b, _("Center lines"), NULL); |
1208 | + gtk_widget_set_tooltip_text (b, _("Center lines")); |
1209 | gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE); |
1210 | g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg ); |
1211 | gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE); |
1212 | @@ -269,7 +267,7 @@ |
1213 | // TODO - replace with Inkscape-specific call |
1214 | GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_RIGHT, GTK_ICON_SIZE_LARGE_TOOLBAR ); |
1215 | GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); |
1216 | - gtk_tooltips_set_tip (tt, b, _("Align lines right"), NULL); |
1217 | + gtk_widget_set_tooltip_text (b, _("Align lines right")); |
1218 | gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE); |
1219 | g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg ); |
1220 | gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE); |
1221 | @@ -283,7 +281,7 @@ |
1222 | // TODO - replace with Inkscape-specific call |
1223 | GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_LARGE_TOOLBAR ); |
1224 | GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); |
1225 | - gtk_tooltips_set_tip (tt, b, _("Justify lines"), NULL); |
1226 | + gtk_widget_set_tooltip_text (b, _("Justify lines")); |
1227 | gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE); |
1228 | g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg ); |
1229 | gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE); |
1230 | @@ -305,7 +303,7 @@ |
1231 | GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, |
1232 | INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL ); |
1233 | GtkWidget *b = group = gtk_radio_button_new (NULL); |
1234 | - gtk_tooltips_set_tip (tt, b, _("Horizontal text"), NULL); |
1235 | + gtk_widget_set_tooltip_text (b, _("Horizontal text")); |
1236 | gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE); |
1237 | g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg ); |
1238 | gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE); |
1239 | @@ -319,7 +317,7 @@ |
1240 | GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, |
1241 | INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL ); |
1242 | GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); |
1243 | - gtk_tooltips_set_tip (tt, b, _("Vertical text"), NULL); |
1244 | + gtk_widget_set_tooltip_text (b, _("Vertical text")); |
1245 | gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE); |
1246 | g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg ); |
1247 | gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE); |
1248 | |
1249 | === modified file 'src/dialogs/xml-tree.cpp' |
1250 | --- src/dialogs/xml-tree.cpp 2011-02-21 21:43:30 +0000 |
1251 | +++ src/dialogs/xml-tree.cpp 2011-06-05 13:32:27 +0000 |
1252 | @@ -66,7 +66,6 @@ |
1253 | static Inkscape::MessageContext *_message_context = NULL; |
1254 | static sigc::connection _message_changed_connection; |
1255 | |
1256 | -static GtkTooltips *tooltips = NULL; |
1257 | static GtkEditable *attr_name = NULL; |
1258 | static GtkTextView *attr_value = NULL; |
1259 | static SPXMLViewTree *tree = NULL; |
1260 | @@ -194,9 +193,6 @@ |
1261 | GtkWidget *text_container, *attr_container, *attr_subpaned_container, *box2; |
1262 | GtkWidget *set_attr; |
1263 | |
1264 | - tooltips = gtk_tooltips_new(); |
1265 | - gtk_tooltips_enable(tooltips); |
1266 | - |
1267 | dlg = sp_window_new("", TRUE); |
1268 | Inkscape::Preferences *prefs = Inkscape::Preferences::get(); |
1269 | if (x == -1000 || y == -1000) { |
1270 | @@ -267,8 +263,8 @@ |
1271 | gtk_paned_pack1(GTK_PANED(paned), box, FALSE, FALSE); |
1272 | |
1273 | tree = SP_XMLVIEW_TREE(sp_xmlview_tree_new(NULL, NULL, NULL)); |
1274 | - gtk_tooltips_set_tip( tooltips, GTK_WIDGET(tree), |
1275 | - _("Drag to reorder nodes"), NULL ); |
1276 | + gtk_widget_set_tooltip_text( GTK_WIDGET(tree), |
1277 | + _("Drag to reorder nodes") ); |
1278 | |
1279 | g_signal_connect( G_OBJECT(tree), "tree_select_row", |
1280 | G_CALLBACK(on_tree_select_row), NULL ); |
1281 | @@ -495,9 +491,9 @@ |
1282 | FALSE, TRUE, 0); |
1283 | |
1284 | attr_name = GTK_EDITABLE(gtk_entry_new()); |
1285 | - gtk_tooltips_set_tip( tooltips, GTK_WIDGET(attr_name), |
1286 | + gtk_widget_set_tooltip_text( GTK_WIDGET(attr_name), |
1287 | // TRANSLATORS: "Attribute" is a noun here |
1288 | - _("Attribute name"), NULL ); |
1289 | + _("Attribute name") ); |
1290 | |
1291 | gtk_signal_connect( GTK_OBJECT(attributes), "select_row", |
1292 | (GCallback) on_attr_select_row_set_name_content, |
1293 | @@ -515,9 +511,9 @@ |
1294 | TRUE, TRUE, 0); |
1295 | |
1296 | set_attr = gtk_button_new(); |
1297 | - gtk_tooltips_set_tip( tooltips, GTK_WIDGET(set_attr), |
1298 | + gtk_widget_set_tooltip_text( GTK_WIDGET(set_attr), |
1299 | // TRANSLATORS: "Set" is a verb here |
1300 | - _("Set attribute"), NULL ); |
1301 | + _("Set attribute") ); |
1302 | // TRANSLATORS: "Set" is a verb here |
1303 | GtkWidget *set_label = gtk_label_new(_("Set")); |
1304 | gtk_container_add(GTK_CONTAINER(set_attr), set_label); |
1305 | @@ -540,9 +536,9 @@ |
1306 | |
1307 | attr_value =(GtkTextView *) gtk_text_view_new(); |
1308 | gtk_text_view_set_wrap_mode((GtkTextView *) attr_value, GTK_WRAP_CHAR); |
1309 | - gtk_tooltips_set_tip( tooltips, GTK_WIDGET(attr_value), |
1310 | + gtk_widget_set_tooltip_text( GTK_WIDGET(attr_value), |
1311 | // TRANSLATORS: "Attribute" is a noun here |
1312 | - _("Attribute value"), NULL ); |
1313 | + _("Attribute value") ); |
1314 | gtk_signal_connect( GTK_OBJECT(attributes), "select_row", |
1315 | (GCallback) on_attr_select_row_set_value_content, |
1316 | attr_value ); |
1317 | @@ -895,8 +891,6 @@ |
1318 | static void on_destroy(GtkObject */*object*/, gpointer /*data*/) |
1319 | { |
1320 | set_tree_desktop(NULL); |
1321 | - gtk_object_destroy(GTK_OBJECT(tooltips)); |
1322 | - tooltips = NULL; |
1323 | sp_signal_disconnect_by_data(INKSCAPE, dlg); |
1324 | wd.win = dlg = NULL; |
1325 | wd.stop = 0; |
1326 | |
1327 | === modified file 'src/ege-adjustment-action.cpp' |
1328 | --- src/ege-adjustment-action.cpp 2011-06-03 10:44:52 +0000 |
1329 | +++ src/ege-adjustment-action.cpp 2011-06-05 13:32:27 +0000 |
1330 | @@ -103,7 +103,6 @@ |
1331 | struct _EgeAdjustmentActionPrivate |
1332 | { |
1333 | GtkAdjustment* adj; |
1334 | - GtkTooltips* toolTips; |
1335 | GtkWidget* focusWidget; |
1336 | gdouble climbRate; |
1337 | guint digits; |
1338 | @@ -275,7 +274,6 @@ |
1339 | { |
1340 | action->private_data = EGE_ADJUSTMENT_ACTION_GET_PRIVATE( action ); |
1341 | action->private_data->adj = 0; |
1342 | - action->private_data->toolTips = 0; |
1343 | action->private_data->focusWidget = 0; |
1344 | action->private_data->climbRate = 0.0; |
1345 | action->private_data->digits = 2; |
1346 | @@ -852,10 +850,7 @@ |
1347 | g_object_get_property( G_OBJECT(action), "tooltip", &tooltip ); |
1348 | const gchar* tipstr = g_value_get_string( &tooltip ); |
1349 | if ( tipstr && *tipstr ) { |
1350 | - if ( !act->private_data->toolTips ) { |
1351 | - act->private_data->toolTips = gtk_tooltips_new(); |
1352 | - } |
1353 | - gtk_tooltips_set_tip( act->private_data->toolTips, spinbutton, tipstr, 0 ); |
1354 | + gtk_widget_set_tooltip_text( spinbutton, tipstr ); |
1355 | } |
1356 | g_value_unset( &tooltip ); |
1357 | } |
1358 | |
1359 | === modified file 'src/ege-select-one-action.cpp' |
1360 | --- src/ege-select-one-action.cpp 2011-06-03 10:44:52 +0000 |
1361 | +++ src/ege-select-one-action.cpp 2011-06-05 13:32:27 +0000 |
1362 | @@ -652,7 +652,6 @@ |
1363 | GtkTreeIter iter; |
1364 | gboolean valid = FALSE; |
1365 | gint index = 0; |
1366 | - GtkTooltips* tooltips = gtk_tooltips_new(); |
1367 | |
1368 | { |
1369 | gchar* sss = 0; |
1370 | @@ -737,7 +736,7 @@ |
1371 | |
1372 | sub = gtk_action_create_tool_item( GTK_ACTION(ract) ); |
1373 | gtk_action_connect_proxy( GTK_ACTION(ract), sub ); |
1374 | - gtk_tool_item_set_tooltip( GTK_TOOL_ITEM(sub), tooltips, tip, NULL ); |
1375 | + gtk_tool_item_set_tooltip_text( GTK_TOOL_ITEM(sub), tip ); |
1376 | |
1377 | gtk_box_pack_start( GTK_BOX(holder), sub, FALSE, FALSE, 0 ); |
1378 | |
1379 | @@ -750,7 +749,6 @@ |
1380 | } |
1381 | |
1382 | g_object_set_data( G_OBJECT(holder), "ege-proxy_action-group", group ); |
1383 | - g_object_set_data( G_OBJECT(holder), "ege-tooltips", tooltips ); |
1384 | |
1385 | gtk_container_add( GTK_CONTAINER(item), holder ); |
1386 | } else { |
1387 | |
1388 | === modified file 'src/libgdl/gdl-dock-bar.c' |
1389 | --- src/libgdl/gdl-dock-bar.c 2007-08-29 21:27:07 +0000 |
1390 | +++ src/libgdl/gdl-dock-bar.c 2011-06-05 13:32:27 +0000 |
1391 | @@ -65,7 +65,6 @@ |
1392 | struct _GdlDockBarPrivate { |
1393 | GdlDockMaster *master; |
1394 | GSList *items; |
1395 | - GtkTooltips *tooltips; |
1396 | GtkOrientation orientation; |
1397 | GdlDockBarStyle dockbar_style; |
1398 | }; |
1399 | @@ -130,11 +129,8 @@ |
1400 | dockbar->_priv = g_new0 (GdlDockBarPrivate, 1); |
1401 | dockbar->_priv->master = NULL; |
1402 | dockbar->_priv->items = NULL; |
1403 | - dockbar->_priv->tooltips = gtk_tooltips_new (); |
1404 | dockbar->_priv->orientation = GTK_ORIENTATION_VERTICAL; |
1405 | dockbar->_priv->dockbar_style = GDL_DOCK_BAR_BOTH; |
1406 | - g_object_ref (dockbar->_priv->tooltips); |
1407 | - gtk_object_sink (GTK_OBJECT (dockbar->_priv->tooltips)); |
1408 | } |
1409 | |
1410 | static void |
1411 | @@ -208,11 +204,6 @@ |
1412 | priv->master = NULL; |
1413 | } |
1414 | |
1415 | - if (priv->tooltips) { |
1416 | - g_object_unref (priv->tooltips); |
1417 | - priv->tooltips = NULL; |
1418 | - } |
1419 | - |
1420 | dockbar->_priv = NULL; |
1421 | |
1422 | g_free (priv); |
1423 | @@ -334,7 +325,7 @@ |
1424 | gtk_container_add (GTK_CONTAINER (button), box); |
1425 | gtk_box_pack_start (GTK_BOX (dockbar), button, FALSE, FALSE, 0); |
1426 | |
1427 | - gtk_tooltips_set_tip (priv->tooltips, button, name, name); |
1428 | + gtk_widget_set_tooltip_text (button, name); |
1429 | g_free (name); |
1430 | |
1431 | g_object_set_data (G_OBJECT (item), "GdlDockBar", dockbar); |
1432 | |
1433 | === modified file 'src/libgdl/gdl-dock-item-grip.c' |
1434 | --- src/libgdl/gdl-dock-item-grip.c 2011-06-03 10:44:52 +0000 |
1435 | +++ src/libgdl/gdl-dock-item-grip.c 2011-06-05 13:32:27 +0000 |
1436 | @@ -33,7 +33,6 @@ |
1437 | struct _GdlDockItemGripPrivate { |
1438 | GtkWidget *close_button; |
1439 | GtkWidget *iconify_button; |
1440 | - GtkTooltips *tooltips; |
1441 | |
1442 | gboolean icon_pixbuf_valid; |
1443 | GdkPixbuf *icon_pixbuf; |
1444 | @@ -264,11 +263,6 @@ |
1445 | priv->icon_pixbuf = NULL; |
1446 | } |
1447 | |
1448 | - if (priv->tooltips) { |
1449 | - g_object_unref (priv->tooltips); |
1450 | - priv->tooltips = NULL; |
1451 | - } |
1452 | - |
1453 | if (grip->item) |
1454 | g_signal_handlers_disconnect_by_func (grip->item, |
1455 | gdl_dock_item_grip_item_notify, |
1456 | @@ -386,13 +380,10 @@ |
1457 | g_signal_connect (G_OBJECT (grip->_priv->iconify_button), "clicked", |
1458 | G_CALLBACK (gdl_dock_item_grip_iconify_clicked), grip); |
1459 | |
1460 | - grip->_priv->tooltips = gtk_tooltips_new (); |
1461 | - g_object_ref (grip->_priv->tooltips); |
1462 | - gtk_object_sink (GTK_OBJECT (grip->_priv->tooltips)); |
1463 | - gtk_tooltips_set_tip (grip->_priv->tooltips, grip->_priv->iconify_button, |
1464 | - _("Iconify"), _("Iconify this dock")); |
1465 | - gtk_tooltips_set_tip (grip->_priv->tooltips, grip->_priv->close_button, |
1466 | - _("Close"), _("Close this dock")); |
1467 | + gtk_widget_set_tooltip_text (grip->_priv->iconify_button, |
1468 | + _("Iconify")); |
1469 | + gtk_widget_set_tooltip_text (grip->_priv->close_button, |
1470 | + _("Close")); |
1471 | } |
1472 | |
1473 | static void |
1474 | |
1475 | === modified file 'src/libgdl/gdl-switcher.c' |
1476 | --- src/libgdl/gdl-switcher.c 2011-06-03 10:44:52 +0000 |
1477 | +++ src/libgdl/gdl-switcher.c 2011-06-05 13:32:27 +0000 |
1478 | @@ -74,7 +74,6 @@ |
1479 | GtkWidget *icon; |
1480 | GtkWidget *arrow; |
1481 | GtkWidget *hbox; |
1482 | - GtkTooltips *tooltips; |
1483 | int id; |
1484 | } Button; |
1485 | |
1486 | @@ -103,7 +102,7 @@ |
1487 | |
1488 | static Button * |
1489 | button_new (GtkWidget *button_widget, GtkWidget *label, GtkWidget *icon, |
1490 | - GtkTooltips *tooltips, GtkWidget *arrow, GtkWidget *hbox, int id) |
1491 | + GtkWidget *arrow, GtkWidget *hbox, int id) |
1492 | { |
1493 | Button *button = g_new (Button, 1); |
1494 | |
1495 | @@ -112,7 +111,6 @@ |
1496 | button->icon = icon; |
1497 | button->arrow = arrow; |
1498 | button->hbox = hbox; |
1499 | - button->tooltips = tooltips; |
1500 | button->id = id; |
1501 | |
1502 | g_object_ref (button_widget); |
1503 | @@ -120,7 +118,6 @@ |
1504 | g_object_ref (icon); |
1505 | g_object_ref (arrow); |
1506 | g_object_ref (hbox); |
1507 | - g_object_ref (tooltips); |
1508 | |
1509 | return button; |
1510 | } |
1511 | @@ -132,7 +129,6 @@ |
1512 | g_object_unref (button->label); |
1513 | g_object_unref (button->icon); |
1514 | g_object_unref (button->hbox); |
1515 | - g_object_unref (button->tooltips); |
1516 | g_free (button); |
1517 | } |
1518 | |
1519 | @@ -750,7 +746,6 @@ |
1520 | GtkWidget *icon_widget; |
1521 | GtkWidget *label_widget; |
1522 | GtkWidget *arrow; |
1523 | - GtkTooltips *button_tooltips; |
1524 | |
1525 | button_widget = gtk_toggle_button_new (); |
1526 | if (switcher->priv->show) |
1527 | @@ -781,24 +776,19 @@ |
1528 | } |
1529 | gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5); |
1530 | gtk_widget_show (label_widget); |
1531 | - button_tooltips = gtk_tooltips_new(); |
1532 | - gtk_tooltips_set_tip (GTK_TOOLTIPS (button_tooltips), button_widget, |
1533 | - tooltips, NULL); |
1534 | + gtk_widget_set_tooltip_text (button_widget, tooltips); |
1535 | |
1536 | switch (INTERNAL_MODE (switcher)) { |
1537 | case GDL_SWITCHER_STYLE_TEXT: |
1538 | gtk_box_pack_start (GTK_BOX (hbox), label_widget, TRUE, TRUE, 0); |
1539 | - gtk_tooltips_disable (button_tooltips); |
1540 | break; |
1541 | case GDL_SWITCHER_STYLE_ICON: |
1542 | gtk_box_pack_start (GTK_BOX (hbox), icon_widget, TRUE, TRUE, 0); |
1543 | - gtk_tooltips_enable (button_tooltips); |
1544 | break; |
1545 | case GDL_SWITCHER_STYLE_BOTH: |
1546 | default: |
1547 | gtk_box_pack_start (GTK_BOX (hbox), icon_widget, FALSE, TRUE, 0); |
1548 | gtk_box_pack_start (GTK_BOX (hbox), label_widget, TRUE, TRUE, 0); |
1549 | - gtk_tooltips_disable (button_tooltips); |
1550 | break; |
1551 | } |
1552 | arrow = gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE); |
1553 | @@ -808,7 +798,7 @@ |
1554 | switcher->priv->buttons = |
1555 | g_slist_append (switcher->priv->buttons, |
1556 | button_new (button_widget, label_widget, |
1557 | - icon_widget, button_tooltips, |
1558 | + icon_widget, |
1559 | arrow, hbox, switcher_id)); |
1560 | gtk_widget_set_parent (button_widget, GTK_WIDGET (switcher)); |
1561 | |
1562 | @@ -901,7 +891,6 @@ |
1563 | gtk_box_pack_start (GTK_BOX (button->hbox), button->label, |
1564 | TRUE, TRUE, 0); |
1565 | gtk_widget_show (button->label); |
1566 | - gtk_tooltips_disable (button->tooltips); |
1567 | } |
1568 | break; |
1569 | case GDL_SWITCHER_STYLE_ICON: |
1570 | @@ -914,7 +903,6 @@ |
1571 | } else |
1572 | gtk_container_child_set (GTK_CONTAINER (button->hbox), |
1573 | button->icon, "expand", TRUE, NULL); |
1574 | - gtk_tooltips_enable (button->tooltips); |
1575 | break; |
1576 | case GDL_SWITCHER_STYLE_BOTH: |
1577 | if (INTERNAL_MODE (switcher) |
1578 | @@ -929,7 +917,6 @@ |
1579 | button->icon, "expand", FALSE, NULL); |
1580 | } |
1581 | |
1582 | - gtk_tooltips_disable (button->tooltips); |
1583 | gtk_box_pack_start (GTK_BOX (button->hbox), button->label, TRUE, |
1584 | TRUE, 0); |
1585 | gtk_widget_show (button->label); |
1586 | |
1587 | === modified file 'src/widgets/button.cpp' |
1588 | --- src/widgets/button.cpp 2010-10-29 07:49:37 +0000 |
1589 | +++ src/widgets/button.cpp 2011-06-05 13:32:27 +0000 |
1590 | @@ -46,7 +46,7 @@ |
1591 | static void sp_button_action_set_active (SPAction *action, unsigned int active, void *data); |
1592 | static void sp_button_action_set_sensitive (SPAction *action, unsigned int sensitive, void *data); |
1593 | static void sp_button_action_set_shortcut (SPAction *action, unsigned int shortcut, void *data); |
1594 | -static void sp_button_set_composed_tooltip (GtkTooltips *tooltips, GtkWidget *widget, SPAction *action); |
1595 | +static void sp_button_set_composed_tooltip (GtkWidget *widget, SPAction *action); |
1596 | |
1597 | static GtkToggleButtonClass *parent_class; |
1598 | SPActionEventVector button_event_vector = { |
1599 | @@ -98,7 +98,6 @@ |
1600 | { |
1601 | button->action = NULL; |
1602 | button->doubleclick_action = NULL; |
1603 | - button->tooltips = NULL; |
1604 | |
1605 | gtk_container_set_border_width (GTK_CONTAINER (button), 0); |
1606 | |
1607 | @@ -116,11 +115,6 @@ |
1608 | |
1609 | button = SP_BUTTON (object); |
1610 | |
1611 | - if (button->tooltips) { |
1612 | - g_object_unref (G_OBJECT (button->tooltips)); |
1613 | - button->tooltips = NULL; |
1614 | - } |
1615 | - |
1616 | if (button->action) { |
1617 | sp_button_set_action (button, NULL); |
1618 | } |
1619 | @@ -186,7 +180,7 @@ |
1620 | |
1621 | |
1622 | GtkWidget * |
1623 | -sp_button_new( Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action, GtkTooltips *tooltips ) |
1624 | +sp_button_new( Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action ) |
1625 | { |
1626 | SPButton *button; |
1627 | |
1628 | @@ -194,9 +188,6 @@ |
1629 | |
1630 | button->type = type; |
1631 | button->lsize = CLAMP( size, Inkscape::ICON_SIZE_MENU, Inkscape::ICON_SIZE_DECORATION ); |
1632 | - button->tooltips = tooltips; |
1633 | - |
1634 | - if (tooltips) g_object_ref ((GObject *) tooltips); |
1635 | |
1636 | sp_button_set_action (button, action); |
1637 | if (doubleclick_action) |
1638 | @@ -253,9 +244,7 @@ |
1639 | } |
1640 | } |
1641 | |
1642 | - if (button->tooltips) { |
1643 | - sp_button_set_composed_tooltip (button->tooltips, (GtkWidget *) button, action); |
1644 | - } |
1645 | + sp_button_set_composed_tooltip ((GtkWidget *) button, action); |
1646 | } |
1647 | |
1648 | static void |
1649 | @@ -283,12 +272,10 @@ |
1650 | sp_button_action_set_shortcut (SPAction *action, unsigned int /*shortcut*/, void *data) |
1651 | { |
1652 | SPButton *button=SP_BUTTON (data); |
1653 | - if (button->tooltips) { |
1654 | - sp_button_set_composed_tooltip (button->tooltips, GTK_WIDGET (button), action); |
1655 | - } |
1656 | + sp_button_set_composed_tooltip (GTK_WIDGET (button), action); |
1657 | } |
1658 | |
1659 | -static void sp_button_set_composed_tooltip(GtkTooltips *tooltips, GtkWidget *widget, SPAction *action) |
1660 | +static void sp_button_set_composed_tooltip(GtkWidget *widget, SPAction *action) |
1661 | { |
1662 | if (action) { |
1663 | unsigned int shortcut = sp_shortcut_get_primary (action->verb); |
1664 | @@ -298,16 +285,16 @@ |
1665 | gchar *key = sp_shortcut_get_label(shortcut); |
1666 | |
1667 | gchar *tip = g_strdup_printf ("%s (%s)", action->tip, key); |
1668 | - gtk_tooltips_set_tip(tooltips, widget, tip, NULL); |
1669 | + gtk_widget_set_tooltip_text(widget, tip); |
1670 | g_free(tip); |
1671 | g_free(key); |
1672 | } else { |
1673 | // action has no shortcut |
1674 | - gtk_tooltips_set_tip(tooltips, widget, action->tip, NULL); |
1675 | + gtk_widget_set_tooltip_text(widget, action->tip); |
1676 | } |
1677 | } else { |
1678 | // no action |
1679 | - gtk_tooltips_set_tip(tooltips, widget, NULL, NULL); |
1680 | + gtk_widget_set_tooltip_text(widget, NULL); |
1681 | } |
1682 | } |
1683 | |
1684 | @@ -316,12 +303,11 @@ |
1685 | SPButtonType type, |
1686 | Inkscape::UI::View::View *view, |
1687 | const gchar *name, |
1688 | - const gchar *tip, |
1689 | - GtkTooltips *tooltips ) |
1690 | + const gchar *tip ) |
1691 | { |
1692 | GtkWidget *button; |
1693 | SPAction *action=sp_action_new(view, name, name, tip, name, 0); |
1694 | - button = sp_button_new (size, type, action, NULL, tooltips); |
1695 | + button = sp_button_new (size, type, action, NULL); |
1696 | nr_object_unref ((NRObject *) action); |
1697 | return button; |
1698 | } |
1699 | |
1700 | === modified file 'src/widgets/button.h' |
1701 | --- src/widgets/button.h 2011-06-03 10:44:52 +0000 |
1702 | +++ src/widgets/button.h 2011-06-05 13:32:27 +0000 |
1703 | @@ -38,7 +38,6 @@ |
1704 | unsigned int psize; |
1705 | SPAction *action; |
1706 | SPAction *doubleclick_action; |
1707 | - GtkTooltips *tooltips; |
1708 | }; |
1709 | |
1710 | struct SPButtonClass { |
1711 | @@ -49,7 +48,7 @@ |
1712 | |
1713 | GType sp_button_get_type (void); |
1714 | |
1715 | -GtkWidget *sp_button_new (Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action, GtkTooltips *tooltips); |
1716 | +GtkWidget *sp_button_new (Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action); |
1717 | |
1718 | void sp_button_toggle_set_down (SPButton *button, gboolean down); |
1719 | |
1720 | @@ -57,8 +56,7 @@ |
1721 | SPButtonType type, |
1722 | Inkscape::UI::View::View *view, |
1723 | const gchar *name, |
1724 | - const gchar *tip, |
1725 | - GtkTooltips *tooltips); |
1726 | + const gchar *tip); |
1727 | |
1728 | |
1729 | |
1730 | |
1731 | === modified file 'src/widgets/desktop-widget.cpp' |
1732 | --- src/widgets/desktop-widget.cpp 2011-06-04 02:45:55 +0000 |
1733 | +++ src/widgets/desktop-widget.cpp 2011-06-05 13:32:27 +0000 |
1734 | @@ -236,7 +236,7 @@ |
1735 | gdk_window_process_updates(GTK_WIDGET(sb)->window, TRUE); |
1736 | } |
1737 | |
1738 | - gtk_tooltips_set_tip (this->tt, this->select_status_eventbox, gtk_label_get_text (sb) , NULL); |
1739 | + gtk_widget_set_tooltip_text (this->select_status_eventbox, gtk_label_get_text (sb)); |
1740 | } |
1741 | |
1742 | Geom::Point |
1743 | @@ -313,7 +313,6 @@ |
1744 | dtw->window = 0; |
1745 | dtw->desktop = NULL; |
1746 | dtw->_interaction_disabled_counter = 0; |
1747 | - dtw->tt = gtk_tooltips_new (); |
1748 | |
1749 | /* Main table */ |
1750 | dtw->vbox = gtk_vbox_new (FALSE, 0); |
1751 | @@ -359,7 +358,7 @@ |
1752 | dtw->hruler = sp_hruler_new (); |
1753 | dtw->hruler_box = eventbox; |
1754 | sp_ruler_set_metric (GTK_RULER (dtw->hruler), SP_PT); |
1755 | - gtk_tooltips_set_tip (dtw->tt, dtw->hruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT))), NULL); |
1756 | + gtk_widget_set_tooltip_text (dtw->hruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT)))); |
1757 | gtk_container_add (GTK_CONTAINER (eventbox), dtw->hruler); |
1758 | gtk_table_attach (GTK_TABLE (canvas_tbl), eventbox, 1, 2, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_FILL), widget->style->xthickness, 0); |
1759 | g_signal_connect (G_OBJECT (eventbox), "button_press_event", G_CALLBACK (sp_dt_hruler_event), dtw); |
1760 | @@ -371,7 +370,7 @@ |
1761 | dtw->vruler = sp_vruler_new (); |
1762 | dtw->vruler_box = eventbox; |
1763 | sp_ruler_set_metric (GTK_RULER (dtw->vruler), SP_PT); |
1764 | - gtk_tooltips_set_tip (dtw->tt, dtw->vruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT))), NULL); |
1765 | + gtk_widget_set_tooltip_text (dtw->vruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT)))); |
1766 | gtk_container_add (GTK_CONTAINER (eventbox), GTK_WIDGET (dtw->vruler)); |
1767 | gtk_table_attach (GTK_TABLE (canvas_tbl), eventbox, 0, 1, 1, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(GTK_FILL), 0, widget->style->ythickness); |
1768 | g_signal_connect (G_OBJECT (eventbox), "button_press_event", G_CALLBACK (sp_dt_vruler_event), dtw); |
1769 | @@ -389,8 +388,7 @@ |
1770 | SP_BUTTON_TYPE_TOGGLE, |
1771 | NULL, |
1772 | INKSCAPE_ICON_ZOOM_ORIGINAL, |
1773 | - _("Zoom drawing if window size changes"), |
1774 | - dtw->tt); |
1775 | + _("Zoom drawing if window size changes")); |
1776 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dtw->sticky_zoom), prefs->getBool("/options/stickyzoom/value")); |
1777 | gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->sticky_zoom, FALSE, FALSE, 0); |
1778 | g_signal_connect (G_OBJECT (dtw->sticky_zoom), "toggled", G_CALLBACK (sp_dtw_sticky_zoom_toggled), dtw); |
1779 | @@ -412,8 +410,7 @@ |
1780 | SP_BUTTON_TYPE_TOGGLE, |
1781 | NULL, |
1782 | INKSCAPE_ICON_COLOR_MANAGEMENT, |
1783 | - tip, |
1784 | - dtw->tt ); |
1785 | + tip ); |
1786 | #if ENABLE_LCMS |
1787 | { |
1788 | Glib::ustring current = prefs->getString("/options/displayprofile/uri"); |
1789 | @@ -493,7 +490,7 @@ |
1790 | |
1791 | // zoom status spinbutton |
1792 | dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1); |
1793 | - gtk_tooltips_set_tip (dtw->tt, dtw->zoom_status, _("Zoom"), NULL); |
1794 | + gtk_widget_set_tooltip_text (dtw->zoom_status, _("Zoom")); |
1795 | gtk_widget_set_size_request (dtw->zoom_status, STATUS_ZOOM_WIDTH, -1); |
1796 | gtk_entry_set_width_chars (GTK_ENTRY (dtw->zoom_status), 6); |
1797 | gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (dtw->zoom_status), FALSE); |
1798 | @@ -513,7 +510,7 @@ |
1799 | gtk_table_attach(GTK_TABLE(dtw->coord_status), gtk_vseparator_new(), 0,1, 0,2, GTK_FILL, GTK_FILL, 0, 0); |
1800 | eventbox = gtk_event_box_new (); |
1801 | gtk_container_add (GTK_CONTAINER (eventbox), dtw->coord_status); |
1802 | - gtk_tooltips_set_tip (dtw->tt, eventbox, _("Cursor coordinates"), NULL); |
1803 | + gtk_widget_set_tooltip_text (eventbox, _("Cursor coordinates")); |
1804 | GtkWidget *label_x = gtk_label_new(_("X:")); |
1805 | gtk_misc_set_alignment (GTK_MISC(label_x), 0.0, 0.5); |
1806 | gtk_table_attach(GTK_TABLE(dtw->coord_status), label_x, 1,2, 0,1, GTK_FILL, GTK_FILL, 0, 0); |
1807 | @@ -1595,8 +1592,8 @@ |
1808 | } // children |
1809 | } // if aux_toolbox is a container |
1810 | |
1811 | - gtk_tooltips_set_tip(this->tt, this->hruler_box, gettext(sp_unit_get_plural (nv->doc_units)), NULL); |
1812 | - gtk_tooltips_set_tip(this->tt, this->vruler_box, gettext(sp_unit_get_plural (nv->doc_units)), NULL); |
1813 | + gtk_widget_set_tooltip_text(this->hruler_box, gettext(sp_unit_get_plural (nv->doc_units))); |
1814 | + gtk_widget_set_tooltip_text(this->vruler_box, gettext(sp_unit_get_plural (nv->doc_units))); |
1815 | |
1816 | sp_desktop_widget_update_rulers(this); |
1817 | ToolboxFactory::updateSnapToolbox(this->desktop, 0, this->snap_toolbox); |
1818 | |
1819 | === modified file 'src/widgets/desktop-widget.h' |
1820 | --- src/widgets/desktop-widget.h 2011-06-03 10:44:52 +0000 |
1821 | +++ src/widgets/desktop-widget.h 2011-06-05 13:32:27 +0000 |
1822 | @@ -69,8 +69,6 @@ |
1823 | |
1824 | sigc::connection modified_connection; |
1825 | |
1826 | - GtkTooltips *tt; |
1827 | - |
1828 | SPDesktop *desktop; |
1829 | |
1830 | Gtk::Window *window; |
1831 | |
1832 | === modified file 'src/widgets/gradient-selector.cpp' |
1833 | --- src/widgets/gradient-selector.cpp 2011-06-04 04:10:51 +0000 |
1834 | +++ src/widgets/gradient-selector.cpp 2011-06-05 13:32:27 +0000 |
1835 | @@ -133,7 +133,6 @@ |
1836 | GtkWidget *hb = gtk_hbox_new( FALSE, 0 ); |
1837 | sel->nonsolid.push_back(hb); |
1838 | gtk_box_pack_start( GTK_BOX(sel), hb, FALSE, FALSE, 0 ); |
1839 | - GtkTooltips *ttips = gtk_tooltips_new (); |
1840 | |
1841 | sel->add = gtk_button_new_with_label (_("Duplicate")); |
1842 | sel->nonsolid.push_back(sel->add); |
1843 | @@ -159,12 +158,12 @@ |
1844 | sel->nonsolid.push_back(sel->spread); |
1845 | gtk_widget_show(sel->spread); |
1846 | gtk_box_pack_end( GTK_BOX(hb), sel->spread, FALSE, FALSE, 0 ); |
1847 | - gtk_tooltips_set_tip( ttips, sel->spread, |
1848 | + gtk_widget_set_tooltip_text( sel->spread, |
1849 | // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute |
1850 | _("Whether to fill with flat color beyond the ends of the gradient vector " |
1851 | "(spreadMethod=\"pad\"), or repeat the gradient in the same direction " |
1852 | "(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite " |
1853 | - "directions (spreadMethod=\"reflect\")"), NULL); |
1854 | + "directions (spreadMethod=\"reflect\")")); |
1855 | |
1856 | GtkWidget *m = gtk_menu_new(); |
1857 | GtkWidget *mi = gtk_menu_item_new_with_label(_("none")); |
1858 | |
1859 | === modified file 'src/widgets/gradient-toolbar.cpp' |
1860 | --- src/widgets/gradient-toolbar.cpp 2011-06-04 02:45:55 +0000 |
1861 | +++ src/widgets/gradient-toolbar.cpp 2011-06-05 13:32:27 +0000 |
1862 | @@ -464,8 +464,6 @@ |
1863 | SPGradientSpread spr_selected = (SPGradientSpread) INT_MAX; // meaning undefined |
1864 | bool spr_multi = false; |
1865 | |
1866 | - GtkTooltips *tt = gtk_tooltips_new(); |
1867 | - |
1868 | gr_read_selection (selection, ev? ev->get_drag() : 0, gr_selected, gr_multi, spr_selected, spr_multi); |
1869 | |
1870 | GtkWidget *widget = gtk_hbox_new(FALSE, FALSE); |
1871 | @@ -484,7 +482,7 @@ |
1872 | { |
1873 | GtkWidget *hb = gtk_hbox_new(FALSE, 1); |
1874 | GtkWidget *b = gtk_button_new_with_label(_("Edit...")); |
1875 | - gtk_tooltips_set_tip(tt, b, _("Edit the stops of the gradient"), NULL); |
1876 | + gtk_widget_set_tooltip_text(b, _("Edit the stops of the gradient")); |
1877 | gtk_widget_show(b); |
1878 | gtk_container_add(GTK_CONTAINER(hb), b); |
1879 | gtk_signal_connect(GTK_OBJECT(b), "clicked", GTK_SIGNAL_FUNC(gr_edit), widget); |
1880 | @@ -542,8 +540,6 @@ |
1881 | gtk_object_set_data(GTK_OBJECT(tbl), "dtw", desktop->canvas); |
1882 | gtk_object_set_data(GTK_OBJECT(tbl), "desktop", desktop); |
1883 | |
1884 | - GtkTooltips *tt = gtk_tooltips_new(); |
1885 | - |
1886 | sp_toolbox_add_label(tbl, _("<b>New:</b>")); |
1887 | |
1888 | // TODO replace aux_toolbox_space(tbl, AUX_SPACING); |
1889 | @@ -557,8 +553,7 @@ |
1890 | SP_BUTTON_TYPE_TOGGLE, |
1891 | NULL, |
1892 | INKSCAPE_ICON_PAINT_GRADIENT_LINEAR, |
1893 | - _("Create linear gradient"), |
1894 | - tt); |
1895 | + _("Create linear gradient") ); |
1896 | g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (gr_toggle_type), tbl); |
1897 | g_object_set_data(G_OBJECT(tbl), "linear", button); |
1898 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), |
1899 | @@ -571,8 +566,7 @@ |
1900 | SP_BUTTON_TYPE_TOGGLE, |
1901 | NULL, |
1902 | INKSCAPE_ICON_PAINT_GRADIENT_RADIAL, |
1903 | - _("Create radial (elliptic or circular) gradient"), |
1904 | - tt); |
1905 | + _("Create radial (elliptic or circular) gradient")); |
1906 | g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (gr_toggle_type), tbl); |
1907 | g_object_set_data(G_OBJECT(tbl), "radial", button); |
1908 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), |
1909 | @@ -599,8 +593,7 @@ |
1910 | SP_BUTTON_TYPE_TOGGLE, |
1911 | NULL, |
1912 | INKSCAPE_ICON_OBJECT_FILL, |
1913 | - _("Create gradient in the fill"), |
1914 | - tt); |
1915 | + _("Create gradient in the fill")); |
1916 | g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (gr_toggle_fillstroke), tbl); |
1917 | g_object_set_data(G_OBJECT(tbl), "fill", button); |
1918 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), |
1919 | @@ -613,8 +606,7 @@ |
1920 | SP_BUTTON_TYPE_TOGGLE, |
1921 | NULL, |
1922 | INKSCAPE_ICON_OBJECT_STROKE, |
1923 | - _("Create gradient in the stroke"), |
1924 | - tt); |
1925 | + _("Create gradient in the stroke")); |
1926 | g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (gr_toggle_fillstroke), tbl); |
1927 | g_object_set_data(G_OBJECT(tbl), "stroke", button); |
1928 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), |
1929 | |
1930 | === modified file 'src/widgets/gradient-vector.cpp' |
1931 | --- src/widgets/gradient-vector.cpp 2011-06-04 02:45:55 +0000 |
1932 | +++ src/widgets/gradient-vector.cpp 2011-06-05 13:32:27 +0000 |
1933 | @@ -788,7 +788,6 @@ |
1934 | gtk_box_pack_start(GTK_BOX(vb), w, TRUE, TRUE, PAD); |
1935 | |
1936 | sp_repr_add_listener(gradient->getRepr(), &grad_edit_dia_repr_events, vb); |
1937 | - GtkTooltips *tt = gtk_tooltips_new(); |
1938 | |
1939 | /* Stop list */ |
1940 | GtkWidget *mnu = gtk_option_menu_new(); |
1941 | @@ -805,12 +804,12 @@ |
1942 | GtkWidget *b = gtk_button_new_with_label(_("Add stop")); |
1943 | gtk_widget_show(b); |
1944 | gtk_container_add(GTK_CONTAINER(hb), b); |
1945 | - gtk_tooltips_set_tip(tt, b, _("Add another control stop to gradient"), NULL); |
1946 | + gtk_widget_set_tooltip_text(b, _("Add another control stop to gradient")); |
1947 | gtk_signal_connect(GTK_OBJECT(b), "clicked", GTK_SIGNAL_FUNC(sp_grd_ed_add_stop), vb); |
1948 | b = gtk_button_new_with_label(_("Delete stop")); |
1949 | gtk_widget_show(b); |
1950 | gtk_container_add(GTK_CONTAINER(hb), b); |
1951 | - gtk_tooltips_set_tip(tt, b, _("Delete current control stop from gradient"), NULL); |
1952 | + gtk_widget_set_tooltip_text(b, _("Delete current control stop from gradient")); |
1953 | gtk_signal_connect(GTK_OBJECT(b), "clicked", GTK_SIGNAL_FUNC(sp_grd_ed_del_stop), vb); |
1954 | |
1955 | gtk_widget_show(hb); |
1956 | |
1957 | === modified file 'src/widgets/paint-selector.cpp' |
1958 | --- src/widgets/paint-selector.cpp 2011-06-03 10:44:52 +0000 |
1959 | +++ src/widgets/paint-selector.cpp 2011-06-05 13:32:27 +0000 |
1960 | @@ -71,7 +71,7 @@ |
1961 | static void sp_paint_selector_init(SPPaintSelector *slider); |
1962 | static void sp_paint_selector_destroy(GtkObject *object); |
1963 | |
1964 | -static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel, gchar const *px, SPPaintSelector::Mode mode, GtkTooltips *tt, gchar const *tip); |
1965 | +static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel, gchar const *px, SPPaintSelector::Mode mode, gchar const *tip); |
1966 | static void sp_paint_selector_style_button_toggled(GtkToggleButton *tb, SPPaintSelector *psel); |
1967 | static void sp_paint_selector_fillrule_toggled(GtkToggleButton *tb, SPPaintSelector *psel); |
1968 | |
1969 | @@ -210,8 +210,6 @@ |
1970 | static void |
1971 | sp_paint_selector_init(SPPaintSelector *psel) |
1972 | { |
1973 | - GtkTooltips *tt = gtk_tooltips_new(); |
1974 | - |
1975 | psel->mode = static_cast<SPPaintSelector::Mode>(-1); // huh? do you mean 0xff? -- I think this means "not in the enum" |
1976 | |
1977 | /* Paint style button box */ |
1978 | @@ -222,19 +220,19 @@ |
1979 | |
1980 | /* Buttons */ |
1981 | psel->none = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_NONE, |
1982 | - SPPaintSelector::MODE_NONE, tt, _("No paint")); |
1983 | + SPPaintSelector::MODE_NONE, _("No paint")); |
1984 | psel->solid = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_SOLID, |
1985 | - SPPaintSelector::MODE_COLOR_RGB, tt, _("Flat color")); |
1986 | + SPPaintSelector::MODE_COLOR_RGB, _("Flat color")); |
1987 | psel->gradient = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_GRADIENT_LINEAR, |
1988 | - SPPaintSelector::MODE_GRADIENT_LINEAR, tt, _("Linear gradient")); |
1989 | + SPPaintSelector::MODE_GRADIENT_LINEAR, _("Linear gradient")); |
1990 | psel->radial = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_GRADIENT_RADIAL, |
1991 | - SPPaintSelector::MODE_GRADIENT_RADIAL, tt, _("Radial gradient")); |
1992 | + SPPaintSelector::MODE_GRADIENT_RADIAL, _("Radial gradient")); |
1993 | psel->pattern = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_PATTERN, |
1994 | - SPPaintSelector::MODE_PATTERN, tt, _("Pattern")); |
1995 | + SPPaintSelector::MODE_PATTERN, _("Pattern")); |
1996 | psel->swatch = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_SWATCH, |
1997 | - SPPaintSelector::MODE_SWATCH, tt, _("Swatch")); |
1998 | + SPPaintSelector::MODE_SWATCH, _("Swatch")); |
1999 | psel->unset = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_UNKNOWN, |
2000 | - SPPaintSelector::MODE_UNSET, tt, _("Unset paint (make it undefined so it can be inherited)")); |
2001 | + SPPaintSelector::MODE_UNSET, _("Unset paint (make it undefined so it can be inherited)")); |
2002 | |
2003 | /* Fillrule */ |
2004 | { |
2005 | @@ -246,7 +244,7 @@ |
2006 | gtk_button_set_relief(GTK_BUTTON(psel->evenodd), GTK_RELIEF_NONE); |
2007 | gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(psel->evenodd), FALSE); |
2008 | // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty |
2009 | - gtk_tooltips_set_tip(tt, psel->evenodd, _("Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)"), NULL); |
2010 | + gtk_widget_set_tooltip_text(psel->evenodd, _("Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)")); |
2011 | gtk_object_set_data(GTK_OBJECT(psel->evenodd), "mode", GUINT_TO_POINTER(SPPaintSelector::FILLRULE_EVENODD)); |
2012 | w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_FILL_RULE_EVEN_ODD); |
2013 | gtk_container_add(GTK_CONTAINER(psel->evenodd), w); |
2014 | @@ -257,7 +255,7 @@ |
2015 | gtk_button_set_relief(GTK_BUTTON(psel->nonzero), GTK_RELIEF_NONE); |
2016 | gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(psel->nonzero), FALSE); |
2017 | // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty |
2018 | - gtk_tooltips_set_tip(tt, psel->nonzero, _("Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)"), NULL); |
2019 | + gtk_widget_set_tooltip_text(psel->nonzero, _("Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)")); |
2020 | gtk_object_set_data(GTK_OBJECT(psel->nonzero), "mode", GUINT_TO_POINTER(SPPaintSelector::FILLRULE_NONZERO)); |
2021 | w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_FILL_RULE_NONZERO); |
2022 | gtk_container_add(GTK_CONTAINER(psel->nonzero), w); |
2023 | @@ -290,12 +288,12 @@ |
2024 | |
2025 | static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel, |
2026 | gchar const *pixmap, SPPaintSelector::Mode mode, |
2027 | - GtkTooltips *tt, gchar const *tip) |
2028 | + gchar const *tip) |
2029 | { |
2030 | GtkWidget *b, *w; |
2031 | |
2032 | b = gtk_toggle_button_new(); |
2033 | - gtk_tooltips_set_tip(tt, b, tip, NULL); |
2034 | + gtk_widget_set_tooltip_text(b, tip); |
2035 | gtk_widget_show(b); |
2036 | |
2037 | gtk_container_set_border_width(GTK_CONTAINER(b), 0); |
2038 | |
2039 | === modified file 'src/widgets/sp-color-icc-selector.cpp' |
2040 | --- src/widgets/sp-color-icc-selector.cpp 2011-06-04 04:10:51 +0000 |
2041 | +++ src/widgets/sp-color-icc-selector.cpp 2011-06-05 13:32:27 +0000 |
2042 | @@ -137,8 +137,7 @@ |
2043 | _fooMap(0), |
2044 | _adj(0), |
2045 | _sbtn(0), |
2046 | - _label(0), |
2047 | - _tt(0) |
2048 | + _label(0) |
2049 | #if ENABLE_LCMS |
2050 | , |
2051 | _profileName(""), |
2052 | @@ -270,8 +269,6 @@ |
2053 | _updating = FALSE; |
2054 | _dragging = FALSE; |
2055 | |
2056 | - _tt = gtk_tooltips_new(); |
2057 | - |
2058 | t = gtk_table_new (5, 3, FALSE); |
2059 | gtk_widget_show (t); |
2060 | gtk_box_pack_start (GTK_BOX (_csel), t, TRUE, TRUE, 0); |
2061 | @@ -290,7 +287,7 @@ |
2062 | _fixupBtn = gtk_button_new_with_label(_("Fix")); |
2063 | g_signal_connect( G_OBJECT(_fixupBtn), "clicked", G_CALLBACK(_fixupHit), (gpointer)this ); |
2064 | gtk_widget_set_sensitive( _fixupBtn, FALSE ); |
2065 | - gtk_tooltips_set_tip( _tt, _fixupBtn, _("Fix RGB fallback to match icc-color() value."), NULL ); |
2066 | + gtk_widget_set_tooltip_text( _fixupBtn, _("Fix RGB fallback to match icc-color() value.") ); |
2067 | //gtk_misc_set_alignment( GTK_MISC (_fixupBtn), 1.0, 0.5 ); |
2068 | gtk_widget_show( _fixupBtn ); |
2069 | gtk_table_attach( GTK_TABLE (t), _fixupBtn, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD ); |
2070 | @@ -338,18 +335,18 @@ |
2071 | /* Slider */ |
2072 | _fooSlider[i] = sp_color_slider_new( _fooAdj[i] ); |
2073 | #if ENABLE_LCMS |
2074 | - gtk_tooltips_set_tip( _tt, _fooSlider[i], tips[i], NULL ); |
2075 | + gtk_widget_set_tooltip_text( _fooSlider[i], tips[i] ); |
2076 | #else |
2077 | - gtk_tooltips_set_tip( _tt, _fooSlider[i], ".", NULL ); |
2078 | + gtk_widget_set_tooltip_text( _fooSlider[i], "." ); |
2079 | #endif // ENABLE_LCMS |
2080 | gtk_widget_show( _fooSlider[i] ); |
2081 | gtk_table_attach( GTK_TABLE (t), _fooSlider[i], 1, 2, row, row + 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)GTK_FILL, XPAD, YPAD ); |
2082 | |
2083 | _fooBtn[i] = gtk_spin_button_new( _fooAdj[i], step, digits ); |
2084 | #if ENABLE_LCMS |
2085 | - gtk_tooltips_set_tip( _tt, _fooBtn[i], tips[i], NULL ); |
2086 | + gtk_widget_set_tooltip_text( _fooBtn[i], tips[i] ); |
2087 | #else |
2088 | - gtk_tooltips_set_tip( _tt, _fooBtn[i], ".", NULL ); |
2089 | + gtk_widget_set_tooltip_text( _fooBtn[i], "." ); |
2090 | #endif // ENABLE_LCMS |
2091 | sp_dialog_defocus_on_enter( _fooBtn[i] ); |
2092 | gtk_label_set_mnemonic_widget( GTK_LABEL(_fooLabel[i]), _fooBtn[i] ); |
2093 | @@ -381,7 +378,7 @@ |
2094 | |
2095 | /* Slider */ |
2096 | _slider = sp_color_slider_new (_adj); |
2097 | - gtk_tooltips_set_tip (_tt, _slider, _("Alpha (opacity)"), NULL); |
2098 | + gtk_widget_set_tooltip_text (_slider, _("Alpha (opacity)")); |
2099 | gtk_widget_show (_slider); |
2100 | gtk_table_attach (GTK_TABLE (t), _slider, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)GTK_FILL, XPAD, YPAD); |
2101 | |
2102 | @@ -393,7 +390,7 @@ |
2103 | |
2104 | /* Spinbutton */ |
2105 | _sbtn = gtk_spin_button_new (GTK_ADJUSTMENT (_adj), 1.0, 0); |
2106 | - gtk_tooltips_set_tip (_tt, _sbtn, _("Alpha (opacity)"), NULL); |
2107 | + gtk_widget_set_tooltip_text (_sbtn, _("Alpha (opacity)")); |
2108 | sp_dialog_defocus_on_enter (_sbtn); |
2109 | gtk_label_set_mnemonic_widget (GTK_LABEL(_label), _sbtn); |
2110 | gtk_widget_show (_sbtn); |
2111 | @@ -694,8 +691,8 @@ |
2112 | for ( guint i = 0; i < _profChannelCount; i++ ) { |
2113 | gtk_label_set_text_with_mnemonic( GTK_LABEL(_fooLabel[i]), names[i]); |
2114 | |
2115 | - gtk_tooltips_set_tip( _tt, _fooSlider[i], tips[i], NULL ); |
2116 | - gtk_tooltips_set_tip( _tt, _fooBtn[i], tips[i], NULL ); |
2117 | + gtk_widget_set_tooltip_text( _fooSlider[i], tips[i] ); |
2118 | + gtk_widget_set_tooltip_text( _fooBtn[i], tips[i] ); |
2119 | |
2120 | sp_color_slider_set_colors( SP_COLOR_SLIDER(_fooSlider[i]), |
2121 | SPColor(0.0, 0.0, 0.0).toRGBA32(0xff), |
2122 | |
2123 | === modified file 'src/widgets/sp-color-icc-selector.h' |
2124 | --- src/widgets/sp-color-icc-selector.h 2011-06-03 10:44:52 +0000 |
2125 | +++ src/widgets/sp-color-icc-selector.h 2011-06-05 13:32:27 +0000 |
2126 | @@ -66,8 +66,6 @@ |
2127 | GtkWidget* _sbtn; /* Spinbutton */ |
2128 | GtkWidget* _label; /* Label */ |
2129 | |
2130 | - GtkTooltips* _tt; /* tooltip container */ |
2131 | - |
2132 | #if ENABLE_LCMS |
2133 | std::string _profileName; |
2134 | Inkscape::ColorProfile* _prof; |
2135 | |
2136 | === modified file 'src/widgets/sp-color-notebook.cpp' |
2137 | --- src/widgets/sp-color-notebook.cpp 2011-02-27 20:48:16 +0000 |
2138 | +++ src/widgets/sp-color-notebook.cpp 2011-06-05 13:32:27 +0000 |
2139 | @@ -203,8 +203,6 @@ |
2140 | GType *selector_types = 0; |
2141 | guint selector_type_count = 0; |
2142 | |
2143 | - GtkTooltips *tt = gtk_tooltips_new (); |
2144 | - |
2145 | /* tempory hardcoding to get types loaded */ |
2146 | SP_TYPE_COLOR_SCALES; |
2147 | SP_TYPE_COLOR_WHEEL_SELECTOR; |
2148 | @@ -336,24 +334,21 @@ |
2149 | _box_colormanaged = gtk_event_box_new (); |
2150 | GtkWidget *colormanaged = gtk_image_new_from_icon_name ("color-management-icon", GTK_ICON_SIZE_SMALL_TOOLBAR); |
2151 | gtk_container_add (GTK_CONTAINER (_box_colormanaged), colormanaged); |
2152 | - GtkTooltips *tooltips_colormanaged = gtk_tooltips_new (); |
2153 | - gtk_tooltips_set_tip (tooltips_colormanaged, _box_colormanaged, _("Color Managed"), ""); |
2154 | + gtk_widget_set_tooltip_text (_box_colormanaged, _("Color Managed")); |
2155 | gtk_widget_set_sensitive (_box_colormanaged, false); |
2156 | gtk_box_pack_start(GTK_BOX(rgbabox), _box_colormanaged, FALSE, FALSE, 2); |
2157 | |
2158 | _box_outofgamut = gtk_event_box_new (); |
2159 | GtkWidget *outofgamut = gtk_image_new_from_icon_name ("out-of-gamut-icon", GTK_ICON_SIZE_SMALL_TOOLBAR); |
2160 | gtk_container_add (GTK_CONTAINER (_box_outofgamut), outofgamut); |
2161 | - GtkTooltips *tooltips_outofgamut = gtk_tooltips_new (); |
2162 | - gtk_tooltips_set_tip (tooltips_outofgamut, _box_outofgamut, _("Out of gamut!"), ""); |
2163 | + gtk_widget_set_tooltip_text (_box_outofgamut, _("Out of gamut!")); |
2164 | gtk_widget_set_sensitive (_box_outofgamut, false); |
2165 | gtk_box_pack_start(GTK_BOX(rgbabox), _box_outofgamut, FALSE, FALSE, 2); |
2166 | |
2167 | _box_toomuchink = gtk_event_box_new (); |
2168 | GtkWidget *toomuchink = gtk_image_new_from_icon_name ("too-much-ink-icon", GTK_ICON_SIZE_SMALL_TOOLBAR); |
2169 | gtk_container_add (GTK_CONTAINER (_box_toomuchink), toomuchink); |
2170 | - GtkTooltips *tooltips_toomuchink = gtk_tooltips_new (); |
2171 | - gtk_tooltips_set_tip (tooltips_toomuchink, _box_toomuchink, _("Too much ink!"), ""); |
2172 | + gtk_widget_set_tooltip_text (_box_toomuchink, _("Too much ink!")); |
2173 | gtk_widget_set_sensitive (_box_toomuchink, false); |
2174 | gtk_box_pack_start(GTK_BOX(rgbabox), _box_toomuchink, FALSE, FALSE, 2); |
2175 | |
2176 | @@ -368,7 +363,7 @@ |
2177 | sp_dialog_defocus_on_enter (_rgbae); |
2178 | gtk_entry_set_max_length (GTK_ENTRY (_rgbae), 8); |
2179 | gtk_entry_set_width_chars (GTK_ENTRY (_rgbae), 8); |
2180 | - gtk_tooltips_set_tip (tt, _rgbae, _("Hexadecimal RGBA value of the color"), NULL); |
2181 | + gtk_widget_set_tooltip_text (_rgbae, _("Hexadecimal RGBA value of the color")); |
2182 | gtk_box_pack_start(GTK_BOX(rgbabox), _rgbae, FALSE, FALSE, 0); |
2183 | gtk_label_set_mnemonic_widget (GTK_LABEL(_rgbal), _rgbae); |
2184 | |
2185 | |
2186 | === modified file 'src/widgets/sp-color-scales.cpp' |
2187 | --- src/widgets/sp-color-scales.cpp 2010-10-25 08:10:59 +0000 |
2188 | +++ src/widgets/sp-color-scales.cpp 2011-06-05 13:32:27 +0000 |
2189 | @@ -140,8 +140,6 @@ |
2190 | _updating = FALSE; |
2191 | _dragging = FALSE; |
2192 | |
2193 | - _tt = gtk_tooltips_new(); |
2194 | - |
2195 | t = gtk_table_new (5, 3, FALSE); |
2196 | gtk_widget_show (t); |
2197 | gtk_box_pack_start (GTK_BOX (_csel), t, TRUE, TRUE, 0); |
2198 | @@ -402,17 +400,17 @@ |
2199 | case SP_COLOR_SCALES_MODE_RGB: |
2200 | _setRangeLimit(255.0); |
2201 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_R:")); |
2202 | - gtk_tooltips_set_tip (_tt, _s[0], _("Red"), NULL); |
2203 | - gtk_tooltips_set_tip (_tt, _b[0], _("Red"), NULL); |
2204 | + gtk_widget_set_tooltip_text (_s[0], _("Red")); |
2205 | + gtk_widget_set_tooltip_text (_b[0], _("Red")); |
2206 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_G:")); |
2207 | - gtk_tooltips_set_tip (_tt, _s[1], _("Green"), NULL); |
2208 | - gtk_tooltips_set_tip (_tt, _b[1], _("Green"), NULL); |
2209 | + gtk_widget_set_tooltip_text (_s[1], _("Green")); |
2210 | + gtk_widget_set_tooltip_text (_b[1], _("Green")); |
2211 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_B:")); |
2212 | - gtk_tooltips_set_tip (_tt, _s[2], _("Blue"), NULL); |
2213 | - gtk_tooltips_set_tip (_tt, _b[2], _("Blue"), NULL); |
2214 | + gtk_widget_set_tooltip_text (_s[2], _("Blue")); |
2215 | + gtk_widget_set_tooltip_text (_b[2], _("Blue")); |
2216 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:")); |
2217 | - gtk_tooltips_set_tip (_tt, _s[3], _("Alpha (opacity)"), NULL); |
2218 | - gtk_tooltips_set_tip (_tt, _b[3], _("Alpha (opacity)"), NULL); |
2219 | + gtk_widget_set_tooltip_text (_s[3], _("Alpha (opacity)")); |
2220 | + gtk_widget_set_tooltip_text (_b[3], _("Alpha (opacity)")); |
2221 | sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), NULL); |
2222 | gtk_widget_hide (_l[4]); |
2223 | gtk_widget_hide (_s[4]); |
2224 | @@ -428,17 +426,17 @@ |
2225 | case SP_COLOR_SCALES_MODE_HSV: |
2226 | _setRangeLimit(255.0); |
2227 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_H:")); |
2228 | - gtk_tooltips_set_tip (_tt, _s[0], _("Hue"), NULL); |
2229 | - gtk_tooltips_set_tip (_tt, _b[0], _("Hue"), NULL); |
2230 | + gtk_widget_set_tooltip_text (_s[0], _("Hue")); |
2231 | + gtk_widget_set_tooltip_text (_b[0], _("Hue")); |
2232 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_S:")); |
2233 | - gtk_tooltips_set_tip (_tt, _s[1], _("Saturation"), NULL); |
2234 | - gtk_tooltips_set_tip (_tt, _b[1], _("Saturation"), NULL); |
2235 | + gtk_widget_set_tooltip_text (_s[1], _("Saturation")); |
2236 | + gtk_widget_set_tooltip_text (_b[1], _("Saturation")); |
2237 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_L:")); |
2238 | - gtk_tooltips_set_tip (_tt, _s[2], _("Lightness"), NULL); |
2239 | - gtk_tooltips_set_tip (_tt, _b[2], _("Lightness"), NULL); |
2240 | + gtk_widget_set_tooltip_text (_s[2], _("Lightness")); |
2241 | + gtk_widget_set_tooltip_text (_b[2], _("Lightness")); |
2242 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:")); |
2243 | - gtk_tooltips_set_tip (_tt, _s[3], _("Alpha (opacity)"), NULL); |
2244 | - gtk_tooltips_set_tip (_tt, _b[3], _("Alpha (opacity)"), NULL); |
2245 | + gtk_widget_set_tooltip_text (_s[3], _("Alpha (opacity)")); |
2246 | + gtk_widget_set_tooltip_text (_b[3], _("Alpha (opacity)")); |
2247 | sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), (guchar*)sp_color_scales_hue_map ()); |
2248 | gtk_widget_hide (_l[4]); |
2249 | gtk_widget_hide (_s[4]); |
2250 | @@ -456,20 +454,20 @@ |
2251 | case SP_COLOR_SCALES_MODE_CMYK: |
2252 | _setRangeLimit(100.0); |
2253 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_C:")); |
2254 | - gtk_tooltips_set_tip (_tt, _s[0], _("Cyan"), NULL); |
2255 | - gtk_tooltips_set_tip (_tt, _b[0], _("Cyan"), NULL); |
2256 | + gtk_widget_set_tooltip_text (_s[0], _("Cyan")); |
2257 | + gtk_widget_set_tooltip_text (_b[0], _("Cyan")); |
2258 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_M:")); |
2259 | - gtk_tooltips_set_tip (_tt, _s[1], _("Magenta"), NULL); |
2260 | - gtk_tooltips_set_tip (_tt, _b[1], _("Magenta"), NULL); |
2261 | + gtk_widget_set_tooltip_text (_s[1], _("Magenta")); |
2262 | + gtk_widget_set_tooltip_text (_b[1], _("Magenta")); |
2263 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_Y:")); |
2264 | - gtk_tooltips_set_tip (_tt, _s[2], _("Yellow"), NULL); |
2265 | - gtk_tooltips_set_tip (_tt, _b[2], _("Yellow"), NULL); |
2266 | + gtk_widget_set_tooltip_text (_s[2], _("Yellow")); |
2267 | + gtk_widget_set_tooltip_text (_b[2], _("Yellow")); |
2268 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_K:")); |
2269 | - gtk_tooltips_set_tip (_tt, _s[3], _("Black"), NULL); |
2270 | - gtk_tooltips_set_tip (_tt, _b[3], _("Black"), NULL); |
2271 | + gtk_widget_set_tooltip_text (_s[3], _("Black")); |
2272 | + gtk_widget_set_tooltip_text (_b[3], _("Black")); |
2273 | gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[4]), _("_A:")); |
2274 | - gtk_tooltips_set_tip (_tt, _s[4], _("Alpha (opacity)"), NULL); |
2275 | - gtk_tooltips_set_tip (_tt, _b[4], _("Alpha (opacity)"), NULL); |
2276 | + gtk_widget_set_tooltip_text (_s[4], _("Alpha (opacity)")); |
2277 | + gtk_widget_set_tooltip_text (_b[4], _("Alpha (opacity)")); |
2278 | sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), NULL); |
2279 | gtk_widget_show (_l[4]); |
2280 | gtk_widget_show (_s[4]); |
2281 | |
2282 | === modified file 'src/widgets/sp-color-scales.h' |
2283 | --- src/widgets/sp-color-scales.h 2011-06-03 10:44:52 +0000 |
2284 | +++ src/widgets/sp-color-scales.h 2011-06-05 13:32:27 +0000 |
2285 | @@ -65,8 +65,6 @@ |
2286 | GtkWidget *_b[5]; /* Spinbuttons */ |
2287 | GtkWidget *_l[5]; /* Labels */ |
2288 | |
2289 | - GtkTooltips *_tt; /* tooltip container */ |
2290 | - |
2291 | private: |
2292 | // By default, disallow copy constructor and assignment operator |
2293 | ColorScales(ColorScales const &obj); |
2294 | |
2295 | === modified file 'src/widgets/sp-color-wheel-selector.cpp' |
2296 | --- src/widgets/sp-color-wheel-selector.cpp 2011-06-03 10:44:52 +0000 |
2297 | +++ src/widgets/sp-color-wheel-selector.cpp 2011-06-05 13:32:27 +0000 |
2298 | @@ -152,8 +152,6 @@ |
2299 | _updating = FALSE; |
2300 | _dragging = FALSE; |
2301 | |
2302 | - _tt = gtk_tooltips_new(); |
2303 | - |
2304 | t = gtk_table_new (5, 3, FALSE); |
2305 | gtk_widget_show (t); |
2306 | gtk_box_pack_start (GTK_BOX (_csel), t, TRUE, TRUE, 0); |
2307 | @@ -179,7 +177,7 @@ |
2308 | |
2309 | /* Slider */ |
2310 | _slider = sp_color_slider_new (_adj); |
2311 | - gtk_tooltips_set_tip (_tt, _slider, _("Alpha (opacity)"), NULL); |
2312 | + gtk_widget_set_tooltip_text (_slider, _("Alpha (opacity)")); |
2313 | gtk_widget_show (_slider); |
2314 | gtk_table_attach (GTK_TABLE (t), _slider, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)GTK_FILL, XPAD, YPAD); |
2315 | |
2316 | @@ -191,7 +189,7 @@ |
2317 | |
2318 | /* Spinbutton */ |
2319 | _sbtn = gtk_spin_button_new (GTK_ADJUSTMENT (_adj), 1.0, 0); |
2320 | - gtk_tooltips_set_tip (_tt, _sbtn, _("Alpha (opacity)"), NULL); |
2321 | + gtk_widget_set_tooltip_text (_sbtn, _("Alpha (opacity)")); |
2322 | sp_dialog_defocus_on_enter (_sbtn); |
2323 | gtk_label_set_mnemonic_widget (GTK_LABEL(_label), _sbtn); |
2324 | gtk_widget_show (_sbtn); |
2325 | |
2326 | === modified file 'src/widgets/sp-color-wheel-selector.h' |
2327 | --- src/widgets/sp-color-wheel-selector.h 2011-06-03 10:44:52 +0000 |
2328 | +++ src/widgets/sp-color-wheel-selector.h 2011-06-05 13:32:27 +0000 |
2329 | @@ -44,8 +44,6 @@ |
2330 | GtkWidget* _sbtn; /* Spinbutton */ |
2331 | GtkWidget* _label; /* Label */ |
2332 | |
2333 | - GtkTooltips* _tt; /* tooltip container */ |
2334 | - |
2335 | private: |
2336 | // By default, disallow copy constructor and assignment operator |
2337 | ColorWheelSelector( const ColorWheelSelector& obj ); |
2338 | |
2339 | === modified file 'src/widgets/spw-utilities.cpp' |
2340 | --- src/widgets/spw-utilities.cpp 2010-12-23 17:52:29 +0000 |
2341 | +++ src/widgets/spw-utilities.cpp 2011-06-05 13:32:27 +0000 |
2342 | @@ -92,10 +92,8 @@ |
2343 | g_assert (dialog != NULL); |
2344 | g_assert (vbox != NULL); |
2345 | |
2346 | - GtkTooltips *tt = gtk_tooltips_new (); |
2347 | - |
2348 | GtkWidget *b = gtk_check_button_new_with_label (label); |
2349 | - gtk_tooltips_set_tip(tt, b, tip, NULL); |
2350 | + gtk_widget_set_tooltip_text(b, tip); |
2351 | g_assert (b != NULL); |
2352 | gtk_widget_show (b); |
2353 | gtk_box_pack_start (GTK_BOX (vbox), b, FALSE, FALSE, 0); |
2354 | |
2355 | === modified file 'src/widgets/toolbox.cpp' |
2356 | --- src/widgets/toolbox.cpp 2011-05-11 17:50:57 +0000 |
2357 | +++ src/widgets/toolbox.cpp 2011-06-05 13:32:27 +0000 |
2358 | @@ -548,11 +548,11 @@ |
2359 | |
2360 | static GtkWidget * sp_toolbox_button_new_from_verb_with_doubleclick( GtkWidget *t, Inkscape::IconSize size, SPButtonType type, |
2361 | Inkscape::Verb *verb, Inkscape::Verb *doubleclick_verb, |
2362 | - Inkscape::UI::View::View *view, GtkTooltips *tt); |
2363 | + Inkscape::UI::View::View *view); |
2364 | |
2365 | class VerbAction : public Gtk::Action { |
2366 | public: |
2367 | - static Glib::RefPtr<VerbAction> create(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view, GtkTooltips *tooltips); |
2368 | + static Glib::RefPtr<VerbAction> create(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view); |
2369 | |
2370 | virtual ~VerbAction(); |
2371 | virtual void set_active(bool active = true); |
2372 | @@ -570,31 +570,29 @@ |
2373 | Inkscape::Verb* verb; |
2374 | Inkscape::Verb* verb2; |
2375 | Inkscape::UI::View::View *view; |
2376 | - GtkTooltips *tooltips; |
2377 | bool active; |
2378 | |
2379 | - VerbAction(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view, GtkTooltips *tooltips); |
2380 | + VerbAction(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view); |
2381 | }; |
2382 | |
2383 | |
2384 | -Glib::RefPtr<VerbAction> VerbAction::create(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view, GtkTooltips *tooltips) |
2385 | +Glib::RefPtr<VerbAction> VerbAction::create(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view) |
2386 | { |
2387 | Glib::RefPtr<VerbAction> result; |
2388 | SPAction *action = verb->get_action(view); |
2389 | if ( action ) { |
2390 | //SPAction* action2 = verb2 ? verb2->get_action(view) : 0; |
2391 | - result = Glib::RefPtr<VerbAction>(new VerbAction(verb, verb2, view, tooltips)); |
2392 | + result = Glib::RefPtr<VerbAction>(new VerbAction(verb, verb2, view)); |
2393 | } |
2394 | |
2395 | return result; |
2396 | } |
2397 | |
2398 | -VerbAction::VerbAction(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view, GtkTooltips *tooltips) : |
2399 | +VerbAction::VerbAction(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view) : |
2400 | Gtk::Action(Glib::ustring(verb->get_id()), Gtk::StockID(verb->get_image()), Glib::ustring(_(verb->get_name())), Glib::ustring(_(verb->get_tip()))), |
2401 | verb(verb), |
2402 | verb2(verb2), |
2403 | view(view), |
2404 | - tooltips(tooltips), |
2405 | active(false) |
2406 | { |
2407 | } |
2408 | @@ -624,8 +622,7 @@ |
2409 | SP_BUTTON_TYPE_TOGGLE, |
2410 | verb, |
2411 | verb2, |
2412 | - view, |
2413 | - tooltips ); |
2414 | + view ); |
2415 | if ( active ) { |
2416 | sp_button_toggle_set_down( SP_BUTTON(button), active); |
2417 | } |
2418 | @@ -808,7 +805,7 @@ |
2419 | |
2420 | GtkWidget * sp_toolbox_button_new_from_verb_with_doubleclick(GtkWidget *t, Inkscape::IconSize size, SPButtonType type, |
2421 | Inkscape::Verb *verb, Inkscape::Verb *doubleclick_verb, |
2422 | - Inkscape::UI::View::View *view, GtkTooltips *tt) |
2423 | + Inkscape::UI::View::View *view) |
2424 | { |
2425 | SPAction *action = verb->get_action(view); |
2426 | if (!action) { |
2427 | @@ -824,7 +821,7 @@ |
2428 | |
2429 | /* fixme: Handle sensitive/unsensitive */ |
2430 | /* fixme: Implement sp_button_new_from_action */ |
2431 | - GtkWidget *b = sp_button_new(size, type, action, doubleclick_action, tt); |
2432 | + GtkWidget *b = sp_button_new(size, type, action, doubleclick_action); |
2433 | gtk_widget_show(b); |
2434 | |
2435 | |
2436 | @@ -959,9 +956,8 @@ |
2437 | } |
2438 | |
2439 | if ( !mainActions->get_action("ToolZoom") ) { |
2440 | - GtkTooltips *tt = gtk_tooltips_new(); |
2441 | for ( guint i = 0; i < G_N_ELEMENTS(tools) && tools[i].type_name; i++ ) { |
2442 | - Glib::RefPtr<VerbAction> va = VerbAction::create(Inkscape::Verb::get(tools[i].verb), Inkscape::Verb::get(tools[i].doubleclick_verb), view, tt); |
2443 | + Glib::RefPtr<VerbAction> va = VerbAction::create(Inkscape::Verb::get(tools[i].verb), Inkscape::Verb::get(tools[i].doubleclick_verb), view); |
2444 | if ( va ) { |
2445 | mainActions->add(va); |
2446 | if ( i == 0 ) { |