#include "input_manager.hpp"
#include "util/input_slider.hpp"
#include "util/qvlcframe.hpp"
+#include "util/customwidgets.hpp"
#include "dialogs_provider.hpp"
#include "components/interface_widgets.hpp"
#include "dialogs/playlist.hpp"
#include <QPushButton>
#include <QStatusBar>
#include <QKeyEvent>
+#include <QUrl>
#include <assert.h>
#include <vlc_keys.h>
MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
{
+ /* Configuration */
settings = new QSettings( "VideoLAN", "VLC" );
settings->beginGroup( "MainWindow" );
bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL;
embeddedPlaylistWasActive = videoIsActive = false;
- /* Fetch configuration from settings and vlc config */
videoEmbeddedFlag = false;
- if( config_GetInt( p_intf, "embedded-video" ) )
- videoEmbeddedFlag = true;
+ if( config_GetInt( p_intf, "embedded-video" ) ) videoEmbeddedFlag = true;
alwaysVideoFlag = false;
if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ))
alwaysVideoFlag = true;
- playlistEmbeddedFlag = settings->value( "playlist-embedded", true ).
- toBool();
+ playlistEmbeddedFlag = settings->value("playlist-embedded", true).toBool();
advControlsEnabled= settings->value( "adv-controls", false ).toBool();
+ visualSelectorEnabled= settings->value( "visual-selector", false ).toBool();
+ /* UI */
setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
handleMainUi( settings );
-
QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
- advControlsEnabled );
-
- /* Status bar */
+ advControlsEnabled, visualSelectorEnabled );
timeLabel = new QLabel( 0 );
nameLabel = new QLabel( 0 );
statusBar()->addWidget( nameLabel, 4 );
statusBar()->addPermanentWidget( timeLabel, 1 );
setFocusPolicy( Qt::StrongFocus );
+ setAcceptDrops(true);
/* Init input manager */
MainInputManager::getInstance( p_intf );
BUTTON_SET_ACT_I( ui.nextButton, "", next.png, qtr("Next"), next() );
BUTTON_SET_ACT_I( ui.playButton, "", play.png, qtr("Play"), play() );
BUTTON_SET_ACT_I( ui.stopButton, "", stop.png, qtr("Stop"), stop() );
- BUTTON_SET_ACT_I( ui.visualButton, "", stop.png,
- qtr( "Audio visualizations" ), visual() );
/* Volume */
ui.volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
{
width = playlistWidget->widgetSize.width();
height = playlistWidget->widgetSize.height();
- fprintf( stderr, "Have %ix%i playlist\n", width, height );
}
else if( videoIsActive )
{
width = videoWidget->widgetSize.width() ;
height = videoWidget->widgetSize.height();
- fprintf( stderr, "Video Size %ix%i\n", DS( videoWidget->widgetSize ) );
}
else
{
}
if( VISIBLE( visualSelector ) )
height += visualSelector->height();
- fprintf( stderr, "Adv %p - visible %i\n", advControls, advControls->isVisible() );
if( VISIBLE( advControls) )
{
- fprintf( stderr, "visible\n" );
height += advControls->sizeHint().height();
}
-
- fprintf( stderr, "Adv height %i\n", advControls->sizeHint().height() );
- fprintf( stderr, "Setting to %ix%i\n",
- width + addSize.width() , height + addSize.height() );
-
mainSize = QSize( width + addSize.width(), height + addSize.height() );
}
void MainInterface::resizeEvent( QResizeEvent *e )
{
- fprintf( stderr, "Resize event to %ix%i\n", DS( e->size() ) );
videoWidget->widgetSize.setWidth( e->size().width() - addSize.width() );
if( videoWidget && videoIsActive && videoWidget->widgetSize.height() > 1 )
{
{
unsigned int i_width = va_arg( args, unsigned int );
unsigned int i_height = va_arg( args, unsigned int );
-// if( !i_width && p_vout ) i_width = p_vout->i_window_width;
-// if( !i_height && p_vout ) i_height = p_vout->i_window_height;
videoWidget->widgetSize = QSize( i_width, i_height );
videoWidget->updateGeometry();
need_components_update = true;
{
/* Show the background widget */
}
+ visualSelectorEnabled = true;
}
else
{
/* Stop any currently running visualization */
visualSelector->hide();
+ visualSelectorEnabled = false;
}
doComponentsUpdate();
}
QSize( 650, 310 ) ).toSize();
playlistWidget->hide();
}
- /// Todo, reset its size ?
- if( VISIBLE( playlistWidget) )
+ if( VISIBLE( playlistWidget ) )
{
playlistWidget->hide();
if( videoIsActive )
playlistEmbeddedFlag = false;
menuBar()->clear();
- QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled );
+ QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled,
+ visualSelectorEnabled);
if( videoIsActive )
{
PlaylistDialog::killInstance();
playlistEmbeddedFlag = true;
menuBar()->clear();
- QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled );
+ QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled,
+ visualSelectorEnabled);
playlist();
}
}
+
+/************************************************************************
+ * D&D
+ ************************************************************************/
+void MainInterface::dropEvent(QDropEvent *event)
+{
+ const QMimeData *mimeData = event->mimeData();
+
+ /* D&D of a subtitles file, add it on the fly */
+ if( mimeData->urls().size() == 1 )
+ {
+ if( THEMIM->getIM()->hasInput() )
+ {
+ if( input_AddSubtitles( THEMIM->getInput(),
+ qtu( mimeData->urls()[0].toString() ),
+ VLC_TRUE ) )
+ {
+ event->acceptProposedAction();
+ return;
+ }
+ }
+ }
+ bool first = true;
+ foreach( QUrl url, mimeData->urls() ) {
+ QString s = url.toString();
+ if( s.length() > 0 ) {
+ playlist_PlaylistAdd( THEPL, qtu(s), NULL,
+ PLAYLIST_APPEND | (first ? PLAYLIST_GO:0),
+ PLAYLIST_END );
+ first = false;
+ }
+ }
+ event->acceptProposedAction();
+}
+void MainInterface::dragEnterEvent(QDragEnterEvent *event)
+{
+ event->acceptProposedAction();
+}
+void MainInterface::dragMoveEvent(QDragMoveEvent *event)
+{
+ event->acceptProposedAction();
+}
+void MainInterface::dragLeaveEvent(QDragLeaveEvent *event)
+{
+ event->accept();
+}
+
/************************************************************************
* Other stuff
************************************************************************/
void MainInterface::keyPressEvent( QKeyEvent *e )
{
- int i_vlck = 0;
- /* Handle modifiers */
- if( e->modifiers()& Qt::ShiftModifier ) i_vlck |= KEY_MODIFIER_SHIFT;
- if( e->modifiers()& Qt::AltModifier ) i_vlck |= KEY_MODIFIER_ALT;
- if( e->modifiers()& Qt::ControlModifier ) i_vlck |= KEY_MODIFIER_CTRL;
- if( e->modifiers()& Qt::MetaModifier ) i_vlck |= KEY_MODIFIER_META;
-
- bool found = false;
- /* Look for some special keys */
-#define HANDLE( qt, vk ) case Qt::qt : i_vlck |= vk; found = true;break
- switch( e->key() )
- {
- HANDLE( Key_Left, KEY_LEFT );
- HANDLE( Key_Right, KEY_RIGHT );
- HANDLE( Key_Up, KEY_UP );
- HANDLE( Key_Down, KEY_DOWN );
- HANDLE( Key_Space, KEY_SPACE );
- HANDLE( Key_Escape, KEY_ESC );
- HANDLE( Key_Enter, KEY_ENTER );
- HANDLE( Key_F1, KEY_F1 );
- HANDLE( Key_F2, KEY_F2 );
- HANDLE( Key_F3, KEY_F3 );
- HANDLE( Key_F4, KEY_F4 );
- HANDLE( Key_F5, KEY_F5 );
- HANDLE( Key_F6, KEY_F6 );
- HANDLE( Key_F7, KEY_F7 );
- HANDLE( Key_F8, KEY_F8 );
- HANDLE( Key_F9, KEY_F9 );
- HANDLE( Key_F10, KEY_F10 );
- HANDLE( Key_F11, KEY_F11 );
- HANDLE( Key_F12, KEY_F12 );
- HANDLE( Key_PageUp, KEY_PAGEUP );
- HANDLE( Key_PageDown, KEY_PAGEDOWN );
- HANDLE( Key_Home, KEY_HOME );
- HANDLE( Key_End, KEY_END );
- HANDLE( Key_Insert, KEY_INSERT );
- HANDLE( Key_Delete, KEY_DELETE );
-
- }
- if( !found )
- {
- /* Force lowercase */
- if( e->key() >= Qt::Key_A && e->key() <= Qt::Key_Z )
- i_vlck += e->key() + 32;
- /* Rest of the ascii range */
- else if( e->key() >= Qt::Key_Space && e->key() <= Qt::Key_AsciiTilde )
- i_vlck += e->key();
- }
+ int i_vlck = qtEventToVLCKey( e );
if( i_vlck >= 0 )
{
var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
}
void MainInterface::play()
{
- if( !THEPL->i_size || !THEPL->i_enabled )
+ if( !playlist_IsEmpty(THEPL) || !THEPL->i_enabled )
{
/* The playlist is empty, open a file requester */
THEDP->simpleOpenDialog();
void MainInterface::updateOnTimer()
{
- aout_instance_t *p_aout = (aout_instance_t *)vlc_object_find( p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
- /* Todo: make this event-driven */
- if( p_aout )
- {
- ui.visualButton->setEnabled( true );
- vlc_object_release( p_aout );
- }
- else
- ui.visualButton->setEnabled( false );
-
- /* And this too */
+ /* \todo Make this event-driven */
advControls->enableInput( THEMIM->getIM()->hasInput() );
advControls->enableVideo( THEMIM->getIM()->hasVideo() );
- if( p_intf->b_die )
+ if( intf_ShouldDie( p_intf ) )
{
QApplication::closeAllWindows();
- DialogsProvider::killInstance();
QApplication::quit();
}
if( need_components_update )
projects / vlc / blobdiff