Merge lp:~kokoto-java/kazam/first-part-of-the-UI-chnages-blueprint-and-more-stuff into lp:kazam/unstable

Proposed by George Karavasilev on 2012-04-20
Status: Merged
Approved by: David Klasinc on 2012-04-20
Approved revision: 198
Merged at revision: 199
Proposed branch: lp:~kokoto-java/kazam/first-part-of-the-UI-chnages-blueprint-and-more-stuff
Merge into: lp:kazam/unstable
Diff against target: 123 lines (+28/-43)
2 files modified
data/ui/kazam.ui (+22/-37)
kazam/frontend/window_region.py (+6/-6)
To merge this branch: bzr merge lp:~kokoto-java/kazam/first-part-of-the-UI-chnages-blueprint-and-more-stuff
Reviewer Review Type Date Requested Status
David Klasinc 2012-04-20 Approve on 2012-04-20
Review via email: mp+102850@code.launchpad.net

Description of the change

Straight copy/paste from bzr-commit:
Set Main UI window size restrictions, moved the "Record region" button at the bottom, removed an obsolete GtkButtonBox (the container for the "Record Region" button) and improved the rectangle for selecting a region that is to be recorded.
Also, be sure to test if the window size restriction play well with really, really, really, really, no REALLY long audio source names :)

To post a comment you must log in.
David Klasinc (bigwhale) wrote :

Looks good.

review: Approve

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-04-20 05:52:17 +0000
3+++ data/ui/kazam.ui 2012-04-20 13:15:37 +0000
4@@ -30,6 +30,8 @@
5 <property name="border_width">10</property>
6 <property name="title" translatable="yes">Kazam Screencaster</property>
7 <property name="resizable">False</property>
8+ <property name="width-request">300</property>
9+ <property name="height-request">200</property>
10 <signal name="delete-event" handler="cb_delete_event" swapped="no"/>
11 <child>
12 <object class="GtkGrid" id="grid5">
13@@ -410,43 +412,6 @@
14 </packing>
15 </child>
16 <child>
17- <object class="GtkButtonBox" id="buttonbox2">
18- <property name="visible">True</property>
19- <property name="can_focus">False</property>
20- <property name="halign">end</property>
21- <property name="hexpand">True</property>
22- <property name="orientation">vertical</property>
23- <property name="layout_style">start</property>
24- <child>
25- <object class="GtkToggleButton" id="btn_region">
26- <property name="label" translatable="yes">Record Region</property>
27- <property name="use_action_appearance">False</property>
28- <property name="width_request">110</property>
29- <property name="visible">True</property>
30- <property name="can_focus">True</property>
31- <property name="receives_default">True</property>
32- <property name="has_tooltip">True</property>
33- <property name="tooltip_markup" translatable="yes">Select a screen region to record</property>
34- <property name="tooltip_text" translatable="yes">Select a screen region to record</property>
35- <property name="halign">end</property>
36- <property name="use_action_appearance">False</property>
37- <signal name="toggled" handler="cb_region_toggled" swapped="no"/>
38- </object>
39- <packing>
40- <property name="expand">False</property>
41- <property name="fill">False</property>
42- <property name="position">0</property>
43- </packing>
44- </child>
45- </object>
46- <packing>
47- <property name="left_attach">4</property>
48- <property name="top_attach">1</property>
49- <property name="width">1</property>
50- <property name="height">1</property>
51- </packing>
52- </child>
53- <child>
54 <placeholder/>
55 </child>
56 </object>
57@@ -546,6 +511,26 @@
58 <property name="secondary">True</property>
59 </packing>
60 </child>
61+ <child>
62+ <object class="GtkToggleButton" id="btn_region">
63+ <property name="label" translatable="yes">Record Region</property>
64+ <property name="use_action_appearance">False</property>
65+ <property name="width_request">100</property>
66+ <property name="visible">True</property>
67+ <property name="can_focus">True</property>
68+ <property name="receives_default">True</property>
69+ <property name="has_tooltip">True</property>
70+ <property name="tooltip_markup" translatable="yes">Select a screen region to record</property>
71+ <property name="tooltip_text" translatable="yes">Select a screen region to record</property>
72+ <property name="use_action_appearance">False</property>
73+ <signal name="toggled" handler="cb_region_toggled" swapped="no"/>
74+ </object>
75+ <packing>
76+ <property name="expand">False</property>
77+ <property name="fill">False</property>
78+ <property name="position">4</property>
79+ </packing>
80+ </child>
81 </object>
82 <packing>
83 <property name="left_attach">0</property>
84
85=== modified file 'kazam/frontend/window_region.py'
86--- kazam/frontend/window_region.py 2012-04-14 06:17:17 +0000
87+++ kazam/frontend/window_region.py 2012-04-20 13:15:37 +0000
88@@ -185,7 +185,7 @@
89 # cr.set_operator(cairo.OPERATOR_OVER)
90 #else:
91 if self.compositing:
92- cr.set_source_rgba(0.0, 0.0, 0.0, 0.4)
93+ cr.set_source_rgba(0.0, 0.0, 0.0, 0.65)
94 else:
95 cr.set_source_rgb(0.5, 0.5, 0.5)
96
97@@ -195,7 +195,7 @@
98 cr.set_source_rgba(1.0, 1.0, 1.0, 1.0)
99 else:
100 cr.set_source_rgba(1.0, 1.0, 1.0)
101- cr.set_line_width(1.0)
102+ cr.set_line_width(6.0)
103 cr.move_to(0, 0)
104 cr.rectangle(0, 0, 16, 16)
105 cr.rectangle(w-16, 0, 16, 16)
106@@ -208,13 +208,13 @@
107 cr.rectangle(w-16, h/2-8, 16, 16)
108
109 cr.fill()
110- cr.set_source_rgb(0.0, 0.0, 0.0)
111+ cr.set_source_rgb(0.65, 0.65, 0.65)
112 cr.rectangle(0, 0, w, h)
113 cr.stroke()
114 cr.set_operator(cairo.OPERATOR_OVER)
115- self._outline_text(cr, w, h, 24, _("Select region by resizing the window"))
116- self._outline_text(cr, w, h + 50, 24, _("Press ENTER to confirm or ESC to cancel."))
117- self._outline_text(cr, w, h + 80, 12, "({0} x {1})".format(w, h))
118+ self._outline_text(cr, w, h, 30, _("Select region by resizing the rectangle"))
119+ self._outline_text(cr, w, h + 50, 26, _("Press ENTER to confirm or ESC to cancel"))
120+ self._outline_text(cr, w, h + 100, 20, "({0} x {1})".format(w, h))
121
122
123 def _outline_text(self, cr, w, h, size, text):

Subscribers

People subscribed via source and target branches