Qt: Drop the no longer used sample_classic

[vlc] / modules / gui / qt4 / components / preferences_widgets.cpp

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index a7eac990b23c485752f69c84db317565d85fd0d1..fa697f3f5413ad5d541c014a1946b15977f6f666 100644 (file)
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -38,6 +38,7 @@
 #include "util/customwidgets.hpp"
 #include "util/qt_dirs.hpp"
 #include <vlc_keys.h>
+#include <vlc_intf_strings.h>
 
 #include <QString>
 #include <QVariant>
@@ -204,16 +205,31 @@ InterfacePreviewWidget::InterfacePreviewWidget ( QWidget *parent ) : QLabel( par
     setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
 }
 
-void InterfacePreviewWidget::setPreview( int comboid )
+void InterfacePreviewWidget::setNormalPreview( bool b_minimal )
 {
-    /* Need to move resources references as soon as qt4.cpp
-       local defines has been moved somewhere else
-    */
-    static const char pixmaps[][28] = { ":/prefsmenu/sample_classic",
-                                        ":/prefsmenu/sample_complete",
-                                        ":/prefsmenu/sample_minimal",
-                                        ":/prefsmenu/sample_skins" };
-    setPixmap( QPixmap( pixmaps[ comboid ] ) );
+    setPreview( ( b_minimal )?MINIMAL:COMPLETE );
+}
+
+void InterfacePreviewWidget::setPreview( enum_style e_style )
+{
+    QString pixmapLocationString(":/prefsmenu/");
+
+    switch( e_style )
+    {
+    default:
+    case COMPLETE:
+        pixmapLocationString += "sample_complete";
+        break;
+    case MINIMAL:
+        pixmapLocationString += "sample_minimal";
+        break;
+    case SKINS:
+        pixmapLocationString += "sample_skins";
+        break;
+    }
+
+    setPixmap( QPixmap( pixmapLocationString ) );
+    update();
 }
 
 
@@ -357,7 +373,7 @@ DirectoryConfigControl::DirectoryConfigControl( vlc_object_t *_p_this,
 void DirectoryConfigControl::updateField()
 {
     QString dir = QFileDialog::getExistingDirectory( NULL,
-                      qtr( "Select Directory" ),
+                      qtr( I_OP_SEL_DIR ),
                       text->text().isEmpty() ?
                         QVLCUserDir( VLC_HOME_DIR ) : text->text(),
                   QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );