diff --git a/useful/stg312/openslx_gui b/useful/stg312/openslx_gui index 42d6d6efe29a28946333710762d873f60041222c..7e06a720ba9890cad1a1797d5edcd7b8bb2652ac 100755 Binary files a/useful/stg312/openslx_gui and b/useful/stg312/openslx_gui differ diff --git a/useful/stg312/stg4.c b/useful/stg312/stg4.c index a8a2f3df6dcd0e2bd7b76514a2eafcd8fdd55593..0fee6d5a65bf256c9359c09309bc251561eb9949 100644 --- a/useful/stg312/stg4.c +++ b/useful/stg312/stg4.c @@ -154,8 +154,8 @@ void stg4_2a_tela(GPid pid, gint status,gpointer p){ g_signal_connect (G_OBJECT (window_stg4_final), "key_press_event", G_CALLBACK (on_key_press), data); //Conecta os sinais pra quando apertar uma tecla g_signal_connect(button_help_4at, "clicked", G_CALLBACK(help_screen), NULL); printf("Linha %d\n", __LINE__); - //g_signal_connect(button_stg4_upload, "clicked", G_CALLBACK(faz_upload), data); - g_signal_connect(button_stg4_upload, "clicked", G_CALLBACK(faz_upload_teste), data); + g_signal_connect(button_stg4_upload, "clicked", G_CALLBACK(faz_upload), data); + //g_signal_connect(button_stg4_upload, "clicked", G_CALLBACK(faz_upload_teste), data); //g_signal_connect(button_stg4_upload, "clicked", G_CALLBACK(faz_upload_dummy), data); printf("Linha %d\n", __LINE__); g_signal_connect(button_stg4_final_sair, "clicked", G_CALLBACK(mata_janela_e_chama_tela_principal), data); @@ -172,10 +172,10 @@ void stg4_clique_2a_tela(GtkWidget *w,gpointer p){ GPid pid; GChildWatchFunc handler; - GtkWidget *window_stg4_final, *button_stg4_final_sair, *janela_ant, *button_help_4at, *loading_screen, *button_stg4_upload, *label_tempo_upload; + GtkWidget *window_stg4_final, *loading_screen; GtkBuilder *builder; int i; - char *version, *home, *tmscripts, *pasta_do_stg4, *number_of_parts_str, **argv, *texto_tempo_upload, *temp; + char *version, *home, *tmscripts, *pasta_do_stg4, *number_of_parts_str, **argv; argv = malloc(10*sizeof(char*)); for (i=0; i < 10; i++){ @@ -186,11 +186,8 @@ void stg4_clique_2a_tela(GtkWidget *w,gpointer p){ home = malloc(255*sizeof(char)); tmscripts = malloc(255*sizeof(char)); number_of_parts_str = malloc(255*sizeof(char)); - texto_tempo_upload = malloc(255*sizeof(char)); - temp = malloc(255*sizeof(char)); dados *data_ant = p; //Pega os dados recebidos pela chamada da função - janela_ant = (GtkWidget*) data_ant->dado1; builder = data_ant->builder; @@ -217,8 +214,8 @@ void stg4_clique_2a_tela(GtkWidget *w,gpointer p){ //gboolean g_spawn_async_with_pipes (const gchar *working_directory, gchar **argv, gchar **envp, GSpawnFlags flags, // GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error); - strcpy(argv[0], CLONE_STG4_SCRIPT_DUMMY); - //strcpy(argv[0], CLONE_STG4_SCRIPT); + //strcpy(argv[0], CLONE_STG4_SCRIPT_DUMMY); + strcpy(argv[0], CLONE_STG4_SCRIPT); strcpy(argv[1], tmscripts); diff --git a/useful/stg312/upload-utils.c b/useful/stg312/upload-utils.c index 324a3452b45d10c07bd3dffcdd97bf045e842d4d..c2b3024df54109b3d3b4332aa6c8143cc8be212c 100644 --- a/useful/stg312/upload-utils.c +++ b/useful/stg312/upload-utils.c @@ -413,7 +413,7 @@ void faz_upload_dummy(GtkWidget *w, gpointer p){ //função de teste que faz upload da imagem teste.r1 void faz_upload_teste(GtkWidget *w, gpointer p){ - GtkWidget *loading, *window_stg4_upload_confirm; + GtkWidget *loading; GtkBuilder *builder; dados *data_ant = p; //Pega os dados recebidos pela chamada da função int i; @@ -429,7 +429,6 @@ void faz_upload_teste(GtkWidget *w, gpointer p){ builder = gtk_builder_new(); //Cria um novo Builder gtk gtk_builder_add_from_file (builder, "openslx_gui_v01.glade", NULL); //Carrega as coisas do arquivo .glade para utilizar nos widgets loading = GTK_WIDGET(gtk_builder_get_object(builder, "loading_screen")); - window_stg4_upload_confirm = GTK_WIDGET(gtk_builder_get_object(builder, "window_stg4_upload_confirm")); gtk_widget_show_all(loading); strcpy(argv[0], "./upload"); @@ -450,7 +449,7 @@ void faz_upload_teste(GtkWidget *w, gpointer p){ void faz_upload(GtkWidget *w, gpointer p){ printf("Linha faz upload %d\n", __LINE__); - GtkWidget *loading, *window_stg4_upload_confirm; + GtkWidget *loading; dados *data_ant = p; //Pega os dados recebidos pela chamada da função GtkBuilder *builder; struct dados *data = malloc(sizeof(*data)); @@ -467,7 +466,7 @@ void faz_upload(GtkWidget *w, gpointer p){ builder = gtk_builder_new(); //Cria um novo Builder gtk gtk_builder_add_from_file (builder, "openslx_gui_v01.glade", NULL); //Carrega as coisas do arquivo .glade para utilizar nos widgets loading = GTK_WIDGET(gtk_builder_get_object(builder, "loading_screen")); - window_stg4_upload_confirm = GTK_WIDGET(gtk_builder_get_object(builder, "window_stg4_upload_confirm")); + printf("Linha %d\n", __LINE__);