From e7d20cf352688bf717a01f4e6d9e6f497c2bea4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Sep 2025 19:19:34 +0200 Subject: New upstream version 5.3.1Beta2 --- app/bin/paramfilesearch_ui.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'app/bin/paramfilesearch_ui.c') diff --git a/app/bin/paramfilesearch_ui.c b/app/bin/paramfilesearch_ui.c index 5050f22..a04b82f 100644 --- a/app/bin/paramfilesearch_ui.c +++ b/app/bin/paramfilesearch_ui.c @@ -133,7 +133,7 @@ int SearchFileListLoad(Catalog *catalog) char * type_copy = MyStrdup(catalogEntry->tag); char * cp = type_copy; char * type = strtok(cp, " \t"); - SCALE_FIT_TYPE_T fit_type; + SCALE_FIT_TYPE_T fit_type = FIT_STRUCTURE; if (strcmp(type,TURNOUTCOMMAND) == 0) { fit_type = FIT_TURNOUT; } else if (strcmp(type,STRUCTURECOMMAND)==0) { @@ -414,13 +414,6 @@ static void SearchUiDlgUpdate( } } -void -SearchUiCancel(wWin_p window) -{ - ClearCurrentCatalog(); - wHide(window); -} - /** * Get the system default directory for parameter files. First step is to * check the configuration file for a user specific setting. If that is not @@ -445,8 +438,8 @@ GetParamsPath() return (params_path); } -#include "bitmaps/funnel.xpm" -#include "bitmaps/funnelclear.xpm" +#include "bitmaps/funnel.image1" +#include "bitmaps/funnelclear.image1" /** * Create and open the search dialog. @@ -463,9 +456,9 @@ void DoSearchParams(void * junk) trackLibrary = CreateLibrary(paramsDir); free(paramsDir); - searchUiPLs[I_SEARCHBUTTON].winLabel = (char *)wIconCreatePixMap(funnel_xpm); + searchUiPLs[I_SEARCHBUTTON].winLabel = (char *)wIconCreatePixMap(funnel_image1); searchUiPLs[I_CLEARBUTTON].winLabel = (char *)wIconCreatePixMap( - funnelclear_xpm); + funnelclear_image1); searchFitMode = FIT_COMPATIBLE; //Default to "Any" after startup @@ -474,7 +467,8 @@ void DoSearchParams(void * junk) searchUiW = ParamCreateDialog(&searchUiPG, - MakeWindowTitle(_("Choose parameter files")), _("Done"), NULL, SearchUiCancel, + MakeWindowTitle(_("Choose parameter files")), _("Done"), NULL, + ParamCancel_Current, TRUE, NULL, F_RESIZE | F_RECALLSIZE, SearchUiDlgUpdate); -- cgit v1.2.3