diff --git a/examples/examples/Image/Lighttable/.icon.png b/examples/examples/Image/Lighttable/.icon.png
index 5d7c47473..b3e203496 100644
Binary files a/examples/examples/Image/Lighttable/.icon.png and b/examples/examples/Image/Lighttable/.icon.png differ
diff --git a/examples/examples/Image/Lighttable/.lang/de.mo b/examples/examples/Image/Lighttable/.lang/de.mo
index 037627c38..aa4c1acc3 100644
Binary files a/examples/examples/Image/Lighttable/.lang/de.mo and b/examples/examples/Image/Lighttable/.lang/de.mo differ
diff --git a/examples/examples/Image/Lighttable/.lang/de.po b/examples/examples/Image/Lighttable/.lang/de.po
index 32f376826..ee63a51f6 100644
--- a/examples/examples/Image/Lighttable/.lang/de.po
+++ b/examples/examples/Image/Lighttable/.lang/de.po
@@ -18,11 +18,11 @@ msgstr "Leuchttisch"
msgid "A tool to sort photographs"
msgstr "Fotos sortieren"
-#: FHelp.class:40
+#: FHelp.form:11
msgid "Help"
msgstr "Hilfe"
-#: FHelp.class:60 FInfo.class:58
+#: FHelp.form:31 FInfo.form:17
msgid "&Close"
msgstr "&Schließen"
@@ -30,157 +30,161 @@ msgstr "&Schließen"
msgid "There are no Exif informations in this file."
msgstr "Diese Datei entält keine Exif-Informationen."
-#: FInfo.class:25
-msgid "&More"
-msgstr "&Mehr"
-
#: FInfo.class:29
msgid "&Less"
msgstr "&Weniger"
-#: FInfo.class:52
+#: FInfo.form:11
msgid "Picture Informations"
msgstr "Bildinformationen"
-#: FMain.class:37
+#: FInfo.form:24
+msgid "&More"
+msgstr "&Mehr"
+
+#: FMain.class:33
msgid "Lighttable - "
msgstr "Leuchttisch - "
-#: FMain.class:60
+#: FMain.class:47
msgid "Right-click for Main Menu"
msgstr "Rechtsklick für das Hauptmenü"
-#: FMain.class:61
+#: FMain.class:48
msgid " pictures"
msgstr " Bilder"
-#: FMain.class:62
+#: FMain.class:49
msgid "sorted alphabetically"
msgstr "alphabetisch sortiert"
-#: FMain.class:82
+#: FMain.class:75
msgid "Right-click on the background or on a frame for menus."
msgstr "Menüs: auf den Hintergrund oder auf einen Rahmen rechtsklicken."
-#: FMain.class:102
+#: FMain.class:95
msgid "Right-click for Picture Menu"
msgstr "Rechtsklick für das Bildmenü"
-#: FMain.class:181
+#: FMain.class:174
msgid "&Rename all files..."
msgstr "Alle Dateien &umbenennen..."
-#: FMain.class:282
+#: FMain.class:269
msgid "Loading picture..."
msgstr "Bild wird geladen..."
-#: FMain.class:357
+#: FMain.class:344
msgid "sorted chronologically"
msgstr "chronologisch sortiert"
-#: FMain.class:397
+#: FMain.class:384
msgid "The file &1 already exists in the current directory!"
msgstr "Die Datei &1 existiert im aktuellen Verzeichnis bereits!"
-#: FMain.class:449 FRename.class:94 FRenameAll.class:185
-#: FRenameAllWarning.class:40 FStart.class:159 FTime.class:85
+#: FMain.class:436 FRename.form:32 FRenameAll.form:80
+#: FRenameAllWarning.form:17 FStart.form:26 FTime.form:51
msgid "&Cancel"
msgstr "&Abbrechen"
-#: FMain.class:449 FRename.class:88 FRenameAll.class:179 FStart.class:153
-#: FTime.class:79
+#: FMain.class:436 FRename.form:26 FRenameAll.form:74 FStart.form:20
+#: FTime.form:45
msgid "&OK"
msgstr "-"
-#: FMain.class:449
+#: FMain.class:436
msgid "The file &1 will be deleted."
msgstr "Die Datei &1 wird gelöscht."
-#: FMain.class:742
+#: FMain.class:729
msgid "Loading of pictures is being aborted..."
msgstr "Das Laden der Bilder wird abgebrochen..."
-#: FMain.class:793
+#: FMain.class:780
msgid "Files are being renamed..."
msgstr "Dateien werden umbenannt..."
-#: FMain.class:822
+#: FMain.class:809
msgid "&1 files renamed"
msgstr "&1 Dateien umbenannt"
-#: FMain.class:838
+#: FMain.class:825
msgid "Setting time informations in all files..."
msgstr "Die Zeitinformationen in allen Dateien werden geändert..."
-#: FMain.class:954
+#: FMain.form:44
msgid "Main menu"
msgstr "Hauptmenü"
-#: FMain.class:958
+#: FMain.form:48
msgid "Sorted &alphabetically"
msgstr "&Alphabetisch sortiert"
-#: FMain.class:965
+#: FMain.form:55
msgid "Sorted &chronologically"
msgstr "&Chronologisch sortiert"
-#: FMain.class:971
+#: FMain.form:61
msgid "&Slideshow"
msgstr "Dia&show"
-#: FMain.class:977
+#: FMain.form:67
msgid "Abort &Loading"
msgstr "&Laden abbrechen"
-#: FMain.class:983
+#: FMain.form:73
msgid "&Time correction..."
msgstr "&Zeitkorrektur..."
-#: FMain.class:989
+#: FMain.form:79
+msgid "&Open folder..."
+msgstr "&Ordner öffnen..."
+
+#: FMain.form:85
msgid "&Help"
msgstr "&Hilfe"
-#: FMain.class:995
+#: FMain.form:91
msgid "&Quit"
msgstr "&Beenden"
-#: FMain.class:1002
+#: FMain.form:98
msgid "Picture menu"
msgstr "Bildermenü"
-#: FMain.class:1006
+#: FMain.form:102
msgid "(Move picture: drag frame with mouse)"
msgstr "(Bild verschieben: Rahmen mit Maus ziehen)"
-#: FMain.class:1011
+#: FMain.form:107
msgid "&View picture (click on picture)"
msgstr "Vergrößerte &Ansicht (Bild anklicken)"
-#: FMain.class:1017
+#: FMain.form:113
msgid "&Full Screen View"
msgstr "&Vollbildansicht"
-#: FMain.class:1023
+#: FMain.form:119
msgid "&Close view"
msgstr "&Ansicht schließen"
-#: FMain.class:1029
+#: FMain.form:125
msgid "&Next picture"
msgstr "&Nächstes Bild"
-#: FMain.class:1035
+#: FMain.form:131
msgid "&Previous picture"
msgstr "Vor&heriges Bild"
-#: FMain.class:1041
+#: FMain.form:137
msgid "Picture &informations"
msgstr "&Bildinformationen"
-#: FMain.class:1047
+#: FMain.form:143
msgid "&Rename picture"
msgstr "Bild &umbenennen"
-#: FMain.class:1053
+#: FMain.form:149
msgid "&Delete picture"
msgstr "Bild &löschen"
@@ -188,11 +192,11 @@ msgstr "Bild &löschen"
msgid "Old and new filename are identical."
msgstr "Alter und neuer Dateiname sind gleich."
-#: FRename.class:73
+#: FRename.form:11
msgid "Rename"
msgstr "Umbenennen"
-#: FRename.class:79
+#: FRename.form:17
msgid "New filename:"
msgstr "Neuer Dateiname:"
@@ -200,67 +204,67 @@ msgstr "Neuer Dateiname:"
msgid "MyPicture.JPG"
msgstr "MeinBild.JPG"
-#: FRenameAll.class:127
+#: FRenameAll.form:22
msgid "Rename all pictures"
msgstr "Alle Bilder umbenennen"
-#: FRenameAll.class:146
+#: FRenameAll.form:41
msgid "1"
msgstr "-"
-#: FRenameAll.class:152
+#: FRenameAll.form:47
msgid "Keep original filename as suffix"
msgstr "originalen Dateinamen als Suffix behalten"
-#: FRenameAll.class:158
+#: FRenameAll.form:53
msgid "Number format"
msgstr "Zahlenformat"
-#: FRenameAll.class:163
+#: FRenameAll.form:58
msgid "digits"
msgstr "Stellen"
-#: FRenameAll.class:168
+#: FRenameAll.form:63
msgid "Prefix"
msgstr "Präfix"
-#: FRenameAll.class:173
+#: FRenameAll.form:68
msgid "Start value"
msgstr "Startwert"
-#: FRenameAll.class:193
+#: FRenameAll.form:88
msgid "This function will rename all .jp(e)g files in the directory and add serial numbers to the filenames.
The pictures will be handled in the order they are shown right now, in rows from left to right, rows from top to bottom."
msgstr "Diese Funktion benennt alle .jp(e)g-Dateien im Verzeichnis um und fügt Seriennummern zu den Dateinamen hinzu.
Die Dateien werden in der Reihenfolge bearbeitet, in der sie jetzt gezeigt werden, die Reihen von oben nach unten, in der Reihe von links nach rechts."
-#: FRenameAll.class:199
+#: FRenameAll.form:94
msgid "Options"
msgstr "Optionen"
-#: FRenameAll.class:204
+#: FRenameAll.form:99
msgid "Example:"
msgstr "Beispiel:"
-#: FRenameAllWarning.class:35
+#: FRenameAllWarning.form:12
msgid "File Conflicts"
msgstr "Dateikonflikte"
-#: FRenameAllWarning.class:47
+#: FRenameAllWarning.form:24
msgid "Continue &anyway"
msgstr "&Trotzdem fortfahren"
-#: FRenameAllWarning.class:52
+#: FRenameAllWarning.form:29
msgid "The following files can't be renamed, because the target filenames already exist in the directory.
If you continue, only the files without conflicts will be renamed.
If you cancel, you can choose new filename options."
msgstr "Folgende Dateien können nicht umbenannt werden, weil die Zielnamen im Verzeichnis bereits existieren.
Wenn Sie fortfahren, werden nur die Dateien ohne Konflikt umbenannt.
Wenn Sie abbrechen, können Sie neue Optionen für die Dateinamen einstellen."
-#: FSlideshow.class:98
+#: FSlideshow.form:38
msgid "Pause between pictures:"
msgstr "Pause zwischen Bildern:"
-#: FSlideshow.class:109
+#: FSlideshow.form:49
msgid "sec"
msgstr "Sek."
-#: FSlideshow.class:114
+#: FSlideshow.form:54
msgid "Stop"
msgstr "-"
@@ -268,15 +272,15 @@ msgstr "-"
msgid "The folder &1 doesn't contain any jp(e)g files."
msgstr "Das Verzeichnis &1 enthält keine jp(e)g-Dateien."
-#: FStart.class:148
+#: FStart.form:15
msgid "Lighttable - Select picture folder"
msgstr "Leuchttisch - Bilderverzeichnis auswählen"
-#: FStart.class:174
+#: FStart.form:41
msgid "New selection"
msgstr "Neue Auswahl"
-#: FStart.class:184
+#: FStart.form:51
msgid "Last selections"
msgstr "Zuletzt ausgewählt"
@@ -284,35 +288,35 @@ msgstr "Zuletzt ausgewählt"
msgid "There is no time correction selected."
msgstr "Es ist keine Zeitkorrektur gesetzt."
-#: FTime.class:52
+#: FTime.form:18
msgid "Time correction"
msgstr "Zeitkorrektur"
-#: FTime.class:73
+#: FTime.form:39
msgid "earlier"
msgstr "früher"
-#: FTime.class:73
+#: FTime.form:39
msgid "later"
msgstr "später"
-#: FTime.class:93
+#: FTime.form:59
msgid "This function will correct all date/time informations in the EXIF section of all .jp(e)g files in the folder.
A backup of the files will be made with file names like 'MyPicture.jpg_original'.
If there are no EXIF date/time informations in a file, nothing will be done."
msgstr "Diese Funktion korrigiert alle Datums-/Zeitinformationen im EXIF-Abschnitt aller .jp(e)g-Dateien im Verzeichnis.
Es werden Sicherungskopien mit Namen wie 'MeinBild.jpg_original' erstellt.
Falls eine Datei keine Zeitinformationen enthält, wird nichts unternommen."
-#: FTime.class:99
+#: FTime.form:65
msgid "Set the original time of all pictures to"
msgstr "Die Originalzeit aller Bilder ändern auf"
-#: FTime.class:104
+#: FTime.form:70
msgid "day(s)"
msgstr "Tag(e)"
-#: FTime.class:109
+#: FTime.form:75
msgid "hour(s)"
msgstr "Stunde(n)"
-#: FTime.class:114
+#: FTime.form:80
msgid "minute(s)"
msgstr "Minute(n)"
diff --git a/examples/examples/Image/Lighttable/.project b/examples/examples/Image/Lighttable/.project
index 8a4236fd6..68d5f583c 100644
--- a/examples/examples/Image/Lighttable/.project
+++ b/examples/examples/Image/Lighttable/.project
@@ -3,7 +3,7 @@
Title=Lighttable
Startup=MMain
Icon=lighttable.png
-Version=0.2.16
+Version=0.2.17
Component=gb.image
Component=gb.qt4
Component=gb.form
@@ -12,7 +12,7 @@ Component=gb.settings
Component=gb.qt4.ext
Component=gb.qt4.webkit
Description="A tool to sort photographs"
-Authors="Matti"
+Authors="Matti, with tips and some changes from Benoît"
TabSize=2
Translate=1
Language=en
diff --git a/examples/examples/Image/Lighttable/.settings b/examples/examples/Image/Lighttable/.settings
index a7604b790..c6aa7c0e7 100644
--- a/examples/examples/Image/Lighttable/.settings
+++ b/examples/examples/Image/Lighttable/.settings
@@ -17,10 +17,8 @@ SearchString=True
[OpenFile]
File[1]=".src/FMain.form"
Active=2
-File[2]=".src/FMain.class:35.22"
-File[3]=".src/MMain.module:48.0"
-File[4]=".src/FStart.form"
-Count=4
+File[2]=".src/FMain.class:877.0"
+Count=2
[Watches]
Count=0
diff --git a/examples/examples/Image/Lighttable/.src/FMain.class b/examples/examples/Image/Lighttable/.src/FMain.class
index 59e7e2929..ce8e75262 100644
--- a/examples/examples/Image/Lighttable/.src/FMain.class
+++ b/examples/examples/Image/Lighttable/.src/FMain.class
@@ -30,27 +30,15 @@ Public Sub Form_Open()
aFiles = MMain.GetFiles()
iPicCount = aFiles.Count
- 'Me.Height = Desktop.Height ' Maximized not useable (Me.h/w incorrect)
- 'Me.Width = Desktop.Width
Me.Caption = ("Lighttable - ") & sPath
- 'Me.Maximized = True
Me.Move(Desktop.X, Desktop.Y, Desktop.Width, Desktop.Height)
- 'ScrollView1.Height = Me.Height - 45
- 'ScrollView1.Width = Me.Width - 7
- 'ScrollView1.X = 0
- 'ScrollView1.Y = -2
- 'StatusBar.X = 0
- 'StatusBar.Y = Me.Height - 48
- 'StatusBar.Width = Me.Width
- 'lblStatus.X = (StatusBar.Width - 400) / 2
- 'lblStatus.Width = 400
- 'ProgressBar1.X = Me.Width - 175
mnuSortA.Enabled = False
mnuSortT.Enabled = False
mnuDelete.Enabled = False
mnuTimecorr.Enabled = False
mnuSlide.Enabled = False
+ mnuOpen.Enabled = False
hCurClose = New Cursor(Picture.Load("close.png"))
hCurHand = New Cursor(Picture.Load("hand1.png"))
hCurZoom = New Cursor(Picture.Load("zoom-in.png"))
@@ -79,7 +67,7 @@ Public Sub Timer1_Timer() ' Load the pictures in the background
Dim hImg As Image
If iPicRow = 0 Then
- Print Me.Width
+' Print Me.Width
iPicRow = Int((Me.Width) / 200)
iOffset = (Me.Width + 30 - iPicRow * 200) / 2
Endif
@@ -187,6 +175,7 @@ Public Sub Timer1_Timer() ' Load the pictures in the background
mnu_StopLoad_RenameAll.Picture = Stock["16/save-as"]
mnu_StopLoad_RenameAll.Shortcut = "Ctrl+N"
mnuSlide.Enabled = True
+ mnuOpen.Enabled = True
bStop = True
Me.Tag = "alpha"
Me.Tooltip = ""
@@ -885,6 +874,13 @@ Public Function GetDelay(iSec As Integer) As Boolean
End
+Public Sub mnuOpen_Click() ' Open another folder
+
+ MMain.Main
+ Me.Close
+
+End
+
Public Sub mnuQuit_Click() ' Quit
Me.Close
diff --git a/examples/examples/Image/Lighttable/.src/FMain.form b/examples/examples/Image/Lighttable/.src/FMain.form
index 4e46040bf..41224a395 100644
--- a/examples/examples/Image/Lighttable/.src/FMain.form
+++ b/examples/examples/Image/Lighttable/.src/FMain.form
@@ -34,6 +34,11 @@
Picture = Picture["icon:/16/camera"]
Shortcut = "Ctrl+T"
}
+ { mnuOpen Menu
+ Text = ("&Open folder...")
+ Picture = Picture["icon:/16/open"]
+ Shortcut = "Ctrl+O"
+ }
{ mnuHelp Menu
Text = ("&Help")
Picture = Picture["help-contents.png"]
@@ -135,7 +140,7 @@
MoveScaled(47,0,27,4)
Font = Font["-1"]
Expand = True
- Alignment = Align.Left
+ Alignment = Align.Center
}
{ Panel2 Panel
MoveScaled(75,0,22,4)
diff --git a/examples/examples/Image/Lighttable/.startup b/examples/examples/Image/Lighttable/.startup
index 17efd7663..ff695a266 100644
--- a/examples/examples/Image/Lighttable/.startup
+++ b/examples/examples/Image/Lighttable/.startup
@@ -2,7 +2,7 @@ MMain
Lighttable
0
0
-0.2.16
+0.2.17
gb.image
gb.qt4