Skip to content

Commit a0b244c

Browse files
jun08111jun08111
authored
Merge pull request #21 from jun08111/master
UI update
2 parents 316e59b + 580b2ef commit a0b244c

File tree

4 files changed

+35
-21
lines changed

4 files changed

+35
-21
lines changed

‎src/glade/bxr_plover‎

56 Bytes
Binary file not shown.

‎src/glade/main.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,7 @@ int main (int argc, char *argv[])
982982
detect_window = GTK_WIDGET(gtk_builder_get_object(builder, "detect_window"));
983983
setting_window = GTK_WIDGET(gtk_builder_get_object(builder, "setting_window"));
984984
d_scrolledwindow = GTK_SCROLLED_WINDOW(gtk_builder_get_object(builder, "d_scrolledwindow"));
985+
gtk_window_set_position(GTK_WINDOW(detect_window), GTK_WIN_POS_CENTER);
985986

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

‎src/glade/main.glade‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
<property name="can_focus">False</property>
198198
<property name="title" translatable="yes">신규 사용자 등록</property>
199199
<property name="resizable">False</property>
200-
<property name="modal">True</property>
201200
<property name="default_width">420</property>
202201
<property name="default_height">480</property>
203202
<child type="titlebar">
@@ -248,7 +247,7 @@
248247
</object>
249248
<packing>
250249
<property name="x">187</property>
251-
<property name="y">127</property>
250+
<property name="y">137</property>
252251
</packing>
253252
</child>
254253
</object>
@@ -419,7 +418,7 @@
419418
<property name="default_width">420</property>
420419
<property name="default_height">480</property>
421420
<signal name="destroy" handler="m_window_destroy" swapped="no"/>
422-
<child>
421+
<child type="titlebar">
423422
<placeholder/>
424423
</child>
425424
<child>
@@ -454,6 +453,7 @@
454453
<property name="height_request">14</property>
455454
<property name="visible">True</property>
456455
<property name="can_focus">False</property>
456+
<property name="margin_bottom">43</property>
457457
<property name="label" translatable="yes">v1.0.0.1</property>
458458
<attributes>
459459
<attribute name="font-desc" value="Dingbats Bold 10"/>
@@ -465,7 +465,7 @@
465465
</object>
466466
<packing>
467467
<property name="x">187</property>
468-
<property name="y">127</property>
468+
<property name="y">137</property>
469469
</packing>
470470
</child>
471471
</object>
@@ -484,13 +484,17 @@
484484
<child>
485485
<object class="GtkButton" id="m_detect_btn">
486486
<property name="label" translatable="yes">민감정보 검사</property>
487-
<property name="width_request">150</property>
488-
<property name="height_request">150</property>
487+
<property name="width_request">170</property>
488+
<property name="height_request">170</property>
489489
<property name="visible">True</property>
490490
<property name="can_focus">True</property>
491491
<property name="receives_default">True</property>
492492
<signal name="clicked" handler="m_detect_btn_clicked" object="detect_window" swapped="no"/>
493493
</object>
494+
<packing>
495+
<property name="x">125</property>
496+
<property name="y">10</property>
497+
</packing>
494498
</child>
495499
</object>
496500
<packing>
@@ -502,19 +506,22 @@
502506
<child>
503507
<object class="GtkFixed" id="m_fixed3">
504508
<property name="width_request">420</property>
505-
<property name="height_request">144</property>
509+
<property name="height_request">114</property>
506510
<property name="visible">True</property>
507511
<property name="can_focus">False</property>
508512
<child>
509513
<object class="GtkButton" id="m_setting_btn">
510-
<property name="label" translatable="yes">환경 설정</property>
511-
<property name="width_request">100</property>
512-
<property name="height_request">50</property>
514+
<property name="width_request">114</property>
515+
<property name="height_request">40</property>
513516
<property name="visible">True</property>
514517
<property name="can_focus">True</property>
515518
<property name="receives_default">True</property>
516519
<signal name="clicked" handler="m_setting_btn_clicked" object="setting_window" swapped="no"/>
517520
</object>
521+
<packing>
522+
<property name="x">286</property>
523+
<property name="y">54</property>
524+
</packing>
518525
</child>
519526
</object>
520527
<packing>

‎src/glade/main.glade~‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
<property name="can_focus">False</property>
198198
<property name="title" translatable="yes">신규 사용자 등록</property>
199199
<property name="resizable">False</property>
200-
<property name="modal">True</property>
201200
<property name="default_width">420</property>
202201
<property name="default_height">480</property>
203202
<child type="titlebar">
@@ -248,7 +247,7 @@
248247
</object>
249248
<packing>
250249
<property name="x">187</property>
251-
<property name="y">127</property>
250+
<property name="y">137</property>
252251
</packing>
253252
</child>
254253
</object>
@@ -419,7 +418,7 @@
419418
<property name="default_width">420</property>
420419
<property name="default_height">480</property>
421420
<signal name="destroy" handler="m_window_destroy" swapped="no"/>
422-
<child>
421+
<child type="titlebar">
423422
<placeholder/>
424423
</child>
425424
<child>
@@ -430,8 +429,6 @@
430429
<property name="can_focus">False</property>
431430
<child>
432431
<object class="GtkImage" id="m_window_image">
433-
<property name="width_request">100</property>
434-
<property name="height_request">80</property>
435432
<property name="visible">True</property>
436433
<property name="can_focus">False</property>
437434
<property name="pixbuf">resource/bg-login.svg</property>
@@ -456,6 +453,7 @@
456453
<property name="height_request">14</property>
457454
<property name="visible">True</property>
458455
<property name="can_focus">False</property>
456+
<property name="margin_bottom">43</property>
459457
<property name="label" translatable="yes">v1.0.0.1</property>
460458
<attributes>
461459
<attribute name="font-desc" value="Dingbats Bold 10"/>
@@ -467,7 +465,7 @@
467465
</object>
468466
<packing>
469467
<property name="x">187</property>
470-
<property name="y">127</property>
468+
<property name="y">137</property>
471469
</packing>
472470
</child>
473471
</object>
@@ -486,13 +484,17 @@
486484
<child>
487485
<object class="GtkButton" id="m_detect_btn">
488486
<property name="label" translatable="yes">민감정보 검사</property>
489-
<property name="width_request">150</property>
490-
<property name="height_request">150</property>
487+
<property name="width_request">170</property>
488+
<property name="height_request">170</property>
491489
<property name="visible">True</property>
492490
<property name="can_focus">True</property>
493491
<property name="receives_default">True</property>
494492
<signal name="clicked" handler="m_detect_btn_clicked" object="detect_window" swapped="no"/>
495493
</object>
494+
<packing>
495+
<property name="x">125</property>
496+
<property name="y">10</property>
497+
</packing>
496498
</child>
497499
</object>
498500
<packing>
@@ -504,19 +506,23 @@
504506
<child>
505507
<object class="GtkFixed" id="m_fixed3">
506508
<property name="width_request">420</property>
507-
<property name="height_request">144</property>
509+
<property name="height_request">114</property>
508510
<property name="visible">True</property>
509511
<property name="can_focus">False</property>
510512
<child>
511513
<object class="GtkButton" id="m_setting_btn">
512514
<property name="label" translatable="yes">환경 설정</property>
513-
<property name="width_request">100</property>
514-
<property name="height_request">50</property>
515+
<property name="width_request">114</property>
516+
<property name="height_request">40</property>
515517
<property name="visible">True</property>
516518
<property name="can_focus">True</property>
517519
<property name="receives_default">True</property>
518520
<signal name="clicked" handler="m_setting_btn_clicked" object="setting_window" swapped="no"/>
519521
</object>
522+
<packing>
523+
<property name="x">286</property>
524+
<property name="y">54</property>
525+
</packing>
520526
</child>
521527
</object>
522528
<packing>

0 commit comments

Comments
 (0)