diff --git a/applications/cactusjukebox/Cactus_Jukebox.iss b/applications/cactusjukebox/Cactus_Jukebox.iss
new file mode 100644
index 000000000..80ca9ff89
--- /dev/null
+++ b/applications/cactusjukebox/Cactus_Jukebox.iss
@@ -0,0 +1,53 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "Cactus JukeBox"
+#define MyAppVersion "0.4.2"
+#define MyAppPublisher "Lazarus, Inc."
+#define MyAppURL "http://www.lazarus.freepascal.org"
+#define MyAppExeName "cactus_jukebox.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{540C04C4-8EB6-4837-AAA2-E4C94F6FD463}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName=C:\CactusJukeBox\
+DefaultGroupName={#MyAppName}
+LicenseFile=.\doc\CREDITS
+InfoBeforeFile=.\doc\README
+OutputBaseFilename=setup
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "cactus_jukebox.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "cactus.cfg"; DestDir: "{app}"; Flags: ignoreversion
+Source: "mplayer.cfg"; DestDir: "{app}"; Flags: ignoreversion
+Source: "doc\*"; DestDir: "{app}\doc\"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "icon\*"; DestDir: "{app}\icon\"; Flags: ignoreversion recursesubdirs createallsubdirs
+;Source: "plugins\*"; DestDir: "{app}\plugins\"; Flags: ignoreversion
+Source: "skins\*"; DestDir: "{app}\skins\"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "mplayer\*"; DestDir: "{app}\mplayer\"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, "&", "&&")}}"; Flags: nowait postinstall skipifsilent
+
diff --git a/applications/cactusjukebox/source/mainform.lfm b/applications/cactusjukebox/source/mainform.lfm
index a9721421f..daf047153 100644
--- a/applications/cactusjukebox/source/mainform.lfm
+++ b/applications/cactusjukebox/source/mainform.lfm
@@ -1,11 +1,11 @@
object Main: TMain
- Left = 129
+ Left = 184
Height = 624
- Top = 126
+ Top = 61
Width = 893
ActiveControl = Panel4
Caption = 'titel'
- ClientHeight = 602
+ ClientHeight = 604
ClientWidth = 893
Icon.Data = {
3E42000000000100010040400000010020002842000016000000280000004000
@@ -548,7 +548,7 @@ object Main: TMain
object StatusBar1: TStatusBar
Left = 0
Height = 22
- Top = 580
+ Top = 582
Width = 893
Panels = <
item
@@ -562,7 +562,7 @@ object Main: TMain
end
object Splitter1: TSplitter
Left = 288
- Height = 580
+ Height = 582
Top = 0
Width = 8
AutoSnap = False
@@ -572,19 +572,19 @@ object Main: TMain
end
object Panel1: TPanel
Left = 296
- Height = 580
+ Height = 582
Top = 0
Width = 597
Align = alClient
BevelOuter = bvNone
- ClientHeight = 580
+ ClientHeight = 582
ClientWidth = 597
TabOrder = 0
OnClick = Panel1Click
OnResize = Panel1Resize
object TitleTree: TListView
Left = 0
- Height = 150
+ Height = 152
Top = 5
Width = 587
Align = alTop
@@ -604,22 +604,22 @@ object Main: TMain
item
AutoSize = True
Caption = 'Title'
- Width = 37
+ Width = 36
end
item
AutoSize = True
Caption = 'Album'
- Width = 52
+ Width = 49
end
item
AutoSize = True
Caption = 'Track'
- Width = 45
+ Width = 44
end
item
AutoSize = True
Caption = 'Genre'
- Width = 49
+ Width = 47
end
item
AutoSize = True
@@ -631,7 +631,7 @@ object Main: TMain
AutoSize = True
Caption = 'Length'
MaxWidth = 60
- Width = 55
+ Width = 51
end>
PopupMenu = titlelistmenu
ReadOnly = True
@@ -654,7 +654,7 @@ object Main: TMain
Cursor = crVSplit
Left = 0
Height = 10
- Top = 155
+ Top = 157
Width = 597
Align = alTop
ResizeAnchor = akTop
@@ -662,7 +662,7 @@ object Main: TMain
object Panel3: TPanel
Left = 0
Height = 415
- Top = 165
+ Top = 167
Width = 597
Align = alClient
BevelOuter = bvNone
@@ -847,7 +847,7 @@ object Main: TMain
end
object current_title_edit: TEdit
Left = 12
- Height = 27
+ Height = 25
Top = 109
Width = 200
Color = clBtnFace
@@ -856,7 +856,7 @@ object Main: TMain
end
object current_title_edit1: TEdit
Left = 12
- Height = 27
+ Height = 25
Top = 141
Width = 200
Color = clBtnFace
@@ -865,9 +865,9 @@ object Main: TMain
end
object randomcheck: TCheckBox
Left = 135
- Height = 23
+ Height = 21
Top = 257
- Width = 75
+ Width = 71
Caption = 'Random'
OnChange = randomcheckChange
TabOrder = 3
@@ -940,20 +940,20 @@ object Main: TMain
end
object Panel2: TPanel
Left = 0
- Height = 50
+ Height = 49
Top = 2
Width = 464
BevelOuter = bvNone
- ClientHeight = 50
+ ClientHeight = 49
ClientWidth = 464
PopupMenu = SearchMenu
TabOrder = 2
object filetypebox: TComboBox
Left = 360
- Height = 27
- Top = 14
+ Height = 25
+ Top = 8
Width = 90
- ItemHeight = 19
+ ItemHeight = 17
ItemIndex = 0
Items.Strings = (
'all types'
@@ -971,8 +971,8 @@ object Main: TMain
end
object searchstr: TEdit
Left = 120
- Height = 27
- Top = 14
+ Height = 25
+ Top = 8
Width = 232
OnKeyUp = searchstrKeyUp
TabOrder = 1
@@ -981,7 +981,7 @@ object Main: TMain
Left = 16
Height = 28
Hint = 'Search the library'
- Top = 12
+ Top = 5
Width = 90
BorderSpacing.InnerBorder = 4
Caption = 'Search'
@@ -1013,11 +1013,11 @@ object Main: TMain
end
object clear_list: TBitBtn
AnchorSideBottom.Side = asrCenter
- Left = 501
+ Left = 504
Height = 30
Hint = 'Clear Playlist'
- Top = 14
- Width = 84
+ Top = 7
+ Width = 79
Anchors = [akTop, akRight]
AutoSize = True
Caption = 'Clear'
@@ -1084,9 +1084,9 @@ object Main: TMain
end
object lblPath: TLabel
Left = 8
- Height = 14
+ Height = 13
Top = 56
- Width = 50
+ Width = 43
Caption = 'lblPath'
ParentColor = False
end
@@ -1094,19 +1094,19 @@ object Main: TMain
end
object Panel4: TPanel
Left = 0
- Height = 580
+ Height = 582
Top = 0
Width = 288
Align = alLeft
BorderSpacing.InnerBorder = 30
BevelOuter = bvNone
- ClientHeight = 580
+ ClientHeight = 582
ClientWidth = 288
TabOrder = 1
OnClick = Panel4Click
object ArtistTree: TTreeView
Left = 26
- Height = 570
+ Height = 572
Top = 5
Width = 259
Align = alClient
@@ -1147,9 +1147,9 @@ object Main: TMain
OnClick = ArtistSrchFieldClick
object Label2: TLabel
Left = 77
- Height = 14
+ Height = 13
Top = 8
- Width = 43
+ Width = 37
Caption = 'Search'
ParentColor = False
end
@@ -1200,7 +1200,7 @@ object Main: TMain
end
object artistsearch: TEdit
Left = 8
- Height = 27
+ Height = 25
Top = 32
Width = 110
OnKeyUp = ArtistTreeKeyUp
@@ -1210,7 +1210,7 @@ object Main: TMain
end
object ToolBar1: TToolBar
Left = 0
- Height = 575
+ Height = 577
Top = 5
Width = 26
Align = alLeft
diff --git a/applications/cactusjukebox/source/mp3proj.lpi b/applications/cactusjukebox/source/mp3proj.lpi
index f7e719970..ee9092336 100755
--- a/applications/cactusjukebox/source/mp3proj.lpi
+++ b/applications/cactusjukebox/source/mp3proj.lpi
@@ -10,6 +10,9 @@
+
+
+
@@ -261,6 +264,12 @@
+
+
+
+
+
+
diff --git a/applications/cactusjukebox/source/mp3proj.res b/applications/cactusjukebox/source/mp3proj.res
index e66ecf85f..8cd28a3bf 100644
Binary files a/applications/cactusjukebox/source/mp3proj.res and b/applications/cactusjukebox/source/mp3proj.res differ
diff --git a/applications/cactusjukebox/source/tagreader/mp3file.pas b/applications/cactusjukebox/source/tagreader/mp3file.pas
index 20b436869..0bcb58683 100644
--- a/applications/cactusjukebox/source/tagreader/mp3file.pas
+++ b/applications/cactusjukebox/source/tagreader/mp3file.pas
@@ -285,11 +285,12 @@ Begin
ftrack := '';
End; // else writeln('no id3v1 tag');
except WriteLn(Filename+' -> exception while reading id3v1 tag... skipped!!'); end;
-{ If ((artistv2<>'')) And (CactusConfig.id3v2_prio Or (artist='')) Then Fartist := artistv2;
+ {$IFNDEF WINDOWS}
+ If ((artistv2<>'')) And (CactusConfig.id3v2_prio Or (artist='')) Then Fartist := artistv2;
If ((titlev2<>'')) And (CactusConfig.id3v2_prio Or (title='')) Then Ftitle := titlev2;
If ((albumv2<>'')) And (CactusConfig.id3v2_prio Or (album='')) Then Falbum := albumv2;
- If ((commentv2<>'')) And (CactusConfig.id3v2_prio Or (comment='')) Then Fcomment := commentv2; }
- {$IFDEF WINDOWS}
+ If ((commentv2<>'')) And (CactusConfig.id3v2_prio Or (comment='')) Then Fcomment := commentv2;
+ {$ELSE}
if Length(Trim(fartist)) <> 0 then begin
If ((artistv2<>'')) And (CactusConfig.id3v2_prio Or (artist='')) Then Fartist := UTF8Encode(artistv2);
end else Fartist := artistv2;