Skip to content

Commit

Permalink
Upd
Browse files Browse the repository at this point in the history
  • Loading branch information
alinvip22@gmail.com authored and alinvip22@gmail.com committed Jan 14, 2021
1 parent fb57b65 commit 2f1b203
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
# Delphi history and backups
__history/
__recovery/
Win32/
Win64/
*.~*

# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
Expand Down
2 changes: 1 addition & 1 deletion FMXWindows/VKAudio.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<FrameworkType>FMX</FrameworkType>
<MainSource>VKAudio.dpr</MainSource>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config>
<Config Condition="'$(Config)'==''">Debug</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>37983</TargetedPlatforms>
<AppType>Application</AppType>
Expand Down
3 changes: 2 additions & 1 deletion FMXWindows/VKAudioWin.Main.fmx
Original file line number Diff line number Diff line change
Expand Up @@ -80986,14 +80986,15 @@ object FormMain: TFormMain
TextPrompt = #1055#1086#1080#1089#1082' '#1084#1091#1079#1099#1082#1080
StyledSettings = [Family, Style, FontColor]
OnChangeTracking = EditSearchChangeTracking
object SearchEditButton1: TSearchEditButton
object SearchEditButton: TSearchEditButton
CanFocus = False
Cursor = crHandPoint
Size.Width = 60.000000000000000000
Size.Height = 36.000000000000000000
Size.PlatformDefault = False
StyleLookup = 'SearchEditButton1Style1'
TabOrder = 0
OnClick = SearchEditButtonClick
end
object ClearEditButtonSearch: TClearEditButton
CanFocus = False
Expand Down
19 changes: 13 additions & 6 deletions FMXWindows/VKAudioWin.Main.pas
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TFormMain = class(TForm)
TabItemSearch: TTabItem;
PanelControls: TPanel;
EditSearch: TEdit;
SearchEditButton1: TSearchEditButton;
SearchEditButton: TSearchEditButton;
LayoutFooter: TLayout;
LabelNowPlay: TLabel;
Label2: TLabel;
Expand Down Expand Up @@ -350,6 +350,7 @@ TFormMain = class(TForm)
procedure SpeedButtonPlayClick(Sender: TObject);
procedure ListBoxPlaylistItemClick(const Sender: TCustomListBox; const Item: TListBoxItem);
procedure TrackBarVolumeChange(Sender: TObject);
procedure SearchEditButtonClick(Sender: TObject);
private
FCurrentPlaylist: TCurrentPlaylist;
FMusicOffset: Integer;
Expand All @@ -362,7 +363,7 @@ TFormMain = class(TForm)
FSettings: TSettingsIni;
FNeedCatalog: Boolean;
FNeedPlaylists: Boolean;
FPlaylistAlbum: TBitmap;
FPlaylistAlbum: TBitmap;
FAudioCover: TBitmap;
FPlaylistInfo: TPlaylistInfo;
procedure SelectTab(Tab: TTabItem; SelectionButton: TSpeedButton);
Expand All @@ -379,7 +380,7 @@ TFormMain = class(TForm)
procedure FOnOpenPlaylist(Sender: TObject; const PlaylistInfo: TPlaylistInfo);
procedure FOnPlayPlaylist(Sender: TObject; const PlaylistInfo: TPlaylistInfo);
procedure LoadPlaylist(const PlaylistInfo: TPlaylistInfo; const AutoStart: Boolean);
procedure FOnPlaylistAlbumChange(Sender: TObject);
procedure FOnPlaylistAlbumChange(Sender: TObject);
procedure FOnAudioCoverChange(Sender: TObject);
procedure FOnCurrentPlaylistChange(const Sender: TCurrentPlaylist);
public
Expand Down Expand Up @@ -420,14 +421,19 @@ procedure TFormMain.CopyAudioList(Src, Dest: TListBox);
procedure TFormMain.EditSearchChangeTracking(Sender: TObject);
begin
ClearEditButtonSearch.Visible := not EditSearch.Text.IsEmpty;
SearchEditButton1.Align := TAlignLayout.MostRight;
SearchEditButton.Align := TAlignLayout.MostRight;
end;

procedure TFormMain.FloatAnimationSelectionTabPosProcess(Sender: TObject);
begin
LayoutTabs.InvalidateRect(LayoutTabs.ClipRect);
end;

procedure TFormMain.SearchEditButtonClick(Sender: TObject);
begin
//VK.Audio.GetCatalog()
end;

procedure TFormMain.SelectActiveAudio;

procedure SelectActiveAudioFor(List: TListBox);
Expand Down Expand Up @@ -518,7 +524,7 @@ procedure TFormMain.FormCreate(Sender: TObject);
FCurrentPlaylist := TCurrentPlaylist.Create;
FCurrentPlaylist.OnChange := FOnCurrentPlaylistChange;
FPlaylistAlbum := TBitmap.Create;
FPlaylistAlbum.OnChange := FOnPlaylistAlbumChange;
FPlaylistAlbum.OnChange := FOnPlaylistAlbumChange;
FAudioCover := TBitmap.Create;
FAudioCover.OnChange := FOnAudioCoverChange;
FNeedCatalog := True;
Expand Down Expand Up @@ -1025,7 +1031,8 @@ procedure TFormMain.LoadPlaylist(const PlaylistInfo: TPlaylistInfo; const AutoSt
procedure
begin
ListBoxPlaylist.EndUpdate;
UpdateSizeTab;
if TabControl.ActiveTab = TabItemPlaylist then
UpdateSizeTab;
if AutoStart then
begin
CopyAudioList(ListBoxPlaylist, ListBoxCurrent);
Expand Down
Binary file removed FMXWindows/Win32/Release/Release.zip
Binary file not shown.

0 comments on commit 2f1b203

Please sign in to comment.