Kazam Screencaster

Merge lp:~kokoto-java/kazam/no-fix-in-a-loooong-time into lp:kazam

  1. no-fix-in-a-loooong-time
  2. Merge into stable
Proposed by George Karavasilev
Status: Merged
Approved by: David Klasinc
Approved revision: 135
Merged at revision: 136
Proposed branch: lp:~kokoto-java/kazam/no-fix-in-a-loooong-time
Merge into: lp:kazam
Diff against target: 77 lines (+20/-18)
2 files modified
data/ui/kazam.ui (+15/-17)
kazam/frontend/about_dialog.py (+5/-1)
To merge this branch: bzr merge lp:~kokoto-java/kazam/no-fix-in-a-loooong-time
Reviewer Review Type Date Requested Status
David Klasinc Pending
Review via email: mp+199861@code.launchpad.net
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 'data/ui/kazam.ui'
2--- data/ui/kazam.ui 2012-12-27 13:47:35 +0000
3+++ data/ui/kazam.ui 2013-12-20 20:21:43 +0000
4@@ -286,26 +286,9 @@
5 </packing>
6 </child>
7 <child>
8- <object class="GtkSeparator" id="separator2">
9- <property name="visible">True</property>
10- <property name="can_focus">False</property>
11- <property name="margin_left">5</property>
12- <property name="margin_right">5</property>
13- <property name="margin_top">8</property>
14- <property name="margin_bottom">8</property>
15- </object>
16- <packing>
17- <property name="left_attach">0</property>
18- <property name="top_attach">4</property>
19- <property name="width">1</property>
20- <property name="height">1</property>
21- </packing>
22- </child>
23- <child>
24 <object class="GtkToolbar" id="toolbar_aux">
25 <property name="visible">True</property>
26 <property name="can_focus">False</property>
27- <property name="margin_top">10</property>
28 <property name="toolbar_style">both</property>
29 </object>
30 <packing>
31@@ -330,6 +313,21 @@
32 </packing>
33 </child>
34 <child>
35+ <object class="GtkSeparator" id="separator2">
36+ <property name="visible">True</property>
37+ <property name="can_focus">False</property>
38+ <property name="margin_left">5</property>
39+ <property name="margin_right">5</property>
40+ <property name="margin_bottom">8</property>
41+ </object>
42+ <packing>
43+ <property name="left_attach">0</property>
44+ <property name="top_attach">4</property>
45+ <property name="width">1</property>
46+ <property name="height">1</property>
47+ </packing>
48+ </child>
49+ <child>
50 <placeholder/>
51 </child>
52 <child>
53
54=== modified file 'kazam/frontend/about_dialog.py'
55--- kazam/frontend/about_dialog.py 2012-11-24 11:22:39 +0000
56+++ kazam/frontend/about_dialog.py 2013-12-20 20:21:43 +0000
57@@ -31,8 +31,9 @@
58
59 ARTISTS = """
60 Matthew Paul Thomas <mpt@canonical.com>
61-Georgi Karavasilev <motorslav@gmail.com>
62+Georgi Karavasilev <kokoto-java@ubuntu.com>
63 Frank Souza <franksouza183@gmail.com>
64+Sam Hewitt <snwh@ubuntu.com>
65 Robert McKenna <ttk1opc@yahoo.com>
66 Andrew Higginson <rugby471@gmail.com>
67 """
68@@ -68,6 +69,9 @@
69 except:
70 # Not important, we just don't get to show our lovely logo.. :)
71 pass
72+ # dialog.set_modal(True)
73+ # dialog.set_transient_for(kazam)
74+ # dialog.set_decorated(False)
75 dialog.show_all()
76 dialog.set_position(Gtk.WindowPosition.CENTER)
77 dialog.run()

Subscribers

People subscribed via source and target branches

to all changes: