Skip to content

Commit 5446237

Browse files
jun08111jun08111
authored
Merge pull request #23 from jun08111/master
[Client]주석추가
2 parents 29b4d33 + 8381645 commit 5446237

File tree

3 files changed

+60
-47
lines changed

3 files changed

+60
-47
lines changed

‎src/glade/main.c‎

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,47 +30,53 @@ typedef struct Data_storage
3030
uint fgcnt; // 외국인등록번호 개수 //
3131
uint pcnt; // 여권번호 개수 //
3232
uint fsize; // 파일 크기 //
33-
char stat; // 파일 상태 //
34-
char fpath[300]; // 파일 경로 //
35-
36-
33+
char stat; // 파일 상태 //
34+
char fpath[300]; // 파일 경로 //
35+
36+
3737
}data_storage;
3838

3939
data_storage ds[MAX_CNTF]; // 파일기준의 data구조체 //
4040

41-
static gchar *path;
42-
static int cntf = 0;
43-
static char chkfname[20];
44-
int chk_tf; // chk_true or false //
45-
//uint data_flag = 1; // 어떤종류의 민감정보인지 확인하기위한 flag //
41+
static gchar *path; // 파일경로 //
42+
static int cntf = 0; // 파일개수 cnt //
43+
static char chkfname[20];
44+
int chk_tf; // chk_true or false //
45+
//uint data_flag = 1; // 어떤종류의 민감정보인지 확인하기위한 flag //
4646

4747

48-
GtkWidget *detect_window,
49-
*setting_window;
50-
51-
GtkScrolledWindow *d_scrolledwindow;
52-
53-
GtkEntry *d_detect_entry;
48+
GtkWidget *detect_window,
49+
*setting_window;
50+
51+
GtkEntry *d_detect_entry;
5452

53+
GtkScrolledWindow *d_scrolledwindow;
5554

55+
// enrollment_window //
5656
void e_enroll_btn_clicked (GtkButton *e_enroll_btn, gpointer *data);
57+
/* end of enrollment_window */
5758

59+
// main_window //
5860
void m_window_destroy();
5961
void m_detect_btn_clicked (GtkButton *m_detect_btn, gpointer *data);
60-
void m_setting_btn_clicked (GtkButton *m_setting_btn, gpointer *data);
62+
void m_setting_btn_clicked (GtkButton *m_setting_btn, gpointer *data);
63+
/* end of main_window */
6164

65+
// detect_window //
6266
void d_detect_btn_clicked (GtkButton *d_detect_btn, gpointer *data);
6367
void d_option_btn_clicked (GtkButton *d_option_btn, gpointer *data);
6468
void d_folder_btn_clicked (GtkButton *d_folder_btn, gpointer *data);
65-
void d_close_btn_clicked (GtkButton *d_close_btn, gpointer *data);
69+
void d_close_btn_clicked (GtkButton *d_close_btn, gpointer *data);
6670
void d_detect_entry_activate (GtkEntry *d_detect_entry, gpointer *data);
71+
/* end of detect_window */
6772

73+
// setting_window //
6874
void s_cloese_btn_clicked (GtkButton *s_cloese_btn, gpointer *data);
75+
/* end of setting_window */
6976

7077
// Base64 encoding //
7178
char *b64_encode(const unsigned char *src, size_t len, char *enc);
72-
73-
79+
/* end of char *b64_encode(); */
7480

7581
//Compile the regular expression described by "regex_text" into "r"//
7682
int compile_regex (regex_t *r, const char *regex_text)
@@ -90,6 +96,8 @@ int compile_regex (regex_t *r, const char *regex_text)
9096

9197
return 0;
9298
}
99+
/* end of compile_regex(); */
100+
93101

94102
//Match the string in "to_match" against the compiled regular expression in "r"//
95103
// 주민등록번호, 외국인등록번호 정규식 //
@@ -212,6 +220,7 @@ char match_regex_jnfg (regex_t *r, const char *to_match, char *filepath, struct
212220
p += m[0].rm_eo;
213221
}
214222
}
223+
/* end of match_regex_jnfg(); */
215224

216225
// 운전면허 정규식 //
217226
char match_regex_d (regex_t *r, const char *to_match, char *filepath, struct dirent *file, struct stat buf)
@@ -274,6 +283,8 @@ char match_regex_d (regex_t *r, const char *to_match, char *filepath, struct dir
274283
p += m[0].rm_eo;
275284
}
276285
}
286+
/* end of match_regex_d(); */
287+
277288

278289
// 여권번호 정규식 //
279290
char match_regex_p (regex_t *r, const char *to_match, char *filepath, struct dirent *file, struct stat buf)
@@ -336,7 +347,9 @@ char match_regex_p (regex_t *r, const char *to_match, char *filepath, struct dir
336347
p += m[0].rm_eo;
337348
}
338349
}
350+
/* end of match_regex_p(); */
339351

352+
// data 종류 확인 //
340353
void check_kind_of_data (const char *to_match, char *filepath, struct dirent *file, struct stat buf)
341354
{
342355
regex_t r;
@@ -374,7 +387,9 @@ void check_kind_of_data (const char *to_match, char *filepath, struct dirent *fi
374387
compile_regex(&r, regex_text); // 정규식 컴파일 //
375388
match_regex_p(&r, to_match, filepath, file, buf);
376389
}
390+
/* end of check_kind_of_data(); */
377391

392+
// 폴더, 파일 스캔 //
378393
int scan_dir (gchar *path)
379394
{
380395
DIR *dp = NULL;
@@ -447,7 +462,9 @@ int scan_dir (gchar *path)
447462

448463
return 0;
449464
}
465+
/* end of scan_dir(); */
450466

467+
// 검출, 전송 //
451468
int detect_func(gchar *path)
452469
{
453470
char *hostname;
@@ -678,6 +695,7 @@ int detect_func(gchar *path)
678695

679696
return TRUE;
680697
}
698+
/* end of detect_func(); */
681699

682700
// 계정이 있는지 확인: TRUE(1)=있다 FALSE(0)=없다 //
683701
int chk_user()
@@ -686,9 +704,9 @@ int chk_user()
686704

687705
return chk_tf;
688706
}
707+
/* end of */
689708

690-
691-
// main_window_start //
709+
// main_window //
692710
void m_detect_btn_clicked (GtkButton *m_detect_btn, gpointer *data)
693711
{
694712
gtk_widget_show(detect_window);
@@ -709,11 +727,11 @@ void main_window_destroy()
709727

710728
return;
711729
}
712-
// main_window_end //
730+
/* end of main_window */
713731

714732

715733

716-
// detect_window_start //
734+
// detect_window //
717735
void d_detect_entry_activate (GtkEntry *d_detect_entry, gpointer *data)
718736
{
719737
path = (gchar *)gtk_entry_get_text(d_detect_entry);
@@ -751,7 +769,7 @@ void d_folder_btn_clicked (GtkButton *d_folder_btn, gpointer *data)
751769
return;
752770
}
753771

754-
// treeview start //
772+
// treeview //
755773
enum
756774
{
757775
d_treeview_num = 0,
@@ -893,7 +911,7 @@ create_view_and_model (void)
893911

894912
return view;
895913
}
896-
// treeview end //
914+
/* end of treeview */
897915

898916

899917
void d_detect_btn_clicked (GtkButton *d_detect_btn, gpointer *data)
@@ -939,29 +957,29 @@ void detect_window_destroy (GtkWidget *detect_window, gpointer *data)
939957

940958
return;
941959
}
942-
// detect_window_end //
960+
/* end of detect_window */
943961

944962

945963

946-
// enrollment_window_start //
964+
// enrollment_window //
947965
void e_enroll_btn_clicked (GtkButton *e_enroll_btn, gpointer *data)
948966
{
949967
gtk_widget_hide(GTK_WIDGET(data));
950968

951969
return;
952970
}
953-
// enrollment_window_end //
971+
/* end of enrollment_window */
954972

955973

956974

957-
// setting_setting_start //
975+
// setting_setting //
958976
void s_cloese_btn_clicked (GtkButton *setting_window, gpointer *data)
959977
{
960978
gtk_widget_hide(GTK_WIDGET(data));
961979

962980
return;
963981
}
964-
// setting_setting_end //
982+
/* end of setting_setting */
965983

966984

967985

‎src/glade/main.glade‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<property name="can_focus">False</property>
99
<property name="title" translatable="yes">검사</property>
1010
<property name="resizable">False</property>
11-
<property name="modal">True</property>
1211
<property name="default_width">660</property>
1312
<property name="default_height">610</property>
1413
<child>
@@ -546,7 +545,6 @@
546545
<property name="can_focus">False</property>
547546
<property name="title" translatable="yes">메인</property>
548547
<property name="resizable">False</property>
549-
<property name="modal">True</property>
550548
<property name="default_width">420</property>
551549
<property name="default_height">480</property>
552550
<signal name="destroy" handler="m_window_destroy" swapped="no"/>
@@ -614,8 +612,8 @@
614612
<property name="can_focus">False</property>
615613
<child>
616614
<object class="GtkButton" id="m_detect_btn">
617-
<property name="width_request">180</property>
618-
<property name="height_request">180</property>
615+
<property name="width_request">200</property>
616+
<property name="height_request">200</property>
619617
<property name="visible">True</property>
620618
<property name="can_focus">True</property>
621619
<property name="receives_default">True</property>
@@ -627,8 +625,8 @@
627625
</child>
628626
</object>
629627
<packing>
630-
<property name="x">120</property>
631-
<property name="y">30</property>
628+
<property name="x">110</property>
629+
<property name="y">20</property>
632630
</packing>
633631
</child>
634632
<child>
@@ -720,7 +718,6 @@
720718
<property name="height_request">450</property>
721719
<property name="can_focus">False</property>
722720
<property name="resizable">False</property>
723-
<property name="modal">True</property>
724721
<property name="default_width">680</property>
725722
<property name="default_height">450</property>
726723
<child type="titlebar">

‎src/glade/main.glade~‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<property name="can_focus">False</property>
99
<property name="title" translatable="yes">검사</property>
1010
<property name="resizable">False</property>
11-
<property name="modal">True</property>
1211
<property name="default_width">660</property>
1312
<property name="default_height">610</property>
1413
<child>
@@ -100,6 +99,7 @@
10099
<property name="visible">True</property>
101100
<property name="can_focus">True</property>
102101
<property name="receives_default">True</property>
102+
<property name="opacity">0.10000000000000001</property>
103103
<property name="relief">none</property>
104104
<signal name="clicked" handler="d_option_btn_clicked" object="setting_window" swapped="no"/>
105105
<child>
@@ -253,7 +253,7 @@
253253
</object>
254254
<packing>
255255
<property name="x">150</property>
256-
<property name="y">1</property>
256+
<property name="y">2</property>
257257
</packing>
258258
</child>
259259
<child>
@@ -266,7 +266,7 @@
266266
</object>
267267
<packing>
268268
<property name="x">274</property>
269-
<property name="y">1</property>
269+
<property name="y">2</property>
270270
</packing>
271271
</child>
272272
<child>
@@ -279,7 +279,7 @@
279279
</object>
280280
<packing>
281281
<property name="x">398</property>
282-
<property name="y">1</property>
282+
<property name="y">2</property>
283283
</packing>
284284
</child>
285285
</object>
@@ -546,7 +546,6 @@
546546
<property name="can_focus">False</property>
547547
<property name="title" translatable="yes">메인</property>
548548
<property name="resizable">False</property>
549-
<property name="modal">True</property>
550549
<property name="default_width">420</property>
551550
<property name="default_height">480</property>
552551
<signal name="destroy" handler="m_window_destroy" swapped="no"/>
@@ -614,8 +613,8 @@
614613
<property name="can_focus">False</property>
615614
<child>
616615
<object class="GtkButton" id="m_detect_btn">
617-
<property name="width_request">180</property>
618-
<property name="height_request">180</property>
616+
<property name="width_request">200</property>
617+
<property name="height_request">200</property>
619618
<property name="visible">True</property>
620619
<property name="can_focus">True</property>
621620
<property name="receives_default">True</property>
@@ -627,8 +626,8 @@
627626
</child>
628627
</object>
629628
<packing>
630-
<property name="x">120</property>
631-
<property name="y">30</property>
629+
<property name="x">110</property>
630+
<property name="y">20</property>
632631
</packing>
633632
</child>
634633
<child>
@@ -720,7 +719,6 @@
720719
<property name="height_request">450</property>
721720
<property name="can_focus">False</property>
722721
<property name="resizable">False</property>
723-
<property name="modal">True</property>
724722
<property name="default_width">680</property>
725723
<property name="default_height">450</property>
726724
<child type="titlebar">

0 commit comments

Comments
 (0)