From 7240444db88efabeea7e85310864f6b48c19537e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Wed, 16 Jun 2010 00:44:37 +0200 Subject: [PATCH] Qt: external progressBar, simplification for win32 style --- modules/gui/qt4/dialogs/external.cpp | 14 ++++++++------ modules/gui/qt4/dialogs/external.hpp | 2 -- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp index f51645d85c..9e86da874f 100644 --- a/modules/gui/qt4/dialogs/external.cpp +++ b/modules/gui/qt4/dialogs/external.cpp @@ -183,11 +183,15 @@ void DialogHandler::requestAnswer (vlc_object_t *, void *value) QVLCProgressDialog::QVLCProgressDialog (DialogHandler *parent, struct dialog_progress_bar_t *data) - : QProgressDialog (qfu(data->message), - data->cancel ? ("&" + qfu(data->cancel)) : 0, 0, 1000), + : QProgressDialog ( ), handler (parent), cancelled (false) { + setLabelText( qfu(data->message) ); + setRange( 0, 0 ); + + if( data->cancel ) + setCancelButton( new QPushButton( "&" + qfu(data->cancel) ) ); if (data->title != NULL) setWindowTitle (qfu(data->title)); setWindowRole ("vlc-progress"); @@ -205,14 +209,12 @@ QVLCProgressDialog::QVLCProgressDialog (DialogHandler *parent, data->p_sys = this; } -QVLCProgressDialog::~QVLCProgressDialog (void) -{ -} void QVLCProgressDialog::update (void *priv, const char *text, float value) { QVLCProgressDialog *self = static_cast(priv); - + if( value > 0 ) + self->setRange( 0, 1000 ); if (text != NULL) emit self->described (qfu(text)); emit self->progressed ((int)(value * 1000.)); diff --git a/modules/gui/qt4/dialogs/external.hpp b/modules/gui/qt4/dialogs/external.hpp index 250842e731..44b0a2a3da 100644 --- a/modules/gui/qt4/dialogs/external.hpp +++ b/modules/gui/qt4/dialogs/external.hpp @@ -68,8 +68,6 @@ class QVLCProgressDialog : public QProgressDialog public: QVLCProgressDialog (DialogHandler *parent, struct dialog_progress_bar_t *); - virtual ~QVLCProgressDialog (void); - private: DialogHandler *handler; bool cancelled; -- 2.39.2