From 22246f27fb297f8107cd72c5909b8eb1cdc83f2b Mon Sep 17 00:00:00 2001 From: Marius Date: Tue, 28 Feb 2012 11:57:57 +0200 Subject: [PATCH] Hardcoded patterns --- src/fileswin.c | 8 -------- src/monwin.c | 2 -- src/nonlwin.c | 18 ++++++++++-------- src/ssd_ui.c | 1 + src/xmgrace.c | 11 ----------- 5 files changed, 11 insertions(+), 29 deletions(-) diff --git a/src/fileswin.c b/src/fileswin.c index 0ca40756..c92b19fa 100644 --- a/src/fileswin.c +++ b/src/fileswin.c @@ -75,9 +75,7 @@ void create_saveproject_popup(GProject *gp) if (fsb == NULL) { fsb = CreateFSBDialog(app_shell, "Save project"); AddFSBDialogCB(fsb, save_proc, gp); -#ifdef QT_GUI FSBDialogSetPattern(fsb, "*.xgr"); -#endif WidgetManage(fsb->FSB); } @@ -227,9 +225,7 @@ void create_openproject_popup(void) #endif ui->fsb = CreateFSBDialog(app_shell, "Open project"); AddFSBDialogCB(ui->fsb, open_proc, NULL); -#ifdef QT_GUI FSBDialogSetPattern(ui->fsb, "*.*gr"); -#endif #ifndef QT_GUI fr = CreateFrame(ui->fsb->rc, "Preview"); @@ -298,9 +294,7 @@ void create_file_popup(Widget but, void *data) rdata_dialog = CreateFSBDialog(app_shell, "Read sets"); AddFSBDialogCB(rdata_dialog, read_sets_proc, (void *) gui); -#ifdef QT_GUI FSBDialogSetPattern(rdata_dialog, "*.dat"); -#endif fr = CreateFrame(rdata_dialog->rc, NULL); rc = CreateVContainer(fr); @@ -404,9 +398,7 @@ void create_write_popup(Widget but, void *data) fsb = CreateFSBDialog(app_shell, "Export data"); AddFSBDialogCB(fsb, write_ssd_proc, (void *) gui); -#ifdef QT_GUI FSBDialogSetPattern(fsb, "*.dat"); -#endif gui->sel = CreateSSDColSelector(fsb->rc, NULL, LIST_TYPE_MULTIPLE); diff --git a/src/monwin.c b/src/monwin.c index fbc62794..93ea5d1b 100644 --- a/src/monwin.c +++ b/src/monwin.c @@ -218,9 +218,7 @@ static void create_wmon_frame(Widget but, void *data) if (ui->save_logs_fsb == NULL) { ui->save_logs_fsb = CreateFSBDialog(app_shell, "Save logs"); AddFSBDialogCB(ui->save_logs_fsb, save_logs_proc, ui); -#ifdef QT_GUI FSBDialogSetPattern(ui->save_logs_fsb, "*.log"); -#endif WidgetManage(ui->save_logs_fsb->FSB); } diff --git a/src/nonlwin.c b/src/nonlwin.c index 2a1c1027..1809685b 100644 --- a/src/nonlwin.c +++ b/src/nonlwin.c @@ -646,10 +646,11 @@ static void create_openfit_popup(Widget but, void *data) if (fsb == NULL) { fsb = CreateFSBDialog(app_shell, "Open fit parameter file"); - AddFSBDialogCB(fsb, do_openfit_proc, NULL); + AddFSBDialogCB(fsb, do_openfit_proc, NULL); + FSBDialogSetPattern(fsb, "*.fit"); WidgetManage(fsb->FSB); } - + DialogRaise(fsb->FSB); unset_wait_cursor(); @@ -672,16 +673,17 @@ static void create_savefit_popup(Widget but, void *data) if (fsb == NULL) { Widget fr; - + fsb = CreateFSBDialog(app_shell, "Save fit parameter file"); - fr = CreateFrame(fsb->rc, NULL); - title_item = CreateTextItem(fr, 25, "Title: "); - AddFSBDialogCB(fsb, do_savefit_proc, (void *) title_item); + fr = CreateFrame(fsb->rc, NULL); + title_item = CreateTextItem(fr, 25, "Title: "); + AddFSBDialogCB(fsb, do_savefit_proc, (void *) title_item); + FSBDialogSetPattern(fsb, "*.fit"); WidgetManage(fsb->FSB); } - + /* xv_setstr(title_item, ui->nlfit.title); */ - + DialogRaise(fsb->FSB); unset_wait_cursor(); diff --git a/src/ssd_ui.c b/src/ssd_ui.c index dcb1a318..05973208 100644 --- a/src/ssd_ui.c +++ b/src/ssd_ui.c @@ -76,6 +76,7 @@ static void create_hotfiles_popup(Widget but, void *data) if (fsb == NULL) { fsb = CreateFSBDialog(app_shell, "Hotlinked file"); AddFSBDialogCB(fsb, do_hotlinkfile_proc, data); + FSBDialogSetPattern(fsb, "*.dat"); WidgetManage(fsb->FSB); } diff --git a/src/xmgrace.c b/src/xmgrace.c index 7a537bdb..0e748b6e 100644 --- a/src/xmgrace.c +++ b/src/xmgrace.c @@ -132,17 +132,6 @@ String fallbackResourcesCommon[] = { "XmGrace*mainWin.shadowThickness: 0", "XmGrace*XmMenuShell*shadowThickness: 2", "XmGrace*menuBar*tearOffModel: XmTEAR_OFF_ENABLED", - "XmGrace*saveLogsFSB*pattern: *.log", - "XmGrace*openProjectFSB*pattern: *.*gr", - "XmGrace*saveProjectFSB*pattern: *.xgr", - "XmGrace*readSetsFSB*pattern: *.dat", - "XmGrace*writeSetsFSB*pattern: *.dat", - "XmGrace*readParametersFSB*pattern: *.par", - "XmGrace*writeParametersFSB*pattern: *.par", - "XmGrace*selectNetcdfFileFSB*pattern: *.nc", - "XmGrace*selectHotLinkFileFSB*pattern: *.dat", - "XmGrace*openFitParameterFileFSB*pattern: *.fit", - "XmGrace*saveFitParameterFileFSB*pattern: *.fit", NULL }; -- 2.11.4.GIT