1 files changed, 2 insertions, 187 deletions

diff --git a/shell/panel.c b/shell/panel.c
index 44ab5e3..ca6047f 100644
--- a/shell/panel.c
+++ b/shell/panel.c
@@ -25,12 +25,8 @@
 
 #include "app-icon.h"
 #include "favorites.h"
-#include "vertical-clock.h"
 
 enum {
-  APP_MENU_TOGGLED,
-  SYSTEM_TOGGLED,
-  VOLUME_TOGGLED,
   FAVORITE_LAUNCHED,
   N_SIGNALS
 };
@@ -38,15 +34,6 @@ static guint signals[N_SIGNALS] = { 0 };
 
 struct MaynardPanelPrivate {
   gboolean hidden;
-
-  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 +44,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
@@ -80,27 +65,6 @@ widget_connect_enter_signal (MaynardPanel *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)
 {
@@ -129,91 +93,10 @@ maynard_panel_constructed (GObject *object)
       gtk_widget_get_style_context (GTK_WIDGET (self)),
       "maynard-panel");
 
-  /* main vbox */
-  main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  /* main hbox */
+  main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (self), main_box);
 
-  /* for the top buttons and vertical clock we have a few more
-   * boxes. the hbox has two cells. in each cell there is a
-   * GtkRevealer for hiding and showing the content. only one revealer
-   * is ever visibile at one point and transitions happen at the same
-   * time so the width stays constant (the animation duration is the
-   * same). the first revealer contains another box which has the two
-   * wifi and sound buttons. the second revealer has the vertical
-   * clock widget.
-   */
-
-  /* GtkBoxes seem to eat up enter/leave events, so let's use an event
-   * box for the entire thing. */
-  ebox = gtk_event_box_new ();
-  gtk_box_pack_start (GTK_BOX (main_box), ebox, FALSE, FALSE, 0);
-  widget_connect_enter_signal (self, ebox);
-
-  menu_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_container_add (GTK_CONTAINER (ebox), menu_box);
-
-  /* revealer for the top buttons */
-  self->priv->revealer_buttons = gtk_revealer_new ();
-  gtk_revealer_set_transition_type (GTK_REVEALER (self->priv->revealer_buttons),
-      GTK_REVEALER_TRANSITION_TYPE_SLIDE_LEFT);
-  gtk_revealer_set_reveal_child (GTK_REVEALER (self->priv->revealer_buttons),
-      TRUE);
-  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),
-      GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT);
-  gtk_revealer_set_reveal_child (GTK_REVEALER (self->priv->revealer_clock),
-      FALSE);
-  gtk_box_pack_start (GTK_BOX (menu_box),
-      self->priv->revealer_clock, FALSE, FALSE, 0);
-
-  /* vertical clock */
-  gtk_container_add (GTK_CONTAINER (self->priv->revealer_clock),
-      maynard_vertical_clock_new ());
-
-  /* end of the menu buttons and vertical clock */
-
   /* favorites */
   ebox = gtk_event_box_new ();
   gtk_box_pack_start (GTK_BOX (main_box), ebox, FALSE, FALSE, 0);
@@ -224,18 +107,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 +116,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 +128,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);
@@ -284,14 +142,6 @@ maynard_panel_new (void)
       NULL);
 }
 
-void
-maynard_panel_set_expand (MaynardPanel *self,
-    gboolean expand)
-{
-  gtk_revealer_set_reveal_child (GTK_REVEALER (self->priv->revealer_buttons), expand);
-  gtk_revealer_set_reveal_child (GTK_REVEALER (self->priv->revealer_clock), !expand);
-}
-
 static void
 set_icon (GtkWidget *button,
     const gchar *icon_name)
@@ -303,38 +153,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);
-}