Noise

Merge lp:~l-admin-3/noise/dialog-margins into lp:~elementary-apps/noise/trunk

  1. dialog-margins
  2. Merge into trunk
Proposed by Marcus Wichelmann
Status: Merged
Approved by: Danielle Foré
Approved revision: 1746
Merged at revision: 1746
Proposed branch: lp:~l-admin-3/noise/dialog-margins
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 183 lines (+11/-32)
6 files modified
src/Dialogs/FileNotFoundDialog.vala (+2/-7)
src/Dialogs/InstallGstreamerPluginsDialog.vala (+2/-7)
src/Dialogs/MediaEditor.vala (+2/-5)
src/Dialogs/PreferencesWindow.vala (+1/-4)
src/Dialogs/RemoveFilesDialog.vala (+2/-7)
src/Dialogs/SmartPlaylistEditor.vala (+2/-2)
To merge this branch: bzr merge lp:~l-admin-3/noise/dialog-margins
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+246793@code.launchpad.net

Commit message

Fixes the margins of a Gtk.Dialog in Gtk+-3.14.

Description of the change

Fixes the margins of a Gtk.Dialog in Gtk+-3.14.

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 'src/Dialogs/FileNotFoundDialog.vala'
2--- src/Dialogs/FileNotFoundDialog.vala 2014-09-02 15:20:49 +0000
3+++ src/Dialogs/FileNotFoundDialog.vala 2015-01-16 23:39:23 +0000
4@@ -35,14 +35,8 @@
5 Gtk.Button rescanLibrary;
6
7 public FileNotFoundDialog (Gee.LinkedList<Media> media_list) {
8- Object (use_header_bar: 1);
9-
10 var app_name = ((Noise.App) GLib.Application.get_default ()).get_name ();
11
12- (get_header_bar () as Gtk.HeaderBar).title = app_name;
13- (get_header_bar () as Gtk.HeaderBar).show_close_button = false;
14- get_header_bar ().get_style_context ().remove_class ("header-bar");
15-
16 this.media_list = media_list;
17
18 this.set_modal (true);
19@@ -50,6 +44,7 @@
20 this.destroy_with_parent = true;
21 this.border_width = 6;
22 resizable = false;
23+ deletable = false;
24
25 var content = get_content_area () as Gtk.Box;
26
27@@ -180,4 +175,4 @@
28 void file_operations_started () {
29 rescanLibrary.set_sensitive (false);
30 }
31-}
32\ No newline at end of file
33+}
34
35=== modified file 'src/Dialogs/InstallGstreamerPluginsDialog.vala'
36--- src/Dialogs/InstallGstreamerPluginsDialog.vala 2014-09-02 15:20:49 +0000
37+++ src/Dialogs/InstallGstreamerPluginsDialog.vala 2015-01-16 23:39:23 +0000
38@@ -25,14 +25,8 @@
39 string detail;
40
41 public InstallGstreamerPluginsDialog (Gst.Message message) {
42- Object (use_header_bar: 1);
43-
44 var app_name = ((Noise.App) GLib.Application.get_default ()).get_name ();
45
46- (get_header_bar () as Gtk.HeaderBar).title = app_name;
47- (get_header_bar () as Gtk.HeaderBar).show_close_button = false;
48- get_header_bar ().get_style_context ().remove_class ("header-bar");
49-
50 this.message = message;
51 this.detail = Gst.PbUtils.missing_plugin_message_get_description (message);
52
53@@ -41,6 +35,7 @@
54 this.destroy_with_parent = true;
55 this.border_width = 6;
56 resizable = false;
57+ deletable = false;
58
59 var content = get_content_area () as Gtk.Box;
60
61@@ -121,4 +116,4 @@
62 // this will mean that it will be checked again
63 return true;
64 }
65-}
66\ No newline at end of file
67+}
68
69=== modified file 'src/Dialogs/MediaEditor.vala'
70--- src/Dialogs/MediaEditor.vala 2014-09-03 12:17:08 +0000
71+++ src/Dialogs/MediaEditor.vala 2015-01-16 23:39:23 +0000
72@@ -56,7 +56,6 @@
73 public signal void medias_saved (Gee.LinkedList<int> medias);
74
75 public MediaEditor (Gee.LinkedList<int> allMedias, Gee.LinkedList<int> medias, Library library) {
76- Object (use_header_bar: 1);
77 this.library = library;
78 this.window_position = Gtk.WindowPosition.CENTER;
79 this.type_hint = Gdk.WindowTypeHint.DIALOG;
80@@ -64,6 +63,7 @@
81 this.set_transient_for(App.main_window);
82 this.destroy_with_parent = true;
83 this.resizable = false;
84+ this.deletable = false;
85
86 this.set_size_request (520, -1);
87
88@@ -79,9 +79,6 @@
89 stack_switcher.halign = Gtk.Align.CENTER;
90 stack_switcher.margin_bottom = 24;
91 stack_switcher.margin_top = 12;
92-
93- ((Gtk.HeaderBar) get_header_bar ()).set_custom_title (stack_switcher);
94- ((Gtk.HeaderBar) get_header_bar ()).show_close_button = false;
95
96 stack.add_titled (createBasicContent (), "metadata", _("Details"));
97 if(_medias.size == 1)
98@@ -668,4 +665,4 @@
99
100 info.set_markup(text);
101 }
102-}
103\ No newline at end of file
104+}
105
106=== modified file 'src/Dialogs/PreferencesWindow.vala'
107--- src/Dialogs/PreferencesWindow.vala 2014-08-07 09:27:02 +0000
108+++ src/Dialogs/PreferencesWindow.vala 2015-01-16 23:39:23 +0000
109@@ -39,7 +39,6 @@
110 private int index = 0;
111
112 public PreferencesWindow (LibraryWindow lw) {
113- Object (use_header_bar: 1);
114 build_ui (lw);
115
116 lw.add_preference_page.connect ((page) => {add_page (page);});
117@@ -82,12 +81,10 @@
118 title = _("Preferences");
119 set_size_request (MIN_WIDTH, MIN_HEIGHT);
120 resizable = false;
121+ deletable = false;
122 window_position = Gtk.WindowPosition.CENTER;
123 type_hint = Gdk.WindowTypeHint.DIALOG;
124
125- (get_header_bar () as Gtk.HeaderBar).show_close_button = false;
126- get_header_bar ().get_style_context ().remove_class ("header-bar");
127-
128 main_stack = new Gtk.Stack ();
129 main_stackswitcher = new Gtk.StackSwitcher ();
130 main_stackswitcher.set_stack (main_stack);
131
132=== modified file 'src/Dialogs/RemoveFilesDialog.vala'
133--- src/Dialogs/RemoveFilesDialog.vala 2014-09-02 15:20:49 +0000
134+++ src/Dialogs/RemoveFilesDialog.vala 2015-01-16 23:39:23 +0000
135@@ -31,18 +31,13 @@
136 public signal void remove_media(bool response);
137
138 public RemoveFilesDialog (Gee.LinkedList<Media> to_remove, ViewWrapper.Hint media_type) {
139- Object (use_header_bar: 1);
140-
141 var app_name = ((Noise.App) GLib.Application.get_default ()).get_name ();
142
143- (get_header_bar () as Gtk.HeaderBar).title = app_name;
144- (get_header_bar () as Gtk.HeaderBar).show_close_button = false;
145- get_header_bar ().get_style_context ().remove_class ("header-bar");
146-
147 this.set_modal(true);
148 this.set_transient_for (App.main_window);
149 this.destroy_with_parent = true;
150 resizable = false;
151+ deletable = false;
152
153 content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
154
155@@ -131,4 +126,4 @@
156
157 show_all();
158 }
159-}
160\ No newline at end of file
161+}
162
163=== modified file 'src/Dialogs/SmartPlaylistEditor.vala'
164--- src/Dialogs/SmartPlaylistEditor.vala 2014-04-24 19:29:29 +0000
165+++ src/Dialogs/SmartPlaylistEditor.vala 2015-01-16 23:39:23 +0000
166@@ -34,9 +34,9 @@
167 private Library library;
168
169 public SmartPlaylistEditor (SmartPlaylist? sp = null, Library library) {
170- Object (use_header_bar: 1);
171 this.title = _("Smart Playlist Editor");
172 this.library = library;
173+ this.deletable = false;
174
175 if (sp == null) {
176 is_new = true;
177@@ -442,4 +442,4 @@
178 return (compared == SmartQuery.FieldType.LAST_PLAYED || compared == SmartQuery.FieldType.DATE_ADDED
179 || compared == SmartQuery.FieldType.DATE_RELEASED);
180 }
181-}
182\ No newline at end of file
183+}

Subscribers

People subscribed via source and target branches