Skip to content

Commit c65c120

Browse files
author
root
committed
UI update
1 parent 9c4c5f7 commit c65c120

File tree

5 files changed

+66
-15
lines changed

5 files changed

+66
-15
lines changed

‎src/glade/bxr_plover‎

0 Bytes
Binary file not shown.

‎src/glade/main.c‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ typedef struct Data_storage
2929
uint jcnt; //주민번호 개수
3030
uint dcnt; //운전면허 개수
3131
uint fgcnt; //외국인등록번호 개수
32+
uint pcnt; //여권번호 개수
3233
uint fsize; //파일 크기
3334
char stat; //파일 상태
3435

@@ -689,6 +690,7 @@ enum
689690
d_treeview_jcnt,
690691
d_treeview_dcnt,
691692
d_treeview_fgcnt,
693+
d_treeview_pcnt,
692694
d_treeview_stat,
693695
d_treeview_size,
694696
d_treeview_filelocation,
@@ -701,7 +703,7 @@ create_and_fill_model (void)
701703
GtkTreeStore *treestore;
702704
GtkTreeIter iter;
703705

704-
treestore = gtk_tree_store_new(NUM_COLS, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING);
706+
treestore = gtk_tree_store_new(NUM_COLS, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING);
705707

706708
for(int i = 1; i <= cntf; i++)
707709
{
@@ -712,6 +714,7 @@ create_and_fill_model (void)
712714
d_treeview_jcnt, ds[i].jcnt,
713715
d_treeview_dcnt, ds[i].dcnt,
714716
d_treeview_fgcnt, ds[i].fgcnt,
717+
d_treeview_pcnt, ds[i]. pcnt,
715718
d_treeview_stat, "soon",
716719
d_treeview_size, ds[i].fsize,
717720
d_treeview_filelocation, ds[i].fpath,
@@ -777,6 +780,14 @@ create_view_and_model (void)
777780
renderer = gtk_cell_renderer_text_new();
778781
gtk_tree_view_column_pack_start(col, renderer, TRUE);
779782
gtk_tree_view_column_add_attribute(col, renderer, "text", d_treeview_fgcnt);
783+
784+
/* --- Column #여권번호 개수 --- */
785+
col = gtk_tree_view_column_new();
786+
gtk_tree_view_column_set_title(col, "여권번호");
787+
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
788+
renderer = gtk_cell_renderer_text_new();
789+
gtk_tree_view_column_pack_start(col, renderer, TRUE);
790+
gtk_tree_view_column_add_attribute(col, renderer, "text", d_treeview_pcnt);
780791

781792
/* --- Column #상태 --- */
782793
col = gtk_tree_view_column_new();

‎src/glade/main.glade‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,6 @@
212212
<property name="can_focus">False</property>
213213
<child>
214214
<object class="GtkImage" id="e_window_image">
215-
<property name="width_request">100</property>
216-
<property name="height_request">80</property>
217215
<property name="visible">True</property>
218216
<property name="can_focus">False</property>
219217
<property name="pixbuf">resource/bg-login.svg</property>
@@ -368,15 +366,31 @@
368366
<property name="height_request">114</property>
369367
<property name="visible">True</property>
370368
<property name="can_focus">False</property>
369+
<child>
370+
<object class="GtkImage">
371+
<property name="width_request">420</property>
372+
<property name="height_request">64</property>
373+
<property name="visible">True</property>
374+
<property name="can_focus">False</property>
375+
<property name="pixbuf">resource/btn-login-nor.svg</property>
376+
</object>
377+
<packing>
378+
<property name="y">50</property>
379+
</packing>
380+
</child>
371381
<child>
372382
<object class="GtkButton" id="e_enroll_btn">
373-
<property name="label" translatable="yes">등 록</property>
374383
<property name="width_request">420</property>
375384
<property name="height_request">64</property>
376385
<property name="visible">True</property>
377-
<property name="can_focus">True</property>
378-
<property name="receives_default">True</property>
386+
<property name="can_focus">False</property>
387+
<property name="receives_default">False</property>
388+
<property name="relief">none</property>
389+
<property name="always_show_image">True</property>
379390
<signal name="clicked" handler="e_enroll_btn_clicked" object="enrollment_window" swapped="no"/>
391+
<child>
392+
<placeholder/>
393+
</child>
380394
</object>
381395
<packing>
382396
<property name="y">50</property>
@@ -394,8 +408,6 @@
394408
</object>
395409
</child>
396410
</object>
397-
<object class="GtkEntryBuffer" id="entrybuffer1"/>
398-
<object class="GtkEntryCompletion" id="entrycompletion1"/>
399411
<object class="GtkWindow" id="main_window">
400412
<property name="width_request">680</property>
401413
<property name="height_request">450</property>

‎src/glade/main.glade~‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,6 @@
212212
<property name="can_focus">False</property>
213213
<child>
214214
<object class="GtkImage" id="e_window_image">
215-
<property name="width_request">100</property>
216-
<property name="height_request">80</property>
217215
<property name="visible">True</property>
218216
<property name="can_focus">False</property>
219217
<property name="pixbuf">resource/bg-login.svg</property>
@@ -368,15 +366,32 @@
368366
<property name="height_request">114</property>
369367
<property name="visible">True</property>
370368
<property name="can_focus">False</property>
369+
<child>
370+
<object class="GtkImage">
371+
<property name="width_request">420</property>
372+
<property name="height_request">64</property>
373+
<property name="visible">True</property>
374+
<property name="can_focus">False</property>
375+
<property name="pixbuf">resource/btn-login-nor.svg</property>
376+
</object>
377+
<packing>
378+
<property name="y">50</property>
379+
</packing>
380+
</child>
371381
<child>
372382
<object class="GtkButton" id="e_enroll_btn">
373-
<property name="label" translatable="yes">등 록</property>
374383
<property name="width_request">420</property>
375384
<property name="height_request">64</property>
376385
<property name="visible">True</property>
377-
<property name="can_focus">True</property>
378-
<property name="receives_default">True</property>
386+
<property name="can_focus">False</property>
387+
<property name="focus_on_click">False</property>
388+
<property name="receives_default">False</property>
389+
<property name="relief">none</property>
390+
<property name="always_show_image">True</property>
379391
<signal name="clicked" handler="e_enroll_btn_clicked" object="enrollment_window" swapped="no"/>
392+
<child>
393+
<placeholder/>
394+
</child>
380395
</object>
381396
<packing>
382397
<property name="y">50</property>
@@ -394,8 +409,6 @@
394409
</object>
395410
</child>
396411
</object>
397-
<object class="GtkEntryBuffer" id="entrybuffer1"/>
398-
<object class="GtkEntryCompletion" id="entrycompletion1"/>
399412
<object class="GtkWindow" id="main_window">
400413
<property name="width_request">680</property>
401414
<property name="height_request">450</property>

‎src/glade/resource/btn-login-nor.svg‎

Lines changed: 15 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)