[vlc-commits] commit: Win32: hopefully improve the fontconfig cache display ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun 16 00:44:37 2010 +0200| [18859359f8b0c90752b7148d5d85cb488d889e42] | committer: Jean-Baptiste Kempf 

Win32: hopefully improve the fontconfig cache display

(cherry picked from commit eed5cd17bb72639923faf541cc697467786adc2f)
(cherry picked from commit 7240444db88efabeea7e85310864f6b48c19537e)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=18859359f8b0c90752b7148d5d85cb488d889e42
---

 modules/gui/qt4/dialogs/external.cpp |   16 ++++++++++------
 modules/gui/qt4/dialogs/external.hpp |    2 --
 modules/misc/freetype.c              |    6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp
index f51645d..e9e20eb 100644
--- a/modules/gui/qt4/dialogs/external.cpp
+++ b/modules/gui/qt4/dialogs/external.cpp
@@ -183,13 +183,18 @@ 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");
     setMinimumDuration (300);
     setValue( 0 );
@@ -205,14 +210,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<QVLCProgressDialog *>(priv);
-
+    if( value > 0 )
+        self->setRange( 0, 1000 );
     if (text != NULL)
         emit self->described (qfu(text));
     emit self->progressed ((int)(value * 1000.));
@@ -245,6 +248,7 @@ void DialogHandler::startProgressBar (vlc_object_t *, void *value)
     dialog_progress_bar_t *data = (dialog_progress_bar_t *)value;
     QWidget *dlg = new QVLCProgressDialog (this, data);
 
+    QTimer::singleShot( 300, dlg, SLOT( show() ) );
 //    dlg->show ();
 }
 
diff --git a/modules/gui/qt4/dialogs/external.hpp b/modules/gui/qt4/dialogs/external.hpp
index 250842e..44b0a2a 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;
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index e83e721..cff07a6 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -359,8 +359,8 @@ static int Create( vlc_object_t *p_this )
             _("Please wait while your font cache is rebuilt.\n"
                 "This should take less than a few minutes."), NULL );
 
-    if( p_dialog )
-        dialog_ProgressSet( p_dialog, NULL, 0.5 );
+/*    if( p_dialog )
+        dialog_ProgressSet( p_dialog, NULL, 0.5 ); */
 
     FcConfigBuildFonts( fcConfig );
     t2 = mdate();
@@ -368,7 +368,7 @@ static int Create( vlc_object_t *p_this )
 
     if( p_dialog )
     {
-        dialog_ProgressSet( p_dialog, NULL, 1.0 );
+//        dialog_ProgressSet( p_dialog, NULL, 1.0 );
         dialog_ProgressDestroy( p_dialog );
         p_dialog = NULL;
     }