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

Gui hacks and updates

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@460 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2005-10-24 19:29:03 +00:00
parent 7b52007977
commit b444530864
4 changed files with 1112 additions and 1101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
veejay-current/gveejay-reloaded/vj-api.c
View File

@@ -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;

2
veejay-current/gveejay-reloaded/widgets/gtkcolorsel.c
View File

@@ -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);

2172
veejay-current/share/gveejay.reloaded-2.glade
View File

File diff suppressed because it is too large Load Diff

10
veejay-current/share/gveejay.reloaded.glade
View File

@@ -2027,8 +2027,9 @@ YV16</property>
<child>
<widget class="GtkColorSelection" id="colorselection">
<property name="visible">True</property>
<property name="has_opacity_control">False</property>
<property name="has_opacity_control">True</property>
<property name="has_palette">True</property>
<signal name="color_changed" handler="on_colorselection_color_changed" last_modification_time="Tue, 25 Oct 2005 00:09:40 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@@ -9884,7 +9885,7 @@ YV16</property>
<widget class="GtkDialog" id="veejay_connection">
<property name="visible">True</property>
<property name="title" translatable="yes">Connection to Veejay</property>
<property name="title" translatable="yes">GVeejayReloaded Launcher</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="modal">False</property>
@@ -9898,6 +9899,9 @@ YV16</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="has_separator">False</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">GVeejayReloaded Launcher</atkproperty>
</accessibility>
<signal name="close" handler="on_veejay_connection_close" last_modification_time="Sat, 23 Jul 2005 16:04:51 GMT"/>
<signal name="delete_event" handler="on_veejay_connection_close" last_modification_time="Sat, 23 Jul 2005 18:53:55 GMT"/>
@@ -9997,7 +10001,7 @@ YV16</property>
<property name="relief">GTK_RELIEF_HALF</property>
<property name="focus_on_click">True</property>
<property name="response_id">-7</property>
<signal name="clicked" handler="on_veejay_connection_close_clicked" last_modification_time="Mon, 10 Oct 2005 12:17:11 GMT"/>
<signal name="clicked" handler="gveejay_quit" last_modification_time="Mon, 24 Oct 2005 23:20:07 GMT"/>
</widget>
</child>
</widget>