Merge lp:~michael-sheldon/jokosher/tooltip-deprecation into lp:jokosher
- tooltip-deprecation
- Merge into main
Proposed by
Michael Sheldon
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~michael-sheldon/jokosher/tooltip-deprecation |
Merge into: | lp:jokosher |
Diff against target: |
372 lines (+35/-63) 11 files modified
Jokosher/ControlsBox.py (+10/-16) Jokosher/EventViewer.py (+3/-5) Jokosher/InstrumentEffectsDialog.py (+1/-4) Jokosher/JokosherApp.py (+7/-12) Jokosher/MixerStrip.py (+2/-4) Jokosher/RecordingView.py (+3/-4) Jokosher/TimeLineBar.py (+3/-6) Jokosher/TimeView.py (+1/-2) Jokosher/Workspace.py (+2/-6) Jokosher/ui/StatusBar.py (+1/-1) extensions/eggs/FreesoundSearch/src/FreesoundSearch.py (+2/-3) |
To merge this branch: | bzr merge lp:~michael-sheldon/jokosher/tooltip-deprecation |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jokosher Code | Pending | ||
Review via email: mp+14868@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Jokosher/ControlsBox.py' |
2 | --- Jokosher/ControlsBox.py 2009-02-25 12:39:22 +0000 |
3 | +++ Jokosher/ControlsBox.py 2009-11-14 18:25:19 +0000 |
4 | @@ -53,19 +53,16 @@ |
5 | self.muteImgDisabled = Utils.GetIconThatMayBeMissing("stock_volume", gtk.ICON_SIZE_BUTTON, False) |
6 | self.muteImgEnabled = Utils.GetIconThatMayBeMissing("stock_volume-mute", gtk.ICON_SIZE_BUTTON, False) |
7 | |
8 | - self.recTip = gtk.Tooltips() |
9 | self.recButton = gtk.ToggleButton() |
10 | - self.recTip.set_tip(self.recButton, self.recTipEnabled, None) |
11 | + self.recButton.set_tooltip_text(self.recTipEnabled) |
12 | self.recButton.connect("toggled", self.OnArm) |
13 | |
14 | self.muteButton = gtk.ToggleButton() |
15 | self.muteButton.connect("toggled", self.OnMute) |
16 | - self.muteTip = gtk.Tooltips() |
17 | - self.muteTip.set_tip(self.muteButton, self.muteTipDisabled, None) |
18 | + self.muteButton.set_tooltip_text(self.muteTipDisabled) |
19 | |
20 | self.soloButton = gtk.ToggleButton() |
21 | - self.soloTip = gtk.Tooltips() |
22 | - self.soloTip.set_tip(self.soloButton, self.soloTipDisabled, None) |
23 | + self.soloButton.set_tooltip_text(self.soloTipDisabled) |
24 | self.soloButton.connect("toggled", self.OnSolo) |
25 | |
26 | self.add(self.recButton) |
27 | @@ -80,8 +77,7 @@ |
28 | self.effectsDialog = None #the instrument effects dialog (to make sure more than one is never opened) |
29 | |
30 | self.propsButton.connect("clicked", self.OnEffectsButtonClicked) |
31 | - self.propsTip = gtk.Tooltips() |
32 | - self.propsTip.set_tip(self.propsButton, _("Instrument Effects"), None) |
33 | + self.propsButton.set_tooltip_text(_("Instrument Effects")) |
34 | self.add(self.propsButton) |
35 | |
36 | self.instrument.connect("solo", self.OnInstrumentSolo) |
37 | @@ -139,18 +135,17 @@ |
38 | self.Updating = True |
39 | self.soloButton.set_active(self.instrument.isSolo) |
40 | self.Updating = False |
41 | - self.soloTip.enable() |
42 | |
43 | # update the solo button image and tooltip |
44 | image = gtk.Image() |
45 | if self.instrument.isSolo: |
46 | image.set_from_pixbuf(self.soloImgEnabled) |
47 | self.soloButton.set_image(image) |
48 | - self.soloTip.set_tip(self.soloButton, self.soloTipEnabled, None) |
49 | + self.soloButton.set_tooltip_text(self.soloTipEnabled) |
50 | else: |
51 | image.set_from_pixbuf(self.soloImgDisabled) |
52 | self.soloButton.set_image(image) |
53 | - self.soloTip.set_tip(self.soloButton, self.soloTipDisabled, None) |
54 | + self.soloButton.set_tooltip_text(self.soloTipDisabled) |
55 | |
56 | #_____________________________________________________________________ |
57 | |
58 | @@ -164,18 +159,17 @@ |
59 | self.Updating = True |
60 | self.recButton.set_active(self.instrument.isArmed) |
61 | self.Updating = False |
62 | - self.recTip.enable() |
63 | |
64 | # update the arm button image and tooltip |
65 | image = gtk.Image() |
66 | if self.instrument.isArmed: |
67 | image.set_from_pixbuf(self.recImgEnabled) |
68 | self.recButton.set_image(image) |
69 | - self.recTip.set_tip(self.recButton, self.recTipEnabled, None) |
70 | + self.recButton.set_tooltip_text(self.recTipEnabled) |
71 | else: |
72 | image.set_from_pixbuf(self.recImgDisabled) |
73 | self.recButton.set_image(image) |
74 | - self.recTip.set_tip(self.recButton, self.recTipDisabled, None) |
75 | + self.recButton.set_tooltip_text(self.recTipDisabled) |
76 | |
77 | #_____________________________________________________________________ |
78 | |
79 | @@ -195,11 +189,11 @@ |
80 | if self.instrument.actuallyIsMuted: |
81 | image.set_from_pixbuf(self.muteImgEnabled) |
82 | self.muteButton.set_image(image) |
83 | - self.muteTip.set_tip(self.muteButton, self.muteTipEnabled, None) |
84 | + self.muteButton.set_tooltip_text(self.muteTipEnabled) |
85 | else: |
86 | image.set_from_pixbuf(self.muteImgDisabled) |
87 | self.muteButton.set_image(image) |
88 | - self.muteTip.set_tip(self.muteButton, self.muteTipDisabled, None) |
89 | + self.muteButton.set_tooltip_text(self.muteTipDisabled) |
90 | |
91 | #______________________________________________________________________ |
92 | |
93 | |
94 | === modified file 'Jokosher/EventViewer.py' |
95 | --- Jokosher/EventViewer.py 2009-02-19 03:03:17 +0000 |
96 | +++ Jokosher/EventViewer.py 2009-11-14 18:25:19 +0000 |
97 | @@ -78,8 +78,6 @@ |
98 | """ |
99 | self.small = small |
100 | |
101 | - self.selectiontip = gtk.Tooltips() |
102 | - |
103 | gtk.DrawingArea.__init__(self) |
104 | |
105 | self.set_events(gtk.gdk.POINTER_MOTION_MASK | |
106 | @@ -150,7 +148,7 @@ |
107 | trimimg = gtk.Image() |
108 | trimimg.set_from_file(os.path.join(Globals.IMAGE_PATH, "icon_trim.png")) |
109 | trimButton.set_image(trimimg) |
110 | - self.selectiontip.set_tip(trimButton,_("Trim"),None) |
111 | + trimButton.set_tooltip_text(_("Trim")) |
112 | |
113 | self.drawer.add(trimButton) |
114 | trimButton.connect("clicked", self.TrimToSelection) |
115 | @@ -161,7 +159,7 @@ |
116 | delFPButton.set_image(delimg) |
117 | self.drawer.add(delFPButton) |
118 | delFPButton.connect("clicked", self.DeleteSelectedFadePoints) |
119 | - self.selectiontip.set_tip(delFPButton,_("Delete Fade Points"),None) |
120 | + delFPButton.set_tooltip_text(_("Delete Fade Points")) |
121 | |
122 | snapFPButton = gtk.Button() |
123 | snapimg = gtk.Image() |
124 | @@ -169,7 +167,7 @@ |
125 | snapFPButton.set_image(snapimg) |
126 | self.drawer.add(snapFPButton) |
127 | snapFPButton.connect("clicked", self.SnapSelectionToFadePoints) |
128 | - self.selectiontip.set_tip(snapFPButton,_("Snap To Fade Points"),None) |
129 | + snapFPButton.set_tooltip_text(_("Snap To Fade Points")) |
130 | |
131 | self.drawer.set_sensitive(not self.event.isLoading) |
132 | self.drawer.show() |
133 | |
134 | === modified file 'Jokosher/InstrumentEffectsDialog.py' |
135 | --- Jokosher/InstrumentEffectsDialog.py 2009-04-03 15:01:30 +0000 |
136 | +++ Jokosher/InstrumentEffectsDialog.py 2009-11-14 18:25:19 +0000 |
137 | @@ -679,9 +679,6 @@ |
138 | self.settingswindow.set_icon(self.windowIcon) |
139 | self.settingswindow.set_transient_for(self.window) |
140 | |
141 | - # tooltips object used to assign tooltips to the sliders |
142 | - tooltips = gtk.Tooltips() |
143 | - |
144 | # grab a list of properties from the effect |
145 | proplist = gobject.list_properties(self.instrument.effects[self.effectpos]) |
146 | |
147 | @@ -757,7 +754,7 @@ |
148 | hscale.set_digits(0) |
149 | |
150 | # add the slider to the settings table (with tooltips) |
151 | - tooltips.set_tip(self.sliderdict[property.name], property.blurb) |
152 | + self.sliderdict[property.name].set_tooltip_text(property.blurb) |
153 | self.settingstable.attach(self.sliderdict[property.name], 1, 2, count, count+1, gtk.FILL|gtk.EXPAND) |
154 | |
155 | count += 1 |
156 | |
157 | === modified file 'Jokosher/JokosherApp.py' |
158 | --- Jokosher/JokosherApp.py 2009-05-04 09:38:15 +0000 |
159 | +++ Jokosher/JokosherApp.py 2009-11-14 18:25:19 +0000 |
160 | @@ -70,9 +70,6 @@ |
161 | gtk.glade.bindtextdomain(Globals.LOCALE_APP, Globals.LOCALE_PATH) |
162 | gtk.glade.textdomain(Globals.LOCALE_APP) |
163 | |
164 | - # create tooltips object |
165 | - self.contextTooltips = gtk.Tooltips() |
166 | - |
167 | self.wTree = gtk.glade.XML(Globals.GLADE_PATH, "MainWindow") |
168 | |
169 | #Connect event handlers |
170 | @@ -179,7 +176,7 @@ |
171 | self.isPaused = False |
172 | |
173 | # Intialise context sensitive tooltips for workspace buttons |
174 | - self.compactMixButton.set_tooltip(self.contextTooltips, self.mixingViewDisabledTip, None) |
175 | + self.compactMixButton.set_tooltip_text(self.mixingViewDisabledTip) |
176 | |
177 | # set the window size to the last saved value |
178 | x = int(Globals.settings.general["windowwidth"]) |
179 | @@ -960,11 +957,11 @@ |
180 | |
181 | # update the tooltips depending on the current recording state |
182 | if self.isRecording: |
183 | - self.record.set_tooltip(self.contextTooltips, self.recTipEnabled, None) |
184 | - self.stop.set_tooltip(self.contextTooltips, self.recStopTipEnabled, None) |
185 | + self.record.set_tooltip_text(self.recTipEnabled) |
186 | + self.stop.set_tooltip_text(self.recStopTipEnabled) |
187 | else: |
188 | - self.record.set_tooltip(self.contextTooltips, self.recTipDisabled, None) |
189 | - self.stop.set_tooltip(self.contextTooltips, self.recStopTipDisabled, None) |
190 | + self.record.set_tooltip_text(self.recTipDisabled) |
191 | + self.stop.set_tooltip_text(self.recStopTipDisabled) |
192 | |
193 | self.workspace.mixView.StartUpdateTimeout() |
194 | |
195 | @@ -1087,10 +1084,9 @@ |
196 | self.recentprojectsmenu.remove(c) |
197 | |
198 | if self.recentprojectitems: |
199 | - tooltips = gtk.Tooltips() |
200 | for item in self.recentprojectitems: |
201 | mitem = gtk.MenuItem(item[1]) |
202 | - tooltips.set_tip(mitem, item[0], None) |
203 | + mitem.set_tooltip_text(item[0]) |
204 | self.recentprojectsmenu.append(mitem) |
205 | mitem.connect("activate", self.OnRecentProjectsItem, item[0], item[1]) |
206 | |
207 | @@ -1098,8 +1094,7 @@ |
208 | self.recentprojectsmenu.append(mitem) |
209 | |
210 | mitem = gtk.ImageMenuItem(gtk.STOCK_CLEAR) |
211 | - tooltips.set_tip(mitem, _("Clear the list of recent projects"), None) |
212 | - tooltips.force_window() |
213 | + mitem.set_tooltip_text(_("Clear the list of recent projects")) |
214 | self.recentprojectsmenu.append(mitem) |
215 | mitem.connect("activate", self.OnClearRecentProjects) |
216 | |
217 | |
218 | === modified file 'Jokosher/MixerStrip.py' |
219 | --- Jokosher/MixerStrip.py 2009-02-19 13:44:38 +0000 |
220 | +++ Jokosher/MixerStrip.py 2009-11-14 18:25:19 +0000 |
221 | @@ -60,8 +60,7 @@ |
222 | self.minbutt = gtk.Button() |
223 | img = gtk.image_new_from_stock(gtk.STOCK_GOTO_BOTTOM, gtk.ICON_SIZE_MENU) |
224 | self.minbutt.set_image(img) |
225 | - self.mintip = gtk.Tooltips() |
226 | - self.mintip.set_tip(self.minbutt, _("Minimize instrument"), None) |
227 | + self.minbutt.set_tooltip_text(_("Minimize instrument")) |
228 | self.minbutt.connect("clicked", self.EmitMinimise) |
229 | |
230 | self.vbox.pack_start(self.minbutt, False) |
231 | @@ -82,8 +81,7 @@ |
232 | self.pan.set_range(-1.0, 1.0) |
233 | self.pan.set_increments(0.1, 1.0) |
234 | self.pan.set_draw_value(False) |
235 | - self.pantip = gtk.Tooltips() |
236 | - self.pantip.set_tip(self.pan, _("Adjust instrument balance. Right-click to center"), None) |
237 | + self.pan.set_tooltip_text(_("Adjust instrument balance. Right-click to center")) |
238 | |
239 | if self.instrument.pan: |
240 | self.pan.set_value(self.instrument.pan) |
241 | |
242 | === modified file 'Jokosher/RecordingView.py' |
243 | --- Jokosher/RecordingView.py 2009-03-22 05:36:54 +0000 |
244 | +++ Jokosher/RecordingView.py 2009-11-14 18:25:19 +0000 |
245 | @@ -116,8 +116,7 @@ |
246 | self.zoomSlider.set_increments(0.2, 0.2) |
247 | self.zoomSlider.set_draw_value(False) |
248 | self.zoomSlider.set_value(self.project.viewScale) |
249 | - self.zoomtip = gtk.Tooltips() |
250 | - self.zoomtip.set_tip(self.zoomSlider, _("Zoom the timeline - Right-Click to reset to the default level"), None) |
251 | + self.zoomSlider.set_tooltip_text(_("Zoom the timeline - Right-Click to reset to the default level")) |
252 | |
253 | self.zoomSlider.connect("value-changed", self.OnZoom) |
254 | self.zoomSlider.connect("button-press-event", self.OnZoomReset) |
255 | @@ -126,14 +125,14 @@ |
256 | inimg = gtk.image_new_from_stock(gtk.STOCK_ZOOM_IN, gtk.ICON_SIZE_BUTTON) |
257 | self.inbutton.set_image(inimg) |
258 | self.inbutton.set_relief(gtk.RELIEF_NONE) |
259 | - self.zoomtip.set_tip(self.inbutton, _("Zoom in timeline"), None) |
260 | + self.inbutton.set_tooltip_text(_("Zoom in timeline")) |
261 | self.inbutton.connect("clicked", self.OnZoomIn) |
262 | |
263 | self.outbutton = gtk.Button() |
264 | outimg = gtk.image_new_from_stock(gtk.STOCK_ZOOM_OUT, gtk.ICON_SIZE_BUTTON) |
265 | self.outbutton.set_image(outimg) |
266 | self.outbutton.set_relief(gtk.RELIEF_NONE) |
267 | - self.zoomtip.set_tip(self.outbutton, _("Zoom out timeline"), None) |
268 | + self.outbutton.set_tooltip_text(_("Zoom out timeline")) |
269 | self.outbutton.connect("clicked", self.OnZoomOut) |
270 | |
271 | self.zoom_hb.pack_start( self.outbutton, False, False) |
272 | |
273 | === modified file 'Jokosher/TimeLineBar.py' |
274 | --- Jokosher/TimeLineBar.py 2009-03-23 01:35:26 +0000 |
275 | +++ Jokosher/TimeLineBar.py 2009-11-14 18:25:19 +0000 |
276 | @@ -60,13 +60,11 @@ |
277 | image_size_group.add_widget(self.clickbutton_metronome_image) |
278 | image_size_group.add_widget(self.clickbutton_volume_image) |
279 | |
280 | - self.clicktip = gtk.Tooltips() |
281 | - self.clicktip.set_tip(self.clickbutton, _("Adjust volume of click track"), None) |
282 | + self.clickbutton.set_tooltip_text(_("Adjust volume of click track")) |
283 | |
284 | self.bpmeventbox = gtk.EventBox() |
285 | self.bpmframe = gtk.Frame() |
286 | - self.bpmeventtip = gtk.Tooltips() |
287 | - self.bpmeventtip.set_tip(self.bpmeventbox, _("Beats per minute"), None) |
288 | + self.bpmeventbox.set_tooltip_text(_("Beats per minute")) |
289 | self.bpmframe.set_shadow_type(gtk.SHADOW_ETCHED_OUT) |
290 | |
291 | self.bpmlabel = gtk.Label() |
292 | @@ -85,8 +83,7 @@ |
293 | self.bpmedit.connect_after("button-release-event", self.OnEditBPMClick) |
294 | |
295 | self.sigeventbox = gtk.EventBox() |
296 | - self.sigeventtip = gtk.Tooltips() |
297 | - self.sigeventtip.set_tip(self.sigeventbox, _("Time signature"), None) |
298 | + self.sigeventbox.set_tooltip_text(_("Time signature")) |
299 | self.sigframe = gtk.Frame() |
300 | self.sigframe.set_shadow_type(gtk.SHADOW_ETCHED_OUT) |
301 | |
302 | |
303 | === modified file 'Jokosher/TimeView.py' |
304 | --- Jokosher/TimeView.py 2007-05-21 14:42:28 +0000 |
305 | +++ Jokosher/TimeView.py 2009-11-14 18:25:19 +0000 |
306 | @@ -46,8 +46,7 @@ |
307 | self.project.transport.connect("position", self.OnTransportPosition) |
308 | |
309 | self.UpdateTime() |
310 | - self.tmtip = gtk.Tooltips() |
311 | - self.tmtip.set_tip(self, _("Double click to change the time format"), None) |
312 | + self.set_tooltip_text(_("Double click to change the time format")) |
313 | |
314 | #_____________________________________________________________________ |
315 | |
316 | |
317 | === modified file 'Jokosher/Workspace.py' |
318 | --- Jokosher/Workspace.py 2009-03-02 22:06:09 +0000 |
319 | +++ Jokosher/Workspace.py 2009-11-14 18:25:19 +0000 |
320 | @@ -51,15 +51,11 @@ |
321 | if self.mainview.compactMixButton.get_active(): |
322 | self.recordingView.ChangeSize(True) |
323 | self.mixView.show() |
324 | - self.mainview.compactMixButton.set_tooltip( |
325 | - self.mainview.contextTooltips, |
326 | - self.mainview.mixingViewEnabledTip) |
327 | + self.mainview.compactMixButton.set_tooltip_text(self.mainview.mixingViewEnabledTip) |
328 | else: |
329 | self.recordingView.ChangeSize(False) |
330 | self.mixView.hide() |
331 | - self.mainview.compactMixButton.set_tooltip( |
332 | - self.mainview.contextTooltips, |
333 | - self.mainview.mixingViewDisabledTip) |
334 | + self.mainview.compactMixButton.set_tooltip_text(self.mainview.mixingViewDisabledTip) |
335 | #____________________________________________________________________ |
336 | |
337 | #========================================================================= |
338 | |
339 | === modified file 'Jokosher/ui/StatusBar.py' |
340 | --- Jokosher/ui/StatusBar.py 2009-03-28 22:16:23 +0000 |
341 | +++ Jokosher/ui/StatusBar.py 2009-11-14 18:25:19 +0000 |
342 | @@ -53,7 +53,7 @@ |
343 | Parameters: |
344 | message_id -- numerical id of the message to be removed from the StatusBar. |
345 | """ |
346 | - self.remove(0, message_id) |
347 | + self.remove_message(0, message_id) |
348 | self.label.set_use_markup(True) |
349 | |
350 | #_____________________________________________________________________ |
351 | |
352 | === modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.py' |
353 | --- extensions/eggs/FreesoundSearch/src/FreesoundSearch.py 2009-06-08 12:07:25 +0000 |
354 | +++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.py 2009-11-14 18:25:19 +0000 |
355 | @@ -187,16 +187,15 @@ |
356 | Parameters: |
357 | status -- True for Find, False for Stop. |
358 | """ |
359 | - tooltips = gtk.Tooltips() |
360 | |
361 | if status: |
362 | # change the icon to a search one |
363 | - tooltips.set_tip(self.buttonFind, _("Search the Freesound library")) |
364 | + self.buttonFind.set_tooltip_text(_("Search the Freesound library")) |
365 | self.buttonFind.set_label(_("Find")) |
366 | self.buttonFind.set_image(gtk.image_new_from_stock(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON)) |
367 | else: |
368 | # change the icon to a stop one |
369 | - tooltips.set_tip(self.buttonFind, _("Stop the current search")) |
370 | + self.buttonFind.set_tooltip_text(_("Stop the current search")) |
371 | self.buttonFind.set_label(_("Stop")) |
372 | self.buttonFind.set_image(gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_BUTTON)) |
373 |
These changes bring us in to line with the current best practice for GTK tooltips and prevents dozens of deprecation warnings being displayed by newer versions of pygtk.