Merge lp:~michael-sheldon/jokosher/tooltip-deprecation into lp:jokosher

[Michael Sheldon]

[Michael Sheldon (michael-sheldon)]

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.

=== modified file 'Jokosher/ControlsBox.py'
--- Jokosher/ControlsBox.py	2009-02-25 12:39:22 +0000
+++ Jokosher/ControlsBox.py	2009-11-14 18:25:19 +0000
@@ -53,19 +53,16 @@
 		self.muteImgDisabled = Utils.GetIconThatMayBeMissing("stock_volume", gtk.ICON_SIZE_BUTTON, False)
 		self.muteImgEnabled = Utils.GetIconThatMayBeMissing("stock_volume-mute", gtk.ICON_SIZE_BUTTON, False)
 		
-		self.recTip = gtk.Tooltips()
 		self.recButton = gtk.ToggleButton()
-		self.recTip.set_tip(self.recButton, self.recTipEnabled, None)
+		self.recButton.set_tooltip_text(self.recTipEnabled)
 		self.recButton.connect("toggled", self.OnArm)
 		
 		self.muteButton = gtk.ToggleButton()
 		self.muteButton.connect("toggled", self.OnMute)
-		self.muteTip = gtk.Tooltips()
-		self.muteTip.set_tip(self.muteButton, self.muteTipDisabled, None)
+		self.muteButton.set_tooltip_text(self.muteTipDisabled)
 		
 		self.soloButton = gtk.ToggleButton()
-		self.soloTip = gtk.Tooltips()
-		self.soloTip.set_tip(self.soloButton, self.soloTipDisabled, None)
+		self.soloButton.set_tooltip_text(self.soloTipDisabled)
 		self.soloButton.connect("toggled", self.OnSolo)
 		
 		self.add(self.recButton)
@@ -80,8 +77,7 @@
 			self.effectsDialog = None		#the instrument effects dialog (to make sure more than one is never opened)
 
 			self.propsButton.connect("clicked", self.OnEffectsButtonClicked)
-			self.propsTip = gtk.Tooltips()
-			self.propsTip.set_tip(self.propsButton, _("Instrument Effects"), None)
+			self.propsButton.set_tooltip_text(_("Instrument Effects"))
 			self.add(self.propsButton)
 		
 		self.instrument.connect("solo", self.OnInstrumentSolo)
@@ -139,18 +135,17 @@
 		self.Updating = True
 		self.soloButton.set_active(self.instrument.isSolo)
 		self.Updating = False
-		self.soloTip.enable()
 		
 		# update the solo button image and tooltip
 		image = gtk.Image()
 		if self.instrument.isSolo:
 			image.set_from_pixbuf(self.soloImgEnabled)
 			self.soloButton.set_image(image)
-			self.soloTip.set_tip(self.soloButton, self.soloTipEnabled, None)
+			self.soloButton.set_tooltip_text(self.soloTipEnabled)
 		else:
 			image.set_from_pixbuf(self.soloImgDisabled)
 			self.soloButton.set_image(image)
-			self.soloTip.set_tip(self.soloButton, self.soloTipDisabled, None)
+			self.soloButton.set_tooltip_text(self.soloTipDisabled)
 
 	#_____________________________________________________________________
 	
@@ -164,18 +159,17 @@
 		self.Updating = True
 		self.recButton.set_active(self.instrument.isArmed)
 		self.Updating = False
-		self.recTip.enable()
 		
 		# update the arm button image and tooltip	
 		image = gtk.Image()
 		if self.instrument.isArmed:
 			image.set_from_pixbuf(self.recImgEnabled)
 			self.recButton.set_image(image)
-			self.recTip.set_tip(self.recButton, self.recTipEnabled, None)
+			self.recButton.set_tooltip_text(self.recTipEnabled)
 		else:
 			image.set_from_pixbuf(self.recImgDisabled)
 			self.recButton.set_image(image)
-			self.recTip.set_tip(self.recButton, self.recTipDisabled, None)
+			self.recButton.set_tooltip_text(self.recTipDisabled)
 	
 	#_____________________________________________________________________
 	
@@ -195,11 +189,11 @@
 		if self.instrument.actuallyIsMuted:
 			image.set_from_pixbuf(self.muteImgEnabled)
 			self.muteButton.set_image(image)
-			self.muteTip.set_tip(self.muteButton, self.muteTipEnabled, None)
+			self.muteButton.set_tooltip_text(self.muteTipEnabled)
 		else:
 			image.set_from_pixbuf(self.muteImgDisabled)
 			self.muteButton.set_image(image)
-			self.muteTip.set_tip(self.muteButton, self.muteTipDisabled, None)
+			self.muteButton.set_tooltip_text(self.muteTipDisabled)
 	
 	#______________________________________________________________________
 
 
=== modified file 'Jokosher/EventViewer.py'
--- Jokosher/EventViewer.py	2009-02-19 03:03:17 +0000
+++ Jokosher/EventViewer.py	2009-11-14 18:25:19 +0000
@@ -78,8 +78,6 @@
 		"""
 		self.small = small
 		
-		self.selectiontip = gtk.Tooltips()
-		
 		gtk.DrawingArea.__init__(self)
 
 		self.set_events(gtk.gdk.POINTER_MOTION_MASK |
@@ -150,7 +148,7 @@
 		trimimg = gtk.Image()
 		trimimg.set_from_file(os.path.join(Globals.IMAGE_PATH, "icon_trim.png"))
 		trimButton.set_image(trimimg)
-		self.selectiontip.set_tip(trimButton,_("Trim"),None)
+		trimButton.set_tooltip_text(_("Trim"))
 
 		self.drawer.add(trimButton)
 		trimButton.connect("clicked", self.TrimToSelection)
@@ -161,7 +159,7 @@
 		delFPButton.set_image(delimg)
 		self.drawer.add(delFPButton)
 		delFPButton.connect("clicked", self.DeleteSelectedFadePoints)
-		self.selectiontip.set_tip(delFPButton,_("Delete Fade Points"),None)
+		delFPButton.set_tooltip_text(_("Delete Fade Points"))
 		
 		snapFPButton = gtk.Button()
 		snapimg = gtk.Image()
@@ -169,7 +167,7 @@
 		snapFPButton.set_image(snapimg)
 		self.drawer.add(snapFPButton)
 		snapFPButton.connect("clicked", self.SnapSelectionToFadePoints)
-		self.selectiontip.set_tip(snapFPButton,_("Snap To Fade Points"),None)
+		snapFPButton.set_tooltip_text(_("Snap To Fade Points"))
 		
 		self.drawer.set_sensitive(not self.event.isLoading)
 		self.drawer.show()
 
=== modified file 'Jokosher/InstrumentEffectsDialog.py'
--- Jokosher/InstrumentEffectsDialog.py	2009-04-03 15:01:30 +0000
+++ Jokosher/InstrumentEffectsDialog.py	2009-11-14 18:25:19 +0000
@@ -679,9 +679,6 @@
 		self.settingswindow.set_icon(self.windowIcon)
 		self.settingswindow.set_transient_for(self.window)
 		
-		# tooltips object used to assign tooltips to the sliders
-		tooltips = gtk.Tooltips()
-		
 		# grab a list of properties from the effect
 		proplist = gobject.list_properties(self.instrument.effects[self.effectpos])
 		
@@ -757,7 +754,7 @@
 					hscale.set_digits(0)
 
 				# add the slider to the settings table (with tooltips)
-				tooltips.set_tip(self.sliderdict[property.name], property.blurb)
+				self.sliderdict[property.name].set_tooltip_text(property.blurb)
 				self.settingstable.attach(self.sliderdict[property.name], 1, 2, count, count+1, gtk.FILL|gtk.EXPAND)
 			
 			count += 1
 
=== modified file 'Jokosher/JokosherApp.py'
--- Jokosher/JokosherApp.py	2009-05-04 09:38:15 +0000
+++ Jokosher/JokosherApp.py	2009-11-14 18:25:19 +0000
@@ -70,9 +70,6 @@
 		gtk.glade.bindtextdomain(Globals.LOCALE_APP, Globals.LOCALE_PATH)
 		gtk.glade.textdomain(Globals.LOCALE_APP)
 
-		# create tooltips object
-		self.contextTooltips = gtk.Tooltips()
-		
 		self.wTree = gtk.glade.XML(Globals.GLADE_PATH, "MainWindow")
 		
 		#Connect event handlers
@@ -179,7 +176,7 @@
 		self.isPaused = False
 
 		# Intialise context sensitive tooltips for workspace buttons
-		self.compactMixButton.set_tooltip(self.contextTooltips, self.mixingViewDisabledTip, None)
+		self.compactMixButton.set_tooltip_text(self.mixingViewDisabledTip)
 		
 		# set the window size to the last saved value
 		x = int(Globals.settings.general["windowwidth"])
@@ -960,11 +957,11 @@
 		
 		# update the tooltips depending on the current recording state
 		if self.isRecording:
-			self.record.set_tooltip(self.contextTooltips, self.recTipEnabled, None)
-			self.stop.set_tooltip(self.contextTooltips, self.recStopTipEnabled, None)
+			self.record.set_tooltip_text(self.recTipEnabled)
+			self.stop.set_tooltip_text(self.recStopTipEnabled)
 		else:
-			self.record.set_tooltip(self.contextTooltips, self.recTipDisabled, None)
-			self.stop.set_tooltip(self.contextTooltips, self.recStopTipDisabled, None)
+			self.record.set_tooltip_text(self.recTipDisabled)
+			self.stop.set_tooltip_text(self.recStopTipDisabled)
 		
 		self.workspace.mixView.StartUpdateTimeout()
 	
@@ -1087,10 +1084,9 @@
 			self.recentprojectsmenu.remove(c)
 		
 		if self.recentprojectitems:
-			tooltips = gtk.Tooltips()
 			for item in self.recentprojectitems:
 				mitem = gtk.MenuItem(item[1])
-				tooltips.set_tip(mitem, item[0], None)
+				mitem.set_tooltip_text(item[0])
 				self.recentprojectsmenu.append(mitem)
 				mitem.connect("activate", self.OnRecentProjectsItem, item[0], item[1])
 			
@@ -1098,8 +1094,7 @@
 			self.recentprojectsmenu.append(mitem)
 			
 			mitem = gtk.ImageMenuItem(gtk.STOCK_CLEAR)
-			tooltips.set_tip(mitem, _("Clear the list of recent projects"), None)
-			tooltips.force_window()
+			mitem.set_tooltip_text(_("Clear the list of recent projects"))
 			self.recentprojectsmenu.append(mitem)
 			mitem.connect("activate", self.OnClearRecentProjects)
 			
 
=== modified file 'Jokosher/MixerStrip.py'
--- Jokosher/MixerStrip.py	2009-02-19 13:44:38 +0000
+++ Jokosher/MixerStrip.py	2009-11-14 18:25:19 +0000
@@ -60,8 +60,7 @@
 		self.minbutt = gtk.Button()
 		img = gtk.image_new_from_stock(gtk.STOCK_GOTO_BOTTOM, gtk.ICON_SIZE_MENU)
 		self.minbutt.set_image(img)
-		self.mintip = gtk.Tooltips()
-		self.mintip.set_tip(self.minbutt, _("Minimize instrument"), None)
+		self.minbutt.set_tooltip_text(_("Minimize instrument"))
 		self.minbutt.connect("clicked", self.EmitMinimise)
 				
 		self.vbox.pack_start(self.minbutt, False)
@@ -82,8 +81,7 @@
 		self.pan.set_range(-1.0, 1.0)
 		self.pan.set_increments(0.1, 1.0)
 		self.pan.set_draw_value(False)
-		self.pantip = gtk.Tooltips()
-		self.pantip.set_tip(self.pan, _("Adjust instrument balance. Right-click to center"), None)
+		self.pan.set_tooltip_text(_("Adjust instrument balance. Right-click to center"))
 		
 		if self.instrument.pan:
 			self.pan.set_value(self.instrument.pan)
 
=== modified file 'Jokosher/RecordingView.py'
--- Jokosher/RecordingView.py	2009-03-22 05:36:54 +0000
+++ Jokosher/RecordingView.py	2009-11-14 18:25:19 +0000
@@ -116,8 +116,7 @@
 		self.zoomSlider.set_increments(0.2, 0.2)
 		self.zoomSlider.set_draw_value(False)
 		self.zoomSlider.set_value(self.project.viewScale)
-		self.zoomtip = gtk.Tooltips()
-		self.zoomtip.set_tip(self.zoomSlider, _("Zoom the timeline - Right-Click to reset to the default level"), None)
+		self.zoomSlider.set_tooltip_text(_("Zoom the timeline - Right-Click to reset to the default level"))
 		
 		self.zoomSlider.connect("value-changed", self.OnZoom)
 		self.zoomSlider.connect("button-press-event", self.OnZoomReset)
@@ -126,14 +125,14 @@
 		inimg = gtk.image_new_from_stock(gtk.STOCK_ZOOM_IN, gtk.ICON_SIZE_BUTTON)
 		self.inbutton.set_image(inimg)
 		self.inbutton.set_relief(gtk.RELIEF_NONE)
-		self.zoomtip.set_tip(self.inbutton, _("Zoom in timeline"), None)
+		self.inbutton.set_tooltip_text(_("Zoom in timeline"))
 		self.inbutton.connect("clicked", self.OnZoomIn)
 		
 		self.outbutton = gtk.Button()
 		outimg = gtk.image_new_from_stock(gtk.STOCK_ZOOM_OUT, gtk.ICON_SIZE_BUTTON)
 		self.outbutton.set_image(outimg)
 		self.outbutton.set_relief(gtk.RELIEF_NONE)
-		self.zoomtip.set_tip(self.outbutton, _("Zoom out timeline"), None)
+		self.outbutton.set_tooltip_text(_("Zoom out timeline"))
 		self.outbutton.connect("clicked", self.OnZoomOut)
 
 		self.zoom_hb.pack_start( self.outbutton, False, False)
 
=== modified file 'Jokosher/TimeLineBar.py'
--- Jokosher/TimeLineBar.py	2009-03-23 01:35:26 +0000
+++ Jokosher/TimeLineBar.py	2009-11-14 18:25:19 +0000
@@ -60,13 +60,11 @@
 		image_size_group.add_widget(self.clickbutton_metronome_image)
 		image_size_group.add_widget(self.clickbutton_volume_image)
 		
-		self.clicktip = gtk.Tooltips()
-		self.clicktip.set_tip(self.clickbutton, _("Adjust volume of click track"), None)
+		self.clickbutton.set_tooltip_text(_("Adjust volume of click track"))
 					
 		self.bpmeventbox = gtk.EventBox()
 		self.bpmframe = gtk.Frame()
-		self.bpmeventtip = gtk.Tooltips()
-		self.bpmeventtip.set_tip(self.bpmeventbox, _("Beats per minute"), None)
+		self.bpmeventbox.set_tooltip_text(_("Beats per minute"))
 		self.bpmframe.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
 		
 		self.bpmlabel = gtk.Label()
@@ -85,8 +83,7 @@
 		self.bpmedit.connect_after("button-release-event", self.OnEditBPMClick)
 
 		self.sigeventbox = gtk.EventBox()
-		self.sigeventtip = gtk.Tooltips()
-		self.sigeventtip.set_tip(self.sigeventbox, _("Time signature"), None)
+		self.sigeventbox.set_tooltip_text(_("Time signature"))
 		self.sigframe = gtk.Frame()
 		self.sigframe.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
 		
 
=== modified file 'Jokosher/TimeView.py'
--- Jokosher/TimeView.py	2007-05-21 14:42:28 +0000
+++ Jokosher/TimeView.py	2009-11-14 18:25:19 +0000
@@ -46,8 +46,7 @@
 		self.project.transport.connect("position", self.OnTransportPosition)
 		
 		self.UpdateTime()
-		self.tmtip = gtk.Tooltips()
-		self.tmtip.set_tip(self, _("Double click to change the time format"), None)
+		self.set_tooltip_text(_("Double click to change the time format"))
 		
 	#_____________________________________________________________________
 		
 
=== modified file 'Jokosher/Workspace.py'
--- Jokosher/Workspace.py	2009-03-02 22:06:09 +0000
+++ Jokosher/Workspace.py	2009-11-14 18:25:19 +0000
@@ -51,15 +51,11 @@
 		if self.mainview.compactMixButton.get_active():
 			self.recordingView.ChangeSize(True)
 			self.mixView.show()
-			self.mainview.compactMixButton.set_tooltip(
-						self.mainview.contextTooltips,
-						self.mainview.mixingViewEnabledTip)
+			self.mainview.compactMixButton.set_tooltip_text(self.mainview.mixingViewEnabledTip)
 		else:
 			self.recordingView.ChangeSize(False)
 			self.mixView.hide()
-			self.mainview.compactMixButton.set_tooltip(
-						self.mainview.contextTooltips,
-						self.mainview.mixingViewDisabledTip)
+			self.mainview.compactMixButton.set_tooltip_text(self.mainview.mixingViewDisabledTip)
 	#____________________________________________________________________	
 
 #=========================================================================
 
=== modified file 'Jokosher/ui/StatusBar.py'
--- Jokosher/ui/StatusBar.py	2009-03-28 22:16:23 +0000
+++ Jokosher/ui/StatusBar.py	2009-11-14 18:25:19 +0000
@@ -53,7 +53,7 @@
 		Parameters:
 			message_id -- numerical id of the message to be removed from the StatusBar.
 		"""
-		self.remove(0, message_id)
+		self.remove_message(0, message_id)
 		self.label.set_use_markup(True)
 		
 	#_____________________________________________________________________
 
=== modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.py'
--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.py	2009-06-08 12:07:25 +0000
+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.py	2009-11-14 18:25:19 +0000
@@ -187,16 +187,15 @@
 		Parameters:
 			status -- True for Find, False for Stop.
 		"""
-		tooltips = gtk.Tooltips()
 		
 		if status:
 			# change the icon to a search one
-			tooltips.set_tip(self.buttonFind, _("Search the Freesound library"))
+			self.buttonFind.set_tooltip_text(_("Search the Freesound library"))
 			self.buttonFind.set_label(_("Find"))
 			self.buttonFind.set_image(gtk.image_new_from_stock(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
 		else:
 			# change the icon to a stop one
-			tooltips.set_tip(self.buttonFind, _("Stop the current search"))
+			self.buttonFind.set_tooltip_text(_("Stop the current search"))
 			self.buttonFind.set_label(_("Stop"))
 			self.buttonFind.set_image(gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_BUTTON))