Used buttons instead of pixmaps. Just looks a lot better ;-).

diff --git a/plugins/familiar/familiar.glade b/plugins/familiar/familiar.glade
index 5dfebf981d13ef4b4ff83c8d6e2e62b77ddd3744..13b1822340d38c9bf46c11edc0d0e5e3220fc275 100644 (file)
--- a/plugins/familiar/familiar.glade
+++ b/plugins/familiar/familiar.glade
@@ -60,130 +60,78 @@
       <tooltips>True</tooltips>
       <child>
        <padding>0</padding>
-       <expand>False</expand>
+       <expand>True</expand>
        <fill>True</fill>
       </child>
 
       <widget>
-       <class>GtkPixmap</class>
-       <name>xpm_open</name>
-       <can_focus>True</can_focus>
-       <signal>
-         <name>button_press_event</name>
-         <handler>on_xpm_open_button_press_event</handler>
-         <last_modification_time>Mon, 22 Jul 2002 13:18:11 GMT</last_modification_time>
-       </signal>
-       <filename>familiar-openb16x16.xpm</filename>
-       <xalign>0.5</xalign>
-       <yalign>0.5</yalign>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <build_insensitive>True</build_insensitive>
+       <class>GtkButton</class>
+       <child_name>Toolbar:button</child_name>
+       <name>toolbar_open</name>
+       <label>Open</label>
+       <icon>familiar-openb16x16.xpm</icon>
       </widget>
 
       <widget>
-       <class>GtkPixmap</class>
-       <name>xpm_preferences</name>
-       <can_focus>True</can_focus>
-       <signal>
-         <name>button_press_event</name>
-         <handler>on_xpm_preferences_button_press_event</handler>
-         <last_modification_time>Mon, 22 Jul 2002 13:17:55 GMT</last_modification_time>
-       </signal>
-       <filename>familiar-preferencesb16x16.xpm</filename>
-       <xalign>0.5</xalign>
-       <yalign>0.5</yalign>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <build_insensitive>True</build_insensitive>
+       <class>GtkButton</class>
+       <child_name>Toolbar:button</child_name>
+       <name>toolbar_preferences</name>
+       <label>Preferences</label>
+       <icon>familiar-preferencesb16x16.xpm</icon>
       </widget>
 
       <widget>
-       <class>GtkPixmap</class>
-       <name>xpm_rewind</name>
-       <can_focus>True</can_focus>
-       <signal>
-         <name>button_press_event</name>
-         <handler>on_xpm_rewind_button_press_event</handler>
-         <last_modification_time>Mon, 22 Jul 2002 13:18:17 GMT</last_modification_time>
-       </signal>
-       <filename>familiar-rewindb16x16.xpm</filename>
-       <xalign>0.5</xalign>
-       <yalign>0.5</yalign>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <build_insensitive>True</build_insensitive>
+       <class>GtkButton</class>
+       <child_name>Toolbar:button</child_name>
+       <name>toolbar_rewind</name>
+       <label>Rewind</label>
+       <icon>familiar-rewindb16x16.xpm</icon>
        <child>
          <new_group>True</new_group>
        </child>
       </widget>
 
       <widget>
-       <class>GtkPixmap</class>
-       <name>xpm_pause</name>
-       <can_focus>True</can_focus>
-       <signal>
-         <name>button_press_event</name>
-         <handler>on_xpm_pause_button_press_event</handler>
-         <last_modification_time>Mon, 22 Jul 2002 13:18:29 GMT</last_modification_time>
-       </signal>
-       <filename>familiar-pauseb16x16.xpm</filename>
-       <xalign>0.5</xalign>
-       <yalign>0.5</yalign>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <build_insensitive>True</build_insensitive>
+       <class>GtkButton</class>
+       <child_name>Toolbar:button</child_name>
+       <name>toolbar_pause</name>
+       <label>Pause</label>
+       <icon>familiar-pauseb16x16.xpm</icon>
       </widget>
 
       <widget>
-       <class>GtkPixmap</class>
-       <name>xpm_play</name>
-       <can_focus>True</can_focus>
-       <signal>
-         <name>button_press_event</name>
-         <handler>on_xpm_play_button_press_event</handler>
-         <last_modification_time>Mon, 22 Jul 2002 13:18:36 GMT</last_modification_time>
-       </signal>
-       <filename>familiar-playb16x16.xpm</filename>
-       <xalign>0.5</xalign>
-       <yalign>0.5</yalign>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <build_insensitive>True</build_insensitive>
+       <class>GtkButton</class>
+       <child_name>Toolbar:button</child_name>
+       <name>toolbar_play</name>
+       <label>Play</label>
+       <icon>familiar-playb16x16.xpm</icon>
       </widget>
 
       <widget>
-       <class>GtkPixmap</class>
-       <name>xpm_stop</name>
-       <can_focus>True</can_focus>
-       <signal>
-         <name>button_press_event</name>
-         <handler>on_xpm_stop_button_press_event</handler>
-         <last_modification_time>Mon, 22 Jul 2002 13:18:43 GMT</last_modification_time>
-       </signal>
-       <filename>familiar-stopb16x16.xpm</filename>
-       <xalign>0.5</xalign>
-       <yalign>0.5</yalign>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <build_insensitive>True</build_insensitive>
+       <class>GtkButton</class>
+       <child_name>Toolbar:button</child_name>
+       <name>toolbar_stop</name>
+       <label>Stop</label>
+       <icon>familiar-stopb16x16.xpm</icon>
       </widget>
 
       <widget>
-       <class>GtkPixmap</class>
-       <name>xpm_forward</name>
-       <can_focus>True</can_focus>
-       <signal>
-         <name>button_press_event</name>
-         <handler>on_xpm_forward_button_press_event</handler>
-         <last_modification_time>Mon, 22 Jul 2002 13:18:55 GMT</last_modification_time>
-       </signal>
-       <filename>familiar-forwardb16x16.xpm</filename>
-       <xalign>0.5</xalign>
-       <yalign>0.5</yalign>
-       <xpad>0</xpad>
-       <ypad>0</ypad>
-       <build_insensitive>True</build_insensitive>
+       <class>GtkButton</class>
+       <child_name>Toolbar:button</child_name>
+       <name>toolbar_forward</name>
+       <label>Forward</label>
+       <icon>familiar-forwardb16x16.xpm</icon>
+      </widget>
+
+      <widget>
+       <class>GtkButton</class>
+       <child_name>Toolbar:button</child_name>
+       <name>toolbar_about</name>
+       <label>About</label>
+       <icon>vlc16x16.xpm</icon>
+       <child>
+         <new_group>True</new_group>
+       </child>
       </widget>
     </widget>
 

diff --git a/plugins/familiar/familiar_callbacks.h b/plugins/familiar/familiar_callbacks.h
index 1d22ada178d7f0ab9016123e047c3217bb55943d..c82042d64cbfde5fc887b8fc0be61a1b60cd417b 100644 (file)
--- a/plugins/familiar/familiar_callbacks.h
+++ b/plugins/familiar/familiar_callbacks.h
@@ -1,3 +1,25 @@
+/*****************************************************************************
+ * familiar_callbacks.h : familiar plugin for vlc
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: familiar_callbacks.h,v 1.4 2002/07/24 15:59:02 jpsaman Exp $
+ *
+ * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
 
 #include <gtk/gtk.h>
 

diff --git a/plugins/familiar/familiar_interface.c b/plugins/familiar/familiar_interface.c
index 43b7f5d9bb93998f8618798595e96062ca5dcf6f..db7ae55c2057e1b715b92c731801baa7ab88ccda 100644 (file)
--- a/plugins/familiar/familiar_interface.c
+++ b/plugins/familiar/familiar_interface.c
@@ -24,13 +24,15 @@ create_familiar (void)
   GtkWidget *familiar;
   GtkWidget *vbox;
   GtkWidget *toolbar;
-  GtkWidget *xpm_open;
-  GtkWidget *xpm_preferences;
-  GtkWidget *xpm_rewind;
-  GtkWidget *xpm_pause;
-  GtkWidget *xpm_play;
-  GtkWidget *xpm_stop;
-  GtkWidget *xpm_forward;
+  GtkWidget *tmp_toolbar_icon;
+  GtkWidget *toolbar_open;
+  GtkWidget *toolbar_preferences;
+  GtkWidget *toolbar_rewind;
+  GtkWidget *toolbar_pause;
+  GtkWidget *toolbar_play;
+  GtkWidget *toolbar_stop;
+  GtkWidget *toolbar_forward;
+  GtkWidget *toolbar_about;
   GtkWidget *progress;
   GtkWidget *notebook;
   GtkWidget *fixedMedia;
@@ -84,66 +86,108 @@ create_familiar (void)
   gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar", toolbar,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar);
-  gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), toolbar, TRUE, TRUE, 0);
   gtk_widget_set_usize (toolbar, 112, 16);
 
-  xpm_open = create_pixmap (familiar, "familiar-openb16x16.xpm");
-  gtk_widget_ref (xpm_open);
-  gtk_object_set_data_full (GTK_OBJECT (familiar), "xpm_open", xpm_open,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (xpm_open);
-  gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), xpm_open, NULL, NULL);
-  GTK_WIDGET_SET_FLAGS (xpm_open, GTK_CAN_FOCUS);
-
-  xpm_preferences = create_pixmap (familiar, "familiar-preferencesb16x16.xpm");
-  gtk_widget_ref (xpm_preferences);
-  gtk_object_set_data_full (GTK_OBJECT (familiar), "xpm_preferences", xpm_preferences,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (xpm_preferences);
-  gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), xpm_preferences, NULL, NULL);
-  GTK_WIDGET_SET_FLAGS (xpm_preferences, GTK_CAN_FOCUS);
+  tmp_toolbar_icon = create_pixmap (familiar, "familiar-openb16x16.xpm");
+  toolbar_open = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                _("Open"),
+                                NULL, NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_widget_ref (toolbar_open);
+  gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_open", toolbar_open,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (toolbar_open);
+
+  tmp_toolbar_icon = create_pixmap (familiar, "familiar-preferencesb16x16.xpm");
+  toolbar_preferences = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                _("Preferences"),
+                                NULL, NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_widget_ref (toolbar_preferences);
+  gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_preferences", toolbar_preferences,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (toolbar_preferences);
 
-  xpm_rewind = create_pixmap (familiar, "familiar-rewindb16x16.xpm");
-  gtk_widget_ref (xpm_rewind);
-  gtk_object_set_data_full (GTK_OBJECT (familiar), "xpm_rewind", xpm_rewind,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (xpm_rewind);
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
-  gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), xpm_rewind, NULL, NULL);
-  GTK_WIDGET_SET_FLAGS (xpm_rewind, GTK_CAN_FOCUS);
+  tmp_toolbar_icon = create_pixmap (familiar, "familiar-rewindb16x16.xpm");
+  toolbar_rewind = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                _("Rewind"),
+                                NULL, NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_widget_ref (toolbar_rewind);
+  gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_rewind", toolbar_rewind,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (toolbar_rewind);
+
+  tmp_toolbar_icon = create_pixmap (familiar, "familiar-pauseb16x16.xpm");
+  toolbar_pause = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                _("Pause"),
+                                NULL, NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_widget_ref (toolbar_pause);
+  gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_pause", toolbar_pause,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (toolbar_pause);
+
+  tmp_toolbar_icon = create_pixmap (familiar, "familiar-playb16x16.xpm");
+  toolbar_play = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                _("Play"),
+                                NULL, NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_widget_ref (toolbar_play);
+  gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_play", toolbar_play,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (toolbar_play);
+
+  tmp_toolbar_icon = create_pixmap (familiar, "familiar-stopb16x16.xpm");
+  toolbar_stop = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                _("Stop"),
+                                NULL, NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_widget_ref (toolbar_stop);
+  gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_stop", toolbar_stop,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (toolbar_stop);
+
+  tmp_toolbar_icon = create_pixmap (familiar, "familiar-forwardb16x16.xpm");
+  toolbar_forward = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                _("Forward"),
+                                NULL, NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_widget_ref (toolbar_forward);
+  gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_forward", toolbar_forward,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (toolbar_forward);
 
-  xpm_pause = create_pixmap (familiar, "familiar-pauseb16x16.xpm");
-  gtk_widget_ref (xpm_pause);
-  gtk_object_set_data_full (GTK_OBJECT (familiar), "xpm_pause", xpm_pause,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (xpm_pause);
-  gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), xpm_pause, NULL, NULL);
-  GTK_WIDGET_SET_FLAGS (xpm_pause, GTK_CAN_FOCUS);
-
-  xpm_play = create_pixmap (familiar, "familiar-playb16x16.xpm");
-  gtk_widget_ref (xpm_play);
-  gtk_object_set_data_full (GTK_OBJECT (familiar), "xpm_play", xpm_play,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (xpm_play);
-  gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), xpm_play, NULL, NULL);
-  GTK_WIDGET_SET_FLAGS (xpm_play, GTK_CAN_FOCUS);
-
-  xpm_stop = create_pixmap (familiar, "familiar-stopb16x16.xpm");
-  gtk_widget_ref (xpm_stop);
-  gtk_object_set_data_full (GTK_OBJECT (familiar), "xpm_stop", xpm_stop,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (xpm_stop);
-  gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), xpm_stop, NULL, NULL);
-  GTK_WIDGET_SET_FLAGS (xpm_stop, GTK_CAN_FOCUS);
+  gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
-  xpm_forward = create_pixmap (familiar, "familiar-forwardb16x16.xpm");
-  gtk_widget_ref (xpm_forward);
-  gtk_object_set_data_full (GTK_OBJECT (familiar), "xpm_forward", xpm_forward,
+  tmp_toolbar_icon = create_pixmap (familiar, "vlc16x16.xpm");
+  toolbar_about = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
+                                GTK_TOOLBAR_CHILD_BUTTON,
+                                NULL,
+                                _("About"),
+                                NULL, NULL,
+                                tmp_toolbar_icon, NULL, NULL);
+  gtk_widget_ref (toolbar_about);
+  gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_about", toolbar_about,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (xpm_forward);
-  gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), xpm_forward, NULL, NULL);
-  GTK_WIDGET_SET_FLAGS (xpm_forward, GTK_CAN_FOCUS);
+  gtk_widget_show (toolbar_about);
 
   progress = gtk_progress_bar_new ();
   gtk_widget_ref (progress);
@@ -401,27 +445,6 @@ create_familiar (void)
   gtk_signal_connect (GTK_OBJECT (familiar), "destroy",
                       GTK_SIGNAL_FUNC (gtk_main_quit),
                       NULL);
-  gtk_signal_connect (GTK_OBJECT (xpm_open), "button_press_event",
-                      GTK_SIGNAL_FUNC (on_xpm_open_button_press_event),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (xpm_preferences), "button_press_event",
-                      GTK_SIGNAL_FUNC (on_xpm_preferences_button_press_event),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (xpm_rewind), "button_press_event",
-                      GTK_SIGNAL_FUNC (on_xpm_rewind_button_press_event),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (xpm_pause), "button_press_event",
-                      GTK_SIGNAL_FUNC (on_xpm_pause_button_press_event),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (xpm_play), "button_press_event",
-                      GTK_SIGNAL_FUNC (on_xpm_play_button_press_event),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (xpm_stop), "button_press_event",
-                      GTK_SIGNAL_FUNC (on_xpm_stop_button_press_event),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (xpm_forward), "button_press_event",
-                      GTK_SIGNAL_FUNC (on_xpm_forward_button_press_event),
-                      NULL);
 
   gtk_object_set_data (GTK_OBJECT (familiar), "tooltips", tooltips);