[DEVELOPMENT ENVIRONMENT]

* BUG: Do not display the internal self-component in the project property 
  component list.

[GB.FORM]
* NEW: Bookmarks are editable now.


git-svn-id: svn://localhost/gambas/trunk@3355 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2010-12-11 01:55:35 +00:00
parent 98628b539d
commit b15fea4e1b
23 changed files with 428 additions and 290 deletions

View file

@ -480,7 +480,7 @@ msgstr ""
#: FMakeInstall.class:318 FMenu.class:1243 FNewConnection.class:317
#: FNewTable.class:165 FNewTranslation.class:70 FOpenProject.class:502
#: FOption.class:600 FPasteSpecial.class:279 FPropertyComponent.class:471
#: FPropertyProject.class:801 FReportBorderChooser.class:207
#: FPropertyProject.class:802 FReportBorderChooser.class:207
#: FReportCoordChooser.class:114 FSave.class:118 FSaveProjectAs.class:130
#: FSelectExtraFile.class:78 FSelectIcon.class:273 FSnippet.class:142
#: FTableChooser.class:144 FText.class:106 FTextEditor.class:489
@ -504,7 +504,7 @@ msgstr ""
msgid "Project commit"
msgstr ""
#: FCommit.class:195 FMakeInstall.class:1299 FPropertyProject.class:1350
#: FCommit.class:195 FMakeInstall.class:1299 FPropertyProject.class:1351
msgid "Description"
msgstr ""
@ -947,7 +947,7 @@ msgid "Style sheet"
msgstr ""
#: FCreateFile.class:791 FCreateProject.class:535 FImportTable.class:526
#: FPropertyComponent.class:306 FPropertyProject.class:1372
#: FPropertyComponent.class:306 FPropertyProject.class:1373
msgid "Options"
msgstr ""
@ -1097,7 +1097,7 @@ msgstr ""
msgid "Identification"
msgstr ""
#: FCreateProject.class:647 FPropertyProject.class:1339
#: FCreateProject.class:647 FPropertyProject.class:1340
msgid "Title"
msgstr ""
@ -1213,7 +1213,7 @@ msgid "Remove current expression"
msgstr ""
#: FDebugInfo.class:1239 FMain.class:2620 FMakeInstall.class:1605
#: FOption.class:1581 FPropertyComponent.class:440 FPropertyProject.class:1626
#: FOption.class:1581 FPropertyComponent.class:440 FPropertyProject.class:1627
msgid "&Remove"
msgstr ""
@ -1615,7 +1615,7 @@ msgstr ""
msgid "Go to line"
msgstr ""
#: FHelpBrowser.class:22 FPropertyProject.class:1494
#: FHelpBrowser.class:22 FPropertyProject.class:1495
msgid "Default language"
msgstr ""
@ -1970,7 +1970,7 @@ msgid "This file has not been modified since the last commit."
msgstr ""
#: FInfo.class:305 FOption.class:948 FPropertyComponent.class:293
#: FPropertyProject.class:1283
#: FPropertyProject.class:1284
msgid "General"
msgstr ""
@ -1986,7 +1986,7 @@ msgstr ""
msgid "Last modified"
msgstr ""
#: FInfo.class:391 FPropertyProject.class:1734
#: FInfo.class:391 FPropertyProject.class:1735
msgid "Versioning"
msgstr ""
@ -2002,7 +2002,7 @@ msgstr ""
msgid "Edit list property"
msgstr ""
#: FList.class:274 FPropertyProject.class:1677
#: FList.class:274 FPropertyProject.class:1678
msgid "&Insert"
msgstr ""
@ -2486,7 +2486,7 @@ msgstr ""
msgid "Properties"
msgstr ""
#: FMakeExecutable.class:18 FPropertyProject.class:1049
#: FMakeExecutable.class:18 FPropertyProject.class:1050
msgid "Gambas applications"
msgstr ""
@ -2546,7 +2546,7 @@ msgstr ""
msgid "There is no CHANGELOG entry for this release."
msgstr ""
#: FMakeInstall.class:318 FPropertyProject.class:801 FSave.class:111
#: FMakeInstall.class:318 FPropertyProject.class:802 FSave.class:111
#: Project.module:2874
msgid "Continue"
msgstr ""
@ -3072,11 +3072,11 @@ msgstr ""
msgid "Sort properties"
msgstr ""
#: FOption.class:1028 FPropertyComponent.class:340 FPropertyProject.class:1425
#: FOption.class:1028 FPropertyComponent.class:340 FPropertyProject.class:1426
msgid "No"
msgstr ""
#: FOption.class:1028 FPropertyComponent.class:340 FPropertyProject.class:1425
#: FOption.class:1028 FPropertyComponent.class:340 FPropertyProject.class:1426
msgid "Yes"
msgstr ""
@ -3104,7 +3104,7 @@ msgstr ""
msgid "Default tab size"
msgstr ""
#: FOption.class:1166 FPropertyProject.class:1400
#: FOption.class:1166 FPropertyProject.class:1401
msgid "space(s)"
msgstr ""
@ -3355,7 +3355,7 @@ msgstr ""
msgid "Features"
msgstr ""
#: FPropertyComponent.class:402 FPropertyProject.class:1555
#: FPropertyComponent.class:402 FPropertyProject.class:1556
msgid "Components"
msgstr ""
@ -3375,159 +3375,159 @@ msgstr ""
msgid "Snapping value is incorrect."
msgstr ""
#: FPropertyProject.class:445
#: FPropertyProject.class:446
msgid "These components are incompatible:<br>&1."
msgstr ""
#: FPropertyProject.class:458
#: FPropertyProject.class:459
msgid "The &1 component needs one of the following components:<br>&2."
msgstr ""
#: FPropertyProject.class:465
#: FPropertyProject.class:466
msgid "The &1 component needs the &2 component."
msgstr ""
#: FPropertyProject.class:792
#: FPropertyProject.class:793
msgid "Unable to update project from repository."
msgstr ""
#: FPropertyProject.class:794
#: FPropertyProject.class:795
msgid "Project has been updated from repository successfully."
msgstr ""
#: FPropertyProject.class:801
#: FPropertyProject.class:802
msgid "You are going to cancel your changes!"
msgstr ""
#: FPropertyProject.class:1048
#: FPropertyProject.class:1049
msgid "Select a Gambas application"
msgstr ""
#: FPropertyProject.class:1059
#: FPropertyProject.class:1060
msgid "<b>&1</b> is already used as a library."
msgstr ""
#: FPropertyProject.class:1065
#: FPropertyProject.class:1066
msgid "<b>&1</b> does not export any class."
msgstr ""
#: FPropertyProject.class:1253
#: FPropertyProject.class:1254
msgid "GB_GUI=gb.qt4"
msgstr ""
#: FPropertyProject.class:1259
#: FPropertyProject.class:1260
msgid "GB_GUI=gb.gtk"
msgstr ""
#: FPropertyProject.class:1312
#: FPropertyProject.class:1313
msgid "Version"
msgstr ""
#: FPropertyProject.class:1362
#: FPropertyProject.class:1363
msgid "Author(s)"
msgstr ""
#: FPropertyProject.class:1377
#: FPropertyProject.class:1378
msgid "Edition"
msgstr ""
#: FPropertyProject.class:1388
#: FPropertyProject.class:1389
msgid "Tab size"
msgstr ""
#: FPropertyProject.class:1408
#: FPropertyProject.class:1409
msgid "Compilation"
msgstr ""
#: FPropertyProject.class:1419
#: FPropertyProject.class:1420
msgid "Module symbols are public by default"
msgstr ""
#: FPropertyProject.class:1436
#: FPropertyProject.class:1437
msgid "Form controls are public"
msgstr ""
#: FPropertyProject.class:1453
#: FPropertyProject.class:1454
msgid "Get version from program"
msgstr ""
#: FPropertyProject.class:1466 FTranslate.class:1523
#: FPropertyProject.class:1467 FTranslate.class:1523
msgid "Translation"
msgstr ""
#: FPropertyProject.class:1477
#: FPropertyProject.class:1478
msgid "Project is translatable"
msgstr ""
#: FPropertyProject.class:1509
#: FPropertyProject.class:1510
msgid "Debugging"
msgstr ""
#: FPropertyProject.class:1520
#: FPropertyProject.class:1521
msgid "Use a terminal emulator"
msgstr ""
#: FPropertyProject.class:1534
#: FPropertyProject.class:1535
msgid "Component"
msgstr ""
#: FPropertyProject.class:1545
#: FPropertyProject.class:1546
msgid "This project is a component"
msgstr ""
#: FPropertyProject.class:1559
#: FPropertyProject.class:1560
msgid "Show only components used in project"
msgstr ""
#: FPropertyProject.class:1565
#: FPropertyProject.class:1566
msgid "Show components in beta version"
msgstr ""
#: FPropertyProject.class:1578
#: FPropertyProject.class:1579
msgid "About &component..."
msgstr ""
#: FPropertyProject.class:1589
#: FPropertyProject.class:1590
msgid "&Reset"
msgstr ""
#: FPropertyProject.class:1607
#: FPropertyProject.class:1608
msgid "Libraries"
msgstr ""
#: FPropertyProject.class:1620
#: FPropertyProject.class:1621
msgid "&Add..."
msgstr ""
#: FPropertyProject.class:1652
#: FPropertyProject.class:1653
msgid "Environment"
msgstr ""
#: FPropertyProject.class:1662
#: FPropertyProject.class:1663
msgid "Arguments"
msgstr ""
#: FPropertyProject.class:1705
#: FPropertyProject.class:1706
msgid "Environment variables"
msgstr ""
#: FPropertyProject.class:1739
#: FPropertyProject.class:1740
msgid "Changes since last commit"
msgstr ""
#: FPropertyProject.class:1752
#: FPropertyProject.class:1753
msgid "There is no change to commit."
msgstr ""
#: FPropertyProject.class:1761
#: FPropertyProject.class:1762
msgid "&Update"
msgstr ""
#: FPropertyProject.class:1767
#: FPropertyProject.class:1768
msgid "&Revert..."
msgstr ""
#: FPropertyProject.class:1773
#: FPropertyProject.class:1774
msgid "&Commit..."
msgstr ""

View file

@ -347,6 +347,7 @@ Private Sub RefreshComponents()
For Each hComp In CComponent.All
If hComp.Library Then Continue
If hComp.Key = CComponent.PROJECT_NAME Then Continue
aComp.Add(hComp.Key)
Next
aComp.Sort

Binary file not shown.

Before

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 723 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 B

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

@ -8,7 +8,6 @@ Component=gb.image
Component=gb.gui
Component=gb.form
Component=gb.db
Component=gb.db.form
Authors="Benoît Minisini"
Environment="GB_GUI=gb.qt4"
TabSize=2

View file

@ -82,58 +82,72 @@ msgstr ""
msgid "A"
msgstr ""
#: FColorChooser.class:828
msgid "ButtonBox1"
msgstr ""
#: FDirChooser.class:386
#: FDirChooser.class:392
msgid "All files (*)"
msgstr ""
#: FDirChooser.class:765
#: FDirChooser.class:771
msgid "&Add bookmark"
msgstr ""
#: FDirChooser.class:769
#: FDirChooser.class:775
msgid "&Remove bookmark"
msgstr ""
#: FDirChooser.class:844
#: FDirChooser.class:779
msgid "&Edit bookmark..."
msgstr ""
#: FDirChooser.class:873
msgid "Bookmarks"
msgstr ""
#: FDirChooser.class:864
#: FDirChooser.class:888
msgid "Parent directory"
msgstr ""
#: FDirChooser.class:870
#: FDirChooser.class:894
msgid "Refresh"
msgstr ""
#: FDirChooser.class:876
#: FDirChooser.class:900
msgid "Create directory"
msgstr ""
#: FDirChooser.class:882
#: FDirChooser.class:912
msgid "View hidden files"
msgstr ""
#: FDirChooser.class:890
#: FDirChooser.class:920
msgid "Toggle view"
msgstr ""
#: FDirChooser.class:896
#: FDirChooser.class:926
msgid "Show files"
msgstr ""
#: FDirChooser.class:956 FInputBox.class:102 FWizard.class:59
#: FDirChooser.class:991 FEditBookmark.class:102 FInputBox.class:102
#: FWizard.class:59
msgid "OK"
msgstr ""
#: FDirChooser.class:962 FInputBox.class:108 FWizard.class:165
#: FDirChooser.class:997 FEditBookmark.class:108 FInputBox.class:108
#: FWizard.class:165
msgid "Cancel"
msgstr ""
#: FEditBookmark.class:66
msgid "Edit bookmark"
msgstr ""
#: FEditBookmark.class:75 FileView.class:77
msgid "Name"
msgstr ""
#: FEditBookmark.class:89
msgid "Path"
msgstr ""
#: FFontChooser.class:411
msgid "Family"
msgstr ""
@ -174,10 +188,6 @@ msgstr ""
msgid "How quickly daft jumping zebras vex"
msgstr ""
#: FMain.class:30
msgid "Test"
msgstr ""
#: FMessage.class:129
msgid "Do not display this message again"
msgstr ""
@ -190,10 +200,6 @@ msgstr ""
msgid "&Previous"
msgstr ""
#: FileView.class:77
msgid "Name"
msgstr ""
#: FileView.class:80
msgid "Last modified"
msgstr ""

Binary file not shown.

View file

@ -31,137 +31,26 @@ msgstr ""
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: CBookmarkList.class:50
msgid "Home"
msgstr "Dossier personnel"
#: CBookmarkList.class:52
msgid "Desktop"
msgstr "Bureau"
#: CBookmarkList.class:54
msgid "System"
msgstr "Système"
#: DirView.class:409
msgid "Cannot rename directory."
msgstr "Impossible de renommer le répertoire."
#: DirView.class:439
msgid "New folder"
msgstr "Nouveau répertoire"
#: DirView.class:457
msgid "Cannot create directory."
msgstr "Impossible de créer le répertoire."
#: FCalendar.class:445
msgid "Today"
msgstr "Aujourd'hui"
#: FCalendar.class:451
msgid "Previous month"
msgstr "Mois précédent"
#: FCalendar.class:481
msgid "Next month"
msgstr "Mois suivant"
#: FColorChooser.class:696
msgid "Follow color grid"
msgstr "Suivre la grille de couleurs"
#: FColorChooser.class:742
msgid "R"
msgstr "-"
#: FColorChooser.class:747
msgid "G"
msgstr "-"
#: FColorChooser.class:752
msgid "B"
msgstr "-"
#: FColorChooser.class:763
msgid "H"
msgstr "-"
#: FColorChooser.class:768
msgid "S"
msgstr "-"
#: FColorChooser.class:779
msgid "V"
msgstr "-"
#: FColorChooser.class:795
msgid "A"
msgstr "-"
#: FColorChooser.class:828
msgid "ButtonBox1"
msgstr ""
#: FDirChooser.class:386
msgid "All files (*)"
msgstr "Tous les fichiers (*)"
#: FDirChooser.class:765
#: FDirChooser.class:767
msgid "&Add bookmark"
msgstr "&Ajouter un signet"
#: FDirChooser.class:769
msgid "&Remove bookmark"
msgstr "&Enlever le signet"
#: FDirChooser.class:388
msgid "All files (*)"
msgstr "Tous les fichiers (*)"
#: FDirChooser.class:844
msgid "Bookmarks"
msgstr "Signets"
#: FDirChooser.class:864
msgid "Parent directory"
msgstr "Répertoire parent"
#: FDirChooser.class:870
msgid "Refresh"
msgstr "Rafraîchir"
#: FDirChooser.class:876
msgid "Create directory"
msgstr "Créer un répertoire"
#: FDirChooser.class:882
msgid "View hidden files"
msgstr "Afficher les fichiers cachés"
#: FDirChooser.class:890
msgid "Toggle view"
msgstr "Changer la vue"
#: FDirChooser.class:896
msgid "Show files"
msgstr "Afficher les fichiers"
#: FDirChooser.class:956 FInputBox.class:102 FWizard.class:59
msgid "OK"
msgstr "OK"
#: FDirChooser.class:962 FInputBox.class:108 FWizard.class:165
msgid "Cancel"
msgstr "Annuler"
#: FFontChooser.class:411
msgid "Family"
msgstr "Famille"
#: FFontChooser.class:426
msgid "Style"
msgstr "Style"
#: FColorChooser.class:752
msgid "B"
msgstr "-"
#: FFontChooser.class:432
msgid "Bold"
@ -171,54 +60,179 @@ msgstr "-"
msgid "Bold Italic"
msgstr "-"
#: FFontChooser.class:432
msgid "Italic"
#: FDirChooser.class:862
msgid "Bookmarks"
msgstr "Signets"
#: FWizard.class:165
msgid "Cancel"
msgstr "Annuler"
#: DirView.class:457
msgid "Cannot create directory."
msgstr "Impossible de créer le répertoire."
#: DirView.class:409
msgid "Cannot rename directory."
msgstr "Impossible de renommer le répertoire."
#: FDirChooser.class:894
msgid "Create directory"
msgstr "Créer un répertoire"
#: CBookmarkList.class:52
msgid "Desktop"
msgstr "Bureau"
#: FMessage.class:129
msgid "Do not display this message again"
msgstr "Ne pas affiche ce message de nouveau"
#: FDirChooser.class:775
msgid "&Edit bookmark..."
msgstr "&Modifier le signet..."
#: FEditBookmark.class:66
msgid "Edit bookmark"
msgstr "Modifier le signet"
#: FFontChooser.class:411
msgid "Family"
msgstr "Famille"
#: FColorChooser.class:696
msgid "Follow color grid"
msgstr "Suivre la grille de couleurs"
#: FColorChooser.class:747
msgid "G"
msgstr "-"
#: FFontChooser.class:432
msgid "Normal"
#: FColorChooser.class:763
msgid "H"
msgstr "-"
#: FFontChooser.class:441
msgid "Underline"
msgstr "Souligné"
#: FFontChooser.class:446
msgid "Strikeout"
msgstr "Barré"
#: FFontChooser.class:456 FileView.class:78
msgid "Size"
msgstr "Taille"
#: CBookmarkList.class:50
msgid "Home"
msgstr "Dossier personnel"
#: FFontChooser.class:494
msgid "How quickly daft jumping zebras vex"
msgstr "Portez ce vieux whisky au juge blond qui fume"
#: FMessage.class:129
msgid "Do not display this message again"
msgstr ""
#: FWizard.class:55
msgid "&Next"
msgstr "&Suivant"
#: FWizard.class:153
msgid "&Previous"
msgstr "&Précédent"
#: FileView.class:77
msgid "Name"
msgstr "Nom"
#: FFontChooser.class:432
msgid "Italic"
msgstr "-"
#: FileView.class:80
msgid "Last modified"
msgstr "Modifié le"
#: Help.module:71
msgid "The '/' character is forbidden inside file or directory names."
msgstr "Le caractère '/' est interdit dans les noms de fichiers ou de répertoires."
#: .project:1
msgid "More controls for graphical components"
msgstr ""
#: FEditBookmark.class:74 FileView.class:77
msgid "Name"
msgstr "Nom"
#: DirView.class:439
msgid "New folder"
msgstr "Nouveau répertoire"
#: FWizard.class:55
msgid "&Next"
msgstr "&Suivant"
#: FCalendar.class:481
msgid "Next month"
msgstr "Mois suivant"
#: FFontChooser.class:432
msgid "Normal"
msgstr "-"
#: FWizard.class:59
msgid "OK"
msgstr "OK"
#: FDirChooser.class:882
msgid "Parent directory"
msgstr "Répertoire parent"
#: FEditBookmark.class:88
msgid "Path"
msgstr "Emplacement"
#: FWizard.class:153
msgid "&Previous"
msgstr "&Précédent"
#: FCalendar.class:451
msgid "Previous month"
msgstr "Mois précédent"
#: FColorChooser.class:742
msgid "R"
msgstr "-"
#: FDirChooser.class:888
msgid "Refresh"
msgstr "Rafraîchir"
#: FDirChooser.class:771
msgid "&Remove bookmark"
msgstr "&Enlever le signet"
#: FColorChooser.class:768
msgid "S"
msgstr "-"
#: FDirChooser.class:914
msgid "Show files"
msgstr "Afficher les fichiers"
#: FFontChooser.class:456 FileView.class:78
msgid "Size"
msgstr "Taille"
#: Wizard.class:76
msgid "Step #&1"
msgstr "Étape n°&1"
#: FFontChooser.class:446
msgid "Strikeout"
msgstr "Barré"
#: FFontChooser.class:426
msgid "Style"
msgstr "Style"
#: CBookmarkList.class:54
msgid "System"
msgstr "Système"
#: Help.module:71
msgid "The '/' character is forbidden inside file or directory names."
msgstr "Le caractère '/' est interdit dans les noms de fichiers ou de répertoires."
#: FCalendar.class:445
msgid "Today"
msgstr "Aujourd'hui"
#: FDirChooser.class:908
msgid "Toggle view"
msgstr "Changer la vue"
#: FFontChooser.class:441
msgid "Underline"
msgstr "Souligné"
#: FColorChooser.class:779
msgid "V"
msgstr "-"
#: FDirChooser.class:900
msgid "View hidden files"
msgstr "Afficher les fichiers cachés"

View file

@ -6,6 +6,7 @@ Version=2.99.0
VersionProgram=gbx3 -V
Component=gb.image
Component=gb.gui
Component=gb.form
Component=gb.settings
Authors="Benoît Minisini"
Environment="GB_GUI=gb.qt4"

View file

@ -137,7 +137,6 @@
}
{ txtHexa ButtonBox
MoveScaled(0,9,13,5)
Text = ("ButtonBox1")
Picture = Picture["icon:/small/color-picker"]
}
{ panGrab Panel

View file

@ -2,24 +2,9 @@
{ Form Form
MoveScaled(0,0,97,56)
{ Panel1 Panel
MoveScaled(27,3,57,47)
Enabled = False
Border = Border.Plain
{ SidePanel1 SidePanel
MoveScaled(2,1,43,42)
Expand = True
{ Label1 Label
MoveScaled(9,11,24,6)
Text = ("Test")
}
{ Button1 Button
MoveScaled(10,19,16,5)
Text = ("Test")
}
}
}
{ TableView1 TableView
MoveScaled(1,1,24,31)
Arrangement = Arrange.Fill
Margin = True
{ FileChooser1 FileChooser
MoveScaled(2,3,73,43)
}
}

View file

@ -6,14 +6,13 @@ Public Icon As String
Property Read Path As String
Public Sub _new(sLink As String, Optional sName As String, sIcon As String)
If Not sName Then sName = File.Name(sLink)
If Not sIcon Then sIcon = "icon:/small/bookmark"
SetName(sName)
SetIcon(sIcon)
Name = sName
{Link} = sLink
Icon = sIcon
End
@ -25,3 +24,23 @@ Private Function Path_Read() As String
Return sLink
End
Public Sub SetName(sName As String)
If Not sName Then sName = File.Name({Link})
Name = sName
End
Public Sub SetIcon(sIcon As String)
If Not sIcon Then sIcon = "icon:/small/bookmark"
Icon = sIcon
End
Public Sub IsEditable() As Boolean
Return Left({Link}) = "/"
End

View file

@ -18,6 +18,7 @@ Private $bFile As Boolean
Private $iMaxWidth As Integer
Private $hBookmarkList As CBookmarkList
Private $hCurrentBookmark As CBookmark
Private mnuEditBookmark As Menu
Static Private $aHistory As New String[]
@ -68,12 +69,16 @@ Private Sub UpdateLabelDir()
Dim sDir As String
sDir = Mid$(dvwChoose.Current, Len(dvwChoose.Root) + 1)
If Left(sDir) <> "/" Then sDir = "/" & sDir
'If Left(sDir) = "/" Then sDir = Mid$(sDir, 2)
sDir = Trim(Replace(sDir, "/", " / "))
'sDir = Html(sDir)
sDir = Replace(sDir, "/", " ‣ ")
txtDir.Text = sDir
If sDir = "/" Then
txtDir.Text = ""
Else
txtDir.Text = sDir
Endif
End
@ -162,6 +167,7 @@ Private Sub UpdateBookmarkButton()
If IsBookmarkVisible() Then
btnBookmark.Text = $hCurrentBookmark.Name
btnBookmark.Picture = Picture[$hCurrentBookmark.Icon]
mnuEditBookmark.Enabled = $hCurrentBookmark.IsEditable()
Else
btnBookmark.Text = File.Name(dvwChoose.Root)
btnBookmark.Picture = dvwChoose.Picture 'Picture["icon:/small/directory"]
@ -769,6 +775,11 @@ Private Sub FillMenu()
hMenu.Text = ("&Remove bookmark")
hMenu.Picture = Picture["icon:/small/remove"]
hMenu = New Menu(mnuBookmark) As "mnuEditBookmark"
hMenu.Text = ("&Edit bookmark...")
hMenu.Picture = Picture["icon:/small/edit"]
mnuEditBookmark = hMenu
End
Public Sub IsBookmarkVisible() As Boolean
@ -785,3 +796,20 @@ Public Sub ShowBookmark(bShow As Boolean)
End
Public Sub mnuEditBookmark_Click()
If Not $hCurrentBookmark Then Return
If Not $hCurrentBookmark.IsEditable() Then Return
If FEditBookmark.Run($hCurrentBookmark) Then Return
$hBookmarkList.Save
UpdateBookmarkButton
FillMenu
End
Public Sub btnBookmark_Click()
SetDir($hCurrentBookmark.Path)
End

View file

@ -11,7 +11,7 @@
MoveScaled(0,0,79,50)
Expand = True
{ VBox1 VBox
MoveScaled(3,3,76,46)
MoveScaled(2,3,76,46)
Expand = True
{ HBox1 HBox
MoveScaled(1,1,74,4)
@ -21,33 +21,34 @@
ToolTip = ("Bookmarks")
AutoResize = True
Picture = Picture["icon:/small/home"]
Arrow = False
Border = False
Menu = "mnuBookmark"
}
{ txtDir Label
MoveScaled(15,0,11,4)
Expand = True
}
{ Separator1 Separator
MoveScaled(36,0,1,4)
Visible = False
AutoResize = True
}
{ btnParent ToolButton
MoveScaled(38,0,4,4)
MoveScaled(28,0,4,4)
ToolTip = ("Parent directory")
Picture = Picture["icon:/small/up"]
}
{ btnRefresh ToolButton
MoveScaled(42,0,4,4)
MoveScaled(32,0,4,4)
ToolTip = ("Refresh")
Picture = Picture["icon:/small/refresh"]
}
{ btnNewDir ToolButton
MoveScaled(47,0,4,4)
MoveScaled(37,0,4,4)
ToolTip = ("Create directory")
Picture = Picture["icon:/small/new-dir"]
}
{ Panel1 Panel
MoveScaled(42,0,1,4)
Visible = False
Expand = True
}
{ btnShowHidden ToolButton
MoveScaled(51,0,4,4)
ToolTip = ("View hidden files")
@ -67,11 +68,11 @@
}
}
{ Separator2 Separator
MoveScaled(30,6,11,0)
MoveScaled(30,6,39,0)
Visible = False
}
{ splChoose HSplit
MoveScaled(5,8,56,37)
MoveScaled(6,7,56,37)
Expand = True
{ dvwChoose DirView
MoveScaled(2,3,25,33)
@ -82,10 +83,14 @@
Visible = False
Arrangement = Arrange.Fill
{ fvwChoose FileView
MoveScaled(0,0,23,31)
MoveScaled(1,1,23,31)
}
}
}
{ Separator4 Separator
MoveScaled(22,45,46,0)
Visible = False
}
}
}
{ panFilter HBox

View file

@ -0,0 +1,47 @@
' Gambas class file
Private $hBookmark As CBookmark
Public Sub Run(hBookmark As CBookmark) As Boolean
$hBookmark = hBookmark
Return Not FEditBookmark.ShowModal()
End
Public Sub Form_Open()
txtName.Text = $hBookmark.Name
txtPath.Text = $hBookmark.Link
txtName.SetFocus
End
Public Sub btnOK_Click()
Dim sName As String
sName = Trim(txtName.Text)
If Not sName Then Return
$hBookmark.Name = sName
$hBookmark.Link = txtPath.Text
Me.Close(True)
End
Public Sub txtPath_Click()
Dialog.Path = txtPath.Text
If Dialog.SelectDirectory() Then Return
txtPath.Text = Dialog.Path
End
Public Sub btnCancel_Click()
Me.Close
End

View file

@ -0,0 +1,42 @@
# Gambas Form File 3.0
{ Form Form
MoveScaled(0,0,63,17)
Text = ("Edit bookmark")
Icon = Picture["icon:/small/bookmark"]
Resizable = False
{ HBox1 HBox
MoveScaled(1,1,61,4)
{ Label1 Label
MoveScaled(0,0,16,4)
Text = ("Name")
}
{ txtName TextBox
MoveScaled(17,0,43,4)
Expand = True
}
}
{ HBox2 HBox
MoveScaled(1,6,61,4)
{ Label2 Label
MoveScaled(0,0,16,4)
Text = ("Path")
}
{ txtPath ButtonBox
MoveScaled(17,0,43,4)
Expand = True
Picture = Picture["icon:/small/directory"]
ReadOnly = True
}
}
{ btnOK Button
MoveScaled(29,12,16,4)
Text = ("OK")
Default = True
}
{ btnCancel Button
MoveScaled(46,12,16,4)
Text = ("Cancel")
Cancel = True
}
}

View file

@ -21,18 +21,15 @@
***************************************************************************/
#include "CSocket.h"
typedef struct
{
int (*ConnectLocal) (void *_object,char *sPath,int lenpath);
int (*ConnectTCP) (void *_object,char *sHost,int lenhost,int myport);
int (*Peek) (void *_object,char **buf,int MaxLen);
} SOCKET_INTERFACE;
typedef struct
{
SOCKET_INTERFACE Socket;
} NETWORK_INTERFACE;
typedef
struct
{
struct
{
int (*ConnectLocal)(void *_object, char *sPath, int lenpath);
int (*ConnectTCP)(void *_object, char *sHost, int lenhost, int myport);
int (*Peek)(void *_object, char **buf, int MaxLen);
} Socket;
}
NETWORK_INTERFACE;

View file

@ -42,8 +42,6 @@ NETWORK_INTERFACE NET EXPORT;
GB_INTERFACE GB EXPORT;
GB_DESC *GB_CLASSES[] EXPORT =
{
CDnsClientDesc,
@ -56,7 +54,6 @@ GB_DESC *GB_CLASSES[] EXPORT =
};
int EXPORT GB_INIT(void)
{
NET.Socket.ConnectLocal=CSocket_connect_unix;
@ -66,8 +63,6 @@ int EXPORT GB_INIT(void)
return 0;
}
void EXPORT GB_EXIT()
{