Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tm-scripts
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cdn
tm-scripts
Commits
474135f0
Commit
474135f0
authored
9 years ago
by
Enris Nogare Von Tein
Browse files
Options
Downloads
Patches
Plain Diff
Removed warnings
Signed-off-by:
Enris Nogare von Tein
<
ent13@inf.ufpr.br
>
parent
1138419a
Branches
Branches containing commit
No related tags found
1 merge request
!11
Issue 3063 stg4clnr
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
useful/stg312/openslx_gui
+0
-0
0 additions, 0 deletions
useful/stg312/openslx_gui
useful/stg312/stg4.c
+6
-9
6 additions, 9 deletions
useful/stg312/stg4.c
useful/stg312/upload-utils.c
+3
-4
3 additions, 4 deletions
useful/stg312/upload-utils.c
with
9 additions
and
13 deletions
useful/stg312/openslx_gui
+
0
−
0
View file @
474135f0
No preview for this file type
This diff is collapsed.
Click to expand it.
useful/stg312/stg4.c
+
6
−
9
View file @
474135f0
...
@@ -154,8 +154,8 @@ void stg4_2a_tela(GPid pid, gint status,gpointer p){
...
@@ -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
(
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
);
g_signal_connect
(
button_help_4at
,
"clicked"
,
G_CALLBACK
(
help_screen
),
NULL
);
printf
(
"Linha %d
\n
"
,
__LINE__
);
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
),
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_teste), data);
//g_signal_connect(button_stg4_upload, "clicked", G_CALLBACK(faz_upload_dummy), data);
//g_signal_connect(button_stg4_upload, "clicked", G_CALLBACK(faz_upload_dummy), data);
printf
(
"Linha %d
\n
"
,
__LINE__
);
printf
(
"Linha %d
\n
"
,
__LINE__
);
g_signal_connect
(
button_stg4_final_sair
,
"clicked"
,
G_CALLBACK
(
mata_janela_e_chama_tela_principal
),
data
);
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){
...
@@ -172,10 +172,10 @@ void stg4_clique_2a_tela(GtkWidget *w,gpointer p){
GPid
pid
;
GPid
pid
;
GChildWatchFunc
handler
;
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
;
GtkBuilder
*
builder
;
int
i
;
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
*
));
argv
=
malloc
(
10
*
sizeof
(
char
*
));
for
(
i
=
0
;
i
<
10
;
i
++
){
for
(
i
=
0
;
i
<
10
;
i
++
){
...
@@ -186,11 +186,8 @@ void stg4_clique_2a_tela(GtkWidget *w,gpointer p){
...
@@ -186,11 +186,8 @@ void stg4_clique_2a_tela(GtkWidget *w,gpointer p){
home
=
malloc
(
255
*
sizeof
(
char
));
home
=
malloc
(
255
*
sizeof
(
char
));
tmscripts
=
malloc
(
255
*
sizeof
(
char
));
tmscripts
=
malloc
(
255
*
sizeof
(
char
));
number_of_parts_str
=
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
dados
*
data_ant
=
p
;
//Pega os dados recebidos pela chamada da função
janela_ant
=
(
GtkWidget
*
)
data_ant
->
dado1
;
builder
=
data_ant
->
builder
;
builder
=
data_ant
->
builder
;
...
@@ -217,8 +214,8 @@ void stg4_clique_2a_tela(GtkWidget *w,gpointer p){
...
@@ -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,
//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);
// GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error);
strcpy
(
argv
[
0
],
CLONE_STG4_SCRIPT_DUMMY
);
//
strcpy(argv[0], CLONE_STG4_SCRIPT_DUMMY);
//
strcpy(argv[0], CLONE_STG4_SCRIPT);
strcpy
(
argv
[
0
],
CLONE_STG4_SCRIPT
);
strcpy
(
argv
[
1
],
tmscripts
);
strcpy
(
argv
[
1
],
tmscripts
);
...
...
This diff is collapsed.
Click to expand it.
useful/stg312/upload-utils.c
+
3
−
4
View file @
474135f0
...
@@ -413,7 +413,7 @@ void faz_upload_dummy(GtkWidget *w, gpointer p){
...
@@ -413,7 +413,7 @@ void faz_upload_dummy(GtkWidget *w, gpointer p){
//função de teste que faz upload da imagem teste.r1
//função de teste que faz upload da imagem teste.r1
void
faz_upload_teste
(
GtkWidget
*
w
,
gpointer
p
){
void
faz_upload_teste
(
GtkWidget
*
w
,
gpointer
p
){
GtkWidget
*
loading
,
*
window_stg4_upload_confirm
;
GtkWidget
*
loading
;
GtkBuilder
*
builder
;
GtkBuilder
*
builder
;
dados
*
data_ant
=
p
;
//Pega os dados recebidos pela chamada da função
dados
*
data_ant
=
p
;
//Pega os dados recebidos pela chamada da função
int
i
;
int
i
;
...
@@ -429,7 +429,6 @@ void faz_upload_teste(GtkWidget *w, gpointer p){
...
@@ -429,7 +429,6 @@ void faz_upload_teste(GtkWidget *w, gpointer p){
builder
=
gtk_builder_new
();
//Cria um novo Builder gtk
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
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"
));
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
);
gtk_widget_show_all
(
loading
);
strcpy
(
argv
[
0
],
"./upload"
);
strcpy
(
argv
[
0
],
"./upload"
);
...
@@ -450,7 +449,7 @@ void faz_upload_teste(GtkWidget *w, gpointer p){
...
@@ -450,7 +449,7 @@ void faz_upload_teste(GtkWidget *w, gpointer p){
void
faz_upload
(
GtkWidget
*
w
,
gpointer
p
){
void
faz_upload
(
GtkWidget
*
w
,
gpointer
p
){
printf
(
"Linha faz upload %d
\n
"
,
__LINE__
);
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
dados
*
data_ant
=
p
;
//Pega os dados recebidos pela chamada da função
GtkBuilder
*
builder
;
GtkBuilder
*
builder
;
struct
dados
*
data
=
malloc
(
sizeof
(
*
data
));
struct
dados
*
data
=
malloc
(
sizeof
(
*
data
));
...
@@ -467,7 +466,7 @@ void faz_upload(GtkWidget *w, gpointer p){
...
@@ -467,7 +466,7 @@ void faz_upload(GtkWidget *w, gpointer p){
builder
=
gtk_builder_new
();
//Cria um novo Builder gtk
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
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"
));
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__
);
printf
(
"Linha %d
\n
"
,
__LINE__
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment