Commit 2afb7240 authored by Sam Hocevar's avatar Sam Hocevar

  * Everything in place for the 0.2.63 release.

  * Got rid of the CONTRIBUTORS list, and switched AUTHORS to a
    linux-kernel like author list.
  * Updated TODO list.
  * Fixed a segfault in the BeOS interface when --noaudio was specified.
  * Title and Chapter selection in the Gnome and Gtk+ interfaces.
parent 317723fa
# The format of this file was inspired by the Linux kernel CREDITS file.
#
# Authors and contributors are listed alphabetically.
#
# The fields are: name (N), email (E), web-address (W), PGP key ID and
# fingerprint (P), description (D), and snail-mail address (S).
Rgis Duchesne <regis@via.ecp.fr>
Michel Lespinasse <walken@zoy.org>
N: Pierre Baillet
E: oct@zoy.org
D: SDL audio and video output
Olivier Pomel <pomel@via.ecp.fr>
N: Ethan C. Baldridge
E: BaldridgeE@cadmus.com
D: directory browsing code in modules.c
Pierre Baillet <oct@zoy.org>
Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>
Andres Krapf <dae@via.ecp.fr>
Christophe Massiot <massiot@via.ecp.fr>
Vincent Seguin <seguin@via.ecp.fr>
Benoit Steiner <benny@via.ecp.fr>
N: Stphane Borel
E: stef@via.ecp.fr
D: MPEG video decoder
D: DVD input
Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
Jean-Marc Dressler <polux@via.ecp.fr>
Gal Hendryckx <jimmy@via.ecp.fr>
Samuel Hocevar <sam@zoy.org>
Brieuc Jeunhomme <bbp@via.ecp.fr>
Michel Kaempf <maxx@via.ecp.fr>
N: Arnaud de Bossoreille de Ribou
E: bozo@via.ecp.fr
D: SDL video output
Stphane Borel <stef@via.ecp.fr>
Renaud Dartus <reno@via.ecp.fr>
Henri Fallon <henri@via.ecp.fr>
N: Tony Castley
E: tcastley@mail.powerup.com.au
D: BeOS interface
Richard Shepherd <richard@rshepherd.demon.co.uk>
Tony Castley <tcastley@mail.powerup.com.au>
N: Renaud Dartus
E: reno@via.ecp.fr
D: AC3 decoder
N: Jean-Marc Dressler
E: polux@via.ecp.fr
D: BeOS port
D: MPEG video decoder
N: Rgis Duchesne
E: regis@via.ecp.fr
N: Henri Fallon
E: henri@via.ecp.fr
D: ALSA audio output
D: input netlist
D: MPEG TS input
N: Jean-Philippe Grimaldi
E: jeanphi@via.ecp.fr
D: Bug fixes
N: Gal Hendryckx
E: jimmy@via.ecp.fr
D: IDCT and YUV transformations
N: Samuel Hocevar
E: sam@zoy.org
D: playlist and modules system
D: Gnome and Gtk+ interfaces, Glide and fb video outputs, Esound audio output
D: DVD subtitles decoder
N: Brieuc Jeunhomme
E: bbp@via.ecp.fr
D: Bug fixes
N: Michel Kaempf
E: maxx@via.ecp.fr
D: audio output
D: AC3 decoder
D: MPEG audio decoder
N: Andres Krapf
E: dae@via.ecp.fr
D: FreeBSD port and tests
N: Markus Kuespert
E: ltlBeBoy@beosmail.com
D: BeOS port of the DVD ioctls
N: Michel Lespinasse
E: walken@zoy.org
D: AC3 decoder
D: MPEG audio decoder
D: MPEG video decoder
N: Christophe Massiot
E: massiot@via.ecp.fr
D: MPEG PS input
D: bitstream and input core functions
D: MPEG video decoder
N: Arkadiusz Miskiewicz
E: misiek@pld.ORG.PL
D: Makefile and configure patches
N: Olivier Pomel
E: pomel@via.ecp.fr
N: Vincent Seguin
E: seguin@via.ecp.fr
D: core vlc structure
D: interface and message queue
D: YUV transformations
D: X11 and GGI video outputs
N: Richard Shepherd
E: richard@rshepherd.demon.co.uk
D: BeOS video output (BBitmap and Overlay)
N: Benoit Steiner
E: benny@via.ecp.fr
D: MPEG system input
D: network input
Ethan C. Baldridge <BaldridgeE@cadmus.com>
* Directory browsing code in modules.c
Arkadiusz Miskiewicz <misiek@pld.ORG.PL>
* Makefile and configure patches.
Markus Kuespert <ltlBeBoy@beosmail.com>
* BeOS port of the DVD ioctls.
......@@ -4,31 +4,15 @@ INSTALL file for vlc, the VideoLAN Client
Building VideoLAN
=================
A typical way to configure the vlc is :
A typical way to configure vlc is:
./configure --prefix=/usr --enable-gnome --with-sdl
For a full compilation, you may try :
./configure --prefix=/usr --enable-gnome --enable-fb \
--with-glide --with-ggi --with-sdl --enable-esd --enable-alsa
See `./configure --help' for more information.
Then, run `make', and `make install' to install it.
To build a Debian package, you may use :
dpkg-buildpackage -rfakeroot -us -uc
To build RedHat packages, use :
rpm -ba vlc.spec
Then, run `make' to build vlc.
Here's a shortcut to copy-paste to do a clean build :
Here is a shortcut to copy-paste for a clean build:
make distclean 2>/dev/null ; ./configure --prefix=/usr --enable-gnome \
--enable-fb --with-glide --with-ggi --with-sdl --enable-esd \
......@@ -38,12 +22,25 @@ Here's a shortcut to copy-paste to do a clean build :
Installing and running VideoLAN
===============================
You can install the vlc and its plugins by typing :
You can install the vlc and its plugins by typing:
make install
But you don't need to do it if you don't want ; vlc can be launched
from the current directory as well :
But you don't need to install it if you don't want to; vlc can be launched
from the current directory as well:
./vlc
Building packages
=================
To build a Debian package, you may use:
dpkg-buildpackage -rfakeroot -us -uc
To build RedHat packages, use:
rpm -ba vlc.spec
......@@ -502,7 +502,7 @@ snapshot:
do cp $$i /tmp/vlc-@VLC_VERSION@/$$i ; \
done
# copy misc files
cp vlc.spec AUTHORS COPYING ChangeLog CONTRIBUTORS INSTALL README TODO \
cp vlc.spec AUTHORS COPYING ChangeLog INSTALL README TODO \
Makefile.in Makefile.dep configure configure.in install-sh \
config.sub config.guess todo.pl \
/tmp/vlc-@VLC_VERSION@/
......
......@@ -82,7 +82,7 @@ Urgency: Normal
Description: Write DVD plugin
We need a DVD plugin which read the device directly, calls DeCSS
(optional) and parse .ifo files.
Status: Todo
Status: Done 8 Feb 2001 (stef)
Task: 0x44
Difficulty: Guru
......@@ -90,7 +90,7 @@ Urgency: Important
Description: Write input_ext-intf.c
This file will provide functions which allow the interface to change
the pace of reading and change the position in the file.
Status: Todo
Status: Done 8 Feb 2001 (Meuuh)
Task: 0x43
Difficulty: Medium
......@@ -278,7 +278,7 @@ Description: SPU error recovery
The SPU decoder does not behave very well when a packet is missed or when
it gets the stream at the middle of an SPU packet. Make it more error-
friendly.
Status: Todo
Status: Done 26 Feb 2001 (sam)
Task: 0x2b
Difficulty: Hard
......@@ -287,7 +287,7 @@ Description: Shoot the TODO list on the web site
The TODO list on the web site hasn't been updated for months. We may
wonder then why the hell to we put a TODO list on the web site ? Maybe
we'd better shoot it in the head, that would make its suffering end.
Status: Todo
Status: Done 5 Mar 2001 (sam)
Task: 0x2a
Difficulty: Medium
......@@ -454,7 +454,7 @@ Description: Split interface/video_output
interface for instance. This will require a major rewrite of
the interface, and a solid knowledge of how the vlc internals
work.
Status: Todo
Status: Done 11 Feb 2001 (sam)
Task: 0x17
Difficulty: Hard
......@@ -542,7 +542,7 @@ Description: Framebuffer exit bug
When the vlc abnormally exits in framebuffer mode, it leaves
the console in an unusable state. This does not happen on
the Matrox framebuffer, but it does on the VESA one.
Status: Todo
Status: Done 18 Feb 2001 (sam)
Task: 0x0c
Difficulty: Hard
......@@ -650,7 +650,7 @@ Description: Better Gnome interface
The Gnome interface has many stubs and is actually rather
unfunctional. Someone should make the buttons work when
the appropriate hooks exist.
Status: Todo
Status: Done 12 Feb 2001 (sam)
Task: 0x01
Difficulty: Hard
......
......@@ -610,7 +610,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
VLC_VERSION=0.2.62
VLC_VERSION=0.2.63
VLC_CODENAME=Urumov
......
......@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_HOST
VLC_VERSION=0.2.62
VLC_VERSION=0.2.63
AC_SUBST(VLC_VERSION)
VLC_CODENAME=Urumov
AC_SUBST(VLC_CODENAME)
......
vlc (0.2.63-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Mon, 5 Mar 2001 00:41:16 +0100
vlc (0.2.62-2) unstable; urgency=low
* Removed a few lintian warnings.
......@@ -6,18 +12,13 @@ vlc (0.2.62-2) unstable; urgency=low
vlc (0.2.62-1) unstable; urgency=low
* New release. Glide and GGI packages build again.
* Updated vlc.1 manpage (Closes: #87478).
* Fixed debian/control (Closes: #83707).
* The framebuffer plugin doesn't hijack ^C anymore (Closes: #87500).
-- Samuel Hocevar <sam@zoy.org> Fri, 2 Mar 2001 17:32:24 +0100
vlc (0.2.62-1) unstable; urgency=low
* New release. Glide and GGI packages build again.
-- Samuel Hocevar <sam@zoy.org> Tue, 20 Feb 2001 23:34:34 +0100
vlc (0.2.61-1) unstable; urgency=low
* New release. The package build works again.
......
vlc-css (0.2.63-1) unstable; urgency=low
* New upstream release.
-- Samuel Hocevar <sam@zoy.org> Mon, 5 Mar 2001 00:41:16 +0100
vlc-css (0.2.62-2) unstable; urgency=low
* Removed a few lintian warnings.
......
AUTHORS
CONTRIBUTORS
README
TODO
......@@ -2,7 +2,7 @@
* intf_beos.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: intf_beos.cpp,v 1.12 2001/03/04 16:20:16 sam Exp $
* $Id: intf_beos.cpp,v 1.13 2001/03/05 01:29:25 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -99,7 +99,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name , intf_thread_t
float yStart = 10.0;
SetName( "interface" );
SetTitle("VideoLan Client for BeOS");
SetTitle(VOUT_TITLE " (BeOS interface)");
BView* p_view;
......@@ -204,7 +204,10 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
if (p_intf->p_input != NULL )
{
// silence the sound, otherwise very horrible
p_main->p_aout->vol = 0;
if (p_main->p_aout != NULL)
{
p_main->p_aout->vol = 0;
}
snooze(400000);
input_SetStatus(p_intf->p_input, INPUT_STATUS_END);
}
......@@ -213,7 +216,10 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
// starts playing in normal mode
// if (p_intf->p_input != NULL )
// {
// p_main->p_aout->vol = vol_val;
// if (p_main->p_aout != NULL)
// {
// p_main->p_aout->vol = vol_val;
// }
// snooze(400000);
// input_SetStatus(p_intf->p_input, INPUT_STATUS_PLAY);
// playback_status = PLAYING;
......@@ -226,13 +232,19 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
// mute the volume if currently playing
if (playback_status == PLAYING)
{
p_main->p_aout->vol = 0;
if (p_main->p_aout != NULL)
{
p_main->p_aout->vol = 0;
}
playback_status = PAUSED;
}
else
// restore the volume
{
p_main->p_aout->vol = vol_val;
if (p_main->p_aout != NULL)
{
p_main->p_aout->vol = vol_val;
}
playback_status = PLAYING;
}
snooze(400000);
......@@ -243,7 +255,10 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
// cycle the fast playback modes
if (p_intf->p_input != NULL )
{
p_main->p_aout->vol = 0;
if (p_main->p_aout != NULL)
{
p_main->p_aout->vol = 0;
}
snooze(400000);
input_SetStatus(p_intf->p_input, INPUT_STATUS_FASTER);
}
......@@ -252,7 +267,10 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
// cycle the slow playback modes
if (p_intf->p_input != NULL )
{
p_main->p_aout->vol = 0;
if (p_main->p_aout != NULL)
{
p_main->p_aout->vol = 0;
}
snooze(400000);
input_SetStatus(p_intf->p_input, INPUT_STATUS_SLOWER);
}
......
......@@ -188,7 +188,7 @@ VideoWindow::VideoWindow(BRect frame, const char *name, vout_thread_t *p_video_o
}
memset(bitmap[0]->Bits(), 0, bitmap[0]->BitsLength());
memset(bitmap[1]->Bits(), 0, bitmap[1]->BitsLength());
SetTitle("VideoLAN (BBitmap)");
SetTitle(VOUT_TITLE " (BBitmap output)");
}
if(fUsingOverlay)
......@@ -198,7 +198,7 @@ VideoWindow::VideoWindow(BRect frame, const char *name, vout_thread_t *p_video_o
view->SetViewOverlay(bitmap[0], bitmap[0]->Bounds(), Bounds(), &key, B_FOLLOW_ALL,
B_OVERLAY_FILTER_HORIZONTAL|B_OVERLAY_FILTER_VERTICAL);
view->SetViewColor(key);
SetTitle("VideoLAN (Overlay)");
SetTitle(VOUT_TITLE " (Overlay output)");
GetSizeLimits(&minWidth, &maxWidth, &minHeight, &maxHeight);
SetSizeLimits((float) Bounds().IntegerWidth(), maxWidth, (float) Bounds().IntegerHeight(), maxHeight);
}
......
......@@ -702,6 +702,15 @@ on_disc_ok_clicked (GtkButton *button,
return;
}
/* Select title and chapter */
main_PutIntVariable( INPUT_TITLE_VAR, gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( lookup_widget(
GTK_WIDGET(button), "disc_title" ) ) ) );
main_PutIntVariable( INPUT_CHAPTER_VAR, gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( lookup_widget(
GTK_WIDGET(button), "disc_chapter" ) ) ) );
/* Build source name and add it to playlist */
sprintf( psz_source, "%s:%s", psz_method, psz_device );
intf_PlstAdd( p_main->p_playlist, PLAYLIST_END, psz_source );
......
......@@ -19,9 +19,15 @@
static GnomeUIInfo menubar_file_menu_uiinfo[] =
{
GNOMEUIINFO_MENU_OPEN_ITEM (on_menubar_open_activate, NULL),
{
GNOME_APP_UI_ITEM, N_("Open _disc..."),
GNOME_APP_UI_ITEM, N_("_Open File..."),
N_("Open a File"),
(gpointer) on_menubar_open_activate, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN,
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("Open _Disc..."),
N_("Open a DVD or VCD"),
(gpointer) on_menubar_disc_activate, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CDROM,
......@@ -94,7 +100,7 @@ create_intf_window (void)
GtkWidget *dockitem;
GtkWidget *toolbar;
GtkWidget *tmp_toolbar_icon;
GtkWidget *toolbar_open;
GtkWidget *toolbar_file;
GtkWidget *toolbar_disc;
GtkWidget *toolbar_back;
GtkWidget *toolbar_stop;
......@@ -215,23 +221,23 @@ create_intf_window (void)
gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_OPEN);
toolbar_open = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
toolbar_file = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
GTK_TOOLBAR_CHILD_BUTTON,
NULL,
_("Open"),
_("Open File"), NULL,
_("Open a File"), NULL,
tmp_toolbar_icon, NULL, NULL);
gtk_widget_ref (toolbar_open);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_open", toolbar_open,
gtk_widget_ref (toolbar_file);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_file", toolbar_file,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (toolbar_open);
gtk_widget_show (toolbar_file);
tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_CDROM);
toolbar_disc = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
GTK_TOOLBAR_CHILD_BUTTON,
NULL,
_("Disc"),
NULL, NULL,
_("Open a DVD or VCD"), NULL,
tmp_toolbar_icon, NULL, NULL);
gtk_widget_ref (toolbar_disc);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_disc", toolbar_disc,
......@@ -409,7 +415,7 @@ create_intf_window (void)
GTK_SIGNAL_FUNC (on_intf_window_drag_data_received),
NULL);
gnome_app_install_menu_hints (GNOME_APP (intf_window), menubar_uiinfo);
gtk_signal_connect (GTK_OBJECT (toolbar_open), "clicked",
gtk_signal_connect (GTK_OBJECT (toolbar_file), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_open_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_disc), "clicked",
......@@ -495,10 +501,16 @@ static GnomeUIInfo intf_popup_uiinfo[] =
0, (GdkModifierType) 0, NULL
},
GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_MENU_OPEN_ITEM (on_popup_open_activate, NULL),
{
GNOME_APP_UI_ITEM, N_("Open _disc..."),
N_("Open DVD or VCD"),
GNOME_APP_UI_ITEM, N_("_Open File..."),
N_("Open a File"),
(gpointer) on_popup_open_activate, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN,
0, (GdkModifierType) 0, NULL
},
{
GNOME_APP_UI_ITEM, N_("Open _Disc..."),
N_("Open a DVD or VCD"),
(gpointer) on_popup_disc_activate, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CDROM,
0, (GdkModifierType) 0, NULL
......@@ -857,11 +869,20 @@ create_intf_disc (void)
{
GtkWidget *intf_disc;
GtkWidget *dialog_vbox4;
GtkWidget *hbox2;
GtkWidget *frame1;
GtkWidget *vbox4;
GSList *disc_group = NULL;
GtkWidget *disc_dvd;
GtkWidget *disc_vcd;
GtkWidget *frame2;
GtkWidget *table1;
GtkWidget *label15;
GtkWidget *label16;
GtkObject *disc_title_adj;
GtkWidget *disc_title;
GtkObject *disc_chapter_adj;
GtkWidget *disc_chapter;
GtkWidget *hbox1;
GtkWidget *label14;
GtkWidget *disc_name;
......@@ -869,7 +890,7 @@ create_intf_disc (void)
GtkWidget *disc_ok;
GtkWidget *disc_cancel;
intf_disc = gnome_dialog_new (_("Open disc"), NULL);
intf_disc = gnome_dialog_new (_("Open Disc"), NULL);
gtk_object_set_data (GTK_OBJECT (intf_disc), "intf_disc", intf_disc);
gtk_window_set_policy (GTK_WINDOW (intf_disc), FALSE, FALSE, FALSE);
......@@ -877,12 +898,19 @@ create_intf_disc (void)
gtk_object_set_data (GTK_OBJECT (intf_disc), "dialog_vbox4", dialog_vbox4);
gtk_widget_show (dialog_vbox4);
hbox2 = gtk_hbox_new (FALSE, 5);
gtk_widget_ref (hbox2);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "hbox2", hbox2,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (hbox2);
gtk_box_pack_start (GTK_BOX (dialog_vbox4), hbox2, TRUE, TRUE, 0);
frame1 = gtk_frame_new (_("Disc type"));
gtk_widget_ref (frame1);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "frame1", frame1,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (frame1);
gtk_box_pack_start (GTK_BOX (dialog_vbox4), frame1, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox2), frame1, TRUE, TRUE, 0);
vbox4 = gtk_vbox_new (FALSE, 0);
gtk_widget_ref (vbox4);
......@@ -899,22 +927,80 @@ create_intf_disc (void)
gtk_widget_show (disc_dvd);
gtk_box_pack_start (GTK_BOX (vbox4), disc_dvd, FALSE, FALSE, 0);
disc_vcd = gtk_radio_button_new_with_label (disc_group, _("VCD (unsupported yet)"));
disc_vcd = gtk_radio_button_new_with_label (disc_group, _("VCD"));
disc_group = gtk_radio_button_group (GTK_RADIO_BUTTON (disc_vcd));
gtk_widget_ref (disc_vcd);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "disc_vcd", disc_vcd,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_vcd);
gtk_box_pack_start (GTK_BOX (vbox4), disc_vcd, FALSE, FALSE, 0);
hbox1 = gtk_hbox_new (FALSE, 0);
gtk_widget_set_sensitive (disc_vcd, FALSE);
frame2 = gtk_frame_new (_("Starting position"));
gtk_widget_ref (frame2);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "frame2", frame2,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (frame2);
gtk_box_pack_start (GTK_BOX (hbox2), frame2, TRUE, TRUE, 0);
table1 = gtk_table_new (2, 2, FALSE);
gtk_widget_ref (table1);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "table1", table1,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (table1);
gtk_container_add (GTK_CONTAINER (frame2), table1);
gtk_container_set_border_width (GTK_CONTAINER (table1), 5);
gtk_table_set_row_spacings (GTK_TABLE (table1), 5);
gtk_table_set_col_spacings (GTK_TABLE (table1), 5);
label15 = gtk_label_new (_("Title"));
gtk_widget_ref (label15);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "label15", label15,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label15);
gtk_table_attach (GTK_TABLE (table1), label15, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label15), 0, 0.5);
label16 = gtk_label_new (_("Chapter"));
gtk_widget_ref (label16);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "label16", label16,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label16);
gtk_table_attach (GTK_TABLE (table1), label16, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label16), 0, 0.5);
disc_title_adj = gtk_adjustment_new (1, 1, 65536, 1, 10, 10);
disc_title = gtk_spin_button_new (GTK_ADJUSTMENT (disc_title_adj), 1, 0);
gtk_widget_ref (disc_title);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "disc_title", disc_title,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_title);
gtk_table_attach (GTK_TABLE (table1), disc_title, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
disc_chapter_adj = gtk_adjustment_new (1, 1, 65536, 1, 10, 10);
disc_chapter = gtk_spin_button_new (GTK_ADJUSTMENT (disc_chapter_adj), 1, 0);
gtk_widget_ref (disc_chapter);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "disc_chapter", disc_chapter,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_chapter);
gtk_table_attach (GTK_TABLE (table1), disc_chapter, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
hbox1 = gtk_hbox_new (FALSE, 5);
gtk_widget_ref (hbox1);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "hbox1", hbox1,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (hbox1);
gtk_box_pack_start (GTK_BOX (dialog_vbox4), hbox1, TRUE, TRUE, 0);
label14 = gtk_label_new (_("Device name (eg. /dev/cdrom or /dev/dvd): "));
label14 = gtk_label_new (_("Device name:"));
gtk_widget_ref (label14);
gtk_object_set_data_full (GTK_OBJECT (intf_disc), "label14", label14,
(GtkDestroyNotify) gtk_widget_unref);
......
......@@ -85,12 +85,15 @@
<widget>
<class>GtkPixmapMenuItem</class>
<name>menubar_open</name>
<tooltip>Open a File</tooltip>
<signal>
<name>activate</name>
<handler>on_menubar_open_activate</handler>
<last_modification_time>Sun, 11 Feb 2001 16:55:04 GMT</last_modification_time>
<last_modification_time>Sun, 04 Mar 2001 21:01:45 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_OPEN_ITEM</stock_item>
<label>_Open File...</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_OPEN</stock_icon>
</widget>
<widget>
......@@ -102,7 +105,7 @@
<handler>on_menubar_disc_activate</handler>
<last_modification_time>Sun, 04 Mar 2001 01:28:32 GMT</last_modification_time>
</signal>
<label>Open _disc...</label>
<label>Open _Disc...</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_CDROM</stock_icon>
</widget>
......@@ -275,12 +278,12 @@
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>toolbar_open</name>
<tooltip>Open File</tooltip>
<name>toolbar_file</name>
<tooltip>Open a File</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_open_clicked</handler>
<last_modification_time>Sun, 11 Feb 2001 17:06:24 GMT</last_modification_time>
<last_modification_time>Sun, 04 Mar 2001 21:01:24 GMT</last_modification_time>
</signal>
<label>Open</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_OPEN</stock_pixmap>
......@@ -290,6 +293,7 @@
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>toolbar_disc</name>
<tooltip>Open a DVD or VCD</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_disc_clicked</handler>
......@@ -604,24 +608,27 @@
<widget>
<class>GtkPixmapMenuItem</class>
<name>popup_open</name>
<tooltip>Open a File</tooltip>
<signal>
<name>activate</name>
<handler>on_popup_open_activate</handler>
<last_modification_time>Sun, 11 Feb 2001 23:49:08 GMT</last_modification_time>
<last_modification_time>Sun, 04 Mar 2001 21:01:58 GMT</last_modification_time>
</signal>
<stock_item>GNOMEUIINFO_MENU_OPEN_ITEM</stock_item>
<label>_Open File...</label>
<right_justify>False</right_justify>
<stock_icon>GNOME_STOCK_MENU_OPEN</stock_icon>
</widget>
<widget>
<class>GtkPixmapMenuItem</class>
<name>popup_disc</name>
<tooltip>Open DVD or VCD</tooltip>