Gtk2 port of the familiar Linux interface. The name is also changed to PDA so it...

The familiar interface itself is deprecreated and will be removed after the next stable version of VLC Media Player.

diff --git a/configure.ac b/configure.ac
index d07a3e67f06298c4c07e443faf71aa3e7a7a0ab9..ea15e4cb1f867e43c69229844322fd7235ba231b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.43 2003/07/27 12:31:50 ipkiss Exp $
+dnl $Id: configure.ac,v 1.44 2003/07/27 21:35:50 jpsaman Exp $
 
 AC_INIT(vlc,0.6.1-test1)
 
@@ -2537,10 +2537,14 @@ then
   AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
   AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}])
   AX_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}])
-  AX_ADD_LDFLAGS([pda],[${GTK2_LDFLAGS} ${LDFLAGS_pda}])
+  AX_ADD_LDFLAGS([pda],[${GTK2_LIBS} ${LDFLAGS_pda}])
   AX_ADD_PLUGINS([pda])
+  if test "${SYS}" != "mingw32"; then
+    NEED_GTK2_MAIN=yes
+  fi
 fi
 
+
 dnl
 dnl  Familiar module uses Gtk+ library
 dnl

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index 3699ce417a71415b664b046d3c3b632eca6eb8e6..d747471034a0543df522d0eb82dbc47fdc0c3a5f 100644 (file)
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -2,7 +2,7 @@
  * pda.c : PDA Gtk2 plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: pda.c,v 1.1 2003/07/23 22:02:56 jpsaman Exp $
+ * $Id: pda.c,v 1.2 2003/07/27 21:35:51 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *          Marc Ariberti <marcari@videolan.org>
@@ -92,7 +92,7 @@ static int Open( vlc_object_t *p_this )
 
 #ifdef NEED_GTK_MAIN
     msg_Dbg( p_intf, "Using gui-helper" );
-    p_intf->p_sys->p_gtk_main = module_Need( p_this, "gui-helper", "gtk" );
+    p_intf->p_sys->p_gtk_main = module_Need( p_this, "gui-helper", "gtk2" );
     if( p_intf->p_sys->p_gtk_main == NULL )
     {
         free( p_intf->p_sys );

diff --git a/modules/gui/pda/pda.gladep b/modules/gui/pda/pda.gladep
index 62bddfc59938d5a0a7780cbd418d89de2ccf5412..16ec38e6c1e8a7750435cab47bbf0a5f657b4305 100644 (file)
--- a/modules/gui/pda/pda.gladep
+++ b/modules/gui/pda/pda.gladep
@@ -5,6 +5,7 @@
   <name>Pda</name>
   <program_name>pda</program_name>
   <pixmaps_directory>../../../share</pixmaps_directory>
+  <use_widget_names>TRUE</use_widget_names>
   <output_main_file>FALSE</output_main_file>
   <output_build_files>FALSE</output_build_files>
 </glade-project>

diff --git a/share/pda-forwardb16x16.xpm b/share/pda-forwardb16x16.xpm
new file mode 100644 (file)
index 0000000..d4e2515
--- /dev/null
+++ b/share/pda-forwardb16x16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * familiar_forwardb16x16_xpm[] = {
+"16 16 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"                ",
+"    ..    ...   ",
+"    ...   ...   ",
+"    ....  ...   ",
+"    ..... ...   ",
+"    .........   ",
+"    .........   ",
+"    .........   ",
+"    ..... ...   ",
+"    ....  ...   ",
+"    ...   ...   ",
+"    ..    ...   ",
+"                ",
+"                ",
+"                "};

diff --git a/share/pda-openb16x16.xpm b/share/pda-openb16x16.xpm
new file mode 100644 (file)
index 0000000..343de04
--- /dev/null
+++ b/share/pda-openb16x16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * familiar_openb16x16_xpm[] = {
+"16 16 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"                ",
+"       ..       ",
+"      ....      ",
+"     ......     ",
+"    ........    ",
+"   ..........   ",
+"  ............  ",
+"  ............  ",
+"                ",
+"  ............  ",
+"  ............  ",
+"  ............  ",
+"  ............  ",
+"                ",
+"                "};

diff --git a/share/pda-pauseb16x16.xpm b/share/pda-pauseb16x16.xpm
new file mode 100644 (file)
index 0000000..bce7c6c
--- /dev/null
+++ b/share/pda-pauseb16x16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * familiar_pauseb16x16_xpm[] = {
+"16 16 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"                ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"   ....  ....   ",
+"                ",
+"                "};

diff --git a/share/pda-playb16x16.xpm b/share/pda-playb16x16.xpm
new file mode 100644 (file)
index 0000000..3bf1e46
--- /dev/null
+++ b/share/pda-playb16x16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * familiar_playb16x16_xpm[] = {
+"16 16 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"                ",
+"  ..            ",
+"  ....          ",
+"  ......        ",
+"  ........      ",
+"  ..........    ",
+"  ...........   ",
+"  ...........   ",
+"  ..........    ",
+"  ........      ",
+"  ......        ",
+"  ....          ",
+"  ..            ",
+"                ",
+"                "};

diff --git a/share/pda-playlistb16x16.xpm b/share/pda-playlistb16x16.xpm
new file mode 100644 (file)
index 0000000..a8daf90
--- /dev/null
+++ b/share/pda-playlistb16x16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * familiar_playlistb16x16_xpm[] = {
+"16 16 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"  ............  ",
+"  ............  ",
+"  ..        ..  ",
+"  ..        ..  ",
+"  ............  ",
+"  ............  ",
+"  ..        ..  ",
+"  ..        ..  ",
+"  ............  ",
+"  ............  ",
+"  ..        ..  ",
+"  ..        ..  ",
+"  ............  ",
+"  ............  ",
+"                "};

diff --git a/share/pda-preferencesb16x16.xpm b/share/pda-preferencesb16x16.xpm
new file mode 100644 (file)
index 0000000..3b5a318
--- /dev/null
+++ b/share/pda-preferencesb16x16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * familiar_preferencesb16x16_xpm[] = {
+"16 16 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"                ",
+"     .......    ",
+"    .........   ",
+"   ...........  ",
+"  .....   ..... ",
+"  .....   ..... ",
+"  .....   ..... ",
+"  .....   ..... ",
+"  .....   ..... ",
+"  .....   ..... ",
+"  .....   ..... ",
+"   ...........  ",
+"    .........   ",
+"     .......    ",
+"                "};

diff --git a/share/pda-rewindb16x16.xpm b/share/pda-rewindb16x16.xpm
new file mode 100644 (file)
index 0000000..bb8027a
--- /dev/null
+++ b/share/pda-rewindb16x16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * familiar_rewindb16x16_xpm[] = {
+"16 16 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"                ",
+"   ...    ..    ",
+"   ...   ...    ",
+"   ...  ....    ",
+"   ... .....    ",
+"   .........    ",
+"   .........    ",
+"   .........    ",
+"   ... .....    ",
+"   ...  ....    ",
+"   ...   ...    ",
+"   ...    ..    ",
+"                ",
+"                ",
+"                "};

diff --git a/share/pda-stopb16x16.xpm b/share/pda-stopb16x16.xpm
new file mode 100644 (file)
index 0000000..4f0d07f
--- /dev/null
+++ b/share/pda-stopb16x16.xpm
@@ -0,0 +1,21 @@
+/* XPM */
+static char * familiar_stopb16x16_xpm[] = {
+"16 16 2 1",
+"      c None",
+".     c #000000",
+"                ",
+"                ",
+"                ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"    ........    ",
+"                ",
+"                ",
+"                "};