Merge lp:~noskcaj/gnome-system-monitor/titlebar into lp:~ubuntu-desktop/gnome-system-monitor/ubuntu

Proposed by Jackson Doak on 2014-12-03
Status: Rejected
Rejected by: Sebastien Bacher on 2015-03-09
Proposed branch: lp:~noskcaj/gnome-system-monitor/titlebar
Merge into: lp:~ubuntu-desktop/gnome-system-monitor/ubuntu
Diff against target: 134 lines (+81/-2)
7 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/patches/series (+2/-0)
debian/patches/traditional-titlebars-pt2.patch (+25/-0)
debian/patches/traditional-titlebars.patch (+40/-0)
debian/source/lintian-overrides (+3/-0)
To merge this branch: bzr merge lp:~noskcaj/gnome-system-monitor/titlebar
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-12-03 Needs Fixing on 2014-12-05
Review via email: mp+243576@code.launchpad.net

Description of the change

Use traditional titlebars on !gnome. Also adds lintian overrides that were dropped when we synced somehow

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks, that looks fine, you include lintian changes as well, those should either be documented in the changelog or moved out of this changeset

review: Needs Fixing
Sebastien Bacher (seb128) wrote :

Thanks, testing that version I found other issues, the bg is transparent which makes the application quite unusable under Unity... that should be fixed before accepting in it vivid as well

review: Needs Fixing
Tim Lunn (darkxst) wrote :

seb, what is transparent the header bar? I don't see that but I do see incorrect theming.

Adwaita now applies header_bar styling to the titlebar class as well [1], quite a few apps are thus setting the class on header bar widget to "titlebar" rather than "header_bar", this includes atleast cheese, baobab, gnome-contacts, g-s-m and gedit. I guess this change needs to be incorporated into the ubuntu themes.

[1] https://git.gnome.org/browse/gnome-themes-standard/commit/?id=35191720f7676bd8f2b142387b767397bb18354e

66. By Jackson Doak on 2014-12-08

Add part 2 patch

67. By Jackson Doak on 2014-12-08

typoe fix

Sebastien Bacher (seb128) wrote :

the update has been done by somebody else

Unmerged revisions

67. By Jackson Doak on 2014-12-08

typoe fix

66. By Jackson Doak on 2014-12-08

Add part 2 patch

65. By Jackson Doak on 2014-12-03

Add traditional-titlebars.patch. Uses traditional titlebars
on !Gnome. Thanks Tim Lunn. LP: #1385560, #1261608

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-10-25 17:20:48 +0000
3+++ debian/changelog 2014-12-08 18:52:07 +0000
4@@ -1,3 +1,10 @@
5+gnome-system-monitor (3.14.1-1ubuntu1) vivid; urgency=medium
6+
7+ * Add traditional-titlebar patches. Uses traditional titlebars
8+ on !Gnome. Thanks Tim Lunn. LP: #1385560, #1261608
9+
10+ -- Jackson Doak <noskcaj@ubuntu.com> Wed, 03 Dec 2014 08:03:13 +1100
11+
12 gnome-system-monitor (3.14.1-1) unstable; urgency=medium
13
14 [ Jackson Doak ]
15
16=== modified file 'debian/control'
17--- debian/control 2014-10-25 17:20:48 +0000
18+++ debian/control 2014-12-08 18:52:07 +0000
19@@ -5,7 +5,8 @@
20 Source: gnome-system-monitor
21 Section: gnome
22 Priority: optional
23-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
26 Uploaders: Andreas Henriksson <andreas@fatal.se>, Laurent Bigonville <bigon@debian.org>
27 Build-Depends: appdata-tools,
28 cdbs,
29
30=== modified file 'debian/control.in'
31--- debian/control.in 2014-10-25 17:20:48 +0000
32+++ debian/control.in 2014-12-08 18:52:07 +0000
33@@ -1,7 +1,8 @@
34 Source: gnome-system-monitor
35 Section: gnome
36 Priority: optional
37-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
38+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
39+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
40 Uploaders: @GNOME_TEAM@
41 Build-Depends: appdata-tools,
42 cdbs,
43
44=== added directory 'debian/patches'
45=== added file 'debian/patches/series'
46--- debian/patches/series 1970-01-01 00:00:00 +0000
47+++ debian/patches/series 2014-12-08 18:52:07 +0000
48@@ -0,0 +1,2 @@
49+traditional-titlebars.patch
50+traditional-titlebars-pt2.patch
51
52=== added file 'debian/patches/traditional-titlebars-pt2.patch'
53--- debian/patches/traditional-titlebars-pt2.patch 1970-01-01 00:00:00 +0000
54+++ debian/patches/traditional-titlebars-pt2.patch 2014-12-08 18:52:07 +0000
55@@ -0,0 +1,25 @@
56+From 44d0f8dedf7b533cb51d2aebbf71693bedcc6bb8 Mon Sep 17 00:00:00 2001
57+From: Tim Lunn <tim@feathertop.org>
58+Date: Wed, 3 Dec 2014 07:42:51 +1100
59+Subject: [PATCH] Don't set "titlebar" class when using headerbar widget as a
60+ toolbar
61+
62+https://bugzilla.gnome.org/show_bug.cgi?id=741236
63+---
64+ src/interface.cpp | 1 +
65+ 1 file changed, 1 insertion(+)
66+
67+diff --git a/src/interface.cpp b/src/interface.cpp
68+index b40676e..582bb80 100644
69+--- a/src/interface.cpp
70++++ b/src/interface.cpp
71+@@ -646,6 +646,7 @@ create_main_window (GsmApplication *app)
72+
73+ mainbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_box"));
74+ headerbar = GTK_WIDGET (gtk_builder_get_object (builder, "header_bar"));
75++ gtk_style_context_remove_class (gtk_widget_get_style_context (headerbar), "titlebar");
76+ gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
77+ gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), FALSE);
78+ gtk_box_pack_start (GTK_BOX(mainbox), headerbar, FALSE, FALSE, 0);
79+--
80+2.1.3
81\ No newline at end of file
82
83=== added file 'debian/patches/traditional-titlebars.patch'
84--- debian/patches/traditional-titlebars.patch 1970-01-01 00:00:00 +0000
85+++ debian/patches/traditional-titlebars.patch 2014-12-08 18:52:07 +0000
86@@ -0,0 +1,40 @@
87+From 059be700bade7088cfba4609b518d2e7c43b9a97 Mon Sep 17 00:00:00 2001
88+From: Tim Lunn <tim@feathertop.org>
89+Date: Wed, 3 Dec 2014 07:42:51 +1100
90+Subject: [PATCH] Use traditional titlebars on !GNOME DE's
91+
92+https://bugzilla.gnome.org/show_bug.cgi?id=741044
93+---
94+ src/interface.cpp | 14 ++++++++++++++
95+ 1 file changed, 14 insertions(+)
96+
97+--- a/src/interface.cpp
98++++ b/src/interface.cpp
99+@@ -626,6 +626,8 @@ create_main_window (GsmApplication *app)
100+ GtkWidget *process_menu_button;
101+ GMenuModel *process_menu_model;
102+
103++ const char* session;
104++
105+ int width, height, xpos, ypos;
106+
107+ GtkBuilder *builder = gtk_builder_new();
108+@@ -637,6 +639,18 @@ create_main_window (GsmApplication *app)
109+ gtk_widget_set_name (main_window, "gnome-system-monitor");
110+ app->main_window = main_window;
111+
112++ session = g_getenv ("XDG_CURRENT_DESKTOP");
113++ if (session && !strstr (session, "GNOME")){
114++ GtkWidget *mainbox;
115++ GtkWidget *headerbar;
116++
117++ mainbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_box"));
118++ headerbar = GTK_WIDGET (gtk_builder_get_object (builder, "header_bar"));
119++ gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
120++ gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), FALSE);
121++ gtk_box_pack_start (GTK_BOX(mainbox), headerbar, FALSE, FALSE, 0);
122++ }
123++
124+ g_settings_get (app->settings, GSM_SETTING_WINDOW_STATE, "(iiii)",
125+ &width, &height, &xpos, &ypos);
126+ width = CLAMP (width, 50, gdk_screen_width ());
127
128=== added file 'debian/source/lintian-overrides'
129--- debian/source/lintian-overrides 1970-01-01 00:00:00 +0000
130+++ debian/source/lintian-overrides 2014-12-08 18:52:07 +0000
131@@ -0,0 +1,3 @@
132+# https://bugzilla.gnome.org/show_bug.cgi?id=738752
133+gnome-system-monitor source: source-is-missing scripts/gsm-kill
134+gnome-system-monitor source: source-is-missing scripts/gsm-renice

Subscribers

People subscribed via source and target branches