gtkui: get rid of top bar in favor of design mode widgets

3 files changed, 1 insertions, 304 deletions

diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 98f85ffc..90ce9db5 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -724,194 +724,6 @@
       </child>
 
       <child>
-	<widget class="GtkHBox" id="hbox2">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox3">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkButton" id="stopbtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_stopbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:48:41 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image128">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-stop</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="playbtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_playbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:48:53 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image2">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-play</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="pausebtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_pausebtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:01 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image3">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-pause</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="prevbtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_prevbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:08 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image4">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-previous</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="nextbtn">
-		  <property name="visible">True</property>
-		  <property name="relief">GTK_RELIEF_NONE</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_nextbtn_clicked" last_modification_time="Sun, 05 Jul 2009 10:49:12 GMT"/>
-
-		  <child>
-		    <widget class="GtkImage" id="image5">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-media-next</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="seekbar">
-	      <property name="width_request">20</property>
-	      <property name="visible">True</property>
-	      <property name="creation_function">create_seekbar</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Fri, 09 Apr 2010 19:51:15 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">2</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="Custom" id="volumebar">
-	      <property name="width_request">70</property>
-	      <property name="visible">True</property>
-	      <property name="creation_function">create_volumebar_widget</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Thu, 18 Feb 2010 20:13:13 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">2</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
 	<widget class="GtkVBox" id="plugins_bottom_vbox">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index 061b0184..6657bea3 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -111,7 +111,7 @@ gtkpl_init (void) {
     gtk_box_pack_start (GTK_BOX (vbox1), theme_treeview, FALSE, FALSE, 0);
     gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (theme_treeview), TRUE);
 
-    theme_button = lookup_widget (mainwin, "stopbtn");
+    theme_button = mainwin;//lookup_widget (mainwin, "stopbtn");
 }
 
 void
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index b712cba2..29318d0a 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -111,20 +111,6 @@ create_mainwin (void)
   GtkWidget *image654;
   GtkWidget *translators1;
   GtkWidget *image655;
-  GtkWidget *hbox2;
-  GtkWidget *hbox3;
-  GtkWidget *stopbtn;
-  GtkWidget *image128;
-  GtkWidget *playbtn;
-  GtkWidget *image2;
-  GtkWidget *pausebtn;
-  GtkWidget *image3;
-  GtkWidget *prevbtn;
-  GtkWidget *image4;
-  GtkWidget *nextbtn;
-  GtkWidget *image5;
-  GtkWidget *seekbar;
-  GtkWidget *volumebar;
   GtkWidget *plugins_bottom_vbox;
   GtkWidget *statusbar;
 
@@ -462,78 +448,6 @@ create_mainwin (void)
   gtk_widget_show (image655);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image655);
 
-  hbox2 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
-
-  hbox3 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox3);
-  gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, TRUE, 0);
-
-  stopbtn = gtk_button_new ();
-  gtk_widget_show (stopbtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), stopbtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(stopbtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (stopbtn), GTK_RELIEF_NONE);
-
-  image128 = gtk_image_new_from_stock ("gtk-media-stop", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image128);
-  gtk_container_add (GTK_CONTAINER (stopbtn), image128);
-
-  playbtn = gtk_button_new ();
-  gtk_widget_show (playbtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), playbtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(playbtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (playbtn), GTK_RELIEF_NONE);
-
-  image2 = gtk_image_new_from_stock ("gtk-media-play", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image2);
-  gtk_container_add (GTK_CONTAINER (playbtn), image2);
-
-  pausebtn = gtk_button_new ();
-  gtk_widget_show (pausebtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), pausebtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(pausebtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (pausebtn), GTK_RELIEF_NONE);
-
-  image3 = gtk_image_new_from_stock ("gtk-media-pause", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image3);
-  gtk_container_add (GTK_CONTAINER (pausebtn), image3);
-
-  prevbtn = gtk_button_new ();
-  gtk_widget_show (prevbtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), prevbtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(prevbtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (prevbtn), GTK_RELIEF_NONE);
-
-  image4 = gtk_image_new_from_stock ("gtk-media-previous", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image4);
-  gtk_container_add (GTK_CONTAINER (prevbtn), image4);
-
-  nextbtn = gtk_button_new ();
-  gtk_widget_show (nextbtn);
-  gtk_box_pack_start (GTK_BOX (hbox3), nextbtn, FALSE, FALSE, 0);
-  gtk_widget_set_can_focus(nextbtn, FALSE);
-  gtk_button_set_relief (GTK_BUTTON (nextbtn), GTK_RELIEF_NONE);
-
-  image5 = gtk_image_new_from_stock ("gtk-media-next", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image5);
-  gtk_container_add (GTK_CONTAINER (nextbtn), image5);
-
-  seekbar = create_seekbar ("seekbar", "", "", 0, 0);
-  gtk_widget_show (seekbar);
-  gtk_box_pack_start (GTK_BOX (hbox2), seekbar, TRUE, TRUE, 2);
-  gtk_widget_set_size_request (seekbar, 20, -1);
-  gtk_widget_set_can_focus(seekbar, FALSE);
-  gtk_widget_set_can_default(seekbar, FALSE);
-
-  volumebar = create_volumebar_widget ("volumebar", "", "", 0, 0);
-  gtk_widget_show (volumebar);
-  gtk_box_pack_start (GTK_BOX (hbox2), volumebar, FALSE, TRUE, 2);
-  gtk_widget_set_size_request (volumebar, 70, -1);
-  gtk_widget_set_can_focus(volumebar, FALSE);
-  gtk_widget_set_can_default(volumebar, FALSE);
-
   plugins_bottom_vbox = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (plugins_bottom_vbox);
   gtk_box_pack_start (GTK_BOX (vbox1), plugins_bottom_vbox, TRUE, TRUE, 0);
@@ -698,21 +612,6 @@ create_mainwin (void)
   g_signal_connect ((gpointer) translators1, "activate",
                     G_CALLBACK (on_translators1_activate),
                     NULL);
-  g_signal_connect ((gpointer) stopbtn, "clicked",
-                    G_CALLBACK (on_stopbtn_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) playbtn, "clicked",
-                    G_CALLBACK (on_playbtn_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) pausebtn, "clicked",
-                    G_CALLBACK (on_pausebtn_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) prevbtn, "clicked",
-                    G_CALLBACK (on_prevbtn_clicked),
-                    NULL);
-  g_signal_connect ((gpointer) nextbtn, "clicked",
-                    G_CALLBACK (on_nextbtn_clicked),
-                    NULL);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (mainwin, mainwin, "mainwin");
@@ -795,20 +694,6 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, image654, "image654");
   GLADE_HOOKUP_OBJECT (mainwin, translators1, "translators1");
   GLADE_HOOKUP_OBJECT (mainwin, image655, "image655");
-  GLADE_HOOKUP_OBJECT (mainwin, hbox2, "hbox2");
-  GLADE_HOOKUP_OBJECT (mainwin, hbox3, "hbox3");
-  GLADE_HOOKUP_OBJECT (mainwin, stopbtn, "stopbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image128, "image128");
-  GLADE_HOOKUP_OBJECT (mainwin, playbtn, "playbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image2, "image2");
-  GLADE_HOOKUP_OBJECT (mainwin, pausebtn, "pausebtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image3, "image3");
-  GLADE_HOOKUP_OBJECT (mainwin, prevbtn, "prevbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image4, "image4");
-  GLADE_HOOKUP_OBJECT (mainwin, nextbtn, "nextbtn");
-  GLADE_HOOKUP_OBJECT (mainwin, image5, "image5");
-  GLADE_HOOKUP_OBJECT (mainwin, seekbar, "seekbar");
-  GLADE_HOOKUP_OBJECT (mainwin, volumebar, "volumebar");
   GLADE_HOOKUP_OBJECT (mainwin, plugins_bottom_vbox, "plugins_bottom_vbox");
   GLADE_HOOKUP_OBJECT (mainwin, statusbar, "statusbar");