diff --git a/veejay-current/gveejay-reloaded/vj-api.c b/veejay-current/gveejay-reloaded/vj-api.c index 3f652d62..2f760837 100644 --- a/veejay-current/gveejay-reloaded/vj-api.c +++ b/veejay-current/gveejay-reloaded/vj-api.c @@ -1657,11 +1657,14 @@ void veejay_quit( ) gboolean gveejay_quit( GtkWidget *widget, gpointer user_data) { - if( prompt_dialog("Quit gveejay", "Are you sure?" ) == GTK_RESPONSE_REJECT) - return TRUE; + if( info->state == STATE_PLAYING) + { + if( prompt_dialog("Quit gveejay", "Are you sure?" ) == GTK_RESPONSE_REJECT) + return TRUE; - if(info->run_state == RUN_STATE_LOCAL) - veejay_quit(); + if(info->run_state == RUN_STATE_LOCAL) + veejay_quit(); + } vj_gui_disconnect(); vj_gui_free(); @@ -1712,8 +1715,12 @@ int gveejay_new_slot(int mode) if(id > 0 ) vj_msg(VEEJAY_MSG_INFO, "Created new %s %d", (mode == MODE_SAMPLE ? "Sample" : "Stream"), id); else - vj_msg(VEEJAY_MSG_ERROR, "Failed to create new %s", + { + char message[100]; + sprintf(message, "Failed to create new %s", (mode == MODE_SAMPLE ? "Sample" : "Stream" ) ); + message_dialog( "Error", message ); + } if( id > 0 ) { /* Add the sample/stream to a sample bank */ @@ -1802,7 +1809,7 @@ static void vj_msg(int type, const char format[], ...) { if( type == VEEJAY_MSG_DEBUG && vims_verbosity == 0 ) return; - + char tmp[1024]; char buf[1024]; char prefix[20]; @@ -6138,6 +6145,8 @@ void vj_gui_init(char *glade_file) vj_mem_init(); + glade_init(); + vj_gui_t *gui = (vj_gui_t*)vj_malloc(sizeof(vj_gui_t)); if(!gui) @@ -6213,7 +6222,7 @@ void vj_gui_init(char *glade_file) gui->config.vims = 0; gui->config.mcast_osc = g_strdup( "224.0.0.32" ); gui->config.mcast_vims = g_strdup( "224.0.0.33" ); - g_timeout_add_full( G_PRIORITY_DEFAULT_IDLE, 500, is_alive, (gpointer*) info,NULL); + g_timeout_add_full( G_PRIORITY_DEFAULT_IDLE, 300, is_alive, (gpointer*) info,NULL); GtkWidget *mainw = glade_xml_get_widget_(info->main_window,"gveejay_window" ); /* Make this run after any internal handling of the client event happened @@ -6356,8 +6365,6 @@ int vj_gui_reconnect(char *hostname,char *group_name, int port_num) vj_client_free(info->client); info->client = NULL; info->run_state = 0; - vj_msg(VEEJAY_MSG_INFO, "Cannot establish connection with %s:%d", - (hostname == NULL ? group_name: hostname ),port_num); return 0; } vj_msg(VEEJAY_MSG_INFO, "New connection established with Veejay running on %s port %d", @@ -6368,8 +6375,6 @@ int vj_gui_reconnect(char *hostname,char *group_name, int port_num) info->channel = g_io_channel_unix_new( vj_client_get_status_fd( info->client, V_STATUS)); - - info->state = STATE_PLAYING; g_io_add_watch_full( @@ -6404,7 +6409,9 @@ int vj_gui_reconnect(char *hostname,char *group_name, int port_num) if( skin__ == 0 ) { GtkWidget *w = glade_xml_get_widget_(info->main_window, "gveejay_window" ); + GtkWidget *w2 = glade_xml_get_widget_(info->main_window, "veejay_connection"); gtk_widget_show( w ); + gtk_widget_hide( w2); } info->uc.reload_hint[HINT_SLIST] = 1; info->uc.reload_hint[HINT_CHAIN] = 1; diff --git a/veejay-current/gveejay-reloaded/widgets/gtkcolorsel.c b/veejay-current/gveejay-reloaded/widgets/gtkcolorsel.c index d3d82a0a..4c1186cf 100644 --- a/veejay-current/gveejay-reloaded/widgets/gtkcolorsel.c +++ b/veejay-current/gveejay-reloaded/widgets/gtkcolorsel.c @@ -1900,7 +1900,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) gtk_object_sink (GTK_OBJECT (priv->tooltips)); gtk_box_set_spacing (GTK_BOX (colorsel), 4); - top_hbox = gtk_hbox_new (FALSE, 8); + top_hbox = gtk_vbox_new (FALSE, 8); gtk_box_pack_start (GTK_BOX (colorsel), top_hbox, FALSE, FALSE, 0); vbox = gtk_vbox_new (FALSE, 4); diff --git a/veejay-current/share/gveejay.reloaded-2.glade b/veejay-current/share/gveejay.reloaded-2.glade index d7f2f538..1f9320ed 100644 --- a/veejay-current/share/gveejay.reloaded-2.glade +++ b/veejay-current/share/gveejay.reloaded-2.glade @@ -1312,765 +1312,44 @@ False - + True False 0 - + True False 0 - + True False 0 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 0 - + True - False - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + True - True - True - GTK_POS_BOTTOM - 0 - GTK_UPDATE_CONTINUOUS - True - 96 0 255 0 0 0 - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + False + 0 - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_decrement.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_increment.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - - 0 - False - True - - - - - - - - True - P0 - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - False - 0 - - - - True - True - True - GTK_POS_BOTTOM - 0 - GTK_UPDATE_CONTINUOUS - True - 146 0 255 0 0 0 - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_decrement.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_increment.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - - 0 - False - True - - - - - - - - True - P1 - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - False - 0 - - - - True - True - True - GTK_POS_BOTTOM - 0 - GTK_UPDATE_CONTINUOUS - True - 201 0 255 0 0 0 - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_decrement.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_increment.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - - 0 - False - True - - - - - - - - True - P2 - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - False - 0 - - - - True - True - True - GTK_POS_BOTTOM - 0 - GTK_UPDATE_CONTINUOUS - True - 0 0 255 0 0 0 - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_decrement.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_increment.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - - 0 - False - True - - - - - - - - True - P3 - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - False - 0 - - - - True - True - True - GTK_POS_BOTTOM - 0 - GTK_UPDATE_CONTINUOUS - True - 96 0 255 0 0 0 - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_decrement.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_increment.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - - 0 - False - True - - - - - - - - True - P4 - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - False - 0 - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 - - - + True True True @@ -2079,404 +1358,1138 @@ GTK_UPDATE_CONTINUOUS True 96 0 255 0 0 0 - + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_decrement.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_increment.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + False + True + - - 0 - True - True - - + True + P0 + False + True + GTK_JUSTIFY_LEFT + False + False 0.5 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_decrement.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_increment.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - True + label_item - - - - - True - P5 - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - label_item + 0 + True + True - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - + True - False - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + True - True - True - GTK_POS_BOTTOM - 0 - GTK_UPDATE_CONTINUOUS - True - 86 0 255 0 0 0 - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 0 - 1 - 0 - 0 - 0 - 0 + False + 0 - + True - False - 0 + True + True + GTK_POS_BOTTOM + 0 + GTK_UPDATE_CONTINUOUS + True + 146 0 255 0 0 0 + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 0 + 1 + 0 + 0 + 0 + 0 - + True - True - GTK_RELIEF_NORMAL - True - + False + 0 - + True - button_mini_decrement.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - + True + GTK_RELIEF_NORMAL + True + - - - True - True - GTK_RELIEF_NORMAL - True - + + + True + button_mini_decrement.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + - + True - button_mini_increment.png - 0.5 - 0.5 - 0 - 0 + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_increment.png + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + - - 0 - False - False - + + 0 + False + True + + + + + + True + P1 + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + - 0 - False - True + label_item - - - - - True - P6 - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - label_item + 0 + True + True - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - + True - False - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + True - True - True - GTK_POS_BOTTOM - 0 - GTK_UPDATE_CONTINUOUS - True - 126 0 255 0 0 0 - + False + 0 + + + + True + True + True + GTK_POS_BOTTOM + 0 + GTK_UPDATE_CONTINUOUS + True + 201 0 255 0 0 0 + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 0 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_decrement.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_increment.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + False + True + + - - 0 - True - True - - + True + P2 + False + True + GTK_JUSTIFY_LEFT + False + False 0.5 0.5 - 0 - 1 - 0 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_decrement.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_mini_increment.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - True + label_item + + 0 + True + True + - + True - P7 - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + True + True + GTK_POS_BOTTOM + 0 + GTK_UPDATE_CONTINUOUS + True + 0 0 255 0 0 0 + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 0 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_decrement.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_increment.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + False + True + + + + + + + + True + P3 + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + - label_item + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + True + True + GTK_POS_BOTTOM + 0 + GTK_UPDATE_CONTINUOUS + True + 96 0 255 0 0 0 + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 0 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_decrement.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_increment.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + False + True + + + + + + + + True + P4 + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 0 + + + + True + True + True + GTK_POS_BOTTOM + 0 + GTK_UPDATE_CONTINUOUS + True + 96 0 255 0 0 0 + + + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 0 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_decrement.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_increment.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + False + True + + + + + + + + True + P5 + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + True + True + GTK_POS_BOTTOM + 0 + GTK_UPDATE_CONTINUOUS + True + 86 0 255 0 0 0 + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 0 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_decrement.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_increment.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + False + True + + + + + + + + True + P6 + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + True + True + GTK_POS_BOTTOM + 0 + GTK_UPDATE_CONTINUOUS + True + 126 0 255 0 0 0 + + + + 0 + True + True + + + + + + True + 0.5 + 0.5 + 0 + 1 + 0 + 0 + 0 + 0 + + + + True + False + 0 + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_decrement.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_mini_increment.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + + 0 + False + True + + + + + + + + True + P7 + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True @@ -2500,9 +2513,22 @@ True + + + + True + False + True + + + 0 + True + True + + - True + False True @@ -2521,32 +2547,6 @@ - - - True - False - True - - - True - True - - - - - - True - label_RGBcolorkey.png - 0.5 - 0.5 - 0 - 0 - - - tab - - - True diff --git a/veejay-current/share/gveejay.reloaded.glade b/veejay-current/share/gveejay.reloaded.glade index b40ce1f0..a7c33a3e 100644 --- a/veejay-current/share/gveejay.reloaded.glade +++ b/veejay-current/share/gveejay.reloaded.glade @@ -2027,8 +2027,9 @@ YV16 True - False + True True + 0 @@ -9884,7 +9885,7 @@ YV16 True - Connection to Veejay + GVeejayReloaded Launcher GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT False @@ -9898,6 +9899,9 @@ YV16 GDK_GRAVITY_NORTH_WEST True False + + GVeejayReloaded Launcher + @@ -9997,7 +10001,7 @@ YV16 GTK_RELIEF_HALF True -7 - +