Changeset 48018aedd562fa8751c620583e1e09852c79e1be

Timestamp:

24/08/08 08:30:51 (3 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1219559451 -0700

git-parent:

[ac495caa3816336ac9a2cece655cd69aa149fcbc]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1219559363 -0700

Message:

Video Widget cleaning. Corrections of previous commits.

zoom and resize when stop should be fixed. #1652 and #1716

Files:

• modules/gui/qt4/components/interface_widgets.cpp (modified) (5 diffs)
• modules/gui/qt4/components/interface_widgets.hpp (modified) (3 diffs)
• modules/gui/qt4/main_interface.cpp (modified) (23 diffs)
• modules/gui/qt4/main_interface.hpp (modified) (1 diff)

modules/gui/qt4/components/interface_widgets.cpp

@@ -68 +68 @@
-    /* Init */
-    i_vout = 0;
-    hide(); setMinimumSize( 16, 16 );
-    videoSize.rwidth() = -1;
-    videoSize.rheight() = -1;
+
+    hide();
+
+    /* Set the policy to expand in both directions */
-    setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
-
-IMVHO 
+
-    QPalette plt =  palette();
-
-
+
-    setPalette( plt );
+    setAutoFillBackground(true);
+
+    /* Indicates that the widget wants to draw directly onto the screen.
+       Widgets with this attribute set do not participate in composition
+       management */
-    setAttribute( Qt::WA_PaintOnScreen, true );
-
@@ -86 +93 @@
-             Qt::BlockingQueuedConnection );
-#else
-error This is broken. Fix it with a QEventLoop with a processEvents () 
+warning This is broken. Fix it with a QEventLoop with a processEvents ()
-    connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)),
-             this, SLOT(SetSizing(unsigned int, unsigned int )) );
@@ -100 +107 @@
-}
-
+/* Kill the vout at Destruction */
-VideoWidget::~VideoWidget()
-{
-
-? 
+ ?
+
-
-    if( p_vout )
@@ -135 +143 @@
-    }
-    i_vout = p_nvout->i_object_id;
+#ifndef NDEBUG
-    msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() );
+#endif
-    return ( void* )winId();
-}
@@ -157 +167 @@
-    videoSize.rwidth() = 0;
-    videoSize.rheight() = 0;
+    updateGeometry();
-    hide();
-    updateGeometry(); // Needed for deinterlace
-}
-

modules/gui/qt4/components/interface_widgets.hpp

@@ -42 +42 @@
-#include <QFrame>
-
-#define VOLUME_MAX 200
-
-/* on WIN32 hide() for fullscreen controller doesnt work, so it have to be
-   done by trick with setting the opacity of window */
-#ifdef WIN32
-    #define WIN32TRICK
-#endif
-
-/* to trying transparency with fullscreen controller on windows enable that */
-/* it can be enabled on-non windows systems,
-   but it will be transparent only with composite manager */
-#ifndef WIN32
-    #define HAVE_TRANSPARENCY 1
-#else
-    #define HAVE_TRANSPARENCY 0
-#endif
-
-/* Default value of opacity for FS controller */
-#define DEFAULT_OPACITY 0.75
-
-class ResizeEvent;
-class QPalette;
@@ -241 +221 @@
-};
-
+/* on WIN32 hide() for fullscreen controller doesnt work, so it have to be
+   done by trick with setting the opacity of window */
+#ifdef WIN32
+    #define WIN32TRICK
+#endif
+
+/* to trying transparency with fullscreen controller on windows enable that */
+/* it can be enabled on-non windows systems,
+   but it will be transparent only with composite manager */
+#ifndef WIN32
+    #define HAVE_TRANSPARENCY 1
+#else
+    #define HAVE_TRANSPARENCY 0
+#endif
+
+/* Default value of opacity for FS controller */
+#define DEFAULT_OPACITY 0.75
+
-/***********************************
- * Fullscreen controller
@@ -303 +301 @@
-
-
-
+
-class VolumeClickHandler : public QObject
-{

modules/gui/qt4/main_interface.cpp

@@ -2 +2 @@
- * main_interface.cpp : Main interface
- ****************************************************************************
-7
+8
- * $Id$
- *
@@ -52 +52 @@
-#include <QSlider>
-#include <QWidgetAction>
-#if 0
-#include <QDockWidget>
-#endif
-#include <QToolBar>
-#include <QGroupBox>
@@ -62 +59 @@
-#include <vlc_keys.h>
-#include <vlc_vout.h>
-
-#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);
-
-#define DS(i) i.width(),i.height()
-
-/* Callback prototypes */
@@ -113 +104 @@
-    settings->beginGroup( "MainWindow" );
-
-
-
+
+
+
+
-    notificationEnabled = (bool)config_GetInt( p_intf, "qt-notification" );
-
@@ -135 +128 @@
-#endif
-
-
-
-
+**************
+ and Status Bar
+**************
-    QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
-
-    /* StatusBar Creation */
-    createStatusBar();
@@ -198 +190 @@
-    /** OnTimeOut **/
-    /* TODO Remove this function, but so far, there is no choice because there
-
+#1365 
-    ON_TIMEOUT( updateOnTimer() );
-
-
-
+
+
-     * Callbacks
-
+**********
-    var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
-    var_AddCallback( p_intf, "interaction", InteractCallback, this );
@@ -214 +205 @@
-    var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
-
-
+
+
-    CONNECT( this, askReleaseVideo( void * ),
-             this, releaseVideoSlot( void * ) );
@@ -231 +223 @@
-    settings->endGroup();
-
+
+    /* Final sizing and showing */
+    setMinimumWidth( __MAX( controls->sizeHint().width(),
+                            menuBar()->sizeHint().width() ) );
-    show();
-
+    /* And switch to minimal view if needed
+       Must be called after the show() */
-    if( i_visualmode == QT_MINIMAL_MODE )
-        toggleMinimalView();
@@ -238 +236 @@
-    /* Update the geometry TODO: is it useful ?*/
-    updateGeometry();
-
+//    
-
-    /*****************************************************
@@ -307 +305 @@
-    nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel);
-
-
-    /* and adding those */
-    statusBar()->addWidget( nameLabel, 8 );
@@ -545 +542 @@
-QSize MainInterface::sizeHint() const
-{
-
-
+
-    int nheight = controls->isVisible() ?
-                  controls->size().height()
@@ -553 +549 @@
-                  : 0 ;
-
-    msg_Dbg( p_intf, "1 %i %i", nheight, nwidth );
-    if( VISIBLE( bgWidget ) )
-    {
-        nheight += bgWidget->size().height();
-        nwidth  = bgWidget->size().width();
-
-
-
+
+
-    {
-        nheight += videoWidget->sizeHint().height();
-        nwidth  = videoWidget->sizeHint().width();
-        msg_Dbg( p_intf, "2 %i %i", nheight, nwidth );
-    }
-#if 0
@@ -571 +564 @@
-        nheight += dockPL->size().height();
-        nwidth = __MAX( nwidth, dockPL->size().width() );
-Dbg
+Warn
-    }
-#endif
-    msg_Dbg( p_intf, "4 %i %i", nheight, nwidth );
-    return QSize( nwidth, nheight );
-}
-
-#if 0
-/* FIXME This is dead code and need to be removed AT THE END */
-void MainInterface::resizeEvent( QResizeEvent *e )
-{
-    if( videoWidget )
-        videoWidget->widgetSize.setWidth( e->size().width() - addSize.width() );
-    if( videoWidget && videoIsActive && videoWidget->widgetSize.height() > 1 )
-    {
-        SET_WH( videoWidget, e->size().width() - addSize.width(),
-                             e->size().height()  - addSize.height() );
-        videoWidget->updateGeometry();
-    }
-    if( VISIBLE( playlistWidget ) )
-    {
-//        SET_WH( playlistWidget , e->size().width() - addSize.width(),
-              //                   e->size().height() - addSize.height() );
-        playlistWidget->updateGeometry();
-    }
-}
-#endif
-
-void MainInterface::toggleFSC()
@@ -606 +577 @@
-   QApplication::postEvent( fullscreenControls, static_cast<QEvent *>(eShow) );
-}
-
-
-
-
-
-
+
-
-//FIXME remove me at the end...
-void MainInterface::debug()
-{
+#ifndef NDEBUG
-    msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() );
-    msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() );
-    if( videoWidget && videoWidget->isVisible() )
-    {
-
-
-
+        
+    
+    
-    }
-    adjustSize();
+#endif
-}
-
@@ -639 +607 @@
- * Video Handling
- ****************************************************************************/
+
+/* This event is used to deal with the fullscreen and always on top
+   issue conflict (bug in wx) */
-class SetVideoOnTopQtEvent : public QEvent
-{
@@ -646 +617 @@
-    {}
-
-
-
-
-
+
-
-private:
@@ -656 +624 @@
-
-/**
- * README
- * README
- * Thou shall not call/resize/hide widgets from on another thread.
@@ -665 +632 @@
-                                   unsigned int *pi_height )
-{
-    bgWasVisible = false;
-
-    /* Request the videoWidget */
-    void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height );
@@ -677 +642 @@
-            emit askBgWidgetToToggle();
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        videoIsActive = true;
-
-//        emit askVideoToResize( *pi_width, *pi_height );
-        emit askUpdate();
-
@@ -700 +655 @@
-}
-
+/* Call from the WindowClose function */
-void MainInterface::releaseVideo( void *p_win )
-{
@@ -707 +663 @@
-}
-
+/* Function that is CONNECTED to the previous emit */
-void MainInterface::releaseVideoSlot( void *p_win )
-{
-    videoWidget->release( p_win );
-    videoWidget->hide();
-
-    if( bgWasVisible )
-    {
+        /* Reset the bg state */
-        bgWasVisible = false;
-        bgWidget->show();
-    }
-
-
-
-
-
+
+
+
+
+
-int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
-{
@@ -826 +784 @@
-        {
-            /* If video is visible, then toggle the status of bgWidget */
-      
+
-        }
-    }
@@ -841 +799 @@
-{
-    msg_Dbg( p_intf, "Updating the geometry" );
-
-debug
+    
+adjustSize
-}
-

modules/gui/qt4/main_interface.hpp

@@ -76 +76 @@
-    int controlVideo( void *p_window, int i_query, va_list args );
-
-#if 0
-    void requestLayoutUpdate();
-#endif
-    /* Getters */
-    QSystemTrayIcon *getSysTray() { return sysTray; };