lolocopter

Merge lp:~jonobacon/lolocopter/release-fixes into lp:lolocopter

  1. release-fixes
  2. Merge into trunk
Proposed by Jono Bacon
Status: Merged
Approved by: Jono Bacon
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~jonobacon/lolocopter/release-fixes
Merge into: lp:lolocopter
Diff against target: 61 lines (+11/-6)
3 files modified
bin/lolocopter (+5/-4)
data/ui/AboutLolocopterDialog.ui (+4/-1)
data/ui/LolocopterWindow.ui (+2/-1)
To merge this branch: bzr merge lp:~jonobacon/lolocopter/release-fixes
Reviewer Review Type Date Requested Status
Stuart Langridge (community) Approve
Review via email: mp+14901@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jono Bacon (jonobacon) wrote :

Some tiny release fixes.

Revision history for this message
Stuart Langridge (sil) wrote :

win.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/lolocopter'
2--- bin/lolocopter 2009-11-15 21:51:09 +0000
3+++ bin/lolocopter 2009-11-15 23:00:28 +0000
4@@ -93,17 +93,18 @@
5 hbox = gtk.HBox()
6 lbl = gtk.Label(name)
7 playbtn = gtk.Button(stock=gtk.STOCK_MEDIA_PLAY)
8+ # playbtn = gtk.ToggleButton("Play")
9 playbtn.connect("clicked", self.playFile,
10 os.path.join(
11 xdg.BaseDirectory.save_data_path('lolocopter'),
12 "sounds",
13 filename))
14- sharebtn = gtk.ToggleButton(label="Share")
15- sharebtn.connect("toggled", self.shareTheLOL, filename, name)
16+ """sharebtn = gtk.ToggleButton(label="Share")
17+ sharebtn.connect("toggled", self.shareTheLOL, filename, name)"""
18 hbox.pack_start(lbl)
19 hbox.pack_start(playbtn)
20- hbox.pack_start(sharebtn)
21- self.mylol_vbox.pack_end(hbox)
22+ """ hbox.pack_start(sharebtn)"""
23+ self.mylol_vbox.pack_end(hbox, False)
24 hbox.show_all()
25
26 def newLolocopterAppears(self, lolname, personname, host, port):
27
28=== modified file 'data/ui/AboutLolocopterDialog.ui'
29--- data/ui/AboutLolocopterDialog.ui 2009-11-14 17:18:08 +0000
30+++ data/ui/AboutLolocopterDialog.ui 2009-11-15 23:00:28 +0000
31@@ -10,7 +10,10 @@
32 <property name="has_separator">False</property>
33 <property name="program_name">Lolocopter</property>
34 <property name="version">0.1</property>
35- <property name="authors">Jono Bacon &lt;jono@jonobacon.org&gt;</property>
36+ <property name="comments" translatable="yes">Bringing LOLs to happy children, the world over.</property>
37+ <property name="website">https://www.launchpad.net/lolocopter</property>
38+ <property name="authors">Jono Bacon &lt;jono@jonobacon.org&gt;
39+Stuart Langridge &lt;sil@kryogenix.org&gt;</property>
40 <child internal-child="vbox">
41 <object class="GtkVBox" id="dialog-vbox1">
42 <property name="visible">True</property>
43
44=== modified file 'data/ui/LolocopterWindow.ui'
45--- data/ui/LolocopterWindow.ui 2009-11-15 21:51:09 +0000
46+++ data/ui/LolocopterWindow.ui 2009-11-15 23:00:28 +0000
47@@ -104,12 +104,13 @@
48 </child>
49 </object>
50 <packing>
51+ <property name="expand">False</property>
52+ <property name="fill">False</property>
53 <property name="position">1</property>
54 </packing>
55 </child>
56 <child>
57 <object class="GtkExpander" id="expander2">
58- <property name="visible">True</property>
59 <property name="can_focus">True</property>
60 <property name="expanded">True</property>
61 <child>

Subscribers

People subscribed via source and target branches

to all changes: