diff --git a/applications/cactusjukebox/source/mainform.lfm b/applications/cactusjukebox/source/mainform.lfm
index 0bf4573c7..9a8175a49 100644
--- a/applications/cactusjukebox/source/mainform.lfm
+++ b/applications/cactusjukebox/source/mainform.lfm
@@ -1,11 +1,11 @@
object Main: TMain
- Left = 39
+ Left = 129
Height = 624
- Top = 0
+ Top = 126
Width = 893
ActiveControl = Panel4
Caption = 'titel'
- ClientHeight = 601
+ ClientHeight = 602
ClientWidth = 893
Icon.Data = {
3E42000000000100010040400000010020002842000016000000280000004000
@@ -545,11 +545,10 @@ object Main: TMain
OnCreate = MainCreate
ShowInTaskBar = stAlways
LCLVersion = '0.9.31'
- WindowState = wsMaximized
object StatusBar1: TStatusBar
Left = 0
- Height = 17
- Top = 584
+ Height = 22
+ Top = 580
Width = 893
Panels = <
item
@@ -563,7 +562,7 @@ object Main: TMain
end
object Splitter1: TSplitter
Left = 288
- Height = 584
+ Height = 580
Top = 0
Width = 8
AutoSnap = False
@@ -573,19 +572,19 @@ object Main: TMain
end
object Panel1: TPanel
Left = 296
- Height = 584
+ Height = 580
Top = 0
Width = 597
Align = alClient
BevelOuter = bvNone
- ClientHeight = 584
+ ClientHeight = 580
ClientWidth = 597
TabOrder = 0
OnClick = Panel1Click
OnResize = Panel1Resize
object TitleTree: TListView
Left = 0
- Height = 154
+ Height = 150
Top = 5
Width = 587
Align = alTop
@@ -600,27 +599,23 @@ object Main: TMain
item
AutoSize = True
Caption = 'Artist'
- Width = 40
+ Width = 567
end
item
AutoSize = True
Caption = 'Title'
- Width = 34
end
item
AutoSize = True
Caption = 'Album'
- Width = 45
end
item
AutoSize = True
Caption = 'Track'
- Width = 39
end
item
AutoSize = True
Caption = 'Genre'
- Width = 45
end
item
AutoSize = True
@@ -632,7 +627,7 @@ object Main: TMain
AutoSize = True
Caption = 'Length'
MaxWidth = 60
- Width = 349
+ Width = 57
end>
PopupMenu = titlelistmenu
ReadOnly = True
@@ -655,7 +650,7 @@ object Main: TMain
Cursor = crVSplit
Left = 0
Height = 10
- Top = 159
+ Top = 155
Width = 597
Align = alTop
ResizeAnchor = akTop
@@ -663,7 +658,7 @@ object Main: TMain
object Panel3: TPanel
Left = 0
Height = 415
- Top = 169
+ Top = 165
Width = 597
Align = alClient
BevelOuter = bvNone
@@ -673,7 +668,7 @@ object Main: TMain
object PlayerControlsPanel: TPanel
Left = 4
Height = 285
- Top = 86
+ Top = 80
Width = 224
BorderSpacing.Left = 20
BorderSpacing.Top = 20
@@ -681,6 +676,7 @@ object Main: TMain
BorderSpacing.Bottom = 20
BorderSpacing.CellAlignHorizontal = ccaCenter
BorderSpacing.CellAlignVertical = ccaCenter
+ BevelOuter = bvNone
ClientHeight = 285
ClientWidth = 224
TabOrder = 0
@@ -793,7 +789,7 @@ object Main: TMain
Cursor = crSizeNWSE
Left = 16
Height = 104
- Top = 168
+ Top = 175
Width = 104
OnMouseUp = CoverImageMouseUp
Stretch = True
@@ -848,7 +844,7 @@ object Main: TMain
object current_title_edit: TEdit
Left = 12
Height = 21
- Top = 102
+ Top = 109
Width = 200
Color = clBtnFace
ReadOnly = True
@@ -857,7 +853,7 @@ object Main: TMain
object current_title_edit1: TEdit
Left = 12
Height = 21
- Top = 134
+ Top = 141
Width = 200
Color = clBtnFace
ReadOnly = True
@@ -865,9 +861,9 @@ object Main: TMain
end
object randomcheck: TCheckBox
Left = 135
- Height = 21
- Top = 250
- Width = 69
+ Height = 19
+ Top = 257
+ Width = 62
Caption = 'Random'
OnChange = randomcheckChange
TabOrder = 3
@@ -875,7 +871,7 @@ object Main: TMain
object Volumebar: TProgressBar
Left = 176
Height = 77
- Top = 171
+ Top = 178
Width = 12
OnMouseUp = VolumebarMouseUp
Orientation = pbVertical
@@ -890,7 +886,6 @@ object Main: TMain
Width = 73
BevelOuter = bvNone
BorderWidth = 1
- BorderStyle = bsSingle
Caption = '00:00'
TabOrder = 4
OnClick = pnlPlaytimeClick
@@ -898,7 +893,7 @@ object Main: TMain
object trackbar: TTrackBar
Left = 17
Height = 25
- Top = 75
+ Top = 82
Width = 190
Max = 100
Position = 0
@@ -920,7 +915,7 @@ object Main: TMain
item
AutoSize = True
Caption = 'Playlist'
- Width = 329
+ Width = 344
end>
PopupMenu = playlistmenu
ReadOnly = True
@@ -944,16 +939,17 @@ object Main: TMain
Height = 50
Top = 2
Width = 464
+ BevelOuter = bvNone
ClientHeight = 50
ClientWidth = 464
PopupMenu = SearchMenu
TabOrder = 2
object filetypebox: TComboBox
Left = 360
- Height = 29
+ Height = 21
Top = 14
Width = 90
- ItemHeight = 0
+ ItemHeight = 13
ItemIndex = 0
Items.Strings = (
'all types'
@@ -981,7 +977,7 @@ object Main: TMain
Left = 16
Height = 28
Hint = 'Search the library'
- Top = 8
+ Top = 10
Width = 90
BorderSpacing.InnerBorder = 4
Caption = 'Search'
@@ -991,7 +987,7 @@ object Main: TMain
TabOrder = 2
end
object Button1: TButton
- Left = 120
+ Left = 136
Height = 25
Top = -2
Width = 75
@@ -1013,11 +1009,11 @@ object Main: TMain
end
object clear_list: TBitBtn
AnchorSideBottom.Side = asrCenter
- Left = 517
- Height = 34
+ Left = 501
+ Height = 30
Hint = 'Clear Playlist'
- Top = 6
- Width = 67
+ Top = 12
+ Width = 84
Anchors = [akTop, akRight]
AutoSize = True
Caption = 'Clear'
@@ -1086,7 +1082,7 @@ object Main: TMain
Left = 8
Height = 14
Top = 56
- Width = 39
+ Width = 50
Caption = 'lblPath'
ParentColor = False
end
@@ -1094,19 +1090,19 @@ object Main: TMain
end
object Panel4: TPanel
Left = 0
- Height = 584
+ Height = 580
Top = 0
Width = 288
Align = alLeft
BorderSpacing.InnerBorder = 30
BevelOuter = bvNone
- ClientHeight = 584
+ ClientHeight = 580
ClientWidth = 288
TabOrder = 1
OnClick = Panel4Click
object ArtistTree: TTreeView
Left = 26
- Height = 574
+ Height = 570
Top = 5
Width = 259
Align = alClient
@@ -1149,7 +1145,7 @@ object Main: TMain
Left = 77
Height = 14
Top = 8
- Width = 41
+ Width = 43
Caption = 'Search'
ParentColor = False
end
@@ -1210,7 +1206,7 @@ object Main: TMain
end
object ToolBar1: TToolBar
Left = 0
- Height = 579
+ Height = 575
Top = 5
Width = 26
Align = alLeft
diff --git a/applications/cactusjukebox/source/mainform.pas b/applications/cactusjukebox/source/mainform.pas
index d13111159..51ccb31e0 100644
--- a/applications/cactusjukebox/source/mainform.pas
+++ b/applications/cactusjukebox/source/mainform.pas
@@ -2145,18 +2145,21 @@ End;
Function TMain.LoadFile(path: String): boolean;
-Var z: integer;
+Var z: integer; aPath: string;
listitem: TListItem;
Begin
DebugOutLn('** Loadfile **', 2);
Application.ProcessMessages;
- If FileExists(path) Then
+ {$IFDEF WINDOWS}
+ aPath := UTF8Decode(path);
+ {$ENDIF}
+ If FileExists(aPath) Then
Begin
z := MediaCollection.GetIndexByPath(path);
DebugOutLn(z, 3);
If z<0 Then
Begin
- z := MediaCollection.add(path);
+ z := MediaCollection.add(apath);
End;
PlayerObj.playlist.add(MediaCollection.items[z]);
ListItem := Playlist.Items.Add;
@@ -3033,7 +3036,7 @@ Procedure TMain.TitleTreeSelectItem(Sender: TObject; Item: TListItem;
Begin
// reanable the popupmenu in case ist was disabled in TMain.TitleTreeMouseDown
TitleTree.PopupMenu.AutoPopup := true;
- lblPath.Caption:=TMediaFileClass(Item.data).Path;
+ lblPath.Caption:=UTF8Encode(TMediaFileClass(Item.data).Path);
End;
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -3577,7 +3580,7 @@ Begin
// reanable the popupmenu in case ist was disabled in TMain.playlistMouseDown
playlist.PopupMenu.AutoPopup := true;
if (Item.Data<>nil) then begin
- lblPath.Caption := TMediaFileClass(Item.data).Path;
+ lblPath.Caption := UTF8Encode(TMediaFileClass(Item.data).Path);
end;
End;
diff --git a/applications/cactusjukebox/source/mp3proj.lpi b/applications/cactusjukebox/source/mp3proj.lpi
index 4e9500c8d..53dac2097 100755
--- a/applications/cactusjukebox/source/mp3proj.lpi
+++ b/applications/cactusjukebox/source/mp3proj.lpi
@@ -15,7 +15,8 @@
-
+
+