Kazam Screencaster

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

  1. first-part-of-the-UI-chnages-blueprint-and-more-stuff
  2. Merge into unstable
Proposed by George Karavasilev
Status: Merged
Approved by: David Klasinc
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 Approve
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.
Revision history for this message
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
=== modified file 'data/ui/kazam.ui'
--- data/ui/kazam.ui 2012-04-20 05:52:17 +0000
+++ data/ui/kazam.ui 2012-04-20 13:15:37 +0000
@@ -30,6 +30,8 @@
30 <property name="border_width">10</property>30 <property name="border_width">10</property>
31 <property name="title" translatable="yes">Kazam Screencaster</property>31 <property name="title" translatable="yes">Kazam Screencaster</property>
32 <property name="resizable">False</property>32 <property name="resizable">False</property>
33 <property name="width-request">300</property>
34 <property name="height-request">200</property>
33 <signal name="delete-event" handler="cb_delete_event" swapped="no"/>35 <signal name="delete-event" handler="cb_delete_event" swapped="no"/>
34 <child>36 <child>
35 <object class="GtkGrid" id="grid5">37 <object class="GtkGrid" id="grid5">
@@ -410,43 +412,6 @@
410 </packing>412 </packing>
411 </child>413 </child>
412 <child>414 <child>
413 <object class="GtkButtonBox" id="buttonbox2">
414 <property name="visible">True</property>
415 <property name="can_focus">False</property>
416 <property name="halign">end</property>
417 <property name="hexpand">True</property>
418 <property name="orientation">vertical</property>
419 <property name="layout_style">start</property>
420 <child>
421 <object class="GtkToggleButton" id="btn_region">
422 <property name="label" translatable="yes">Record Region</property>
423 <property name="use_action_appearance">False</property>
424 <property name="width_request">110</property>
425 <property name="visible">True</property>
426 <property name="can_focus">True</property>
427 <property name="receives_default">True</property>
428 <property name="has_tooltip">True</property>
429 <property name="tooltip_markup" translatable="yes">Select a screen region to record</property>
430 <property name="tooltip_text" translatable="yes">Select a screen region to record</property>
431 <property name="halign">end</property>
432 <property name="use_action_appearance">False</property>
433 <signal name="toggled" handler="cb_region_toggled" swapped="no"/>
434 </object>
435 <packing>
436 <property name="expand">False</property>
437 <property name="fill">False</property>
438 <property name="position">0</property>
439 </packing>
440 </child>
441 </object>
442 <packing>
443 <property name="left_attach">4</property>
444 <property name="top_attach">1</property>
445 <property name="width">1</property>
446 <property name="height">1</property>
447 </packing>
448 </child>
449 <child>
450 <placeholder/>415 <placeholder/>
451 </child>416 </child>
452 </object>417 </object>
@@ -546,6 +511,26 @@
546 <property name="secondary">True</property>511 <property name="secondary">True</property>
547 </packing>512 </packing>
548 </child>513 </child>
514 <child>
515 <object class="GtkToggleButton" id="btn_region">
516 <property name="label" translatable="yes">Record Region</property>
517 <property name="use_action_appearance">False</property>
518 <property name="width_request">100</property>
519 <property name="visible">True</property>
520 <property name="can_focus">True</property>
521 <property name="receives_default">True</property>
522 <property name="has_tooltip">True</property>
523 <property name="tooltip_markup" translatable="yes">Select a screen region to record</property>
524 <property name="tooltip_text" translatable="yes">Select a screen region to record</property>
525 <property name="use_action_appearance">False</property>
526 <signal name="toggled" handler="cb_region_toggled" swapped="no"/>
527 </object>
528 <packing>
529 <property name="expand">False</property>
530 <property name="fill">False</property>
531 <property name="position">4</property>
532 </packing>
533 </child>
549 </object>534 </object>
550 <packing>535 <packing>
551 <property name="left_attach">0</property>536 <property name="left_attach">0</property>
552537
=== modified file 'kazam/frontend/window_region.py'
--- kazam/frontend/window_region.py 2012-04-14 06:17:17 +0000
+++ kazam/frontend/window_region.py 2012-04-20 13:15:37 +0000
@@ -185,7 +185,7 @@
185 # cr.set_operator(cairo.OPERATOR_OVER)185 # cr.set_operator(cairo.OPERATOR_OVER)
186 #else:186 #else:
187 if self.compositing:187 if self.compositing:
188 cr.set_source_rgba(0.0, 0.0, 0.0, 0.4)188 cr.set_source_rgba(0.0, 0.0, 0.0, 0.65)
189 else:189 else:
190 cr.set_source_rgb(0.5, 0.5, 0.5)190 cr.set_source_rgb(0.5, 0.5, 0.5)
191191
@@ -195,7 +195,7 @@
195 cr.set_source_rgba(1.0, 1.0, 1.0, 1.0)195 cr.set_source_rgba(1.0, 1.0, 1.0, 1.0)
196 else:196 else:
197 cr.set_source_rgba(1.0, 1.0, 1.0)197 cr.set_source_rgba(1.0, 1.0, 1.0)
198 cr.set_line_width(1.0)198 cr.set_line_width(6.0)
199 cr.move_to(0, 0)199 cr.move_to(0, 0)
200 cr.rectangle(0, 0, 16, 16)200 cr.rectangle(0, 0, 16, 16)
201 cr.rectangle(w-16, 0, 16, 16)201 cr.rectangle(w-16, 0, 16, 16)
@@ -208,13 +208,13 @@
208 cr.rectangle(w-16, h/2-8, 16, 16)208 cr.rectangle(w-16, h/2-8, 16, 16)
209209
210 cr.fill()210 cr.fill()
211 cr.set_source_rgb(0.0, 0.0, 0.0)211 cr.set_source_rgb(0.65, 0.65, 0.65)
212 cr.rectangle(0, 0, w, h)212 cr.rectangle(0, 0, w, h)
213 cr.stroke()213 cr.stroke()
214 cr.set_operator(cairo.OPERATOR_OVER)214 cr.set_operator(cairo.OPERATOR_OVER)
215 self._outline_text(cr, w, h, 24, _("Select region by resizing the window"))215 self._outline_text(cr, w, h, 30, _("Select region by resizing the rectangle"))
216 self._outline_text(cr, w, h + 50, 24, _("Press ENTER to confirm or ESC to cancel."))216 self._outline_text(cr, w, h + 50, 26, _("Press ENTER to confirm or ESC to cancel"))
217 self._outline_text(cr, w, h + 80, 12, "({0} x {1})".format(w, h))217 self._outline_text(cr, w, h + 100, 20, "({0} x {1})".format(w, h))
218218
219219
220 def _outline_text(self, cr, w, h, size, text):220 def _outline_text(self, cr, w, h, size, text):

Subscribers

People subscribed via source and target branches