eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2026-01-06 06:55:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

UI fixes, tooltips, sensitivity of widgets, padding, alignments

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1181 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-11-13 21:38:01 +00:00
parent f09bb124d5
commit 947f4b5c5c
5 changed files with 1290 additions and 1233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
veejay-current/veejay-client/src/callback.c
View File

@@ -3586,24 +3586,21 @@ void on_bq_button_clicked( GtkWidget *w, gpointer data )
{
info->quality = 2;
multitrack_set_quality( info->mt, 2 );
if(!is_button_toggled( "previewtoggle" ))
set_toggle_button( "previewtoggle", 1 );
set_toggle_button( "previewtoggle", 1 );
}
void on_hqbutton_clicked( GtkWidget *w, gpointer data )
{
info->quality = 1;
multitrack_set_quality( info->mt, 1 );
if(!is_button_toggled( "previewtoggle" ))
set_toggle_button( "previewtoggle", 1 );
set_toggle_button( "previewtoggle", 1 );
}
void on_lqbutton_clicked( GtkWidget *w, gpointer data )
{
info->quality = 0;
multitrack_set_quality( info->mt, 0 );
if(!is_button_toggled( "previewtoggle" ))
set_toggle_button( "previewtoggle", 1 );
set_toggle_button( "previewtoggle", 1 );
}
void on_uq_button_clicked( GtkWidget *w, gpointer data )

24
veejay-current/veejay-client/src/multitrack.c
View File

@@ -351,7 +351,6 @@ static void add_buttons( sequence_view_t *p, sequence_view_t *seqv , GtkWidget *
seqv->icons[i] = gtk_image_new_from_file( path );
seqv->buttons[i] = gtk_button_new_with_label(" ");
gtk_widget_set_size_request_( seqv->icons[i],24,20 );
gtk_button_set_image( GTK_BUTTON(seqv->buttons[i]), seqv->icons[i] );
gtk_widget_set_size_request_( seqv->buttons[i],24,20 );
gtk_box_pack_start( GTK_BOX(w), seqv->buttons[i], TRUE,TRUE, 0 );
@@ -394,7 +393,7 @@ static void playmode_sensitivity( sequence_view_t *p, gint pm )
#endif
if( pm == MODE_STREAM || MODE_PLAIN || MODE_SAMPLE )
{
if(p->toggle)
if(p->num > 0)
gtk_widget_set_sensitive_( GTK_WIDGET( p->toggle ), TRUE );
gtk_widget_set_sensitive_( GTK_WIDGET( p->panel ), TRUE );
@@ -570,10 +569,9 @@ static sequence_view_t *new_sequence_view( void *vp, int num )
gtk_widget_set_size_request_( seqv->area, 176,176 );
seqv->panel = gtk_frame_new(NULL);
if( num > 0 )
{
seqv->toggle = gtk_toggle_button_new_with_label( "preview" );
seqv->toggle = gtk_toggle_button_new_with_label( "preview" );
if(num>0) {
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(seqv->toggle), FALSE );
g_signal_connect( G_OBJECT( seqv->toggle ), "toggled", G_CALLBACK(sequence_preview_cb),
@@ -583,6 +581,10 @@ static sequence_view_t *new_sequence_view( void *vp, int num )
gtk_widget_set_sensitive_( GTK_WIDGET( seqv->toggle ), FALSE );
gtk_widget_show( seqv->toggle );
} else {
gtk_box_pack_start( GTK_BOX(seqv->main_vbox), seqv->toggle,FALSE,FALSE, 0 );
gtk_widget_show( seqv->toggle );
gtk_widget_set_sensitive_( GTK_WIDGET( seqv->toggle ), FALSE );
}
GtkWidget *vvbox = gtk_vbox_new(FALSE, 0);
@@ -603,7 +605,7 @@ static sequence_view_t *new_sequence_view( void *vp, int num )
GtkWidget *box = gtk_vbox_new(FALSE,0);
seqv->timeline_ = gtk_hscale_new_with_range( 0.0,1.0,0.1 );
gtk_scale_set_draw_value( GTK_SCALE(seqv->timeline_), FALSE );
gtk_widget_set_size_request_( seqv->panel,180 ,180);
//gtk_widget_set_size_request_( seqv->panel,180 ,180);
gtk_adjustment_set_value(
GTK_ADJUSTMENT(GTK_RANGE(seqv->timeline_)->adjustment), 0.0 );
gtk_widget_show( seqv->panel );
@@ -784,7 +786,10 @@ void *multitrack_new(
int threads)
{
multitracker_t *mt = NULL;
#ifdef STRICT_CHECKING
assert( max_w > 0 );
assert( max_h > 0 );
#endif
mt = (multitracker_t*) vj_calloc(sizeof(multitracker_t));
mt->view = (sequence_view_t**) vj_calloc(sizeof(sequence_view_t*) * MAX_TRACKS );
mt->preview = NULL;
@@ -794,13 +799,12 @@ void *multitrack_new(
mt->logo = load_logo_image(vj_get_preview_box_w(), vj_get_preview_box_h());
mt->preview_toggle = preview_toggle;
mt->scroll = gtk_scrolled_window_new(NULL,NULL);
gtk_widget_set_size_request(mt->scroll,50+max_w*2, max_h);
// gtk_widget_set_size_request(mt->scroll,50+max_w*2, max_h);
gtk_container_set_border_width(GTK_CONTAINER(mt->scroll),1);
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(mt->scroll),GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(mt->scroll),GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
GtkWidget *table = gtk_table_new( 1, MAX_TRACKS, FALSE );
gtk_box_pack_start( GTK_BOX( mt->main_box ), mt->scroll , TRUE,TRUE, 0 );
gtk_widget_show(mt->scroll);
int c = 0;
for( c = 0; c < MAX_TRACKS; c ++ )
{

16
veejay-current/veejay-client/src/vj-api.c
View File

@@ -94,7 +94,7 @@ static struct
{"Mouse left: Set in point, Mouse right: Set out point, Double click: Clear selected, Mouse middle: Drag selection"},
{"Mouse left/right: Play slot, Shift + Mouse left: Put sample in slot"},
{"Mouse left click: Select slot (sample in slot), Mouse double click: Play sample in slot"},
NULL,
{NULL},
};
enum {
@@ -1865,12 +1865,12 @@ gboolean gveejay_quit( GtkWidget *widget, gpointer user_data)
if( info->watch.state == STATE_PLAYING)
{
if( prompt_dialog("Quit gveejay", "Are you sure?" ) == GTK_RESPONSE_REJECT)
if( prompt_dialog("Quit Reloaded", "Are you sure?" ) == GTK_RESPONSE_REJECT)
return TRUE;
}
running_g_ = 0;
info->watch.state == STATE_QUIT;
info->watch.state = STATE_QUIT;
return FALSE;
}
@@ -2167,6 +2167,7 @@ static void update_curve_widget(const char *name)
char but[25];
sprintf(but, "kf_p%d", p);
set_toggle_button( but, 1 );
info->uc.selected_parameter_id = p;
switch( curve_type )
{
@@ -5361,7 +5362,7 @@ int veejay_update_multitrack( void *data )
GtkWidget *maintrack = glade_xml_get_widget( info->main_window, "imageA");
int i;
GtkWidget *ww = glade_xml_get_widget_( info->main_window, "vjdeck" );
GtkWidget *ww = glade_xml_get_widget_( info->main_window, "notebook18" );
int deckpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(ww));
#ifdef STRICT_CHECKING
@@ -5445,7 +5446,7 @@ int veejay_update_multitrack( void *data )
}*/
// vj_img_cb( s->img_list[i] );
if(deckpage == 2)
if(deckpage == 3)
multitrack_update_sequence_image( gui->mt, i, s->img_list[i] );
gdk_pixbuf_unref( s->img_list[i] );
@@ -5797,7 +5798,6 @@ static void process_reload_hints(int *history, int pm)
gchar *tt1 = _utf8str(_effect_get_param_description(entry_tokens[ENTRY_FXID],i));
gtk_widget_set_tooltip_text( glade_xml_get_widget_(info->main_window, slider_name), tt1 );
g_free(tt1);
enable_widget( button_name );
gint min,max,value;
value = entry_tokens[3 + i];
@@ -5807,6 +5807,8 @@ static void process_reload_hints(int *history, int pm)
}
sprintf(button_name, "kf_p%d", i );
enable_widget( button_name );
set_tooltip( button_name, tt1 );
g_free(tt1);
}
}
@@ -5823,6 +5825,7 @@ static void process_reload_hints(int *history, int pm)
sprintf( button_name, "dec_p%d", i);
disable_widget( button_name );
sprintf( button_name, "kf_p%d", i );
set_tooltip( button_name, NULL );
disable_widget( button_name );
gtk_widget_set_tooltip_text( glade_xml_get_widget_(info->main_window, slider_name), NULL );
}
@@ -6754,7 +6757,6 @@ void vj_gui_enable()
enable_widget( uiwidgets[i].name );
i++;
}
info->sensitive = 1;
}