#include <QWidgetAction>
#include <QDockWidget>
#include <QToolBar>
+#include <QGroupBox>
#include <assert.h>
#include <vlc_keys.h>
#include <vlc_vout.h>
-#ifdef WIN32
- #define PREF_W 410
- #define PREF_H 151
-#else
- #define PREF_W 400
- #define PREF_H 140
-#endif
-
#define SET_WIDTH(i,j) i->widgetSize.setWidth(j)
#define SET_HEIGHT(i,j) i->widgetSize.setHeight(j)
#define SET_WH( i,j,k) i->widgetSize.setWidth(j); i->widgetSize.setHeight(k);
embeddedPlaylistWasActive = videoIsActive = false;
input_name = "";
+ /**
+ * Ask for the network policy on FIRST STARTUP
+ **/
+ if( config_GetInt( p_intf, "privacy-ask") )
+ {
+ QList<ConfigControl *> controls;
+ privacyDialog( controls );
+
+ QList<ConfigControl *>::Iterator i;
+ for( i = controls.begin() ; i != controls.end() ; i++ )
+ {
+ ConfigControl *c = qobject_cast<ConfigControl *>(*i);
+ c->doApply( p_intf );
+ }
+
+ config_PutInt( p_intf, "privacy-ask" , 0 );
+ config_SaveConfigFile( p_intf, NULL );
+ }
+
/**
* Configuration and settings
**/
/* Main settings */
setFocusPolicy( Qt::StrongFocus );
- setAcceptDrops(true);
+ setAcceptDrops( true );
setWindowIcon( QApplication::windowIcon() );
setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
visualSelectorEnabled = settings->value( "visual-selector", false ).toBool();
notificationEnabled = config_GetInt( p_intf, "qt-notification" )
? true : false;
+
/**************************
* UI and Widgets design
**************************/
/* Create a Dock to get the playlist */
dockPL = new QDockWidget( qtr("Playlist"), this );
+ dockPL->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding );
+ dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures );
dockPL->setAllowedAreas( Qt::LeftDockWidgetArea
| Qt::RightDockWidgetArea
| Qt::BottomDockWidgetArea );
- dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures );
- /* Menu Bar */
+ /************
+ * Menu Bar
+ ************/
QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
/****************
b_remainingTime = false;
timeLabel = new TimeLabel;
nameLabel = new QLabel;
+ nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
+ | Qt::TextSelectableByKeyboard );
speedLabel = new QLabel( "1.00x" );
speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
- timeLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
/* Styling those labels */
timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );
- right-clicking and clicking just toggle between remaining and
elapsed time.*/
CONNECT( timeLabel, timeLabelClicked(), this, toggleTimeDisplay() );
- CONNECT( timeLabel, customContextMenuRequested( QPoint ),
- this, toggleTimeDisplay() );
CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
+ CONNECT( timeLabel, timeLabelDoubleClicked(), this, toggleTimeDisplay() );
/* Speed Label behaviour:
- right click gives the vertical speed slider */
createSystray();
if( config_GetInt( p_intf, "qt-minimal-view" ) )
- toggleMenus();
+ toggleMinimalView();
/* Init input manager */
MainInputManager::getInstance( p_intf );
ON_TIMEOUT( updateOnTimer() );
-// ON_TIMEOUT( debug() );
-
+ //ON_TIMEOUT( debug() );
/********************
* Various CONNECTs *
var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
vlc_object_release( p_playlist );
}
+
+ CONNECT( this, askReleaseVideo( void * ), this, releaseVideoSlot( void * ) );
+
+ CONNECT( dockPL, topLevelChanged( bool ), this, doComponentsUpdate() );
// DEBUG FIXME
hide();
+
+
+ updateGeometry();
+ settings->endGroup();
}
MainInterface::~MainInterface()
var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
vlc_object_release( p_playlist );
}
-
- settings->setValue( "playlist-embedded", !dockPL->isFloating() );
+ settings->beginGroup( "MainWindow" );
+ settings->setValue( "playlist-floats", dockPL->isFloating() );
settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED );
settings->setValue( "pos", pos() );
+ playlistWidget->saveSettings( settings );
settings->endGroup();
delete settings;
p_intf->b_interaction = VLC_FALSE;
}
}
-
void MainInterface::handleMainUi( QSettings *settings )
{
/* Create the main Widget and the mainLayout */
mainLayout->setMargin( 0 );
/* Create the CONTROLS Widget */
+ bool b_shiny = config_GetInt( p_intf, "qt-blingbling" );
controls = new ControlsWidget( p_intf,
- settings->value( "adv-controls", false ).toBool() );
+ settings->value( "adv-controls", false ).toBool(),
+ b_shiny );
/* Configure the Controls, the playlist button doesn't trigger THEDP
but the toggle from this MainInterface */
widgetAction->setDefaultWidget( speedControl );
speedControlMenu->addAction( widgetAction );
- /* Set initial size */
- resize( PREF_W, PREF_H );
- addSize = QSize( mainLayout->margin() * 2, PREF_H );
-
/* Visualisation */
+ /* Disabled for now, they SUCK */
+ #if 0
visualSelector = new VisualSelector( p_intf );
mainLayout->insertWidget( 0, visualSelector );
visualSelector->hide();
+ #endif
/* And video Outputs */
if( alwaysVideoFlag )
bgWidget->resize( bgWidget->widgetSize );
bgWidget->updateGeometry();
mainLayout->insertWidget( 0, bgWidget );
+ CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
}
if( videoEmbeddedFlag )
p_intf->pf_request_window = ::DoRequest;
p_intf->pf_release_window = ::DoRelease;
p_intf->pf_control_window = ::DoControl;
-
- CONNECT( this, askVideoToHide(), videoWidget, hide() );
}
/* Finish the sizing */
- setMinimumSize( PREF_W, addSize.height() );
+ updateGeometry();
+}
+
+void MainInterface::privacyDialog( QList<ConfigControl *> controls )
+{
+ QDialog *privacy = new QDialog( this );
+
+ privacy->setWindowTitle( qtr( "Privacy and Network policies" ) );
+
+ QGridLayout *gLayout = new QGridLayout( privacy );
+
+ QGroupBox *blabla = new QGroupBox( qtr( "Privacy and Network Warning" ) );
+ QGridLayout *blablaLayout = new QGridLayout( blabla );
+ QLabel *text = new QLabel( qtr(
+ "<p>The <i>VideoLAN Team</i> doesn't like when an application goes "
+ "online without authorisation.</p>\n "
+ "<p><i>VLC media player</i> can request limited information on "
+ "Internet, espically to get CD Covers and songs metadata or to know "
+ "if updates are available.</p>\n"
+ "<p><i>VLC media player</i> <b>DOES NOT</b> send or collect <b>ANY</b> "
+ "information, even anonymously about your "
+ "usage.</p>\n"
+ "<p>Therefore please check the following options, the default being "
+ "almost no access on the web.</p>\n") );
+ text->setWordWrap( true );
+ text->setTextFormat( Qt::RichText );
+
+ blablaLayout->addWidget( text, 0, 0 ) ;
+
+ QGroupBox *options = new QGroupBox;
+ QGridLayout *optionsLayout = new QGridLayout( options );
+
+ gLayout->addWidget( blabla, 0, 0, 1, 3 );
+ gLayout->addWidget( options, 1, 0, 1, 3 );
+ module_config_t *p_config;
+ ConfigControl *control;
+ int line = 0;
+
+#define CONFIG_GENERIC( option, type ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
+ p_config, options, false, optionsLayout, line ); \
+ controls.append( control ); \
+ }
+
+#define CONFIG_GENERIC_NOBOOL( option, type ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
+ p_config, options, optionsLayout, line ); \
+ controls.append( control ); \
+ }
+
+ CONFIG_GENERIC( "album-art", IntegerList ); line++;
+ CONFIG_GENERIC_NOBOOL( "fetch-meta", Bool ); line++;
+ CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool );
+
+ QPushButton *ok = new QPushButton( qtr( "Ok" ) );
+
+ gLayout->addWidget( ok, 2, 2 );
+
+ CONNECT( ok, clicked(), privacy, accept() );
+ privacy->exec();
}
+//FIXME remove me at the end...
void MainInterface::debug()
{
msg_Dbg( p_intf, "size: %i - %i", controls->size().height(), controls->size().width() );
msg_Dbg( p_intf, "sizeHint: %i - %i", controls->sizeHint().height(), controls->sizeHint().width() );
}
+
/**********************************************************************
* Handling of sizing of the components
**********************************************************************/
-void MainInterface::calculateInterfaceSize()
+
+/* This function is probably wrong, but we don't have many many choices...
+ Since we can't know from the playlist Widget if we are inside a dock or not,
+ because the playlist Widget can be called by THEDP, as a separate windows for
+ the skins.
+ Maybe the other solution is to redefine the sizeHint() of the playlist and
+ ask _parent->isFloating()...
+ If you think this would be better, please FIX it...
+*/
+QSize MainInterface::sizeHint() const
{
- int width = 0, height = 0;
+ QSize tempSize = controls->sizeHint() +
+ QSize( 100, menuBar()->size().height() + statusBar()->size().height() );
+
if( VISIBLE( bgWidget ) )
- {
- width = bgWidget->widgetSize.width();
- height = bgWidget->widgetSize.height();
-// assert( !(playlistWidget));// && playlistWidget->isVisible() ) );
- }
- else if( VISIBLE( playlistWidget ) )
- {
- width = playlistWidget->widgetSize.width();
- height = playlistWidget->widgetSize.height();
- }
+ tempSize += bgWidget->sizeHint();
else if( videoIsActive )
- {
- width = videoWidget->widgetSize.width() ;
- height = videoWidget->widgetSize.height();
- }
- else
- {
- width = PREF_W - addSize.width();
- height = PREF_H - addSize.height();
- }
- if( VISIBLE( visualSelector ) )
- height += visualSelector->height();
-/* if( VISIBLE( advControls) )
- {
- height += advControls->sizeHint().height();
- }*/
- mainSize = QSize( width + addSize.width(), height + addSize.height() );
+ tempSize += videoWidget->size();
+
+ if( !dockPL->isFloating() && dockPL->widget() )
+ tempSize += dockPL->widget()->size();
+
+ return tempSize;
}
+#if 0
+/* This is dead code and need to be removed AT THE END */
void MainInterface::resizeEvent( QResizeEvent *e )
{
if( videoWidget )
}
if( VISIBLE( playlistWidget ) )
{
- SET_WH( playlistWidget , e->size().width() - addSize.width(),
- e->size().height() - addSize.height() );
+ //FIXME
+// SET_WH( playlistWidget , e->size().width() - addSize.width(),
+ // e->size().height() - addSize.height() );
playlistWidget->updateGeometry();
}
}
+#endif
/****************************************************************************
- * Small right-click menus
+ * Small right-click menu for rate control
****************************************************************************/
void MainInterface::showSpeedMenu( QPoint pos )
{
- speedControlMenu->exec( QCursor::pos() - pos + QPoint( 0, speedLabel->height() ) );
+ speedControlMenu->exec( QCursor::pos() - pos
+ + QPoint( 0, speedLabel->height() ) );
}
/****************************************************************************
public:
SetVideoOnTopQtEvent( bool _onTop ) :
QEvent( (QEvent::Type)SetVideoOnTopEvent_Type ), onTop( _onTop)
- {
- }
+ {}
bool OnTop() const
{
bool onTop;
};
-
void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
int *pi_y, unsigned int *pi_width,
unsigned int *pi_height )
{
- msg_Dbg( p_intf, "I was here" );
void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height );
if( ret )
{
videoIsActive = true;
- if( VISIBLE( playlistWidget ) )
- {
- embeddedPlaylistWasActive = true;
-// playlistWidget->hide();
- }
bool bgWasVisible = false;
+
+ /* Did we have a bg ? */
if( VISIBLE( bgWidget) )
{
bgWasVisible = true;
- bgWidget->hide();
+ emit askBgWidgetToToggle();
}
+
if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
{
videoWidget->widgetSize = QSize( *pi_width, *pi_height );
videoWidget->widgetSize = QSize( *pi_width, *pi_height );
}
videoWidget->updateGeometry(); // Needed for deinterlace
- need_components_update = true;
+ updateGeometry();
}
return ret;
}
void MainInterface::releaseVideo( void *p_win )
+{
+ emit askReleaseVideo( p_win );
+}
+
+void MainInterface::releaseVideoSlot( void *p_win )
{
videoWidget->release( p_win );
- emit askVideoToHide();
+ videoWidget->hide();
if( bgWidget )
bgWidget->show();
videoIsActive = false;
- need_components_update = true;
+ updateGeometry();
}
int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
{
int i_ret = VLC_EGENERIC;
- msg_Dbg( p_intf, "I was there" );
switch( i_query )
{
case VOUT_GET_SIZE:
unsigned int i_height = va_arg( args, unsigned int );
videoWidget->widgetSize = QSize( i_width, i_height );
videoWidget->updateGeometry();
- need_components_update = true;
+ updateGeometry();
i_ret = VLC_SUCCESS;
break;
}
**/
void MainInterface::togglePlaylist()
{
- /* If no playlist exist, then create one and attach it to the DockPL*/
+ /* CREATION
+ If no playlist exist, then create one and attach it to the DockPL*/
if( !playlistWidget )
{
msg_Dbg( p_intf, "Creating a new playlist" );
- playlistWidget = new PlaylistWidget( p_intf );
- if(bgWidget)
- CONNECT( playlistWidget, artSet( QString ), bgWidget, setArt(QString) );
+ playlistWidget = new PlaylistWidget( p_intf, settings );
+ if( bgWidget )
+ CONNECT( playlistWidget, artSet( QString ),
+ bgWidget, setArt(QString) );
- playlistWidget->widgetSize = settings->value( "playlistSize",
- QSize( 650, 310 ) ).toSize();
/* Add it to the parent DockWidget */
dockPL->setWidget( playlistWidget );
/* Add the dock to the main Interface */
addDockWidget( Qt::BottomDockWidgetArea, dockPL );
- msg_Dbg( p_intf, "Creating a new playlist" );
-
/* Make the playlist floating is requested. Default is not. */
- if( !settings->value( "playlist-embedded", true ).toBool() );
+ if( settings->value( "playlist-floats", false ).toBool() );
{
msg_Dbg( p_intf, "we don't want it inside");
dockPL->setFloating( true );
}
-
}
else
{
- /* toggle the display */
+ /* toggle the visibility of the playlist */
TOGGLEV( dockPL );
+ //resize(sizeHint());
}
-
-#if 0 // Toggle the playlist dialog if not embedded and return
- if( !playlistEmbeddedFlag )
- {
- if( playlistWidget )
- {
- /// \todo Destroy it
- }
- return;
- }
-
- // Create the playlist Widget and destroy the existing dialog
- if( !playlistWidget )
- {
- PlaylistDialog::killInstance();
- mainLayout->insertWidget( 0, playlistWidget );
- playlistWidget->hide();
- }
-
- // And toggle visibility
- if( VISIBLE( playlistWidget ) )
- {
- playlistWidget->hide();
- if( bgWidget ) bgWidget->show();
- if( videoIsActive )
- {
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- if( bgWidget ) bgWidget->hide();
- }
- }
- else
- {
- playlistWidget->show();
- if( videoIsActive )
- {
- savedVideoSize = videoWidget->widgetSize;
- videoWidget->widgetSize.setHeight( 0 );
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
- if( VISIBLE( bgWidget ) ) bgWidget->hide();
- }
-#endif
+#if 0
doComponentsUpdate();
+#endif
+ updateGeometry();
}
+/* Function called from the menu to undock the playlist */
void MainInterface::undockPlaylist()
{
dockPL->setFloating( true );
-#if 0
- if( playlistWidget )
- {
- playlistWidget->hide();
- playlistWidget->deleteLater();
- mainLayout->removeWidget( playlistWidget );
- playlistWidget = NULL;
- playlistEmbeddedFlag = false;
+ updateGeometry();
+}
- menuBar()->clear();
- QVLCMenu::createMenuBar( this, p_intf, false, visualSelectorEnabled);
+void MainInterface::toggleMinimalView()
+{
+ TOGGLEV( menuBar() );
+ TOGGLEV( controls );
+ TOGGLEV( statusBar() );
+ updateGeometry();
+}
- if( videoIsActive )
- {
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
+/* Video widget cannot do this synchronously as it runs in another thread */
+/* Well, could it, actually ? Probably dangerous ... */
+void MainInterface::doComponentsUpdate()
+{
+ updateGeometry();
+}
- doComponentsUpdate();
- THEDP->playlistDialog();
- }
-#endif
+/* toggling advanced controls buttons */
+void MainInterface::toggleAdvanced()
+{
+ controls->toggleAdvanced();
+}
+
+/* Get the visibility status of the controls (hidden or not, advanced or not) */
+int MainInterface::getControlsVisibilityStatus()
+{
+ return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
+ + CONTROLS_ADVANCED * controls->b_advancedVisible );
}
#if 0
}
#endif
-void MainInterface::toggleMenus()
-{
- TOGGLEV( controls );
- TOGGLEV( statusBar() );
- updateGeometry();
-}
-
-/* Video widget cannot do this synchronously as it runs in another thread */
-/* Well, could it, actually ? Probably dangerous ... */
-void MainInterface::doComponentsUpdate()
-{
- calculateInterfaceSize();
- resize( mainSize );
-}
-
-void MainInterface::toggleAdvanced()
-{
- controls->toggleAdvanced();
-}
-
-int MainInterface::getControlsVisibilityStatus()
-{
- return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
- + CONTROLS_ADVANCED * controls->b_advancedVisible );
-}
-
/************************************************************************
* Other stuff
************************************************************************/
{
char psz_length[MSTRTIME_MAX_SIZE], psz_time[MSTRTIME_MAX_SIZE];
secstotimestr( psz_length, length );
- secstotimestr( psz_time, b_remainingTime ? length - time : time );
+ secstotimestr( psz_time, ( b_remainingTime && length ) ? length - time
+ : time );
+
+ QString title;
+ title.sprintf( "%s/%s", psz_time,
+ ( !length && time ) ? "--:--" : psz_length );
- QString title; title.sprintf( "%s/%s", psz_time, psz_length );
/* Add a minus to remaining time*/
- if( b_remainingTime ) timeLabel->setText( " -"+title+" " );
+ if( b_remainingTime && length ) timeLabel->setText( " -"+title+" " );
else timeLabel->setText( " "+title+" " );
}
QApplication::closeAllWindows();
QApplication::quit();
}
+#if 0
if( need_components_update )
{
doComponentsUpdate();
need_components_update = false;
}
+#endif
controls->updateOnTimer();
}
void MainInterface::keyPressEvent( QKeyEvent *e )
{
+ if( ( e->modifiers() & Qt::ControlModifier ) && ( e->key() & Qt::Key_H )
+ && menuBar()->isHidden() )
+ {
+ toggleMinimalView();
+ e->accept();
+ }
+
int i_vlck = qtEventToVLCKey( e );
- if( i_vlck >= 0 )
+ if( i_vlck > 0 )
{
var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
e->accept();
projects / vlc / blobdiff