<div dir="ltr">Great. Now the path apply.<div><br></div><div style>I needed do some corrections:</div><div style><br></div><div style>* You should configure your text editor to save spaces instead of tabs </div><div style>
(we use 4 spaces by tab)</div><div style><br></div><div style>* Also, try to not add spaces at the end of the lines.</div><div style>One useful trick is add in four .gitconfig file:</div><div style><br></div><div style><div>
[color]</div><div> diff = auto</div><div><br></div><div>[color "diff"]</div><div> whitespace = red reverse</div><div><br></div><div style>Then, when you do "git diff" or "git show"</div>
<div style>will see if the spaces are wrong</div><div style><br></div><div style>* Finally, we needed replace the use of tooltips.set_tip in the gtk widgets,</div><div style>but not set_tooltip in the sugar widgets, like the buttons in the toolbar.</div>
<div style><br></div><div style>I pushed a patch with this changes.</div><div style><br></div><div style>Gonzalo</div><div style><br></div></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, May 25, 2013 at 12:38 PM, Hansel Wave <span dir="ltr"><<a href="mailto:arastafiel@gmail.com" target="_blank">arastafiel@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi Gonzalo,<div>*Yes i am working in the master branch.</div><div>*Ok i wont change the permissions again.</div>
<div>*The patch is attached to this mail.</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>
Hansel</div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><br><div class="gmail_quote">2013/5/24 Gonzalo Odiard <span dir="ltr"><<a href="mailto:gonzalo@laptop.org" target="_blank">gonzalo@laptop.org</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">Hi Hansel,<div>I have tried to apply this patch but gives me many errors.</div><div>Please check:</div><div>* Are you working on the master branch?</div><div>* Try no change permission in the archives, is not needed.</div>
<div>* Can you send me the patch attached to a mail to see if my mail is doing something wrong?</div><div>Thanks</div><div><br></div><div>Gonzalo</div><div><br></div></div><div class="gmail_extra">
<br><br><div class="gmail_quote"><div><div>On Fri, May 24, 2013 at 5:27 PM, Hansel Wave <span dir="ltr"><<a href="mailto:arastafiel@gmail.com" target="_blank">arastafiel@gmail.com</a>></span> wrote:<br></div>
</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div>
From: Hansel Paul Miranda Wave <<a href="mailto:arastafiel@gmail.com" target="_blank">arastafiel@gmail.com</a>><br>
<br>
---<br>
Edit/EditToolbars.py | 22 ++++++++++++++--------<br>
Edit/MainWindow.py | 6 +++++-<br>
Edit/Properties.py | 12 +++++++-----<br>
3 files changed, 26 insertions(+), 14 deletions(-)<br>
mode change 100644 => 100755 Edit/EditToolbars.py<br>
mode change 100644 => 100755 Edit/HitInterface.py<br>
mode change 100644 => 100755 Edit/MainWindow.py<br>
mode change 100644 => 100755 Edit/NoteInterface.py<br>
mode change 100644 => 100755 Edit/Properties.py<br>
mode change 100644 => 100755 Edit/TrackInterface.py<br>
mode change 100644 => 100755 Edit/TuneInterface.py<br>
mode change 100644 => 100755 Edit/__init__.py<br>
create mode 100644 tamtamEdit<br>
<br>
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py<br>
old mode 100644<br>
new mode 100755<br>
index d56acb2..c04ef8b<br>
--- a/Edit/EditToolbars.py<br>
+++ b/Edit/EditToolbars.py<br>
@@ -35,15 +35,16 @@ def common_buttons(toolbar, edit):<br>
'toggled', edit.handlePlayPause_cb)<br>
toolbar.insert(toolbar.playButton, -1)<br>
toolbar.playButton.show()<br>
- toolbar.playButton.set_tooltip(_('Play / Pause'))<br>
+ #toolbar.playButton.set_tooltip(_('Play / Pause')) #Deprecated<br>
+ toolbar.playButton.set_tooltip_text(_('Play / Pause'))<br>
<br>
# Stop button<br>
toolbar.stopButton = ToolButton('media-playback-stop')<br>
toolbar.stopButton.connect('clicked', edit.handleStop_cb)<br>
toolbar.insert(toolbar.stopButton, -1)<br>
toolbar.stopButton.show()<br>
- toolbar.stopButton.set_tooltip(_('Stop'))<br>
-<br>
+ #toolbar.stopButton.set_tooltip(_('Stop')) #deprecated<br>
+ toolbar.stopButton.set_tooltip_text(_('Stop'))<br>
# Play button Image<br>
toolbar.playButtonImg = Gtk.Image()<br>
toolbar.playButtonImg.set_from_icon_name(<br>
@@ -108,8 +109,8 @@ def common_buttons(toolbar, edit):<br>
toolbar.duplicateButton.connect('toggled', handleDuplicate)<br>
toolbar.insert(toolbar.duplicateButton, -1)<br>
toolbar.duplicateButton.show()<br>
- toolbar.duplicateButton.set_tooltip(_('Duplicate'))<br>
-<br>
+ #toolbar.duplicateButton.set_tooltip(_('Duplicate')) #Deprecated<br>
+ toolbar.duplicateButton.set_tooltip_text(_('Duplicate'))<br>
<br>
class mainToolbar(Gtk.Toolbar):<br>
def __init__(self, edit):<br>
@@ -135,7 +136,9 @@ class generateToolbar(Gtk.Toolbar):<br>
self.bigGenerationButton.connect('clicked', self.edit.createNewTune)<br>
self.insert(self.bigGenerationButton, -1)<br>
self.bigGenerationButton.show()<br>
- self.bigGenerationButton.set_tooltip(_('Generate Tune'))<br>
+ #self.bigGenerationButton.set_tooltip(_('Generate Tune')) #deprecated.<br>
+ self.bigGenerationButton.set_tooltip_text(_('Generate Tune'))<br>
+<br>
<br>
# Generation button<br>
self._generationPalette = generationPalette(_('Generation'), self.edit)<br>
@@ -160,7 +163,9 @@ class recordToolbar(Gtk.Toolbar):<br>
'clicked', edit.handleKeyboardRecordButton)<br>
self.insert(self.recordButton, -1)<br>
self.recordButton.show()<br>
- self.recordButton.set_tooltip(_('Record keyboard'))<br>
+ #self.recordButton.set_tooltip(_('Record keyboard')) #Deprecated<br>
+ self.recordButton.set_tooltip_text(_('Record keyboard'))<br>
+<br>
<br>
if Config.FEATURES_OGG:<br>
#RecordOgg button<br>
@@ -168,7 +173,8 @@ class recordToolbar(Gtk.Toolbar):<br>
self.recordOggButton.connect('clicked', edit.handleRecord_cb)<br>
self.insert(self.recordOggButton, -1)<br>
self.recordOggButton.show()<br>
- self.recordOggButton.set_tooltip(_('Record to ogg'))<br>
+ #self.recordOggButton.set_tooltip(_('Record to ogg')) #Deprecated<br>
+ self.recordOggButton.set_tooltip_text(_('Record to ogg'))<br>
<br>
class toolsToolbar(Gtk.Toolbar):<br>
def __init__(self, edit):<br>
diff --git a/Edit/HitInterface.py b/Edit/HitInterface.py<br>
old mode 100644<br>
new mode 100755<br>
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py<br>
old mode 100644<br>
new mode 100755<br>
index 237aae0..dfbd451<br>
--- a/Edit/MainWindow.py<br>
+++ b/Edit/MainWindow.py<br>
@@ -311,6 +311,7 @@ class MainWindow(Gtk.EventBox):<br>
if Tooltips.Edit.has_key(key):<br>
pass<br>
#self.tooltips.set_tip(self.GUI[key],Tooltips.Edit[key])<br>
+ self.GUI[key].set_tooltip_text(Tooltips.Edit[key])<br>
<br>
self.add( self.GUI["2main"] )<br>
<br>
@@ -2217,12 +2218,13 @@ class instrumentPalette(Popup):<br>
self.muteButton.connect("toggled",self.handlemuteButton)<br>
self.muteButton.set_active(True)<br>
#self.tooltips.set_tip(self.muteButton, _('Mute track'))<br>
-<br>
+ self.muteButton.set_tooltip_text(_('Mute track'))#This is a new line adding the tooltip text functionality<br>
self.soloButtonLabel = Gtk.Label(_('S'))<br>
self.soloButton = Gtk.CheckButton()<br>
self.soloButton.connect("toggled",self.handlesoloButton)<br>
self.soloButton.set_active(True)<br>
#self.tooltips.set_tip(self.soloButton, _('Solo track'))<br>
+ self.soloButton.set_tooltip_text(_('Solo track'))#This is a new line adding the tooltip text functionality<br>
<br>
self.volumeSliderAdj = Gtk.Adjustment( self.edit._data["track_volume"][0], 0, 100, 1, 1, 0 )<br>
self.volumeSliderAdj.connect( "value-changed", self.handleTrackVolume)<br>
@@ -2345,6 +2347,8 @@ class drumPalette(Popup):<br>
self.muteButton.connect("button-press-event",self.edit.handlemuteButtonRightClick, self.trackID)<br>
self.muteButton.set_active(True)<br>
#self.tooltips.set_tip(self.muteButton, _('Left click to mute, right click to solo'))<br>
+ self.muteButton.set_tooltip_text( _('Left click to mute, right click to solo'))#This is a new line adding the tooltip textfunctionality<br>
+<br>
<br>
if self.trackID < 4:<br>
exec "self.volumeSliderAdj = self.edit.GUI['2instrument%svolumeAdjustment']" % str(self.trackID+1)<br>
diff --git a/Edit/NoteInterface.py b/Edit/NoteInterface.py<br>
old mode 100644<br>
new mode 100755<br>
diff --git a/Edit/Properties.py b/Edit/Properties.py<br>
old mode 100644<br>
new mode 100755<br>
index b6baf9d..08c339e<br>
--- a/Edit/Properties.py<br>
+++ b/Edit/Properties.py<br>
@@ -14,7 +14,7 @@ Tooltips = Config.Tooltips()<br>
class Properties( gtk.VBox ):<br>
def __init__( self, noteDB, doneHandler, popup ):<br>
gtk.VBox.__init__( self )<br>
- self.tooltips = gtk.Tooltips()<br>
+ #self.tooltips = gtk.Tooltips()<br>
self.noteDB = noteDB<br>
#self.doneHandler = doneHandler<br>
self.popup = popup<br>
@@ -380,9 +380,10 @@ class Properties( gtk.VBox ):<br>
# set tooltips<br>
for key in self.GUI:<br>
if Tooltips.PROP.has_key(key):<br>
- self.tooltips.set_tip(self.GUI[key],Tooltips.PROP[key])<br>
- self.tooltips.set_tip(self.GUI['paraSlider'], 'Random')<br>
-<br>
+ #self.tooltips.set_tip(self.GUI[key],Tooltips.PROP[key])<br>
+ self.GUI[key].set_tooltip_text(Tooltips.PROP[key])<br>
+ #self.tooltips.set_tip(self.GUI['paraSlider'], 'Random')<br>
+ self.GUI['paraSlider'].set_tooltip_text('Random')<br>
<br>
self.show_all()<br>
<br>
@@ -819,7 +820,8 @@ class Properties( gtk.VBox ):<br>
def handleAlgo( self, widget, data ):<br>
self.algorithm = self.algoTypes[data]<br>
paraTooltips = ['Random', 'Maximum step', 'Maximum step', 'Maximum step', 'Maximum step']<br>
- self.tooltips.set_tip(self.GUI['paraSlider'], paraTooltips[data])<br>
+ #self.tooltips.set_tip(self.GUI['paraSlider'], paraTooltips[data])<br>
+ self.GUI['paraSlider'].set_tooltip_text(paraTooltips[data])<br>
<br>
def handleMin( self, adjust ):<br>
self.minValue = adjust.value<br>
diff --git a/Edit/TrackInterface.py b/Edit/TrackInterface.py<br>
old mode 100644<br>
new mode 100755<br>
diff --git a/Edit/TuneInterface.py b/Edit/TuneInterface.py<br>
old mode 100644<br>
new mode 100755<br>
diff --git a/Edit/__init__.py b/Edit/__init__.py<br>
old mode 100644<br>
new mode 100755<br>
diff --git a/tamtamEdit b/tamtamEdit<br>
new file mode 100644<br>
index 0000000..e69de29<br>
</div></div><span><font color="#888888"><span><font color="#888888">--<br>
1.7.10.4<br>
<br>
_______________________________________________<br>
Sugar-devel mailing list<br>
<a href="mailto:Sugar-devel@lists.sugarlabs.org" target="_blank">Sugar-devel@lists.sugarlabs.org</a><br>
<a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a><br>
</font></span></font></span></blockquote></div><br></div>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>