Commit 9d3112e4 authored by Olivier Teulière's avatar Olivier Teulière

 * plugins/win32:
        - added toolbar icons (thanks xav)
        - we can no longer edit plugin names in the preferences :)
        - the tool button for playlist is now a toggle button
parent bd5f3062
...@@ -67,7 +67,7 @@ __fastcall TMainFrameDlg::TMainFrameDlg( TComponent* Owner ) ...@@ -67,7 +67,7 @@ __fastcall TMainFrameDlg::TMainFrameDlg( TComponent* Owner )
TrackBar->Max = SLIDER_MAX_VALUE; TrackBar->Max = SLIDER_MAX_VALUE;
/* default height */ /* default height */
ClientHeight = 65; ClientHeight = 37 + ToolBar->Height;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
...@@ -295,7 +295,7 @@ void __fastcall TMainFrameDlg::ToolButtonNextClick( TObject *Sender ) ...@@ -295,7 +295,7 @@ void __fastcall TMainFrameDlg::ToolButtonNextClick( TObject *Sender )
p_intfGlobal->p_sys->p_playlist->Next(); p_intfGlobal->p_sys->p_playlist->Next();
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TMainFrameDlg::ToolButtonEjectClick( TObject *Sender ) void __fastcall TMainFrameDlg::ToolButtonEjecttempClick( TObject *Sender )
{ {
AnsiString Device = ""; AnsiString Device = "";
...@@ -625,7 +625,7 @@ void __fastcall TMainFrameDlg::ModeManage() ...@@ -625,7 +625,7 @@ void __fastcall TMainFrameDlg::ModeManage()
break; break;
} }
i_Height = StatusBar->Height + ActiveGB->Height + 72; i_Height = StatusBar->Height + ActiveGB->Height + ToolBar->Height + 47;
/* initialize and show slider for seekable streams */ /* initialize and show slider for seekable streams */
if( p_input_bank->pp_input[0]->stream.b_seekable ) if( p_input_bank->pp_input[0]->stream.b_seekable )
...@@ -662,7 +662,7 @@ void __fastcall TMainFrameDlg::ModeManage() ...@@ -662,7 +662,7 @@ void __fastcall TMainFrameDlg::ModeManage()
else else
{ {
/* default mode */ /* default mode */
ClientHeight = 65; ClientHeight = 37 + ToolBar->Height;
/* unsensitize menus */ /* unsensitize menus */
MenuProgram->Enabled = false; MenuProgram->Enabled = false;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -39,13 +39,14 @@ ...@@ -39,13 +39,14 @@
class TMainFrameDlg : public TForm class TMainFrameDlg : public TForm
{ {
__published: // IDE-managed Components __published: // IDE-managed Components
TToolBar *ToolBar1; TToolBar *ToolBar;
TToolButton *ToolButtonFile; TToolButton *ToolButtonFile;
TToolButton *ToolButtonDisc; TToolButton *ToolButtonDisc;
TToolButton *ToolButtonNet; TToolButton *ToolButtonNet;
TToolButton *ToolButtonSep1; TToolButton *ToolButtonSep1;
TToolButton *ToolButtonBack; TToolButton *ToolButtonBack;
TToolButton *ToolButtonStop; TToolButton *ToolButtonStop;
TToolButton *ToolButtonEject;
TToolButton *ToolButtonPlay; TToolButton *ToolButtonPlay;
TToolButton *ToolButtonPause; TToolButton *ToolButtonPause;
TToolButton *ToolButtonSlow; TToolButton *ToolButtonSlow;
...@@ -104,7 +105,6 @@ __published: // IDE-managed Components ...@@ -104,7 +105,6 @@ __published: // IDE-managed Components
TMenuItem *PopupPreferences; TMenuItem *PopupPreferences;
TMenuItem *N7; TMenuItem *N7;
TMenuItem *PopupExit; TMenuItem *PopupExit;
TToolButton *ToolButtonEject;
TStatusBar *StatusBar; TStatusBar *StatusBar;
TGroupBox *GroupBoxFile; TGroupBox *GroupBoxFile;
TLabel *LabelFileName; TLabel *LabelFileName;
...@@ -159,7 +159,7 @@ __published: // IDE-managed Components ...@@ -159,7 +159,7 @@ __published: // IDE-managed Components
void __fastcall ToolButtonFastClick( TObject *Sender ); void __fastcall ToolButtonFastClick( TObject *Sender );
void __fastcall ToolButtonPrevClick( TObject *Sender ); void __fastcall ToolButtonPrevClick( TObject *Sender );
void __fastcall ToolButtonNextClick( TObject *Sender ); void __fastcall ToolButtonNextClick( TObject *Sender );
void __fastcall ToolButtonEjectClick( TObject *Sender ); void __fastcall ToolButtonEjecttempClick( TObject *Sender );
void __fastcall PopupCloseClick( TObject *Sender ); void __fastcall PopupCloseClick( TObject *Sender );
void __fastcall PopupPlayClick( TObject *Sender ); void __fastcall PopupPlayClick( TObject *Sender );
void __fastcall PopupPauseClick( TObject *Sender ); void __fastcall PopupPauseClick( TObject *Sender );
......
...@@ -30,9 +30,10 @@ ...@@ -30,9 +30,10 @@
#include "interface.h" #include "interface.h"
#include "intf_playlist.h" #include "intf_playlist.h"
#include "win32_common.h"
#include "playlist.h" #include "playlist.h"
#include "win32_common.h"
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
//#pragma package(smart_init) //#pragma package(smart_init)
#pragma resource "*.dfm" #pragma resource "*.dfm"
...@@ -74,12 +75,14 @@ void __fastcall TPlaylistDlg::FormShow( TObject *Sender ) ...@@ -74,12 +75,14 @@ void __fastcall TPlaylistDlg::FormShow( TObject *Sender )
{ {
p_intfGlobal->p_sys->p_window->MenuPlaylist->Checked = true; p_intfGlobal->p_sys->p_window->MenuPlaylist->Checked = true;
p_intfGlobal->p_sys->p_window->PopupPlaylist->Checked = true; p_intfGlobal->p_sys->p_window->PopupPlaylist->Checked = true;
p_intfGlobal->p_sys->p_window->ToolButtonPlaylist->Down = true;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TPlaylistDlg::FormHide( TObject *Sender ) void __fastcall TPlaylistDlg::FormHide( TObject *Sender )
{ {
p_intfGlobal->p_sys->p_window->MenuPlaylist->Checked = false; p_intfGlobal->p_sys->p_window->MenuPlaylist->Checked = false;
p_intfGlobal->p_sys->p_window->PopupPlaylist->Checked = false; p_intfGlobal->p_sys->p_window->PopupPlaylist->Checked = false;
p_intfGlobal->p_sys->p_window->ToolButtonPlaylist->Down = false;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TPlaylistDlg::BitBtnOkClick( TObject *Sender ) void __fastcall TPlaylistDlg::BitBtnOkClick( TObject *Sender )
......
...@@ -134,6 +134,7 @@ __fastcall TGroupBoxPlugin::TGroupBoxPlugin( TComponent* Owner, ...@@ -134,6 +134,7 @@ __fastcall TGroupBoxPlugin::TGroupBoxPlugin( TComponent* Owner,
{ {
/* init listview */ /* init listview */
ListView = CreateListView( this, 16, 164, 24, 160, vsReport ); ListView = CreateListView( this, 16, 164, 24, 160, vsReport );
ListView->ReadOnly = true;
ListView->Columns->Add(); ListView->Columns->Add();
ListView->Columns->Items[0]->Width = 160; ListView->Columns->Items[0]->Width = 160;
ListView->Columns->Items[0]->Caption = "Name";//p_config->psz_text; ListView->Columns->Items[0]->Caption = "Name";//p_config->psz_text;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment