Skip to content

Commit bc31f66

Browse files
author
root
committed
운전면허 정규식 수정
1 parent 22d53ad commit bc31f66

File tree

4 files changed

+62
-104
lines changed

4 files changed

+62
-104
lines changed

‎src/glade/bxr_plover‎

0 Bytes
Binary file not shown.

‎src/glade/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void check_kind_of_data (const char *to_match, char *filepath, struct dirent *fi
266266
compile_regex(&r, regex_text); //정규식 컴파일//
267267
match_regex_j(&r, to_match, filepath, file, buf);
268268

269-
regex_text = "[0-9]{2}[-~.[:space:]][0-9]{6}[-~.[:space:]][0-9]{2}"; //운전면허 정규식//
269+
regex_text = "[0-9]{2}-[0-9]{6}-[0-9]{2}"; //운전면허 정규식//
270270
compile_regex(&r, regex_text); //정규식 컴파일//
271271
match_regex_d(&r, to_match, filepath, file, buf);
272272
}

‎src/glade/main.glade‎

Lines changed: 25 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
<property name="default_width">420</property>
202202
<property name="default_height">480</property>
203203
<signal name="hide" handler="gtk_widget_hide" swapped="no"/>
204-
<child>
204+
<child type="titlebar">
205205
<placeholder/>
206206
</child>
207207
<child>
@@ -258,64 +258,31 @@
258258
<property name="visible">True</property>
259259
<property name="can_focus">False</property>
260260
<child>
261-
<object class="GtkGrid">
261+
<object class="GtkBox">
262262
<property name="width_request">300</property>
263-
<property name="height_request">120</property>
263+
<property name="height_request">170</property>
264264
<property name="visible">True</property>
265265
<property name="can_focus">False</property>
266-
<property name="row_spacing">15</property>
267-
<child>
268-
<object class="GtkLabel" id="e_name_label">
269-
<property name="width_request">100</property>
270-
<property name="height_request">30</property>
271-
<property name="visible">True</property>
272-
<property name="can_focus">False</property>
273-
<property name="label" translatable="yes">이 름</property>
274-
</object>
275-
<packing>
276-
<property name="left_attach">0</property>
277-
<property name="top_attach">0</property>
278-
</packing>
279-
</child>
280-
<child>
281-
<object class="GtkLabel" id="e_jobtitle_label">
282-
<property name="width_request">100</property>
283-
<property name="height_request">30</property>
284-
<property name="visible">True</property>
285-
<property name="can_focus">False</property>
286-
<property name="label" translatable="yes">직 급</property>
287-
</object>
288-
<packing>
289-
<property name="left_attach">0</property>
290-
<property name="top_attach">1</property>
291-
</packing>
292-
</child>
293-
<child>
294-
<object class="GtkLabel" id="e_department_label">
295-
<property name="width_request">100</property>
296-
<property name="height_request">30</property>
297-
<property name="visible">True</property>
298-
<property name="can_focus">False</property>
299-
<property name="label" translatable="yes">부 서</property>
300-
</object>
301-
<packing>
302-
<property name="left_attach">0</property>
303-
<property name="top_attach">2</property>
304-
</packing>
305-
</child>
266+
<property name="orientation">vertical</property>
267+
<property name="spacing">10</property>
306268
<child>
307269
<object class="GtkEntry" id="e_name_entry">
270+
<property name="width_request">300</property>
271+
<property name="height_request">50</property>
308272
<property name="visible">True</property>
309273
<property name="can_focus">True</property>
310274
<signal name="activate" handler="e_name_entry_activate" swapped="no"/>
311275
</object>
312276
<packing>
313-
<property name="left_attach">1</property>
314-
<property name="top_attach">0</property>
277+
<property name="expand">False</property>
278+
<property name="fill">True</property>
279+
<property name="position">0</property>
315280
</packing>
316281
</child>
317282
<child>
318-
<object class="GtkComboBoxText" id="e_department_cbxtext">
283+
<object class="GtkComboBoxText" id="e_jobtitle_cbxtext">
284+
<property name="width_request">300</property>
285+
<property name="height_request">50</property>
319286
<property name="visible">True</property>
320287
<property name="can_focus">False</property>
321288
<property name="active">4</property>
@@ -327,12 +294,15 @@
327294
</items>
328295
</object>
329296
<packing>
330-
<property name="left_attach">1</property>
331-
<property name="top_attach">1</property>
297+
<property name="expand">False</property>
298+
<property name="fill">True</property>
299+
<property name="position">1</property>
332300
</packing>
333301
</child>
334302
<child>
335-
<object class="GtkComboBoxText" id="e_jobtitle_cbxtext">
303+
<object class="GtkComboBoxText" id="e_department_cbxtext">
304+
<property name="width_request">300</property>
305+
<property name="height_request">50</property>
336306
<property name="visible">True</property>
337307
<property name="can_focus">False</property>
338308
<property name="active">4</property>
@@ -344,11 +314,15 @@
344314
</items>
345315
</object>
346316
<packing>
347-
<property name="left_attach">1</property>
348-
<property name="top_attach">2</property>
317+
<property name="expand">False</property>
318+
<property name="fill">True</property>
319+
<property name="position">2</property>
349320
</packing>
350321
</child>
351322
</object>
323+
<packing>
324+
<property name="x">84</property>
325+
</packing>
352326
</child>
353327
</object>
354328
<packing>

‎src/glade/main.glade~‎

Lines changed: 36 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
<!-- Generated with glade 3.22.1 -->
33
<interface>
44
<requires lib="gtk+" version="3.20"/>
5+
<object class="GtkWindow">
6+
<property name="width_request">420</property>
7+
<property name="height_request">520</property>
8+
<property name="can_focus">False</property>
9+
<property name="default_width">420</property>
10+
<property name="default_height">520</property>
11+
<child>
12+
<placeholder/>
13+
</child>
14+
</object>
515
<object class="GtkWindow" id="detect_window">
616
<property name="width_request">680</property>
717
<property name="height_request">450</property>
@@ -199,9 +209,9 @@
199209
<property name="resizable">False</property>
200210
<property name="modal">True</property>
201211
<property name="default_width">420</property>
202-
<property name="default_height">520</property>
212+
<property name="default_height">480</property>
203213
<signal name="hide" handler="gtk_widget_hide" swapped="no"/>
204-
<child>
214+
<child type="titlebar">
205215
<placeholder/>
206216
</child>
207217
<child>
@@ -258,64 +268,31 @@
258268
<property name="visible">True</property>
259269
<property name="can_focus">False</property>
260270
<child>
261-
<object class="GtkGrid">
271+
<object class="GtkBox">
262272
<property name="width_request">300</property>
263-
<property name="height_request">120</property>
273+
<property name="height_request">170</property>
264274
<property name="visible">True</property>
265275
<property name="can_focus">False</property>
266-
<property name="row_spacing">15</property>
267-
<child>
268-
<object class="GtkLabel" id="e_name_label">
269-
<property name="width_request">100</property>
270-
<property name="height_request">30</property>
271-
<property name="visible">True</property>
272-
<property name="can_focus">False</property>
273-
<property name="label" translatable="yes">이 름</property>
274-
</object>
275-
<packing>
276-
<property name="left_attach">0</property>
277-
<property name="top_attach">0</property>
278-
</packing>
279-
</child>
280-
<child>
281-
<object class="GtkLabel" id="e_jobtitle_label">
282-
<property name="width_request">100</property>
283-
<property name="height_request">30</property>
284-
<property name="visible">True</property>
285-
<property name="can_focus">False</property>
286-
<property name="label" translatable="yes">직 급</property>
287-
</object>
288-
<packing>
289-
<property name="left_attach">0</property>
290-
<property name="top_attach">1</property>
291-
</packing>
292-
</child>
293-
<child>
294-
<object class="GtkLabel" id="e_department_label">
295-
<property name="width_request">100</property>
296-
<property name="height_request">30</property>
297-
<property name="visible">True</property>
298-
<property name="can_focus">False</property>
299-
<property name="label" translatable="yes">부 서</property>
300-
</object>
301-
<packing>
302-
<property name="left_attach">0</property>
303-
<property name="top_attach">2</property>
304-
</packing>
305-
</child>
276+
<property name="orientation">vertical</property>
277+
<property name="spacing">10</property>
306278
<child>
307279
<object class="GtkEntry" id="e_name_entry">
280+
<property name="width_request">300</property>
281+
<property name="height_request">50</property>
308282
<property name="visible">True</property>
309283
<property name="can_focus">True</property>
310284
<signal name="activate" handler="e_name_entry_activate" swapped="no"/>
311285
</object>
312286
<packing>
313-
<property name="left_attach">1</property>
314-
<property name="top_attach">0</property>
287+
<property name="expand">False</property>
288+
<property name="fill">True</property>
289+
<property name="position">0</property>
315290
</packing>
316291
</child>
317292
<child>
318-
<object class="GtkComboBoxText" id="e_department_cbxtext">
293+
<object class="GtkComboBoxText" id="e_jobtitle_cbxtext">
294+
<property name="width_request">300</property>
295+
<property name="height_request">50</property>
319296
<property name="visible">True</property>
320297
<property name="can_focus">False</property>
321298
<property name="active">4</property>
@@ -327,12 +304,15 @@
327304
</items>
328305
</object>
329306
<packing>
330-
<property name="left_attach">1</property>
331-
<property name="top_attach">1</property>
307+
<property name="expand">False</property>
308+
<property name="fill">True</property>
309+
<property name="position">1</property>
332310
</packing>
333311
</child>
334312
<child>
335-
<object class="GtkComboBoxText" id="e_jobtitle_cbxtext">
313+
<object class="GtkComboBoxText" id="e_department_cbxtext">
314+
<property name="width_request">300</property>
315+
<property name="height_request">50</property>
336316
<property name="visible">True</property>
337317
<property name="can_focus">False</property>
338318
<property name="active">4</property>
@@ -344,11 +324,15 @@
344324
</items>
345325
</object>
346326
<packing>
347-
<property name="left_attach">1</property>
348-
<property name="top_attach">2</property>
327+
<property name="expand">False</property>
328+
<property name="fill">True</property>
329+
<property name="position">2</property>
349330
</packing>
350331
</child>
351332
</object>
333+
<packing>
334+
<property name="x">84</property>
335+
</packing>
352336
</child>
353337
</object>
354338
<packing>

0 commit comments

Comments
 (0)