From 924c77b1548936037cb65f2bec0ce7d29c3277ea Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 28 Jun 2014 10:11:02 +0000 Subject: remove app launcher and system/volume buttons --- shell/panel.c | 127 ---------------------------------------------------------- 1 file changed, 127 deletions(-) (limited to 'shell/panel.c') diff --git a/shell/panel.c b/shell/panel.c index 44ab5e3..b4df188 100644 --- a/shell/panel.c +++ b/shell/panel.c @@ -41,12 +41,6 @@ struct MaynardPanelPrivate { GtkWidget *revealer_buttons; /* for the top buttons */ GtkWidget *revealer_clock; /* for the vertical clock */ - - GtkWidget *system_button; - - gboolean volume_showing; - GtkWidget *volume_button; - gchar *volume_icon_name; }; G_DEFINE_TYPE(MaynardPanel, maynard_panel, GTK_TYPE_WINDOW) @@ -57,8 +51,6 @@ maynard_panel_init (MaynardPanel *self) self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MAYNARD_PANEL_TYPE, MaynardPanelPrivate); - - self->priv->volume_icon_name = g_strdup ("audio-volume-high-symbolic"); } static gboolean @@ -79,27 +71,6 @@ widget_connect_enter_signal (MaynardPanel *self, G_CALLBACK (widget_enter_notify_event_cb), self); } -static void -app_menu_button_clicked_cb (GtkButton *button, - MaynardPanel *self) -{ - g_signal_emit (self, signals[APP_MENU_TOGGLED], 0); -} - -static void -system_button_clicked_cb (GtkButton *button, - MaynardPanel *self) -{ - g_signal_emit (self, signals[SYSTEM_TOGGLED], 0); -} - -static void -volume_button_clicked_cb (GtkButton *button, - MaynardPanel *self) -{ - g_signal_emit (self, signals[VOLUME_TOGGLED], 0); -} - static void favorite_launched_cb (MaynardFavorites *favorites, MaynardPanel *self) @@ -161,44 +132,6 @@ maynard_panel_constructed (GObject *object) gtk_box_pack_start (GTK_BOX (menu_box), self->priv->revealer_buttons, FALSE, FALSE, 0); - /* the box for the top buttons */ - buttons_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add (GTK_CONTAINER (self->priv->revealer_buttons), buttons_box); - - /* system button */ - ebox = gtk_event_box_new (); - gtk_box_pack_start (GTK_BOX (buttons_box), ebox, FALSE, FALSE, 0); - button = gtk_button_new_from_icon_name ("emblem-system-symbolic", - GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_style_context_add_class (gtk_widget_get_style_context (button), - "maynard-system"); - gtk_style_context_remove_class (gtk_widget_get_style_context (button), - "button"); - gtk_style_context_remove_class (gtk_widget_get_style_context (button), - "image-button"); - g_signal_connect (button, "clicked", - G_CALLBACK (system_button_clicked_cb), self); - gtk_container_add (GTK_CONTAINER (ebox), button); - widget_connect_enter_signal (self, ebox); - self->priv->system_button = button; - - /* sound button */ - ebox = gtk_event_box_new (); - gtk_box_pack_start (GTK_BOX (buttons_box), ebox, FALSE, FALSE, 0); - button = gtk_button_new_from_icon_name (self->priv->volume_icon_name, - GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_style_context_add_class (gtk_widget_get_style_context (button), - "maynard-audio"); - gtk_style_context_remove_class (gtk_widget_get_style_context (button), - "button"); - gtk_style_context_remove_class (gtk_widget_get_style_context (button), - "image-button"); - g_signal_connect (button, "clicked", - G_CALLBACK (volume_button_clicked_cb), self); - gtk_container_add (GTK_CONTAINER (ebox), button); - widget_connect_enter_signal (self, ebox); - self->priv->volume_button = button; - /* revealer for the vertical clock */ self->priv->revealer_clock = gtk_revealer_new (); gtk_revealer_set_transition_type (GTK_REVEALER (self->priv->revealer_clock), @@ -224,18 +157,8 @@ maynard_panel_constructed (GObject *object) g_signal_connect (favorites, "app-launched", G_CALLBACK (favorite_launched_cb), self); - /* bottom app menu button */ - ebox = gtk_event_box_new (); - gtk_box_pack_end (GTK_BOX (main_box), ebox, FALSE, FALSE, 0); - button = maynard_app_icon_new ("view-grid-symbolic"); - g_signal_connect (button, "clicked", - G_CALLBACK (app_menu_button_clicked_cb), self); - gtk_container_add (GTK_CONTAINER (ebox), button); - widget_connect_enter_signal (self, ebox); - /* done */ self->priv->hidden = FALSE; - self->priv->volume_showing = FALSE; } static void @@ -243,9 +166,6 @@ maynard_panel_dispose (GObject *object) { MaynardPanel *self = MAYNARD_PANEL (object); - g_free (self->priv->volume_icon_name); - self->priv->volume_icon_name = NULL; - G_OBJECT_CLASS (maynard_panel_parent_class)->dispose (object); } @@ -258,18 +178,6 @@ maynard_panel_class_init (MaynardPanelClass *klass) object_class->constructed = maynard_panel_constructed; object_class->dispose = maynard_panel_dispose; - signals[APP_MENU_TOGGLED] = g_signal_new ("app-menu-toggled", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - NULL, G_TYPE_NONE, 0); - - signals[SYSTEM_TOGGLED] = g_signal_new ("system-toggled", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - NULL, G_TYPE_NONE, 0); - - signals[VOLUME_TOGGLED] = g_signal_new ("volume-toggled", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - NULL, G_TYPE_NONE, 0); - signals[FAVORITE_LAUNCHED] = g_signal_new ("favorite-launched", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 0); @@ -303,38 +211,3 @@ set_icon (GtkWidget *button, gtk_button_set_image (GTK_BUTTON (button), image); } - -void -maynard_panel_show_previous (MaynardPanel *self, - MaynardPanelButton button) -{ - switch (button) - { - case MAYNARD_PANEL_BUTTON_SYSTEM: - set_icon (self->priv->system_button, "go-previous-symbolic"); - set_icon (self->priv->volume_button, self->priv->volume_icon_name); - self->priv->volume_showing = FALSE; - break; - case MAYNARD_PANEL_BUTTON_VOLUME: - set_icon (self->priv->system_button, "emblem-system-symbolic"); - set_icon (self->priv->volume_button, "go-previous-symbolic"); - self->priv->volume_showing = TRUE; - break; - case MAYNARD_PANEL_BUTTON_NONE: - default: - set_icon (self->priv->system_button, "emblem-system-symbolic"); - set_icon (self->priv->volume_button, self->priv->volume_icon_name); - self->priv->volume_showing = FALSE; - } -} - -void -maynard_panel_set_volume_icon_name (MaynardPanel *self, - const gchar *icon_name) -{ - g_free (self->priv->volume_icon_name); - self->priv->volume_icon_name = g_strdup (icon_name); - - if (!self->priv->volume_showing) - set_icon (self->priv->volume_button, icon_name); -} -- cgit v1.3.1