From 23dedd4ffd53685e612ffc5ee171eed52a43bb68 Mon Sep 17 00:00:00 2001 From: Francois Cartegnie Date: Sun, 28 Mar 2010 21:32:11 +0200 Subject: [PATCH] Qt: Drop the no longer used sample_classic Signed-off-by: Jean-Baptiste Kempf --- modules/gui/qt4/Modules.am | 1 - .../gui/qt4/components/preferences_widgets.cpp | 3 --- .../gui/qt4/components/preferences_widgets.hpp | 2 +- modules/gui/qt4/pixmaps/sample_classic.png | Bin 6082 -> 0 bytes modules/gui/qt4/vlc.qrc | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 modules/gui/qt4/pixmaps/sample_classic.png diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index bb505e2592..6da49d0a9f 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -133,7 +133,6 @@ DEPS_res = \ pixmaps/previous.png \ pixmaps/previous_16px.png \ pixmaps/profile_new.png \ - pixmaps/sample_classic.png \ pixmaps/sample_complete.png \ pixmaps/sample_minimal.png \ pixmaps/sample_skins.png \ diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index 90c8bc75ce..fa697f3f54 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -217,9 +217,6 @@ void InterfacePreviewWidget::setPreview( enum_style e_style ) switch( e_style ) { default: - case CLASSIC: - pixmapLocationString += "sample_classic"; - break; case COMPLETE: pixmapLocationString += "sample_complete"; break; diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp index df6120bb11..4ef0c35274 100644 --- a/modules/gui/qt4/components/preferences_widgets.hpp +++ b/modules/gui/qt4/components/preferences_widgets.hpp @@ -63,7 +63,7 @@ class InterfacePreviewWidget : public QLabel Q_OBJECT public: InterfacePreviewWidget( QWidget * ); - enum enum_style { CLASSIC, // aka VLC 0.8.6 + enum enum_style { COMPLETE, // aka MPC MINIMAL, // aka WMP12 minimal SKINS }; diff --git a/modules/gui/qt4/pixmaps/sample_classic.png b/modules/gui/qt4/pixmaps/sample_classic.png deleted file mode 100644 index e5dab5c060fb08e2cdacdd345ac093031b986ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6082 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 IM6N<$g3TYVzyJUM diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc index 4de860d546..b7dbc4e7bf 100644 --- a/modules/gui/qt4/vlc.qrc +++ b/modules/gui/qt4/vlc.qrc @@ -96,7 +96,6 @@ pixmaps/prefs/spref_cone_Interface_64.png pixmaps/prefs/spref_cone_Subtitles_64.png pixmaps/prefs/spref_cone_Video_64.png - pixmaps/sample_classic.png pixmaps/sample_complete.png pixmaps/sample_minimal.png pixmaps/sample_skins.png -- 2.39.2