cleanup, version bump, gveejay theme fixes, fix vims 130, proper naming of things in gui, default title of sample, sample's title as recording name, fixed a few compile warnings

git-svn-id: svn://code.dyne.org/veejay/trunk@515 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2006-01-25 22:03:54 +00:00
parent 8550ff425c
commit 4816172d1a
14 changed files with 142 additions and 296 deletions

View File

@@ -1,12 +1,12 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl AC_INIT dnl AC_INIT
AC_INIT([veejay],[0.9.2],[veejay-users@lissts.sourceforge.net]) AC_INIT([veejay],[0.9.3],[veejay-users@lissts.sourceforge.net])
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_CONFIG_SRCDIR([veejay/veejay.c]) AC_CONFIG_SRCDIR([veejay/veejay.c])
VEEJAY_MAJOR_VERSION=0 VEEJAY_MAJOR_VERSION=0
VEEJAY_MINOR_VERSION=9 VEEJAY_MINOR_VERSION=9
VEEJAY_MICRO_VERSION=2 VEEJAY_MICRO_VERSION=3
VEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION VEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION
VEEJAY_CODENAME="Resume - build $VEEJAY_MINOR_VERSION $VEEJAY_MICRO_VERSION" VEEJAY_CODENAME="Resume - build $VEEJAY_MINOR_VERSION $VEEJAY_MICRO_VERSION"
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

View File

@@ -866,13 +866,36 @@ void on_button_sample_recordstart_clicked(GtkWidget *widget, gpointer user_data)
gint nframes = info->uc.sample_rec_duration; gint nframes = info->uc.sample_rec_duration;
if(nframes <= 0) if(nframes <= 0)
return; return;
/*
int br=0; int bw=0;
gchar *utftext = (gchar*) get_text( "entry_samplename");
if(!utftext)
return;
gchar *text = g_locale_from_utf8( utftext, -1, &br, &bw,NULL);
if(!text || strlen(text) <= 1)
return;
int i = 0;
while( text[i] != '\0' )
{
if( !isalnum( text[i] ))
{
vj_msg(VEEJAY_MSG_ERROR, "Only alphanumeric characters allowed");
if( text) free(text);
return;
}
}
multi_vims( VIMS_SAMPLE_SET_DESCRIPTION, "%d %s", 0, text );
g_free(text);
*/
if(format != NULL) if(format != NULL)
{ {
multi_vims( VIMS_RECORD_DATAFORMAT,"%s", multi_vims( VIMS_RECORD_DATAFORMAT,"%s",
format ); format );
} }
multi_vims( VIMS_SAMPLE_REC_START, multi_vims( VIMS_SAMPLE_REC_START,
"%d %d", "%d %d",
nframes, nframes,
@@ -1576,7 +1599,6 @@ void on_curve_buttonstore_clicked(GtkWidget *widget, gpointer user_data )
if( (end - start) <= 0 || id <= 0 ) if( (end - start) <= 0 || id <= 0 )
{ {
printf("end = %d, start = %d , id = %d\n",end,start,id);
return; return;
} }
@@ -1613,7 +1635,6 @@ void on_curve_buttontime_clicked(GtkWidget *widget, gpointer user_data )
if( (end - start) <= 0 || id <= 0 ) if( (end - start) <= 0 || id <= 0 )
{ {
printf("end = %d, start = %d , id = %d\n",end,start,id);
return; return;
} }
GtkWidget *curve = glade_xml_get_widget_( info->main_window, "curve"); GtkWidget *curve = glade_xml_get_widget_( info->main_window, "curve");
@@ -1929,7 +1950,6 @@ void on_button_sdlclose_clicked(GtkWidget *w, gpointer user_data)
void on_quicklaunch_clicked(GtkWidget *widget, gpointer user_data) void on_quicklaunch_clicked(GtkWidget *widget, gpointer user_data)
{ {
printf("State = %d\n", info->watch.state);
if( info->watch.state == STATE_STOPPED ) if( info->watch.state == STATE_STOPPED )
{ {
vj_fork_or_connect_veejay( config_file ); vj_fork_or_connect_veejay( config_file );
@@ -2256,7 +2276,6 @@ gboolean on_entry_filename_focus_in_event( GtkWidget *w, gpointer user_data)
void on_previewtoggle_toggled(GtkWidget *w, gpointer user_data) void on_previewtoggle_toggled(GtkWidget *w, gpointer user_data)
{ {
printf("%s:%d\n", __FUNCTION__, __LINE__ );
if(!info->status_lock) if(!info->status_lock)
{ {
multitrack_preview_master( info->mt, is_button_toggled("previewtoggle")); multitrack_preview_master( info->mt, is_button_toggled("previewtoggle"));
@@ -2311,27 +2330,23 @@ void on_previewsmall_clicked( GtkWidget *w, gpointer user_data)
void on_multitrack_activate( GtkWidget *w, gpointer user_data) void on_multitrack_activate( GtkWidget *w, gpointer user_data)
{ {
printf("%s\n", __FUNCTION__ );
multitrack_open( info->mt ); multitrack_open( info->mt );
gtk_widget_show( glade_xml_get_widget_( info->main_window , "mtwindow" )); gtk_widget_show( glade_xml_get_widget_( info->main_window , "mtwindow" ));
} }
void on_multitrack_deactivate( GtkWidget *w, gpointer user_data) void on_multitrack_deactivate( GtkWidget *w, gpointer user_data)
{ {
printf("%s\n", __FUNCTION__ );
multitrack_close( info->mt ); multitrack_close( info->mt );
gtk_widget_hide( glade_xml_get_widget_( info->main_window , "mtwindow" )); gtk_widget_hide( glade_xml_get_widget_( info->main_window , "mtwindow" ));
} }
void on_mt_new_activate( GtkWidget *w, gpointer user_data) void on_mt_new_activate( GtkWidget *w, gpointer user_data)
{ {
printf("%s\n",__FUNCTION__ );
multitrack_add_track( info->mt ); multitrack_add_track( info->mt );
} }
void on_mt_delete_activate( GtkWidget *w, gpointer user_data) void on_mt_delete_activate( GtkWidget *w, gpointer user_data)
{ {
printf("%s\n", __FUNCTION__ );
multitrack_close_track( info->mt ); multitrack_close_track( info->mt );
} }

View File

@@ -20,7 +20,7 @@
#define GVRCOMMON_H #define GVRCOMMON_H
#define STATUS_BYTES 100 #define STATUS_BYTES 100
#define STATUS_TOKENS 19 #define STATUS_TOKENS 19
#define VEEJAY_CODENAME "Resume build 2k6 v. beta 1" #define VEEJAY_CODENAME "Resume build 2k6 v. beta 2"
/* Status bytes */ /* Status bytes */
#define ELAPSED_TIME 0 #define ELAPSED_TIME 0

View File

@@ -38,8 +38,6 @@ key_chain_t *new_chain(void)
void del_chain( key_chain_t *chain ) void del_chain( key_chain_t *chain )
{ {
printf("%s :%d %p\n",__FUNCTION__ ,__LINE__ , chain);
if(chain) if(chain)
{ {
gint i; gint i;
@@ -139,7 +137,6 @@ void debug_key( key_parameter_t *key )
void clear_parameter_values( key_parameter_t *key ) void clear_parameter_values( key_parameter_t *key )
{ {
printf("%s :%d\n",__FUNCTION__ ,__LINE__);
if(key) if(key)
{ {
if(key->vector) if(key->vector)
@@ -178,8 +175,6 @@ int get_parameter_key_value( key_parameter_t *key, gint frame_pos, float *result
void get_points_from_curve( key_parameter_t *key, GtkWidget *curve ) void get_points_from_curve( key_parameter_t *key, GtkWidget *curve )
{ {
printf("%s :%d\n",__FUNCTION__ ,__LINE__);
gtk_curve_get_vector( GTK_CURVE(curve), key->curve_len, key->vector ); gtk_curve_get_vector( GTK_CURVE(curve), key->curve_len, key->vector );
} }

View File

@@ -1079,7 +1079,6 @@ void multitrack_set_current( void *data, char *hostname, int port_num , int wid
void multitrack_restart(void *data) void multitrack_restart(void *data)
{ {
//printf("\t%s\n",__FUNCTION__);
} }
static gboolean seqv_mouse_press_event ( GtkWidget *w, GdkEventButton *event, gpointer user_data) static gboolean seqv_mouse_press_event ( GtkWidget *w, GdkEventButton *event, gpointer user_data)

View File

@@ -364,6 +364,9 @@ void *veejay_sequence_thread(gpointer data)
void veejay_abort_sequence( void *data ) void veejay_abort_sequence( void *data )
{ {
veejay_sequence_t *v = (veejay_sequence_t*) data; veejay_sequence_t *v = (veejay_sequence_t*) data;
if(!v)
return;
g_mutex_lock(v->mutex); g_mutex_lock(v->mutex);
v->abort = 1; v->abort = 1;
g_mutex_unlock(v->mutex); g_mutex_unlock(v->mutex);

View File

@@ -5502,15 +5502,10 @@ static gboolean veejay_tick( GIOChannel *source, GIOCondition condition, gpointe
{ {
vj_gui_t *gui = (vj_gui_t*) data; vj_gui_t *gui = (vj_gui_t*) data;
if( (condition&G_IO_ERR) ) { if( (condition&G_IO_ERR) ) {
printf("%s Ends %d\n",__FUNCTION__, __LINE__);
return FALSE; } return FALSE; }
if( (condition&G_IO_HUP) ) { if( (condition&G_IO_HUP) ) {
printf("%s Ends %d\n",__FUNCTION__, __LINE__);
return FALSE; } return FALSE; }
if( (condition&G_IO_NVAL) ) { if( (condition&G_IO_NVAL) ) {
printf("%s Ends %d\n",__FUNCTION__, __LINE__);
return FALSE; return FALSE;
} }
if(gui->watch.state==STATE_PLAYING && (condition & G_IO_IN)&& gui->watch.p_state == 0 ) if(gui->watch.state==STATE_PLAYING && (condition & G_IO_IN)&& gui->watch.p_state == 0 )
@@ -5524,8 +5519,6 @@ printf("%s Ends %d\n",__FUNCTION__, __LINE__);
if(sta_len[0] != 'V' || nb <= 0 ) if(sta_len[0] != 'V' || nb <= 0 )
{ {
printf("%s Ends %d\n",__FUNCTION__, __LINE__);
gui->status_lock = 0; gui->status_lock = 0;
G_UNLOCK( status_lock__ ); G_UNLOCK( status_lock__ );
return FALSE; return FALSE;
@@ -5534,8 +5527,6 @@ printf("%s Ends %d\n",__FUNCTION__, __LINE__);
sscanf( sta_len+1, "%03d", &n_bytes ); sscanf( sta_len+1, "%03d", &n_bytes );
if( n_bytes == 0 || n_bytes >= STATUS_BYTES ) if( n_bytes == 0 || n_bytes >= STATUS_BYTES )
{ {
printf("%s Ends %d\n",__FUNCTION__, __LINE__);
gui->status_lock = 0; gui->status_lock = 0;
G_UNLOCK( status_lock__ ); G_UNLOCK( status_lock__ );
return FALSE; return FALSE;
@@ -5545,7 +5536,6 @@ printf("%s Ends %d\n",__FUNCTION__, __LINE__);
nb = vj_client_read( gui->client, V_STATUS, gui->status_msg, n_bytes ); nb = vj_client_read( gui->client, V_STATUS, gui->status_msg, n_bytes );
if(nb <= 0 ) if(nb <= 0 )
{ {
printf("%s Ends %d\n",__FUNCTION__, __LINE__);
gui->status_lock = 0; gui->status_lock = 0;
G_UNLOCK( status_lock__ ); G_UNLOCK( status_lock__ );
return FALSE; return FALSE;
@@ -5731,8 +5721,6 @@ void vj_fork_or_connect_veejay(char *configfile)
while(args[f] != NULL) f++; while(args[f] != NULL) f++;
args[f] = g_strdup( vims_token ); args[f] = g_strdup( vims_token );
} }
// for(k = 0 ; k < arglen; k ++ )
// fprintf(stderr, "%s arg %d = '%s'\n", __FUNCTION__, k, args[k] );
if( info->watch.state == STATE_STOPPED) if( info->watch.state == STATE_STOPPED)
{ {
// start local veejay // start local veejay
@@ -5842,13 +5830,15 @@ static void vj_init_style( const char *name, const char *font )
GtkWidget *window = glade_xml_get_widget_(info->main_window, "gveejay_window"); GtkWidget *window = glade_xml_get_widget_(info->main_window, "gveejay_window");
GtkWidget *widget = glade_xml_get_widget_(info->main_window, name ); GtkWidget *widget = glade_xml_get_widget_(info->main_window, name );
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(widget), GTK_WRAP_WORD_CHAR ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(widget), GTK_WRAP_WORD_CHAR );
GdkColor red;
GtkStyle *style = gtk_style_copy( gtk_widget_get_style(GTK_WIDGET(window))); gdk_color_parse( "red", &red);
PangoFontDescription *desc = pango_font_description_from_string( font ); // GtkStyle *style = gtk_style_copy( gtk_widget_get_style(GTK_WIDGET(window)));
pango_font_description_set_style( desc, PANGO_STYLE_NORMAL ); // PangoFontDescription *desc = pango_font_description_from_string( font );
style->font_desc = desc; // pango_font_description_set_style( desc, PANGO_STYLE_NORMAL );
gtk_widget_set_style( widget, style ); // style->font_desc = desc;
gtk_style_ref(style); // gtk_widget_set_style( widget, style );
// gtk_style_ref(style);
gtk_widget_modify_bg( widget, GTK_STATE_NORMAL, &red );
} }
void vj_gui_style_setup() void vj_gui_style_setup()
@@ -6151,9 +6141,12 @@ void vj_gui_init(char *glade_file)
memset(&(info->watch.p_time),0,sizeof(struct timeval)); memset(&(info->watch.p_time),0,sizeof(struct timeval));
info->is_alive = g_timeout_add(G_PRIORITY_HIGH_IDLE,is_alive, (gpointer*)info); info->is_alive = g_timeout_add(G_PRIORITY_HIGH_IDLE,is_alive, (gpointer*)info);
GtkWidget *w = glade_xml_get_widget_(info->main_window, "veejay_connection" ); GtkWidget *w = glade_xml_get_widget_(info->main_window, "veejay_connection" );
gtk_widget_show( w ); gtk_widget_show( w );
} }
static gboolean update_log(gpointer data) static gboolean update_log(gpointer data)
{ {
if(info->watch.state != STATE_PLAYING && info->watch.p_state == 0) if(info->watch.state != STATE_PLAYING && info->watch.p_state == 0)

View File

@@ -242,8 +242,7 @@ sample_info *sample_skeleton_new(long startFrame, long endFrame)
} }
si->sample_id = _new_id(); si->sample_id = _new_id();
snprintf(si->descr,SAMPLE_MAX_DESCR_LEN, "Sample%04d", si->sample_id);
snprintf(si->descr,SAMPLE_MAX_DESCR_LEN, "%s", "Untitled");
si->first_frame = startFrame; si->first_frame = startFrame;
si->last_frame = endFrame; si->last_frame = endFrame;
si->edit_list = NULL; // clone later si->edit_list = NULL; // clone later
@@ -284,7 +283,6 @@ sample_info *sample_skeleton_new(long startFrame, long endFrame)
si->selected_entry = 0; si->selected_entry = 0;
si->effect_toggle = 1; si->effect_toggle = 1;
si->offset = 0; si->offset = 0;
sprintf(si->descr, "%s", "Untitled");
sprintf(tmp_file, "sample_%05d.edl", si->sample_id ); sprintf(tmp_file, "sample_%05d.edl", si->sample_id );
si->edit_list_file = strdup( tmp_file ); si->edit_list_file = strdup( tmp_file );
@@ -733,7 +731,7 @@ int sample_set_description(int sample_id, char *description)
if (!si) if (!si)
return -1; return -1;
if (!description || strlen(description) <= 0) { if (!description || strlen(description) <= 0) {
snprintf(si->descr, SAMPLE_MAX_DESCR_LEN, "%s", "Untitled"); snprintf(si->descr, SAMPLE_MAX_DESCR_LEN, "Sample%04d", si->sample_id );
} else { } else {
snprintf(si->descr, SAMPLE_MAX_DESCR_LEN, "%s", description); snprintf(si->descr, SAMPLE_MAX_DESCR_LEN, "%s", description);
} }

View File

@@ -92,7 +92,10 @@ int sample_try_filename(int sample_id, char *filename)
{ {
snprintf(si->encoder_base,255,"%s",filename); snprintf(si->encoder_base,255,"%s",filename);
} }
sprintf(si->encoder_destination, "%s-%05ld.avi", si->encoder_base,si->sequence_num); // sprintf(si->encoder_destination, "%s-%05ld.avi", si->encoder_base,si->sequence_num);
sprintf(si->encoder_destination, "%s.avi", si->encoder_base );
veejay_msg(VEEJAY_MSG_INFO, "Recording to [%s]", si->encoder_destination); veejay_msg(VEEJAY_MSG_INFO, "Recording to [%s]", si->encoder_destination);
return (sample_update(si,sample_id)); return (sample_update(si,sample_id));

View File

@@ -20,6 +20,7 @@
#include "videowall.h" #include "videowall.h"
#include <stdlib.h> #include <stdlib.h>
#include "common.h" #include "common.h"
static inline int gcd(int p, int q ) { if(q==0) return p; else return(gcd(q,p%q)); }
static inline int n_pics(int w, int h) static inline int n_pics(int w, int h)
{ {
@@ -60,7 +61,7 @@ static int frame_delay = 0;
static int *offset_table_x = NULL; static int *offset_table_x = NULL;
static int *offset_table_y = NULL; static int *offset_table_y = NULL;
static inline int gcd(int p, int q ) { if(q==0) return p; else return(gcd(q,p%q)); }
static int prepare_filmstrip(int w, int h) static int prepare_filmstrip(int w, int h)

View File

@@ -426,7 +426,7 @@ int vj_server_poll(vj_server * vje)
return 0; return 0;
} }
static int _vj_server_empty_queue(vj_server *vje, int link_id) int _vj_server_empty_queue(vj_server *vje, int link_id)
{ {
// ensure message queue is empty!! // ensure message queue is empty!!
vj_link **Link = (vj_link**) vje->link; vj_link **Link = (vj_link**) vje->link;

View File

@@ -1,7 +1,6 @@
# Edit these colors and fonts however you like. # Edit these colors and fonts however you like.
style "default" style "default"
{ {
engine "hcengine" {}
xthickness = 1 xthickness = 1
ythickness = 1 ythickness = 1
GtkWidget::shadow_type = GTK_SHADOW_ETCHED_OUT GtkWidget::shadow_type = GTK_SHADOW_ETCHED_OUT
@@ -18,22 +17,27 @@ style "default"
font_name = "Sans 8" font_name = "Sans 8"
fg[NORMAL] = "#646464" # borders etc. # foreground color of widgets
fg[PRELIGHT] = "#646464"
fg[ACTIVE] = "#646464" # ook borders, van sliders en notebook
fg[SELECTED] = "#646464"
fg[INSENSITIVE] = "#404040"
bg[NORMAL] = "#27282F" # algemene achtergrond kleur
bg[PRELIGHT] = "#aaacc1" # achtergrond geselecteerd widget
bg[ACTIVE] = "#454f60" # niet actieve tabs, achtergrond sliders
bg[SELECTED] = "#5058a0"
bg[INSENSITIVE] = "#27282f" # achtergrond kleur van niet actieve knopjes
text[NORMAL] = "#d8d8d8" fg[NORMAL] = "#646464" # normal
text[PRELIGHT] = "#d8d8d8" fg[PRELIGHT] = "#646464" # mouse on top of widget
text[ACTIVE] = "#FF0000" fg[ACTIVE] = "#646464" # the widget is pressed or clicked (and active)
text[SELECTED] = "#FF0000" fg[SELECTED] = "#646464" # selected
fg[INSENSITIVE] = "#404040" # greyed out
bg[NORMAL] = "#27282F" # see above
bg[PRELIGHT] = "#aaacc1" #
bg[ACTIVE] = "#454f60" #
bg[SELECTED] = "#5058a0" #
bg[INSENSITIVE] = "#27282f" #
# set the color used for foreground of widgets using base for the background
text[NORMAL] ="#171223"
text[PRELIGHT] = "#414174"
text[ACTIVE] = "#141444"
# text[SELECTED] = "#FF0000"
text[SELECTED] = "#0b0b46"
text[INSENSITIVE] = "#404040" text[INSENSITIVE] = "#404040"
base[NORMAL] = "#37383f" base[NORMAL] = "#37383f"
@@ -41,78 +45,8 @@ style "default"
base[ACTIVE] = "#757f90" base[ACTIVE] = "#757f90"
base[SELECTED] = "#757ab3" base[SELECTED] = "#757ab3"
base[INSENSITIVE] = "#27282f" base[INSENSITIVE] = "#27282f"
bg_pixmap[NORMAL] = "bg.png"
} }
style "text"
{
font_name = "Sans 8"
fg[NORMAL] = "#ffffff" # borders etc.
fg[PRELIGHT] = "#ffffff"
fg[ACTIVE] = "#ffffff" # ook borders, van sliders en notebook
fg[SELECTED] = "#ffffff"
fg[INSENSITIVE] = "#ffffff"
bg[NORMAL] = "#27282F" # algemene achtergrond kleur
bg[PRELIGHT] = "#aaacc1" # achtergrond geselecteerd widget
bg[ACTIVE] = "#454f60" # niet actieve tabs, achtergrond sliders
bg[SELECTED] = "#5058a0"
bg[INSENSITIVE] = "#27282f" # achtergrond kleur van niet actieve knopjes
text[NORMAL] = "#d8d8d8"
text[PRELIGHT] = "#d8d8d8"
text[ACTIVE] = "#FF0000"
text[SELECTED] = "#FF0000"
text[INSENSITIVE] = "#404040"
base[NORMAL] = "#37383f"
base[PRELIGHT] = "#aaacc1"
base[ACTIVE] = "#757f90"
base[SELECTED] = "#757ab3"
base[INSENSITIVE] = "#27282f"
}
style "buttons"
{
font_name = "Sans 8"
fg[NORMAL] = "#888888"
fg[PRELIGHT] = "#888888"
fg[ACTIVE] = "#888888"
fg[SELECTED] = "#888888"
fg[INSENSITIVE] = "#888888"
bg[NORMAL] = "#27282F"
bg[PRELIGHT] = "#aaacc1"
bg[ACTIVE] = "#454f60"
bg[SELECTED] = "#5058a0"
bg[INSENSITIVE] = "#27282f"
text[NORMAL] = "#d8d8d8"
text[PRELIGHT] = "#d8d8d8"
text[ACTIVE] = "#FF0000"
text[SELECTED] = "#FF0000"
text[INSENSITIVE] = "#404040"
base[NORMAL] = "#37383f"
base[PRELIGHT] = "#aaacc1"
base[ACTIVE] = "#757f90"
base[SELECTED] = "#757ab3"
base[INSENSITIVE] = "#27282f"
}
class "GtkButton" style "buttons"
class "GtkSpinButton" style "buttons"
class "GtkToggleButton" style "buttons"
class "GtkCheckBox" style "buttons"
class "GtkLabel" style "text"
class "GtkWidget" style "default" class "GtkWidget" style "default"

View File

@@ -45,80 +45,6 @@
<child> <child>
<widget class="GtkMenu" id="menuitem8_menu"> <widget class="GtkMenu" id="menuitem8_menu">
<child>
<widget class="GtkImageMenuItem" id="open_connection">
<property name="visible">True</property>
<property name="label" translatable="yes">New veejay session</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_openConnection_activate" last_modification_time="Tue, 19 Jul 2005 19:33:02 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2062">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon_size">1</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>
</child>
<child>
<widget class="GtkImageMenuItem" id="quick_launch_session1">
<property name="visible">True</property>
<property name="label" translatable="yes">Quick launch session</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_quicklaunch_clicked" last_modification_time="Sat, 22 Oct 2005 12:10:54 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2063">
<property name="visible">True</property>
<property name="pixbuf">icon_connect.png</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>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator2">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="configure1">
<property name="visible">True</property>
<property name="label" translatable="yes">Configure</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_configure1_activate" last_modification_time="Sun, 25 Sep 2005 21:18:28 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2064">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</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>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator3">
<property name="visible">True</property>
</widget>
</child>
<child> <child>
<widget class="GtkImageMenuItem" id="save1"> <widget class="GtkImageMenuItem" id="save1">
<property name="visible">True</property> <property name="visible">True</property>
@@ -126,7 +52,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2065"> <widget class="GtkImage" id="image2122">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_save.png</property> <property name="pixbuf">icon_save.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -147,7 +73,7 @@
<signal name="activate" handler="on_button_samplelist_save_clickedactivate" last_modification_time="Wed, 19 Oct 2005 12:22:22 GMT"/> <signal name="activate" handler="on_button_samplelist_save_clickedactivate" last_modification_time="Wed, 19 Oct 2005 12:22:22 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2066"> <widget class="GtkImage" id="image2123">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_saveas.png</property> <property name="pixbuf">icon_saveas.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -167,7 +93,7 @@
<signal name="activate" handler="on_button_saveconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:23:07 GMT"/> <signal name="activate" handler="on_button_saveconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:23:07 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2067"> <widget class="GtkImage" id="image2124">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -190,7 +116,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2068"> <widget class="GtkImage" id="image2125">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_open.png</property> <property name="pixbuf">icon_open.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -211,7 +137,7 @@
<signal name="activate" handler="on_button_samplelist_open_clicked" last_modification_time="Wed, 19 Oct 2005 12:21:30 GMT"/> <signal name="activate" handler="on_button_samplelist_open_clicked" last_modification_time="Wed, 19 Oct 2005 12:21:30 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2069"> <widget class="GtkImage" id="image2126">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_open.png</property> <property name="pixbuf">icon_open.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -231,7 +157,7 @@
<signal name="activate" handler="on_button_loadconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:20:50 GMT"/> <signal name="activate" handler="on_button_loadconfigfile_clicked" last_modification_time="Wed, 19 Oct 2005 12:20:50 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2070"> <widget class="GtkImage" id="image2127">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -261,7 +187,7 @@
<signal name="activate" handler="on_veejay_connection_close" last_modification_time="Sat, 22 Oct 2005 12:07:11 GMT"/> <signal name="activate" handler="on_veejay_connection_close" last_modification_time="Sat, 22 Oct 2005 12:07:11 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2071"> <widget class="GtkImage" id="image2128">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_disconnect.png</property> <property name="pixbuf">icon_disconnect.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -273,26 +199,6 @@
</widget> </widget>
</child> </child>
<child>
<widget class="GtkImageMenuItem" id="quit_veejay1">
<property name="visible">True</property>
<property name="label" translatable="yes">Kill veejay server</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_quit_veejay1_activate" last_modification_time="Sun, 25 Sep 2005 23:13:02 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2072">
<property name="visible">True</property>
<property name="pixbuf">icon_skull.png</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>
</child>
<child> <child>
<widget class="GtkImageMenuItem" id="quit1"> <widget class="GtkImageMenuItem" id="quit1">
<property name="visible">True</property> <property name="visible">True</property>
@@ -322,7 +228,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2073"> <widget class="GtkImage" id="image2129">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_loop.png</property> <property name="pixbuf">icon_loop.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -343,7 +249,7 @@
<signal name="activate" handler="on_new_from_file1_activate" last_modification_time="Mon, 10 Oct 2005 12:31:19 GMT"/> <signal name="activate" handler="on_new_from_file1_activate" last_modification_time="Mon, 10 Oct 2005 12:31:19 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2074"> <widget class="GtkImage" id="image2130">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -358,12 +264,13 @@
<child> <child>
<widget class="GtkImageMenuItem" id="add_file1"> <widget class="GtkImageMenuItem" id="add_file1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_Add file</property> <property name="tooltip" translatable="yes">Append a videofile to the sample's EDL</property>
<property name="label" translatable="yes">_Add videofile</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="activate" handler="on_add_file1_activate" last_modification_time="Mon, 10 Oct 2005 12:31:19 GMT"/> <signal name="activate" handler="on_add_file1_activate" last_modification_time="Mon, 10 Oct 2005 12:31:19 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2075"> <widget class="GtkImage" id="image2131">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_send.png</property> <property name="pixbuf">icon_send.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -383,7 +290,7 @@
<signal name="activate" handler="on_copy1_activate" last_modification_time="Mon, 10 Oct 2005 12:31:19 GMT"/> <signal name="activate" handler="on_copy1_activate" last_modification_time="Mon, 10 Oct 2005 12:31:19 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2076"> <widget class="GtkImage" id="image2132">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_copy.png</property> <property name="pixbuf">icon_copy.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -403,7 +310,7 @@
<signal name="activate" handler="on_delete1_activate" last_modification_time="Mon, 10 Oct 2005 12:32:20 GMT"/> <signal name="activate" handler="on_delete1_activate" last_modification_time="Mon, 10 Oct 2005 12:32:20 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2077"> <widget class="GtkImage" id="image2133">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_clear.png</property> <property name="pixbuf">icon_clear.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -426,7 +333,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2078"> <widget class="GtkImage" id="image2134">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_stream.png</property> <property name="pixbuf">icon_stream.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -442,12 +349,12 @@
<child> <child>
<widget class="GtkImageMenuItem" id="new_source1"> <widget class="GtkImageMenuItem" id="new_source1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_New source</property> <property name="label" translatable="yes">_New </property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="activate" handler="on_new_source1_activate" last_modification_time="Mon, 10 Oct 2005 12:31:19 GMT"/> <signal name="activate" handler="on_new_source1_activate" last_modification_time="Mon, 10 Oct 2005 12:31:19 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2079"> <widget class="GtkImage" id="image2135">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_openlist.png</property> <property name="pixbuf">icon_openlist.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -462,12 +369,12 @@
<child> <child>
<widget class="GtkImageMenuItem" id="new_color1"> <widget class="GtkImageMenuItem" id="new_color1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">_New color</property> <property name="label" translatable="yes">_New Solid</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="activate" handler="on_new_color1_activate" last_modification_time="Mon, 10 Oct 2005 12:35:25 GMT"/> <signal name="activate" handler="on_new_color1_activate" last_modification_time="Mon, 10 Oct 2005 12:35:25 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2080"> <widget class="GtkImage" id="image2136">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_color.png</property> <property name="pixbuf">icon_color.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -487,7 +394,7 @@
<signal name="activate" handler="on_delete2_activate" last_modification_time="Mon, 10 Oct 2005 12:35:46 GMT"/> <signal name="activate" handler="on_delete2_activate" last_modification_time="Mon, 10 Oct 2005 12:35:46 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2081"> <widget class="GtkImage" id="image2137">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_clear.png</property> <property name="pixbuf">icon_clear.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -512,12 +419,12 @@
<child> <child>
<widget class="GtkImageMenuItem" id="video_settings"> <widget class="GtkImageMenuItem" id="video_settings">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Video settings</property> <property name="label" translatable="yes">Settings</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="activate" handler="on_VideoSettings_activate" last_modification_time="Tue, 19 Jul 2005 19:33:02 GMT"/> <signal name="activate" handler="on_VideoSettings_activate" last_modification_time="Tue, 19 Jul 2005 19:33:02 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2082"> <widget class="GtkImage" id="image2138">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-preferences</property> <property name="stock">gtk-preferences</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@@ -551,7 +458,7 @@
<signal name="activate" handler="on_console1_activate" last_modification_time="Sat, 22 Oct 2005 11:05:22 GMT"/> <signal name="activate" handler="on_console1_activate" last_modification_time="Sat, 22 Oct 2005 11:05:22 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2083"> <widget class="GtkImage" id="image2139">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-dialog-info</property> <property name="stock">gtk-dialog-info</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@@ -587,7 +494,7 @@
<signal name="activate" handler="on_vims_bundles_activate" last_modification_time="Sat, 23 Jul 2005 18:59:53 GMT"/> <signal name="activate" handler="on_vims_bundles_activate" last_modification_time="Sat, 23 Jul 2005 18:59:53 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2084"> <widget class="GtkImage" id="image2140">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_bundle.png</property> <property name="pixbuf">icon_bundle.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -598,6 +505,27 @@
</child> </child>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkImageMenuItem" id="configure1">
<property name="visible">True</property>
<property name="label" translatable="yes">Configuration</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_configure1_activate" last_modification_time="Sun, 25 Sep 2005 21:18:28 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image2141">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</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>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>
@@ -620,7 +548,7 @@
<signal name="activate" handler="on_about1_activate" last_modification_time="Thu, 15 Sep 2005 22:07:40 GMT"/> <signal name="activate" handler="on_about1_activate" last_modification_time="Thu, 15 Sep 2005 22:07:40 GMT"/>
<child internal-child="image"> <child internal-child="image">
<widget class="GtkImage" id="image2085"> <widget class="GtkImage" id="image2142">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">icon_question.png</property> <property name="pixbuf">icon_question.png</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
@@ -1193,7 +1121,7 @@
<child> <child>
<widget class="GtkLabel" id="label714"> <widget class="GtkLabel" id="label714">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Record duration</property> <property name="label" translatable="yes">Duration</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1334,7 +1262,7 @@
<child> <child>
<widget class="GtkLabel" id="label718"> <widget class="GtkLabel" id="label718">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Record format</property> <property name="label" translatable="yes">Format</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1979,7 +1907,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label723"> <widget class="GtkLabel" id="label723">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Hardware controls:&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;V4L&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2052,7 +1980,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label601"> <widget class="GtkLabel" id="label601">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Solid-stream Color&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Color wheel&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2361,7 +2289,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label707"> <widget class="GtkLabel" id="label707">
<property name="label" translatable="yes">Frame duplication (&quot;delay&quot;) </property> <property name="label" translatable="yes">Duplication factor</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2417,7 +2345,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label705"> <widget class="GtkLabel" id="label705">
<property name="label" translatable="yes">Sample name:</property> <property name="label" translatable="yes">Title:</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2655,7 +2583,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label179"> <widget class="GtkLabel" id="label179">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Loop Types</property> <property name="label" translatable="yes">Looping</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2747,7 +2675,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label711"> <widget class="GtkLabel" id="label711">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Record duration</property> <property name="label" translatable="yes">Duration</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2797,7 +2725,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label708"> <widget class="GtkLabel" id="label708">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Record format</property> <property name="label" translatable="yes">Format</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2872,29 +2800,6 @@ YV16</property>
<property name="angle">0</property> <property name="angle">0</property>
</widget> </widget>
</child> </child>
<child>
<widget class="GtkLabel" id="label710">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Timecode:&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</child>
</widget> </widget>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
@@ -2909,7 +2814,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label709"> <widget class="GtkLabel" id="label709">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Record duration as</property> <property name="label" translatable="yes">Unit</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3165,7 +3070,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label712"> <widget class="GtkLabel" id="label712">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Recording progress&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Recording&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3313,7 +3218,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label225"> <widget class="GtkLabel" id="label225">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Editlist positon</property> <property name="label" translatable="yes">Positon</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3340,7 +3245,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label226"> <widget class="GtkLabel" id="label226">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Editlist frames</property> <property name="label" translatable="yes">Total frames</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6539,7 +6444,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label756"> <widget class="GtkLabel" id="label756">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Mixing sources</property> <property name="label" translatable="yes">FX sources</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6748,7 +6653,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label753"> <widget class="GtkLabel" id="label753">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Effects</property> <property name="label" translatable="yes">FX List</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6801,7 +6706,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label754"> <widget class="GtkLabel" id="label754">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Color parameters</property> <property name="label" translatable="yes">Color wheel</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6990,7 +6895,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label679"> <widget class="GtkLabel" id="label679">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Keyframe Start&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Time Start&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7145,7 +7050,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label684"> <widget class="GtkLabel" id="label684">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Keyframe End&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Time End&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7448,7 +7353,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label686"> <widget class="GtkLabel" id="label686">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Keyframe parameter:&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Animate parameter:&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7593,7 +7498,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label685"> <widget class="GtkLabel" id="label685">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Drawing method&lt;/b&gt;</property> <property name="label" translatable="yes">&lt;b&gt;Curve drawing method&lt;/b&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7786,7 +7691,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label755"> <widget class="GtkLabel" id="label755">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Keyframing</property> <property name="label" translatable="yes">FX animation</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8741,7 +8646,7 @@ YV16</property>
<child> <child>
<widget class="GtkLabel" id="label673"> <widget class="GtkLabel" id="label673">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Sample banks</property> <property name="label" translatable="yes">Samplebank</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>

View File

@@ -526,7 +526,7 @@ static int check_command_line_options(int argc, char *argv[])
static void print_license() static void print_license()
{ {
veejay_msg(VEEJAY_MSG_INFO, veejay_msg(VEEJAY_MSG_INFO,
"Veejay -<|End of the Line 2k6 beta 1|>- %s Copyright (C) Niels Elburg and others",VERSION); "Veejay -<|End of the Line 2k6 beta 2|>- %s Copyright (C) Niels Elburg and others",VERSION);
veejay_msg(VEEJAY_MSG_INFO, veejay_msg(VEEJAY_MSG_INFO,
"This software is subject to the GNU GENERAL PUBLIC LICENSE"); "This software is subject to the GNU GENERAL PUBLIC LICENSE");