vlc_mutex_init( p_intf, &lock );
p_vout = NULL;
hide(); setMinimumSize( 16, 16 );
-
+
// CONNECT( this, askResize( int, int ), this, SetSizing( int, int ) );
CONNECT( this, askVideoWidgetToShow(), this, show() );
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
resize( 300, 150 );
updateGeometry();
- CONNECT( THEMIM, inputChanged( input_thread_t *), this, update( input_thread_t * ) );
+ CONNECT( THEMIM, inputChanged( input_thread_t *),
+ this, update( input_thread_t * ) );
}
BackgroundWidget::~BackgroundWidget()
bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL;
videoIsActive = false;
input_name = "";
+ playlistVisible = false;
/* Ask for privacy */
privacy();
move( settings->value( "pos", QPoint( 0, 0 ) ).toPoint() );
resize( settings->value( "size", QSize( 350, 60 ) ).toSize() );
- updateGeometry();
+ int tgPlay = settings->value( "playlist-visible", 0 ).toInt();
settings->endGroup();
+
+ if( tgPlay )
+ {
+ togglePlaylist();
+ }
+
+ updateGeometry();
+
}
MainInterface::~MainInterface()
settings->beginGroup( "MainWindow" );
settings->setValue( "playlist-floats", (int)(dockPL->isFloating()) );
+ settings->setValue( "playlist-visible", (int)playlistVisible );
settings->setValue( "adv-controls",
getControlsVisibilityStatus() & CONTROLS_ADVANCED );
settings->setValue( "pos", pos() );
dockPL->resize( settings->value( "size", QSize( 400, 300 ) ).toSize() );
settings->endGroup();
dockPL->show();
+ playlistVisible = true;
}
else
{
/* toggle the visibility of the playlist */
TOGGLEV( dockPL );
resize( sizeHint() );
+ playlistVisible = !playlistVisible;
}
}
MainInterface( intf_thread_t *);
virtual ~MainInterface();
+ /* Video requests from core */
void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
int *pi_y, unsigned int *pi_width,
unsigned int *pi_height );
void releaseVideo( void * );
int controlVideo( void *p_window, int i_query, va_list args );
+ /* Getters */
QSystemTrayIcon *getSysTray() { return sysTray; };
QMenu *getSysTrayMenu() { return systrayMenu; };
int getControlsVisibilityStatus();
+
+ /* Sizehint() */
QSize sizeHint() const;
protected:
// void resizeEvent( QResizeEvent * );
friend class VolumeClickHandler;
private:
QSettings *settings;
- QSize mainSize, addSize;
QSystemTrayIcon *sysTray;
QMenu *systrayMenu;
QString input_name;
QVBoxLayout *mainLayout;
ControlsWidget *controls;
- QMenu *speedControlMenu;
+ QMenu *speedControlMenu;
SpeedControlWidget *speedControl;
- bool need_components_update;
-
void handleMainUi( QSettings* );
void privacy();
- void handleSystray();
- //void buildStatus();
+ int privacyDialog( QList<ConfigControl *> controls );
+ /* Systray */
+ void handleSystray();
void createSystray();
- int privacyDialog( QList<ConfigControl *> controls );
/* Video */
VideoWidget *videoWidget;
- virtual void keyPressEvent( QKeyEvent *);
- virtual void wheelEvent( QWheelEvent * );
-
- bool videoIsActive;
- QSize savedVideoSize;
+ // QSize savedVideoSize;
BackgroundWidget *bgWidget;
VisualSelector *visualSelector;
PlaylistWidget *playlistWidget;
QDockWidget *dockPL;
- bool videoEmbeddedFlag;
- bool alwaysVideoFlag;
+ bool videoIsActive; ///< Having a video now / THEMIM->hasV
+ bool videoEmbeddedFlag; ///< Want an external Video Window
+ bool playlistVisible; ///< Is the playlist visible ?
+ bool alwaysVideoFlag; ///< Always show the background
bool visualSelectorEnabled;
- bool notificationEnabled;
+ bool notificationEnabled; /// Systray Notifications
+ bool b_remainingTime; /* showing elapsed or remaining time */
- InputManager *main_input_manager;
input_thread_t *p_input; ///< Main input associated to the playlist
/* Status Bar */
QLabel *speedLabel;
QLabel *nameLabel;
- bool b_remainingTime; /* showing elapsed or remaining time */
+ virtual void customEvent( QEvent *);
+ virtual void keyPressEvent( QKeyEvent *);
+ virtual void wheelEvent( QWheelEvent * );
- void customEvent( QEvent *);
public slots:
void undockPlaylist();
void toggleMinimalView();