[vlc-commits] Revert "Qt: StandardPanel: Add spinner on network SD nodes."
Rémi Denis-Courmont
git at videolan.org
Thu Jan 24 16:40:34 CET 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jan 24 17:39:27 2013 +0200| [18fd08ca06b401e2f693289b8d97ce2ab7a7a44e] | committer: Rémi Denis-Courmont
Revert "Qt: StandardPanel: Add spinner on network SD nodes."
This reverts commit 62c5847095178cf70de977c3c339d5293668979b.
This commit broke the tests suite; the Qt interfaces crashes always.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=18fd08ca06b401e2f693289b8d97ce2ab7a7a44e
---
modules/gui/qt4/components/playlist/playlist.cpp | 1 -
modules/gui/qt4/components/playlist/selector.cpp | 7 ----
modules/gui/qt4/components/playlist/selector.hpp | 2 -
.../gui/qt4/components/playlist/standardpanel.cpp | 40 --------------------
.../gui/qt4/components/playlist/standardpanel.hpp | 6 ---
5 files changed, 56 deletions(-)
diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 0837d46..3598743 100644
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -141,7 +141,6 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
DCONNECT( selector, categoryActivated( playlist_item_t *, bool ),
mainView, setRootItem( playlist_item_t *, bool ) );
mainView->setRootItem( p_root, false );
- CONNECT( selector, SDCategorySelected(bool), mainView, setWaiting(bool) );
/* */
split = new PlaylistSplitter( this );
diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp
index 6463176..8b4c0cc 100644
--- a/modules/gui/qt4/components/playlist/selector.cpp
+++ b/modules/gui/qt4/components/playlist/selector.cpp
@@ -334,7 +334,6 @@ void PLSelector::createItems()
selItem = addItem( SD_TYPE, *ppsz_longname );
}
- selItem->treeItem()->setData( 0, SD_CATEGORY_ROLE, *p_category );
putSDData( selItem, *ppsz_name, *ppsz_longname );
if ( ! icon.isNull() )
selItem->treeItem()->setData( 0, Qt::DecorationRole, icon );
@@ -420,13 +419,7 @@ void PLSelector::setSource( QTreeWidgetItem *item )
/* */
if( pl_item )
- {
emit categoryActivated( pl_item, false );
- emit SDCategorySelected(
- item->data( 0, SD_CATEGORY_ROLE ).toInt()
- & ( SD_CAT_INTERNET | SD_CAT_LAN )
- );
- }
}
PLSelItem * PLSelector::addItem (
diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp
index 2daaa54..b1755b9 100644
--- a/modules/gui/qt4/components/playlist/selector.hpp
+++ b/modules/gui/qt4/components/playlist/selector.hpp
@@ -62,7 +62,6 @@ enum {
IN_ITEM_ROLE, //input_item_t->i_id
SPECIAL_ROLE, //SpecialData
CAP_SEARCH_ROLE,
- SD_CATEGORY_ROLE,
};
enum ItemAction {
@@ -155,7 +154,6 @@ private slots:
signals:
void categoryActivated( playlist_item_t *, bool );
- void SDCategorySelected( bool );
};
#endif
diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 739f0fd..35e6117 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -33,7 +33,6 @@
#include "components/playlist/ml_model.hpp" /* MLModel */
#include "components/playlist/views.hpp" /* 3 views */
#include "components/playlist/selector.hpp" /* PLSelector */
-#include "util/customwidgets.hpp" /* PixmapAnimator */
#include "menus.hpp" /* Popup */
#include "input_manager.hpp" /* THEMIM */
#include "dialogs_provider.hpp" /* THEDP */
@@ -88,14 +87,6 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
currentRootIndexId = -1;
lastActivatedId = -1;
- QList<QString> frames;
- frames << ":/util/wait1";
- frames << ":/util/wait2";
- frames << ":/util/wait3";
- frames << ":/util/wait4";
- spinnerAnimation = new PixmapAnimator( this, frames );
- CONNECT( spinnerAnimation, pixmapReady( const QPixmap & ), this, updateViewport() );
-
/* Saved Settings */
int i_savedViewMode = getSettings()->value( "Playlist/view-mode", TREE_VIEW ).toInt();
i_zoom = getSettings()->value( "Playlist/zoom", 0 ).toInt();
@@ -512,20 +503,6 @@ bool StandardPLPanel::eventFilter ( QObject *obj, QEvent * event )
"media source from the left."),
QPalette::Text );
}
- else if ( spinnerAnimation->state() == PixmapAnimator::Running )
- {
- if ( currentView->model()->rowCount() )
- spinnerAnimation->stop(); /* Trick until SD emits events */
- else
- {
- QWidget *viewport = qobject_cast<QWidget *>( obj );
- QStylePainter painter( viewport );
- QPixmap *spinner = spinnerAnimation->getPixmap();
- QPoint point = viewport->geometry().center();
- point -= QPoint( spinner->size().width() / 2, spinner->size().height() / 2 );
- painter.drawPixmap( point, *spinner );
- }
- }
}
return false;
}
@@ -705,23 +682,6 @@ void StandardPLPanel::showView( int i_view )
gotoPlayingItem();
}
-void StandardPLPanel::setWaiting( bool b )
-{
- if ( b )
- {
- spinnerAnimation->setLoopCount( 20 ); /* Trick until SD emits an event */
- spinnerAnimation->start();
- }
- else
- spinnerAnimation->stop();
-}
-
-void StandardPLPanel::updateViewport()
-{
- /* A single update on parent widget won't work */
- currentView->viewport()->repaint();
-}
-
int StandardPLPanel::currentViewIndex() const
{
if( currentView == treeView )
diff --git a/modules/gui/qt4/components/playlist/standardpanel.hpp b/modules/gui/qt4/components/playlist/standardpanel.hpp
index b4af779..725d79e 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.hpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.hpp
@@ -53,7 +53,6 @@ class PicFlowView;
class LocationBar;
class PLSelector;
class PlaylistWidget;
-class PixmapAnimator;
class StandardPLPanel: public QWidget
{
@@ -111,14 +110,10 @@ private:
/* for popup */
QModelIndex popupIndex; /* FIXME: don't store here, pass as Action param */
- /* Wait spinner */
- PixmapAnimator *spinnerAnimation;
-
public slots:
void setRootItem( playlist_item_t *, bool );
void browseInto( const QModelIndex& );
void showView( int );
- void setWaiting( bool ); /* spinner */
private slots:
void deleteSelection();
@@ -145,7 +140,6 @@ private slots:
void toggleColumnShown( int );
void cycleViews();
- void updateViewport(); /* spinner */
signals:
void viewChanged( const QModelIndex& );
More information about the vlc-commits
mailing list