Skip to content

Commit 68a77b7

Browse files
Matthias Kastnert-b
authored andcommitted
save search string
Save the content of the search string (max len = 40) into package prefs.
1 parent 3677479 commit 68a77b7

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

procedures/CodeBrowser_gui.ipf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ Function createPanel()
4848
DefineGuide/W=$panel UGHR={FR,panelBorder}
4949

5050
setGlobalStr("procFilter", prefs.procFilter)
51-
setGlobalStr("search", getGlobalStr("search"))
51+
setGlobalStr("search", prefs.search)
52+
5253
CodeBrowserPanel()
5354
ListBox list1, win = $panel, listWave=getDeclWave()
5455
#if (IgorVersion() >= 8.00)

procedures/CodeBrowser_preferences.ipf

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// This file was created by () byte physics Thomas Braun, support@byte-physics.de
77
// (c) 2013
88

9-
static Constant kPrefsVersion = 108
9+
static Constant kPrefsVersion = 109
1010
static StrConstant kPackageName = "CodeBrowser"
1111
static StrConstant kPrefsFileName = "CodeBrowser.bin"
1212
static Constant kPrefsRecordID = 0
@@ -22,7 +22,8 @@ Structure CodeBrowserPrefs
2222
uint32 configCleanOnExit // delete CodeBrowser related data when CodeBrowser exits
2323
uint32 configDebuggingEnabled // enable messages for debugging purpose
2424
char procFilter[40] // procedure filter
25-
uint32 reserved[83] // Reserved for future use
25+
char search[40] // search filter
26+
uint32 reserved[73] // Reserved for future use
2627
EndStructure
2728

2829
// DefaultPackagePrefsStruct(prefs)
@@ -56,8 +57,9 @@ static Function DefaultPackagePrefsStruct(prefs)
5657
prefs.configDebuggingEnabled = 0
5758

5859
prefs.procFilter = "*"
60+
prefs.search = ""
5961

60-
for(i = 0; i < 83; i += 1)
62+
for(i = 0; i < 73; i += 1)
6163
prefs.reserved[i] = 0
6264
endfor
6365
End
@@ -102,6 +104,7 @@ static Function SyncPackagePrefsStruct(prefs)
102104
prefs.configDebuggingEnabled = configItem < 0 ? 0 : configItem
103105

104106
prefs.procFilter = getGlobalStr("procFilter")
107+
prefs.search = getGlobalStr("search")
105108
End
106109

107110
// InitPackagePrefsStruct(prefs)
@@ -145,13 +148,18 @@ Function LoadPackagePrefsFromDisk(prefs)
145148
setGlobalVar("debuggingEnabled", prefs.configDebuggingEnabled)
146149

147150
setGlobalStr("procFilter", prefs.procFilter)
151+
setGlobalStr("search", prefs.search)
148152
End
149153

150154
Function SavePackagePrefsToDisk(prefs)
151155
STRUCT CodeBrowserPrefs &prefs
152156

153-
String procFilter = prefs.procFilter
154-
prefs.procFilter = procFilter[0, 19]
157+
String dummy
158+
159+
dummy = prefs.procFilter
160+
prefs.procFilter = dummy[0, 19]
161+
dummy = prefs.search
162+
prefs.search = dummy[0, 19]
155163

156164
SavePackagePreferences kPackageName, kPrefsFileName, kPrefsRecordID, prefs
157165
End

0 commit comments

Comments
 (0)