Merge lp:~l-admin-3/eidete/dialog-margin-fix into lp:eidete

Proposed by Marcus Wichelmann
Status: Merged
Approved by: Tom Beckmann
Approved revision: 180
Merged at revision: 182
Proposed branch: lp:~l-admin-3/eidete/dialog-margin-fix
Merge into: lp:eidete
Diff against target: 41 lines (+5/-3)
2 files modified
src/Widgets/end_dialog.vala (+5/-2)
src/eidete.vala (+0/-1)
To merge this branch: bzr merge lp:~l-admin-3/eidete/dialog-margin-fix
Reviewer Review Type Date Requested Status
Tom Beckmann (community) Approve
Review via email: mp+245691@code.launchpad.net

Commit message

optimize margins, hide close button on end-dialog

Description of the change

I've decreased the content-margin of some dialogs and removed the close-button of the end-dialog.

To post a comment you must log in.
Revision history for this message
Tom Beckmann (tombeckmann) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Widgets/end_dialog.vala'
--- src/Widgets/end_dialog.vala 2015-01-06 13:29:27 +0000
+++ src/Widgets/end_dialog.vala 2015-01-06 20:02:49 +0000
@@ -27,12 +27,14 @@
27 private File source;27 private File source;
2828
29 public EndDialog (EideteApp app) {29 public EndDialog (EideteApp app) {
30 Object (use_header_bar: 1);
31
30 this.app = app;32 this.app = app;
31
32 this.window_position = Gtk.WindowPosition.CENTER_ON_PARENT;33 this.window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
33 }34 }
3435
35 private void build_ui () {36 private void build_ui () {
37 (this.get_header_bar () as Gtk.HeaderBar).show_close_button = false;
36 this.get_header_bar ().get_style_context ().remove_class ("header-bar");38 this.get_header_bar ().get_style_context ().remove_class ("header-bar");
37 this.set_default_size (600, 600);39 this.set_default_size (600, 600);
38 this.set_application (app);40 this.set_application (app);
@@ -46,7 +48,8 @@
46 this.icon_name = "eidete";48 this.icon_name = "eidete";
4749
48 grid = new Gtk.Grid ();50 grid = new Gtk.Grid ();
49 grid.margin = 12;51 grid.margin_start = 12;
52 grid.margin_end = 12;
5053
51 var content = (this.get_content_area () as Gtk.Box);54 var content = (this.get_content_area () as Gtk.Box);
5255
5356
=== modified file 'src/eidete.vala'
--- src/eidete.vala 2015-01-06 13:29:27 +0000
+++ src/eidete.vala 2015-01-06 20:02:49 +0000
@@ -502,7 +502,6 @@
502502
503 private void build_pause_ui () {503 private void build_pause_ui () {
504 pause_grid = new Gtk.Grid ();504 pause_grid = new Gtk.Grid ();
505 pause_grid.margin = 12;
506 // this.main_window.title = _("Recording paused");505 // this.main_window.title = _("Recording paused");
507506
508 var img_text_grid = new Gtk.Grid ();507 var img_text_grid = new Gtk.Grid ();

Subscribers

People subscribed via source and target branches