luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[DEVELOPMENT ENVIRONMENT]

Browse source 
* NEW: Change the project tree background color when a filter is active.
* BUG: Do not display false circular inheritance errors when a filter is 
  active.
* NEW: Hide the debug panel when a database connection window is active.


git-svn-id: svn://localhost/gambas/trunk@3271 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2010-10-31 19:36:29 +00:00
parent aa1fe3bb1a
commit 583fcf419d
2 changed files with 77 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
app/src/gambas3/.lang/.pot
View file

@ -328,19 +328,19 @@ msgid "Gambas reports"
msgstr "" msgstr ""
#: CProjectTree.class:290 FMain.class:2799 FSearch.class:98 #: CProjectTree.class:290 FMain.class:2799 FSearch.class:98
#: FSelectIcon.class:216 Project.module:1393 #: FSelectIcon.class:216 Project.module:1395
msgid "Project" msgid "Project"
msgstr "" msgstr ""
#: CProjectTree.class:293 Project.module:1396 #: CProjectTree.class:293 Project.module:1398
msgid "Sources" msgid "Sources"
msgstr "" msgstr ""
#: CProjectTree.class:296 Project.module:1399 #: CProjectTree.class:296 Project.module:1401
msgid "Connections" msgid "Connections"
msgstr "" msgstr ""
#: CProjectTree.class:305 Project.module:1408 #: CProjectTree.class:305 Project.module:1410
msgid "Data" msgid "Data"
msgstr "" msgstr ""
@ -370,7 +370,7 @@ msgid ""
"the GNU General Public License." "the GNU General Public License."
msgstr "" msgstr ""
#: Design.module:216 Project.module:1859 #: Design.module:216 Project.module:1861
msgid "In class &1 at line &2." msgid "In class &1 at line &2."
msgstr "" msgstr ""
@ -473,17 +473,17 @@ msgstr ""
#: FColorChooser.class:215 FCommit.class:386 FConflict.class:191 #: FColorChooser.class:215 FCommit.class:386 FConflict.class:191
#: FConnectionEditor.class:261 FCreateFile.class:928 FDebugInfo.class:508 #: FConnectionEditor.class:261 FCreateFile.class:928 FDebugInfo.class:508
#: FEditor.class:2217 FFindList.class:195 FFontChooser.class:85 #: FEditor.class:2217 FFontChooser.class:85 FForm.class:2955
#: FForm.class:2955 FGotoLine.class:63 FHelpBrowser.class:342 #: FGotoLine.class:63 FHelpBrowser.class:342 FIconEditor.class:1396
#: FIconEditor.class:1396 FImportTable.class:39 FList.class:155 #: FImportTable.class:39 FList.class:155 FMain.class:193
#: FMain.class:193 FMakeInstall.class:318 FMenu.class:1202 #: FMakeInstall.class:318 FMenu.class:1202 FNewConnection.class:317
#: FNewConnection.class:317 FNewTable.class:165 FNewTranslation.class:70 #: FNewTable.class:165 FNewTranslation.class:70 FOpenProject.class:502
#: FOpenProject.class:502 FOption.class:600 FPasteSpecial.class:279 #: FOption.class:600 FPasteSpecial.class:279 FPropertyProject.class:1017
#: FPropertyProject.class:1017 FReportBorderChooser.class:207 #: FReportBorderChooser.class:207 FReportCoordChooser.class:114
#: FReportCoordChooser.class:114 FSave.class:118 FSaveProjectAs.class:130 #: FSave.class:118 FSaveProjectAs.class:130 FSearch.class:608
#: FSearch.class:608 FSelectExtraFile.class:78 FSelectIcon.class:273 #: FSelectExtraFile.class:78 FSelectIcon.class:273 FSnippet.class:142
#: FSnippet.class:142 FTableChooser.class:144 FTextEditor.class:489 #: FTableChooser.class:144 FText.class:106 FTextEditor.class:489
#: FText.class:106 FTranslate.class:617 Project.module:397 #: FTranslate.class:617 Project.module:397
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
@ -598,9 +598,8 @@ msgstr ""
msgid "&Edit" msgid "&Edit"
msgstr "" msgstr ""
#: FConflict.class:25 FFindList.class:203 FIconEditor.class:1415 #: FConflict.class:25 FIconEditor.class:1415 FImportTable.class:700
#: FImportTable.class:700 FMakeInstall.class:267 FSearch.class:669 #: FMakeInstall.class:267 FSearch.class:669 FTips.class:240
#: FTips.class:240
msgid "Close" msgid "Close"
msgstr "" msgstr ""
@ -636,8 +635,7 @@ msgstr ""
msgid "Conflict files" msgid "Conflict files"
msgstr "" msgstr ""
#: FConflict.class:384 FCreateFile.class:728 FFindList.class:76 #: FConflict.class:384 FCreateFile.class:728 FSearch.class:43
#: FSearch.class:43
msgid "Text" msgid "Text"
msgstr "" msgstr ""
@ -935,7 +933,7 @@ msgstr ""
msgid "Module" msgid "Module"
msgstr "" msgstr ""
#: FCreateFile.class:628 FDebugInfo.class:49 FFindList.class:71 FInfo.class:84 #: FCreateFile.class:628 FDebugInfo.class:49 FInfo.class:84
msgid "Class" msgid "Class"
msgstr "" msgstr ""
@ -1147,8 +1145,8 @@ msgstr ""
msgid "Function" msgid "Function"
msgstr "" msgstr ""
#: FDebugInfo.class:51 FFindList.class:73 FIconEditor.class:2262 #: FDebugInfo.class:51 FIconEditor.class:2262 FImportTable.class:76
#: FImportTable.class:76 FOption.class:1183 FSearch.class:39 #: FOption.class:1183 FSearch.class:39
msgid "Line" msgid "Line"
msgstr "" msgstr ""
@ -1365,18 +1363,6 @@ msgstr ""
msgid "Procedure list" msgid "Procedure list"
msgstr "" msgstr ""
#: FFindList.class:75
msgid "Column"
msgstr ""
#: FFindList.class:244
msgid "Find list"
msgstr ""
#: FFindList.class:279 FSearch.class:437 FTranslate.class:578
msgid "Search string cannot be found."
msgstr ""
#: FFontChooser.class:57 #: FFontChooser.class:57
msgid "Select a font" msgid "Select a font"
msgstr "" msgstr ""
@ -2519,7 +2505,7 @@ msgid "There is no CHANGELOG entry for this release."
msgstr "" msgstr ""
#: FMakeInstall.class:318 FPropertyProject.class:1017 FSave.class:111 #: FMakeInstall.class:318 FPropertyProject.class:1017 FSave.class:111
#: Project.module:2852 #: Project.module:2856
msgid "Continue" msgid "Continue"
msgstr "" msgstr ""
@ -3555,6 +3541,10 @@ msgstr ""
msgid "Search & Replace" msgid "Search & Replace"
msgstr "" msgstr ""
#: FSearch.class:437 FTranslate.class:578
msgid "Search string cannot be found."
msgstr ""
#: FSearch.class:439 #: FSearch.class:439
msgid "Search string replaced once." msgid "Search string replaced once."
msgstr "" msgstr ""
@ -5155,190 +5145,190 @@ msgstr ""
msgid "ALPHA VERSION, USE AT YOUR OWN RISK! :-)" msgid "ALPHA VERSION, USE AT YOUR OWN RISK! :-)"
msgstr "" msgstr ""
#: Project.module:1557 #: Project.module:1559
msgid "Loading &1..." msgid "Loading &1..."
msgstr "" msgstr ""
#: Project.module:1606 #: Project.module:1608
msgid "Cannot open a binary file." msgid "Cannot open a binary file."
msgstr "" msgstr ""
#: Project.module:1639 #: Project.module:1641
msgid "Cannot open file." msgid "Cannot open file."
msgstr "" msgstr ""
#: Project.module:1697 #: Project.module:1699
msgid "File not found!" msgid "File not found!"
msgstr "" msgstr ""
#: Project.module:1799 #: Project.module:1801
msgid "first" msgid "first"
msgstr "" msgstr ""
#: Project.module:1801 #: Project.module:1803
msgid "second" msgid "second"
msgstr "" msgstr ""
#: Project.module:1803 #: Project.module:1805
msgid "third" msgid "third"
msgstr "" msgstr ""
#: Project.module:1805 #: Project.module:1807
msgid "&1th" msgid "&1th"
msgstr "" msgstr ""
#: Project.module:1855 #: Project.module:1857
msgid "in form definition" msgid "in form definition"
msgstr "" msgstr ""
#: Project.module:2006 #: Project.module:2008
msgid "" msgid ""
"Some project source files are in conflict.\n" "Some project source files are in conflict.\n"
"Please solve them if you want to compile the project." "Please solve them if you want to compile the project."
msgstr "" msgstr ""
#: Project.module:2010 #: Project.module:2012
msgid "Compiling project" msgid "Compiling project"
msgstr "" msgstr ""
#: Project.module:2022 #: Project.module:2024
msgid "Nothing to do." msgid "Nothing to do."
msgstr "" msgstr ""
#: Project.module:2215 #: Project.module:2217
msgid "File already exists." msgid "File already exists."
msgstr "" msgstr ""
#: Project.module:2248 #: Project.module:2250
msgid "Directory already exists." msgid "Directory already exists."
msgstr "" msgstr ""
#: Project.module:2260 #: Project.module:2262
msgid "Cannot link template file." msgid "Cannot link template file."
msgstr "" msgstr ""
#: Project.module:2266 #: Project.module:2268
msgid "Cannot copy template file." msgid "Cannot copy template file."
msgstr "" msgstr ""
#: Project.module:2462 #: Project.module:2466
msgid "Making executable..." msgid "Making executable..."
msgstr "" msgstr ""
#: Project.module:2506 #: Project.module:2510
msgid "Cannot make executable." msgid "Cannot make executable."
msgstr "" msgstr ""
#: Project.module:2851 #: Project.module:2855
msgid "Some components are missing: &1" msgid "Some components are missing: &1"
msgstr "" msgstr ""
#: Project.module:3057 #: Project.module:3061
msgid "Cannot write project file." msgid "Cannot write project file."
msgstr "" msgstr ""
#: Project.module:3089 #: Project.module:3093
msgid "Unable to create desktop shortcut." msgid "Unable to create desktop shortcut."
msgstr "" msgstr ""
#: Project.module:3331 #: Project.module:3335
msgid "The directory will be removed at the next commit." msgid "The directory will be removed at the next commit."
msgstr "" msgstr ""
#: Project.module:3348 #: Project.module:3352
msgid "You must define a startup class or form!" msgid "You must define a startup class or form!"
msgstr "" msgstr ""
#: Project.module:3379 #: Project.module:3383
msgid "Please type a name." msgid "Please type a name."
msgstr "" msgstr ""
#: Project.module:3383 #: Project.module:3387
msgid "This name contains a forbidden character:" msgid "This name contains a forbidden character:"
msgstr "" msgstr ""
#: Project.module:3387 #: Project.module:3391
msgid "The name cannot begins with a dot." msgid "The name cannot begins with a dot."
msgstr "" msgstr ""
#: Project.module:3391 #: Project.module:3395
msgid "This name is already used. Choose another one." msgid "This name is already used. Choose another one."
msgstr "" msgstr ""
#: Project.module:3421 #: Project.module:3425
msgid "" msgid ""
"A class name must begin with a letter or an underscore, followed by any " "A class name must begin with a letter or an underscore, followed by any "
"letter or digit." "letter or digit."
msgstr "" msgstr ""
#: Project.module:3468 #: Project.module:3472
msgid "Destination already exists" msgid "Destination already exists"
msgstr "" msgstr ""
#: Project.module:3668 #: Project.module:3672
msgid "Unable to rename '&1'" msgid "Unable to rename '&1'"
msgstr "" msgstr ""
#: Project.module:3783 #: Project.module:3787
msgid "Please type a project name." msgid "Please type a project name."
msgstr "" msgstr ""
#: Project.module:3791 #: Project.module:3795
msgid "The project name cannot begin with a dot." msgid "The project name cannot begin with a dot."
msgstr "" msgstr ""
#: Project.module:3794 #: Project.module:3798
msgid "Non-ASCII characters are forbidden in a project name." msgid "Non-ASCII characters are forbidden in a project name."
msgstr "" msgstr ""
#: Project.module:3795 #: Project.module:3799
msgid "" msgid ""
"The following characters are forbidden in a project name: ? * / \\ SPACE" "The following characters are forbidden in a project name: ? * / \\ SPACE"
msgstr "" msgstr ""
#: Project.module:3802 #: Project.module:3806
msgid "This project already exists." msgid "This project already exists."
msgstr "" msgstr ""
#: Project.module:3805 #: Project.module:3809
msgid "The project directory already exists." msgid "The project directory already exists."
msgstr "" msgstr ""
#: Project.module:3807 #: Project.module:3811
msgid "" msgid ""
"The project directory cannot be created because a file with the same name " "The project directory cannot be created because a file with the same name "
"already exists." "already exists."
msgstr "" msgstr ""
#: Project.module:3852 #: Project.module:3856
msgid "Create source package" msgid "Create source package"
msgstr "" msgstr ""
#: Project.module:3853 #: Project.module:3857
msgid "Source packages" msgid "Source packages"
msgstr "" msgstr ""
#: Project.module:4129 #: Project.module:4133
msgid "Cannot copy file &1." msgid "Cannot copy file &1."
msgstr "" msgstr ""
#: Project.module:4178 #: Project.module:4182
msgid "Cannot create link &1." msgid "Cannot create link &1."
msgstr "" msgstr ""
#: Project.module:4195 #: Project.module:4199
msgid "Cannot move a directory inside itself." msgid "Cannot move a directory inside itself."
msgstr "" msgstr ""
#: Project.module:4259 #: Project.module:4263
msgid "Cannot move file &1." msgid "Cannot move file &1."
msgstr "" msgstr ""
#: Project.module:4797 #: Project.module:4801
msgid "modified" msgid "modified"
msgstr "" msgstr ""
#: Project.module:4875 #: Project.module:4879
msgid "Unable to update all forms." msgid "Unable to update all forms."
msgstr "" msgstr ""

6
app/src/gambas3/.src/Project.module
View file

@ -1139,7 +1139,7 @@ Private Sub DoRefreshAfter()
AddFile(File.Dir(sKey), File.Name(sKey), True, True) AddFile(File.Dir(sKey), File.Name(sKey), True, True)
$aRefreshAfter[iInd] = File.BaseName(sKey) $aRefreshAfter[iInd] = File.BaseName(sKey)
Next Next
FMain.ShowError("<b>" & ("The following classes have circular inheritance:") & "</b>\n\n" & $aRefreshAfter.Join(", ")) If Not ProjectFilter Then FMain.ShowError("<b>" & ("The following classes have circular inheritance:") & "</b>\n\n" & $aRefreshAfter.Join(", "))
$aRefreshAfter.Clear $aRefreshAfter.Clear
Endif Endif
@ -1387,6 +1387,8 @@ Private Sub DoRefresh(Optional bReset As Boolean)
.Clear() .Clear()
.Background = If(Len(ProjectFilter), Color.LightBackground, Color.Default)
sKey = Project.Dir sKey = Project.Dir
.Add(sKey, Name, GetIcon(Project.Dir, 16)) .Add(sKey, Name, GetIcon(Project.Dir, 16))
@ -2379,6 +2381,8 @@ Public Sub Activate(hForm As Object)
Try ActiveForm.SetFocus Try ActiveForm.SetFocus
FMain.HideDebug(sType = "FConnectionEditor")
FSearch.Update FSearch.Update
End End