Changeset 2e6b21143cb6747ed2cb62ec5a1f025dbd6ebb0b

Timestamp:

23/09/06 15:16:33 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1159017393 +0000

git-parent:

[19f019c7e4356c99d977430b1fc2f2ada708ee0c]

git-author:

Clément Stenac <zorglub@videolan.org> 1159017393 +0000

Message:

Advanced controls bar
Make some sttings persistent

Files:

• modules/gui/qt4/Modules.am (modified) (4 diffs)
• modules/gui/qt4/components/equalizer.cpp (deleted)
• modules/gui/qt4/components/equalizer.hpp (deleted)
• modules/gui/qt4/components/extended_panels.cpp (added)
• modules/gui/qt4/components/extended_panels.hpp (added)
• modules/gui/qt4/components/interface_widgets.cpp (modified) (3 diffs)
• modules/gui/qt4/components/interface_widgets.hpp (modified) (1 diff)
• modules/gui/qt4/dialogs/extended.cpp (modified) (1 diff)
• modules/gui/qt4/input_manager.cpp (modified) (3 diffs)
• modules/gui/qt4/input_manager.hpp (modified) (3 diffs)
• modules/gui/qt4/main_interface.cpp (modified) (18 diffs)
• modules/gui/qt4/main_interface.hpp (modified) (4 diffs)
• modules/gui/qt4/menus.cpp (modified) (5 diffs)
• modules/gui/qt4/menus.hpp (modified) (2 diffs)
• modules/gui/qt4/qt4.hpp (modified) (1 diff)

modules/gui/qt4/Modules.am

@@ -31 +31 @@
-    dialogs/extended \
-    dialogs/interaction \
-qualizer
+xtended_panels
-    components/infopanels \
-    components/preferences_widgets \
@@ -57 +57 @@
-        dialogs/prefs_dialog.moc.cpp \
-        dialogs/interaction.moc.cpp \
-qualizer
+xtended_panels
-        components/infopanels.moc.cpp \
-        components/preferences_widgets.moc.cpp \
@@ -103 +103 @@
-        dialogs/errors.cpp \
-        dialogs/interaction.cpp \
-qualizer
+xtended_panels
-        components/infopanels.cpp \
-        components/preferences_widgets.cpp \
@@ -131 +131 @@
-    dialogs/prefs_dialog.hpp \
-    dialogs/interaction.hpp \
-qualizer
+xtended_panels
-    components/infopanels.hpp \
-    components/preferences_widgets.hpp \

modules/gui/qt4/components/interface_widgets.cpp

@@ -31 +31 @@
-#include <vlc/vout.h>
-
+#include <QLabel>
+#include <QSpacerItem>
-#include <QCursor>
-#include <QPushButton>
@@ -155 +157 @@
-    layout->addWidget( prevButton );
-    layout->addWidget( nextButton );
+
+    layout->addItem( new QSpacerItem( 40,20,
+                              QSizePolicy::Expanding, QSizePolicy::Minimum) );
+    layout->addWidget( new QLabel( qtr("Current visualization:") ) );
+
+    current = new QLabel( qtr( "None" ) );
+    layout->addWidget( current );
+
+    BUTTONACT( prevButton, prev() );
+    BUTTONACT( nextButton, next() );
+
-    setLayout( layout );
-    setMaximumHeight( 35 );
@@ -160 +173 @@
-
-VisualSelector::~VisualSelector()
+{
+}
+
+void VisualSelector::prev()
+{
+    char *psz_new = aout_VisualPrev( p_intf );
+    if( psz_new )
+    {
+        current->setText( qfu( psz_new ) );
+        free( psz_new );
+    }
+}
+
+void VisualSelector::next()
+{
+    char *psz_new = aout_VisualNext( p_intf );
+    if( psz_new )
+    {
+        current->setText( qfu( psz_new ) );
+        free( psz_new );
+    }
+}
+
+/**********************************************************************
+ * More controls
+ **********************************************************************/
+ControlsWidget::ControlsWidget( intf_thread_t *_p_i ) :
+                                           QFrame( NULL ), p_intf( _p_i )
+{
+    QHBoxLayout *layout = new QHBoxLayout( this );
+    layout->setMargin( 0 );
+
+    slowerButton = new QPushButton( "S" );
+    BUTTON_SET_ACT( slowerButton, "S", qtr("Slower" ), slower() );
+    layout->addWidget( slowerButton );
+    slowerButton->setMaximumWidth( 35 );
+
+    normalButton = new QPushButton( "N" );
+    BUTTON_SET_ACT( normalButton, "N", qtr("Normal rate"), normal() );
+    layout->addWidget( normalButton );
+    normalButton->setMaximumWidth( 35 );
+
+    fasterButton = new QPushButton( "F" );
+    BUTTON_SET_ACT( fasterButton, "F", qtr("Faster" ), faster() );
+    layout->addWidget( fasterButton );
+    fasterButton->setMaximumWidth( 35 );
+
+    layout->addItem( new QSpacerItem( 100,20,
+                              QSizePolicy::Expanding, QSizePolicy::Minimum) );
+
+    snapshotButton = new QPushButton( "S" );
+    BUTTON_SET_ACT( snapshotButton, "S", qtr("Take a snapshot"), snapshot() );
+    layout->addWidget( snapshotButton );
+    snapshotButton->setMaximumWidth( 35 );
+
+    fullscreenButton = new QPushButton( "F" );
+    BUTTON_SET_ACT( fullscreenButton, "F", qtr("Fullscreen"), fullscreen() );
+    layout->addWidget( fullscreenButton );
+    fullscreenButton->setMaximumWidth( 35 );
+}
+
+ControlsWidget::~ControlsWidget()
+{
+}
+
+void ControlsWidget::enableInput( bool enable )
+{
+    slowerButton->setEnabled( enable );
+    normalButton->setEnabled( enable );
+    fasterButton->setEnabled( enable );
+}
+void ControlsWidget::enableVideo( bool enable )
+{
+    snapshotButton->setEnabled( enable );
+    fullscreenButton->setEnabled( enable );
+}
+
+void ControlsWidget::slower()
+{
+    THEMIM->getIM()->slower();
+}
+
+void ControlsWidget::faster()
+{
+    THEMIM->getIM()->faster();
+}
+
+void ControlsWidget::normal()
+{
+    THEMIM->getIM()->normalRate();
+}
+
+void ControlsWidget::snapshot()
+{
+}
+
+void ControlsWidget::fullscreen()
-{
-}

modules/gui/qt4/components/interface_widgets.hpp

@@ -90 +90 @@
-private:
-    intf_thread_t *p_intf;
+    QLabel *current;
+private slots:
+    void prev();
+    void next();
-};
+
+class QPushButton;
+class ControlsWidget : public QFrame
+{
+    Q_OBJECT
+public:
+    ControlsWidget( intf_thread_t *);
+    virtual ~ControlsWidget();
+    void enableInput( bool );
+    void enableVideo( bool );
+private:
+    intf_thread_t *p_intf;
+    QPushButton *slowerButton, *normalButton, *fasterButton;
+    QPushButton *fullscreenButton, *snapshotButton;
+private slots:
+    void faster();
+    void slower();
+    void normal();
+    void snapshot();
+    void fullscreen();
+};
+
-
-/******************** Playlist Widgets ****************/

modules/gui/qt4/dialogs/extended.cpp

@@ -27 +27 @@
-#include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
-qualizer
+xtended_panels
-#include "qt4.hpp"
-

modules/gui/qt4/input_manager.cpp

@@ -56 +56 @@
-    if( p_input )
-    {
+        vlc_value_t val;
+        var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
+        b_has_video = val.i_int > 0;
+        var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
+        b_has_audio = val.i_int > 0;
-        var_AddCallback( p_input, "audio-es", ChangeAudio, this );
-        var_AddCallback( p_input, "video-es", ChangeVideo, this );
@@ -140 +145 @@
-void InputManager::sliderUpdate( float new_pos )
-{
-p_input && !p_input->b_die && !p_input->b_dead
+hasInput()
-        var_SetFloat( p_input, "position", new_pos );
-}
@@ -160 +165 @@
-    var_Set( p_input, "state", state );
-    emit statusChanged( state.i_int );
+}
+
+void InputManager::slower()
+{
+    if( hasInput() )
+        var_SetVoid( p_input, "rate-slower" );
+}
+
+void InputManager::faster()
+{
+    if( hasInput() )
+        var_SetVoid( p_input, "rate-faster" );
+}
+
+void InputManager::normalRate()
+{
+    if( hasInput() )
+        var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
-}
-

modules/gui/qt4/input_manager.hpp

@@ -27 +27 @@
-#include <QObject>
-#include <vlc/vlc.h>
+#include <vlc/input.h>
-
-class InputManager : public QObject
@@ -36 +37 @@
-
-    void delInput();
+    bool hasInput() { return p_input && !p_input->b_dead && !p_input->b_die; }
-    bool hasAudio() { return b_has_audio; }
-    bool hasVideo() { return b_has_video; }
@@ -49 +51 @@
-    void setInput( input_thread_t * ); ///< Our controlled input changed
-    void sliderUpdate( float ); ///< User dragged the slider. We get new pos
+    void slower();
+    void faster();
+    void normalRate();
-signals:
-    /// Send new position, new time and new length

modules/gui/qt4/main_interface.cpp

@@ -40 +40 @@
-#include <vlc_keys.h>
-#include <vlc/vout.h>
+#include <aout_internal.h>
-
-#ifdef WIN32
@@ -49 +50 @@
-#endif
-
-#define BUTTON_SET( button, image, tooltip ) ui.button##Button->setText(""); \
-    ui.button##Button->setIcon( QIcon( ":/pixmaps/"#image ) ); \
-    ui.button##Button->setToolTip( tooltip );
-
-#define VISIBLE(i) (i && i->isVisible())
-
@@ -91 +88 @@
-    embeddedPlaylistWasActive = videoIsActive = false;
-
+    /* Fetch configuration from settings and vlc config */
+    videoEmbeddedFlag = false;
+    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();
+    advControlsEnabled= settings->value( "adv-controls", false ).toBool();
+
-    setWindowTitle( QString::fromUtf8( _("VLC media player") ) );
-    handleMainUi( settings );
-
-
+
+
-
-    /* Status bar */
@@ -127 +138 @@
-MainInterface::~MainInterface()
-{
-
+
+
+
+
+
-    p_intf->b_interaction = VLC_FALSE;
-    var_DelCallback( p_intf, "interaction", InteractCallback, this );
@@ -145 +160 @@
-    ui.hboxLayout->insertWidget( 0, slider );
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    /* Volume */
@@ -165 +176 @@
-    ui.volumeSlider->setFocusPolicy( Qt::NoFocus );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                                                qtr( "Open playlist" ) );
-    BUTTONACT( ui.playlistButton, playlist() );
@@ -186 +185 @@
-
-    addSize = QSize( ui.vboxLayout->margin() * 2, PREF_H );
+
+    advControls = new ControlsWidget( p_intf );
+    ui.vboxLayout->insertWidget( 0, advControls );
+    advControls->updateGeometry();
+    if( !advControlsEnabled ) advControls->hide();
+    need_components_update = true;
-
-    visualSelector = new VisualSelector( p_intf );
@@ -212 +217 @@
-        p_intf->pf_control_window  = ::DoControl;
-    }
-
-    calculateInterfaceSize();
-    resize( mainSize );
-
-    setMinimumSize( PREF_W, addSize.height() );
-}
@@ -250 +251 @@
-    if( VISIBLE( visualSelector ) )
-        height += visualSelector->height();
-
+
+
+
+
+
+
+
+
-    fprintf( stderr, "Setting to %ix%i\n",
-                     width + addSize.width() , height + addSize.height() );
@@ -266 +274 @@
-                             e->size().height()  - addSize.height() );
-        videoWidget->updateGeometry();
-        fprintf( stderr, "Video set to %ix%i\n", DS( videoWidget->widgetSize) );
-    }
-    if( VISIBLE( playlistWidget ) )
@@ -273 +280 @@
-                                 e->size().height() - addSize.height() );
-        playlistWidget->updateGeometry();
-        fprintf( stderr, "PL set to %ix%i\n",DS(playlistWidget->widgetSize ) );
-    }
-}
@@ -362 +368 @@
-}
-
+void MainInterface::advanced()
+{
+    if( !VISIBLE( advControls ) )
+    {
+        advControls->show();
+        advControlsEnabled = true;
+    }
+    else
+    {
+        advControls->hide();
+        advControlsEnabled = false;
+    }
+    doComponentsUpdate();
+}
+
-void MainInterface::visual()
-{
@@ -405 +426 @@
-    if( VISIBLE( playlistWidget) )
-    {
-        fprintf( stderr, "hiding playlist\n" );
-        playlistWidget->hide();
-        if( videoIsActive )
@@ -416 +436 @@
-    else
-    {
-        fprintf( stderr, "showing playlist\n" );
-        playlistWidget->show();
-        if( videoIsActive )
@@ -449 +468 @@
-
-        menuBar()->clear();
-
+, advControlsEnabled
-
-        if( videoIsActive )
@@ -470 +489 @@
-        playlistEmbeddedFlag = true;
-        menuBar()->clear();
-
+, advControlsEnabled
-        playlist();
-    }
@@ -588 +607 @@
-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 */
+    advControls->enableInput( THEMIM->getIM()->hasInput() );
+    advControls->enableVideo( THEMIM->getIM()->hasVideo() );
+
-    if( p_intf->b_die )
-    {
@@ -635 +669 @@
-    intf_dialog_args_t *p_arg = new intf_dialog_args_t;
-    p_arg->p_dialog = (interaction_dialog_t *)(new_val.p_address);
-
-    MainInterface *p_interface = (MainInterface*)param;
-    DialogEvent *event = new DialogEvent( INTF_DIALOG_INTERACTION, 0, p_arg );
-    QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );

modules/gui/qt4/main_interface.hpp

@@ -43 +43 @@
-class VolumeClickHandler;
-class VisualSelector;
+class ControlsWidget;
-
-class MainInterface : public QVLCMW
@@ -75 +76 @@
-    BackgroundWidget    *bgWidget;
-    VisualSelector      *visualSelector;
+    ControlsWidget      *advControls;
-    PlaylistWidget      *playlistWidget;
-
@@ -80 +82 @@
-    bool                 videoEmbeddedFlag;
-    bool                 alwaysVideoFlag;
+    bool                 advControlsEnabled;
-
-    InputManager        *main_input_manager;
@@ -102 +105 @@
-    void playlist();
-    void visual();
+    void advanced();
-    void updateVolume( int sliderVolume );
-};

modules/gui/qt4/menus.cpp

@@ -121 +121 @@
-
-void QVLCMenu::createMenuBar( MainInterface *mi, intf_thread_t *p_intf,
-
+, bool adv_controls_enabled
-{
-    QMenuBar *bar = mi->menuBar();
-File
+Media
-    if( playlist )
-    {
-        BAR_ADD( PlaylistMenu( mi,p_intf ), qtr("Playlist" ) );
-    }
-
+, mi, adv_controls_enabled
-    BAR_DADD( VideoMenu( p_intf, NULL ), qtr("Video"), 1 );
-    BAR_DADD( AudioMenu( p_intf, NULL ), qtr("Audio"), 2 );
@@ -162 +162 @@
-}
-
-
+
+
-{
-    QMenu *menu = new QMenu();
@@ -170 +171 @@
-        intfmenu->setTitle( qtr("Interfaces" ) );
-        menu->addMenu( intfmenu );
-        /** \todo ADD EXT GUI HERE */
-        menu->addSeparator();
-    }
@@ -176 +176 @@
-    DP_SADD( qtr("Information") , "", "", streaminfoDialog() );
-    DP_SADD( qtr("Bookmarks"), "", "", bookmarksDialog() );
+    DP_SADD( qtr("Extended settings"), "","",extendedDialog() );
+    if( mi )
+    {
+        menu->addSeparator();
+        QAction *adv = menu->addAction( qtr("Advanced controls" ),
+                                        mi, SLOT( advanced() ) );
+        adv->setCheckable( true );
+        if( adv_controls_enabled ) adv->setChecked( true );
+    }
-    menu->addSeparator();
-    DP_SADD( qtr("Preferences"), "", "", prefsDialog() );
-    DP_SADD( qtr("Extended"), "","",extendedDialog() );
-    return menu;
-}
@@ -341 +349 @@
-    menu->addMenu( intfmenu ); \
-    \
-
+NULL, false, 
-    toolsmenu->setTitle( qtr("Tools" ) ); \
-    menu->addMenu( toolsmenu ); \

modules/gui/qt4/menus.hpp

@@ -59 +59 @@
-    Q_OBJECT;
-public:
-
+, bool
-
-    /* Menus */
@@ -65 +65 @@
-    static QMenu *SDMenu( intf_thread_t * );
-    static QMenu *PlaylistMenu( MainInterface *, intf_thread_t *);
-
+
+
-    static QMenu *NavigMenu( intf_thread_t * , QMenu * );
-    static QMenu *VideoMenu( intf_thread_t * , QMenu * );

modules/gui/qt4/qt4.hpp

@@ -63 +63 @@
-#define ON_TIMEOUT( act ) CONNECT( THEDP->fixed_timer, timeout(), this, act )
-
+#define BUTTON_SET( button, text, tooltip ) \
+    button->setText( text ); \
+    button->setToolTip( tooltip );
+
+#define BUTTON_SET_ACT( button, text, tooltip, thisslot ) \
+    BUTTON_SET( button, text, tooltip ); \
+    BUTTONACT( button, thisslot );
+
+#define BUTTON_SET_IMG( button, text, image, tooltip ) \
+    BUTTON_SET( button, text, tooltip ); \
+    button->setIcon( QIcon( ":/pixmaps/"#image ) );
+
+#define BUTTON_SET_ACT_I( button, text, image, tooltip, thisslot ) \
+    BUTTON_SET_IMG( button, text, image, tooltip ); \
+    BUTTONACT( button, thisslot );
+
-static int DialogEvent_Type = QEvent::User + 1;
-static int PLUndockEvent_Type = QEvent::User + 2;