Skip to content

Commit 5f65969

Browse files
authored
Merge pull request #37 from jun08111/master
[Client]검사창 progressbar update
2 parents 42dc662 + 72aad43 commit 5f65969

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

src/glade/bxr_plover

0 Bytes
Binary file not shown.

src/glade/main.c

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -972,19 +972,22 @@ void d_detect_btn_clicked (GtkButton *d_detect_btn, gpointer *data)
972972
char message[1024];
973973
gdouble percent = 0.0;
974974

975-
detect_func(path);
976-
975+
memset( message, 0x00, strlen(message));
976+
sprintf( message, "%.0f%% Complete", percent);
977977
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(d_progressbar), 0 );
978+
gtk_progress_bar_set_text (GTK_PROGRESS_BAR(d_progressbar), message);
979+
980+
detect_func(path);
978981

979982
view = create_view_and_model();
980983
gtk_container_add (GTK_CONTAINER(d_scrolledwindow), view);
981984
gtk_widget_show_all ((GtkWidget *)d_scrolledwindow);
982985

983-
memset( message, 0x00, strlen(message));
984-
sprintf( message, "%.0f%% Complete", percent);
985-
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(d_progressbar), percent / 100.0);
986-
gtk_progress_bar_set_text (GTK_PROGRESS_BAR(d_progressbar), message);
987986

987+
sprintf( message, "%.0f%% Complete", 100.0);
988+
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(d_progressbar), 100.0);
989+
gtk_progress_bar_set_text (GTK_PROGRESS_BAR(d_progressbar), message);
990+
988991
return;
989992
}
990993

@@ -1057,12 +1060,13 @@ int main (int argc, char *argv[])
10571060
gtk_builder_add_from_file(builder, "main.glade", NULL);
10581061

10591062
main_window = GTK_WIDGET(gtk_builder_get_object(builder, "main_window"));
1060-
enrollment_window = GTK_WIDGET(gtk_builder_get_object(builder, "enrollment_window"));
1061-
detect_window = GTK_WIDGET(gtk_builder_get_object(builder, "detect_window"));
1063+
enrollment_window = GTK_WIDGET(gtk_builder_get_object(builder, "enrollment_window"));
1064+
detect_window = GTK_WIDGET(gtk_builder_get_object(builder, "detect_window"));
10621065
setting_window = GTK_WIDGET(gtk_builder_get_object(builder, "setting_window"));
1063-
d_scrolledwindow = GTK_SCROLLED_WINDOW(gtk_builder_get_object(builder, "d_scrolledwindow"));
1064-
gtk_window_set_position(GTK_WINDOW(detect_window), GTK_WIN_POS_CENTER);
1065-
d_progressbar = GTK_WIDGET(gtk_builder_get_object(builder, "d_progressbar"));
1066+
d_progressbar = GTK_WIDGET(gtk_builder_get_object(builder, "d_progressbar"));
1067+
d_scrolledwindow = GTK_SCROLLED_WINDOW(gtk_builder_get_object(builder, "d_scrolledwindow"));
1068+
1069+
gtk_window_set_position(GTK_WINDOW(detect_window), GTK_WIN_POS_CENTER);
10661070

10671071
// 닫기x 버튼을 hide로 바꾸기, -버튼 활성화 하고 싶으면 glade에서 modal 해제 //
10681072
g_signal_connect(detect_window, "delete_event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);

0 commit comments

Comments
 (0)