From b12a4df13bd5e0f2cf863e1ab384b1c978e2502b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 18 Sep 2018 15:07:32 +0200 Subject: [PATCH 1/5] home-button: Use phosh-panel-btn style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is already used in the top panel. Signed-off-by: Guido Günther --- src/ui/home.ui | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ui/home.ui b/src/ui/home.ui index 0973b3a7..9867edd5 100644 --- a/src/ui/home.ui +++ b/src/ui/home.ui @@ -26,6 +26,9 @@ image1 top True + 0 -- GitLab From 054c37edc01535cd6f2657891192a90a363d0854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 18 Sep 2018 15:07:32 +0200 Subject: [PATCH 2/5] top-panel: Remove favorites button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther --- src/panel.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/src/panel.c b/src/panel.c index 857cfe9a..43195493 100644 --- a/src/panel.c +++ b/src/panel.c @@ -24,14 +24,12 @@ #define _(String) gettext (String) enum { - FAVORITES_ACTIVATED, SETTINGS_ACTIVATED, N_SIGNALS }; static guint signals[N_SIGNALS] = { 0 }; typedef struct { - GtkWidget *btn_favorites; GtkWidget *btn_settings; GtkWidget *wwaninfo; GtkWidget *batteryinfo; @@ -48,15 +46,6 @@ typedef struct _PhoshPanel G_DEFINE_TYPE_WITH_PRIVATE (PhoshPanel, phosh_panel, PHOSH_TYPE_LAYER_SURFACE) -static void -favorites_clicked_cb (PhoshPanel *self, GtkButton *btn) -{ - g_return_if_fail (PHOSH_IS_PANEL (self)); - g_return_if_fail (GTK_IS_BUTTON (btn)); - g_signal_emit(self, signals[FAVORITES_ACTIVATED], 0); -} - - static void settings_clicked_cb (PhoshPanel *self, GtkButton *btn) { @@ -96,7 +85,6 @@ phosh_panel_constructed (GObject *object) G_OBJECT_CLASS (phosh_panel_parent_class)->constructed (object); - gtk_button_set_label (GTK_BUTTON (priv->btn_favorites), _("Librem5 dev board")); priv->wall_clock = gnome_wall_clock_new (); g_signal_connect (priv->wall_clock, @@ -104,12 +92,6 @@ phosh_panel_constructed (GObject *object) G_CALLBACK (wall_clock_notify_cb), self); - g_signal_connect_object (priv->btn_favorites, - "clicked", - G_CALLBACK (favorites_clicked_cb), - self, - G_CONNECT_SWAPPED); - g_signal_connect_object (priv->btn_settings, "clicked", G_CALLBACK (settings_clicked_cb), @@ -126,10 +108,6 @@ phosh_panel_constructed (GObject *object) "phosh-panel"); /* Button properites */ - gtk_style_context_remove_class (gtk_widget_get_style_context (priv->btn_favorites), - "button"); - gtk_style_context_remove_class (gtk_widget_get_style_context (priv->btn_favorites), - "image-button"); gtk_style_context_remove_class (gtk_widget_get_style_context (priv->btn_settings), "button"); gtk_style_context_remove_class (gtk_widget_get_style_context (priv->btn_settings), @@ -160,17 +138,12 @@ phosh_panel_class_init (PhoshPanelClass *klass) object_class->constructed = phosh_panel_constructed; object_class->dispose = phosh_panel_dispose; - signals[FAVORITES_ACTIVATED] = g_signal_new ("favorites-activated", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - NULL, G_TYPE_NONE, 0); - signals[SETTINGS_ACTIVATED] = g_signal_new ("settings-activated", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/phosh/ui/top-panel.ui"); - gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, btn_favorites); gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, btn_settings); PHOSH_TYPE_WWAN_INFO; /* make sure the type is known */ gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, wwaninfo); -- GitLab From bb4706652cbe563f84366e0e92b3a651e0a90533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 18 Sep 2018 15:07:32 +0200 Subject: [PATCH 3/5] top-panel: Move network icons to the right and other indicators to the left Parts of #40 and #29 --- src/ui/top-panel.ui | 84 +++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/src/ui/top-panel.ui b/src/ui/top-panel.ui index ececac83..ea5158a8 100644 --- a/src/ui/top-panel.ui +++ b/src/ui/top-panel.ui @@ -8,56 +8,41 @@ - + True False + False + - - True - True - True - 0.10000000149011612 - 0.5 - True - - - - True - True - 0 - - - - + True False - + True False - 8 - - - False - True - 1 - - - - + + True False 8 + + + False + True + 1 + + False True - 2 + 0 - + 00:00 True @@ -65,9 +50,6 @@ True 0.89999997615814209 0.5 - False @@ -75,12 +57,32 @@ 3 + + + True + False + end + + + True + False + 8 + + + False + True + 2 + + + + + False + True + end + 4 + + - - False - True - 2 - -- GitLab From 874ed5121036df84f18d030f91a678610c4591d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 18 Sep 2018 15:07:32 +0200 Subject: [PATCH 4/5] top-panel: Let the whole top panel toggle the settings menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther --- src/panel.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/panel.c b/src/panel.c index 43195493..cb398eff 100644 --- a/src/panel.c +++ b/src/panel.c @@ -30,6 +30,7 @@ enum { static guint signals[N_SIGNALS] = { 0 }; typedef struct { + GtkWidget *btn_top_panel; GtkWidget *btn_settings; GtkWidget *wwaninfo; GtkWidget *batteryinfo; @@ -47,7 +48,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (PhoshPanel, phosh_panel, PHOSH_TYPE_LAYER_SURFACE) static void -settings_clicked_cb (PhoshPanel *self, GtkButton *btn) +top_panel_clicked_cb (PhoshPanel *self, GtkButton *btn) { g_return_if_fail (PHOSH_IS_PANEL (self)); g_return_if_fail (GTK_IS_BUTTON (btn)); @@ -92,9 +93,9 @@ phosh_panel_constructed (GObject *object) G_CALLBACK (wall_clock_notify_cb), self); - g_signal_connect_object (priv->btn_settings, + g_signal_connect_object (priv->btn_top_panel, "clicked", - G_CALLBACK (settings_clicked_cb), + G_CALLBACK (top_panel_clicked_cb), self, G_CONNECT_SWAPPED); g_signal_connect (self, @@ -108,9 +109,9 @@ phosh_panel_constructed (GObject *object) "phosh-panel"); /* Button properites */ - gtk_style_context_remove_class (gtk_widget_get_style_context (priv->btn_settings), + gtk_style_context_remove_class (gtk_widget_get_style_context (priv->btn_top_panel), "button"); - gtk_style_context_remove_class (gtk_widget_get_style_context (priv->btn_settings), + gtk_style_context_remove_class (gtk_widget_get_style_context (priv->btn_top_panel), "image-button"); wall_clock_notify_cb (priv->wall_clock, NULL, self); @@ -144,6 +145,7 @@ phosh_panel_class_init (PhoshPanelClass *klass) gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/phosh/ui/top-panel.ui"); + gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, btn_top_panel); gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, btn_settings); PHOSH_TYPE_WWAN_INFO; /* make sure the type is known */ gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, wwaninfo); -- GitLab From 645f31d5e476a8324d21aeda70ebdb3911de1df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 18 Sep 2018 15:07:32 +0200 Subject: [PATCH 5/5] top-panel: Make clock a label instead of a button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we the whole panel is clickable there's no point in having a button. Signed-off-by: Guido Günther --- src/panel.c | 6 +++--- src/ui/top-panel.ui | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/panel.c b/src/panel.c index cb398eff..a29e2fe7 100644 --- a/src/panel.c +++ b/src/panel.c @@ -31,7 +31,7 @@ static guint signals[N_SIGNALS] = { 0 }; typedef struct { GtkWidget *btn_top_panel; - GtkWidget *btn_settings; + GtkWidget *lbl_clock; GtkWidget *wwaninfo; GtkWidget *batteryinfo; gint height; @@ -65,7 +65,7 @@ wall_clock_notify_cb (GnomeWallClock *wall_clock, const gchar *str; str = gnome_wall_clock_get_clock(wall_clock); - gtk_button_set_label (GTK_BUTTON (priv->btn_settings), str); + gtk_label_set_text (GTK_LABEL (priv->lbl_clock), str); } @@ -146,7 +146,7 @@ phosh_panel_class_init (PhoshPanelClass *klass) gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/phosh/ui/top-panel.ui"); gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, btn_top_panel); - gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, btn_settings); + gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, lbl_clock); PHOSH_TYPE_WWAN_INFO; /* make sure the type is known */ gtk_widget_class_bind_template_child_private (widget_class, PhoshPanel, wwaninfo); PHOSH_TYPE_BATTERY_INFO; /* make sure the type is known */ diff --git a/src/ui/top-panel.ui b/src/ui/top-panel.ui index ea5158a8..f46472e0 100644 --- a/src/ui/top-panel.ui +++ b/src/ui/top-panel.ui @@ -43,13 +43,11 @@ - + 00:00 True True True - 0.89999997615814209 - 0.5 False -- GitLab