[DEVELOPMENT ENVIRONMENT]

* BUG: Fix search of strings starting with a minus sign.


git-svn-id: svn://localhost/gambas/trunk@3068 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2010-07-25 13:51:53 +00:00
parent 003e185a54
commit 31229ff322
3 changed files with 147 additions and 142 deletions

View file

@ -315,7 +315,7 @@ msgstr ""
msgid "Gambas reports"
msgstr ""
#: CProjectTree.class:290 FMain.class:2703 FSearch.class:89
#: CProjectTree.class:290 FMain.class:2707 FSearch.class:89
#: FSelectIcon.class:216 Project.module:1307
msgid "Project"
msgstr ""
@ -379,7 +379,7 @@ msgstr ""
#: Design.module:381 FColorChooser.class:201 FCommit.class:380
#: FConnectionEditor.class:411 FCreateFile.class:923 FFontChooser.class:79
#: FGotoLine.class:57 FList.class:331 FMain.class:3016
#: FGotoLine.class:57 FList.class:331 FMain.class:3020
#: FMakeExecutable.class:138 FMenu.class:1197 FNewConnection.class:573
#: FNewTable.class:159 FNewTranslation.class:64 FOpenProject.class:473
#: FPasteSpecial.class:273 FPropertyProject.class:258
@ -444,7 +444,7 @@ msgstr ""
msgid "System information"
msgstr ""
#: FAbout.class:618 FList.class:308 FMain.class:2449
#: FAbout.class:618 FList.class:308 FMain.class:2453
msgid "&Copy"
msgstr ""
@ -470,7 +470,7 @@ msgstr ""
#: FNewTranslation.class:70 FOpenProject.class:479 FOption.class:590
#: FPasteSpecial.class:279 FPropertyProject.class:1017
#: FReportBorderChooser.class:207 FReportCoordChooser.class:114
#: FSave.class:118 FSearch.class:472 FSelectExtraFile.class:78
#: FSave.class:118 FSearch.class:473 FSelectExtraFile.class:78
#: FSelectIcon.class:272 FSnippet.class:142 FTableChooser.class:144
#: FTextEditor.class:450 FText.class:106 FTranslate.class:617
#: Project.module:370
@ -584,12 +584,12 @@ msgid ""
"You must resolve the conflict in order to use the file."
msgstr ""
#: FConflict.class:25 FMain.class:2422
#: FConflict.class:25 FMain.class:2426
msgid "&Edit"
msgstr ""
#: FConflict.class:25 FFindList.class:203 FIconEditor.class:1415
#: FImportTable.class:648 FMakeInstall.class:266 FSearch.class:532
#: FImportTable.class:648 FMakeInstall.class:260 FSearch.class:533
#: FTips.class:240
msgid "Close"
msgstr ""
@ -853,7 +853,7 @@ msgstr ""
msgid "Fields"
msgstr ""
#: FConnectionEditor.class:1681 FMain.class:1708
#: FConnectionEditor.class:1681 FMain.class:1712
msgid "Add"
msgstr ""
@ -917,7 +917,7 @@ msgstr ""
msgid "New file"
msgstr ""
#: FCreateFile.class:582 FMain.class:2327
#: FCreateFile.class:582 FMain.class:2331
msgid "New"
msgstr ""
@ -1006,7 +1006,7 @@ msgstr ""
msgid "The project has been successfully created."
msgstr ""
#: FCreateProject.class:337 FMain.class:2605
#: FCreateProject.class:337 FMain.class:2609
msgid "New project"
msgstr ""
@ -1163,11 +1163,11 @@ msgstr ""
msgid "Dynamic variables"
msgstr ""
#: FDebugInfo.class:974 FMain.class:2900
#: FDebugInfo.class:974 FMain.class:2904
msgid "Debug"
msgstr ""
#: FDebugInfo.class:987 FMain.class:2731 FOption.class:1419 FSearch.class:85
#: FDebugInfo.class:987 FMain.class:2735 FOption.class:1419 FSearch.class:85
msgid "Console"
msgstr ""
@ -1207,7 +1207,7 @@ msgstr ""
msgid "Remove current expression"
msgstr ""
#: FDebugInfo.class:1086 FMain.class:2536 FMakeInstall.class:1591
#: FDebugInfo.class:1086 FMain.class:2540 FMakeInstall.class:1546
#: FOption.class:1521 FPropertyProject.class:1825
msgid "&Remove"
msgstr ""
@ -1267,7 +1267,7 @@ msgstr ""
msgid "Open form"
msgstr ""
#: FEditor.class:3299 FForm.class:3466 FMain.class:2489
#: FEditor.class:3299 FForm.class:3466 FMain.class:2493
msgid "&Startup class"
msgstr ""
@ -1351,7 +1351,7 @@ msgstr ""
msgid "Find list"
msgstr ""
#: FFindList.class:279 FSearch.class:387 FTranslate.class:578
#: FFindList.class:279 FSearch.class:388 FTranslate.class:578
msgid "Search string cannot be found."
msgstr ""
@ -1398,11 +1398,11 @@ msgstr ""
msgid "&First"
msgstr ""
#: FForm.class:3494 FSearch.class:920 FTips.class:228
#: FForm.class:3494 FSearch.class:921 FTips.class:228
msgid "&Previous"
msgstr ""
#: FForm.class:3501 FMenu.class:931 FSearch.class:914 FTips.class:234
#: FForm.class:3501 FMenu.class:931 FSearch.class:915 FTips.class:234
msgid "&Next"
msgstr ""
@ -1546,7 +1546,7 @@ msgstr ""
msgid "Move tab last"
msgstr ""
#: FFormStack.class:293 FMain.class:2928
#: FFormStack.class:293 FMain.class:2932
msgid "Hierarchy"
msgstr ""
@ -1956,7 +1956,7 @@ msgstr ""
msgid "Cl&ear"
msgstr ""
#: FList.class:314 FMain.class:2456
#: FList.class:314 FMain.class:2460
msgid "&Paste"
msgstr ""
@ -1999,428 +1999,428 @@ msgid ""
"Please install them to be able to do the translation."
msgstr ""
#: FMain.class:1245
#: FMain.class:1249
msgid "Do you really want to update all forms?"
msgstr ""
#: FMain.class:1245
#: FMain.class:1249
msgid "Update"
msgstr ""
#: FMain.class:1434
#: FMain.class:1438
msgid ""
"All backup or generated files will be removed from the project directory."
msgstr ""
#: FMain.class:1434
#: FMain.class:1438
msgid "Clean"
msgstr ""
#: FMain.class:1708
#: FMain.class:1712
msgid "Do you really want to add this file to the repository?"
msgstr ""
#: FMain.class:1950
#: FMain.class:1954
msgid "&File"
msgstr ""
#: FMain.class:1954
#: FMain.class:1958
msgid "&New project..."
msgstr ""
#: FMain.class:1961
#: FMain.class:1965
msgid "&Open project..."
msgstr ""
#: FMain.class:1967
#: FMain.class:1971
msgid "Open &recent"
msgstr ""
#: FMain.class:1974
#: FMain.class:1978
msgid "Open &example"
msgstr ""
#: FMain.class:1985
#: FMain.class:1989
msgid "&Save project"
msgstr ""
#: FMain.class:1992
#: FMain.class:1996
msgid "Save project &as..."
msgstr ""
#: FMain.class:2002
#: FMain.class:2006
msgid "&Quit"
msgstr ""
#: FMain.class:2009
#: FMain.class:2013
msgid "&Project"
msgstr ""
#: FMain.class:2013
#: FMain.class:2017
msgid "&Compile"
msgstr ""
#: FMain.class:2020
#: FMain.class:2024
msgid "Compile &All"
msgstr ""
#: FMain.class:2030
#: FMain.class:2034
msgid "&Translate..."
msgstr ""
#: FMain.class:2039
#: FMain.class:2043
msgid "Make"
msgstr ""
#: FMain.class:2043
#: FMain.class:2047
msgid "E&xecutable..."
msgstr ""
#: FMain.class:2050
#: FMain.class:2054
msgid "&Source archive..."
msgstr ""
#: FMain.class:2057
#: FMain.class:2061
msgid "&Installation package..."
msgstr ""
#: FMain.class:2068
#: FMain.class:2072
msgid "&Clean up"
msgstr ""
#: FMain.class:2074
#: FMain.class:2078
msgid "&Refresh"
msgstr ""
#: FMain.class:2080
#: FMain.class:2084
msgid "Put on &version control"
msgstr ""
#: FMain.class:2090
#: FMain.class:2094
msgid "&Properties..."
msgstr ""
#: FMain.class:2097
#: FMain.class:2101
msgid "&Debug"
msgstr ""
#: FMain.class:2101
#: FMain.class:2105
msgid "&Run"
msgstr ""
#: FMain.class:2111
#: FMain.class:2115
msgid "&Pause"
msgstr ""
#: FMain.class:2118
#: FMain.class:2122
msgid "&Stop"
msgstr ""
#: FMain.class:2125
#: FMain.class:2129
msgid "St&ep"
msgstr ""
#: FMain.class:2132
#: FMain.class:2136
msgid "&Forward"
msgstr ""
#: FMain.class:2139
#: FMain.class:2143
msgid "Finis&h"
msgstr ""
#: FMain.class:2146
#: FMain.class:2150
msgid "Run &until"
msgstr ""
#: FMain.class:2156
#: FMain.class:2160
msgid "&Toggle breakpoint"
msgstr ""
#: FMain.class:2164
#: FMain.class:2168
msgid "Clear &all breakpoints"
msgstr ""
#: FMain.class:2172
#: FMain.class:2176
msgid "&Watch expression"
msgstr ""
#: FMain.class:2178
#: FMain.class:2182
msgid "Close all &debug windows"
msgstr ""
#: FMain.class:2183
#: FMain.class:2187
msgid "&View"
msgstr ""
#: FMain.class:2187
#: FMain.class:2191
msgid "Pro&ject"
msgstr ""
#: FMain.class:2196
#: FMain.class:2200
msgid "&Properties"
msgstr ""
#: FMain.class:2204
#: FMain.class:2208
msgid "&Toolbox"
msgstr ""
#: FMain.class:2212
#: FMain.class:2216
msgid "&Console"
msgstr ""
#: FMain.class:2222
#: FMain.class:2226
msgid "Status bar"
msgstr ""
#: FMain.class:2229
#: FMain.class:2233
msgid "Hide menubar"
msgstr ""
#: FMain.class:2235
#: FMain.class:2239
msgid "Close &all windows"
msgstr ""
#: FMain.class:2241
#: FMain.class:2245
msgid "&Tools"
msgstr ""
#: FMain.class:2244
#: FMain.class:2248
msgid "&Find..."
msgstr ""
#: FMain.class:2250
#: FMain.class:2254
msgid "&Replace..."
msgstr ""
#: FMain.class:2260
#: FMain.class:2264
msgid "&Browse project..."
msgstr ""
#: FMain.class:2267
#: FMain.class:2271
msgid "&Open a terminal..."
msgstr ""
#: FMain.class:2274
#: FMain.class:2278
msgid "&Update all forms"
msgstr ""
#: FMain.class:2283
#: FMain.class:2287
msgid "&Shortcuts..."
msgstr ""
#: FMain.class:2289
#: FMain.class:2293
msgid "&Preferences..."
msgstr ""
#: FMain.class:2297
#: FMain.class:2301
msgid "&?"
msgstr ""
#: FMain.class:2301
#: FMain.class:2305
msgid "&Help browser"
msgstr ""
#: FMain.class:2309
#: FMain.class:2313
msgid "&Tips of the day"
msgstr ""
#: FMain.class:2318
#: FMain.class:2322
msgid "&About Gambas..."
msgstr ""
#: FMain.class:2331
#: FMain.class:2335
msgid "&Directory"
msgstr ""
#: FMain.class:2337
#: FMain.class:2341
msgid "&Project link..."
msgstr ""
#: FMain.class:2347
#: FMain.class:2351
msgid "&Module..."
msgstr ""
#: FMain.class:2355
#: FMain.class:2359
msgid "&Class..."
msgstr ""
#: FMain.class:2363
#: FMain.class:2367
msgid "&Form..."
msgstr ""
#: FMain.class:2371
#: FMain.class:2375
msgid "&WebPage..."
msgstr ""
#: FMain.class:2379
#: FMain.class:2383
msgid "&Report..."
msgstr ""
#: FMain.class:2390
#: FMain.class:2394
msgid "&Image..."
msgstr ""
#: FMain.class:2397
#: FMain.class:2401
msgid "&HTML file..."
msgstr ""
#: FMain.class:2404
#: FMain.class:2408
msgid "&Style sheet..."
msgstr ""
#: FMain.class:2412
#: FMain.class:2416
msgid "&Other..."
msgstr ""
#: FMain.class:2427
#: FMain.class:2431
msgid "Edit &code"
msgstr ""
#: FMain.class:2431
#: FMain.class:2435
msgid "Edit with"
msgstr ""
#: FMain.class:2442
#: FMain.class:2446
msgid "&Cut"
msgstr ""
#: FMain.class:2463
#: FMain.class:2467
msgid "&Rename..."
msgstr ""
#: FMain.class:2470
#: FMain.class:2474
msgid "&Delete..."
msgstr ""
#: FMain.class:2480
#: FMain.class:2484
msgid "Copy file pat&h"
msgstr ""
#: FMain.class:2497
#: FMain.class:2501
msgid "&Add to repository"
msgstr ""
#: FMain.class:2522
#: FMain.class:2526
msgid "&New connection..."
msgstr ""
#: FMain.class:2530
#: FMain.class:2534
msgid "&Open"
msgstr ""
#: FMain.class:2612
#: FMain.class:2616
msgid "Open project"
msgstr ""
#: FMain.class:2619
#: FMain.class:2623
msgid "Save project"
msgstr ""
#: FMain.class:2626 Project.module:2062
#: FMain.class:2630 Project.module:2061
msgid "Save project as"
msgstr ""
#: FMain.class:2633 FPropertyProject.class:54
#: FMain.class:2637 FPropertyProject.class:54
msgid "Project properties"
msgstr ""
#: FMain.class:2641
#: FMain.class:2645
msgid "Refresh project"
msgstr ""
#: FMain.class:2648 FOption.class:879
#: FMain.class:2652 FOption.class:879
msgid "Preferences"
msgstr ""
#: FMain.class:2657
#: FMain.class:2661
msgid "Shortcuts"
msgstr ""
#: FMain.class:2668
#: FMain.class:2672
msgid "Translate"
msgstr ""
#: FMain.class:2676
#: FMain.class:2680
msgid "Make source archive"
msgstr ""
#: FMain.class:2683 FMakeExecutable.class:83
#: FMain.class:2687 FMakeExecutable.class:83
msgid "Make executable"
msgstr ""
#: FMain.class:2691 FMakeInstall.class:1182
#: FMain.class:2695 FMakeInstall.class:1169
msgid "Make installation package"
msgstr ""
#: FMain.class:2713
#: FMain.class:2717
msgid "Properties sheet"
msgstr ""
#: FMain.class:2722
#: FMain.class:2726
msgid "Toolbox"
msgstr ""
#: FMain.class:2739
#: FMain.class:2743
msgid "Compile"
msgstr ""
#: FMain.class:2746
#: FMain.class:2750
msgid "Compile all"
msgstr ""
#: FMain.class:2753
#: FMain.class:2757
msgid "Run"
msgstr ""
#: FMain.class:2760
#: FMain.class:2764
msgid "Pause"
msgstr ""
#: FMain.class:2767
#: FMain.class:2771
msgid "Stop"
msgstr ""
#: FMain.class:2774
#: FMain.class:2778
msgid "Step"
msgstr ""
#: FMain.class:2781
#: FMain.class:2785
msgid "Forward"
msgstr ""
#: FMain.class:2788
#: FMain.class:2792
msgid "Finish current function"
msgstr ""
#: FMain.class:2796
#: FMain.class:2800
msgid "Run until current line"
msgstr ""
#: FMain.class:2804
#: FMain.class:2808
msgid "Watch expression"
msgstr ""
#: FMain.class:2811
#: FMain.class:2815
msgid "Toggle breakpoint"
msgstr ""
#: FMain.class:2823
#: FMain.class:2827
msgid "Search string"
msgstr ""
#: FMain.class:2829
#: FMain.class:2833
msgid "Search in project"
msgstr ""
#: FMain.class:2836
#: FMain.class:2840
msgid "Search & replace"
msgstr ""
#: FMain.class:2857
#: FMain.class:2861
msgid "Show menu bar"
msgstr ""
#: FMain.class:2909 FProperty.class:1146
#: FMain.class:2913 FProperty.class:1146
msgid "Properties"
msgstr ""
@ -3503,63 +3503,63 @@ msgstr ""
msgid "Search & Replace"
msgstr ""
#: FSearch.class:389
#: FSearch.class:390
msgid "Search string replaced once."
msgstr ""
#: FSearch.class:391
#: FSearch.class:392
msgid "Search string replaced &1 times."
msgstr ""
#: FSearch.class:814
#: FSearch.class:815
msgid "Search"
msgstr ""
#: FSearch.class:840
#: FSearch.class:841
msgid "Replace"
msgstr ""
#: FSearch.class:863
#: FSearch.class:864
msgid "&Case sensitive"
msgstr ""
#: FSearch.class:868
#: FSearch.class:869
msgid "&Words only"
msgstr ""
#: FSearch.class:873
#: FSearch.class:874
msgid "Regular e&xpression"
msgstr ""
#: FSearch.class:878
#: FSearch.class:879
msgid "&Highlight result"
msgstr ""
#: FSearch.class:888
#: FSearch.class:889
msgid "&Ignore strings"
msgstr ""
#: FSearch.class:893
#: FSearch.class:894
msgid "I&gnore comments"
msgstr ""
#: FSearch.class:898
#: FSearch.class:899
msgid "C&urrent procedure"
msgstr ""
#: FSearch.class:926
#: FSearch.class:927
msgid "&Replace"
msgstr ""
#: FSearch.class:932
#: FSearch.class:933
msgid "Replace &all"
msgstr ""
#: FSearch.class:938
#: FSearch.class:939
msgid "&Browse"
msgstr ""
#: FSearch.class:954
#: FSearch.class:955
msgid "Browse"
msgstr ""

View file

@ -1184,7 +1184,11 @@ Public Sub Action_Activate(Key As String) As Boolean
cmbFind_Activate
Case "console"
If Action["console"].Value Then Try FOutput.SetFocus
If Action["console"].Value Then
Try FOutput.SetFocus
Else
Try Project.ActiveForm.SetFocus
Endif
'FOutput.Toggle(Action["console"].Value)
Case "break"

View file

@ -225,16 +225,17 @@ Private Sub GrepFile(hFile As Object) As CFindResult[]
Try sText = hFile.GetText()
If Error Then Return aResult
'grep -nR -F -I -i -w "Date" -ob --exclude=*~ --exclude-dir=.svn -s * .src
'grep -nR -F -I -i -w -ob --exclude=*~ --exclude-dir=.svn -s -- "Date" * .src
aGrep = ["grep", "-nobs"]
If Not CaseSensitive Then aGrep.Add("-i")
If WordOnly Then aGrep.Add("-w")
If RegularExpression Then
aGrep.Add("-E")
Else
aGrep.Add("-F")
Endif
If WordOnly Then aGrep.Add("-w")
aGrep.Add("--")
aGrep.Add(SearchString)
$sGrep = ""