renaming experimental branch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4675 90c681e8-e032-0410-971d-27865f9a5e38

5 files changed, 7 insertions, 87 deletions

diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt
index a052d39f3..698a0adee 100644
--- a/src/plugins/Ui/skinned/CMakeLists.txt
+++ b/src/plugins/Ui/skinned/CMakeLists.txt
@@ -94,58 +94,10 @@ SET(skinned_HDRS
     shortcutitem.h
 )
 
-SET(skinned_MOC_HDRS
-    balancebar.h
-    button.h
-    skinnedsettings.h
-    display.h
-    dock.h
-    eqgraph.h
-    eqslider.h
-    eqtitlebar.h
-    eqwidget.h
-    listwidget.h
-    mainvisual.h
-    mainwindow.h
-    monostereo.h
-    number.h
-    pixmapwidget.h
-    playlistcontrol.h
-    playlist.h
-    playlistslider.h
-    playlisttitlebar.h
-    playstatus.h
-    positionbar.h
-    preseteditor.h
-    shadedbar.h
-    shadedvisual.h
-    skin.h
-    skinreader.h
-    symboldisplay.h
-    textscroller.h
-    timeindicator.h
-    titlebarcontrol.h
-    titlebar.h
-    togglebutton.h
-    visualmenu.h
-    volumebar.h
-    playlistbrowser.h
-    playlistselector.h
-    popupwidget.h
-    popupsettings.h
-    actionmanager.h
-    shortcutdialog.h
-    skinnedfactory.h
-    hotkeyeditor.h
-)
-
 SET(skinned_RCCS default/default.qrc resources/resources.qrc translations/translations.qrc)
 
 QT4_ADD_RESOURCES(skinned_RCC_SRCS ${skinned_RCCS})
 
-QT4_AUTOMOC(${skinned_MOC_SRC})
-QT4_WRAP_CPP(skinned_MOC_SRCS ${skinned_MOC_HDRS})
-
 # user interface
 
 SET(skinned_UIS
@@ -163,7 +115,7 @@ QT4_WRAP_UI(skinned_UIS_H ${skinned_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(X11_FOUND)
-ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_MOC_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS})
+ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS})
 target_link_libraries(skinned ${QT_LIBRARIES} libqmmp qmmpui ${X11_LDFLAGS})
 add_dependencies(skinned qmmpui libqmmp)
 target_link_libraries(skinned ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS})
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index c324eda66..0f6c9bf89 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -333,21 +333,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e)
 
         if ((Qt::ShiftModifier & e->modifiers()))
         {
-            bool select = true;
-            if (m_pressed_index > m_anchor_index)
-            {
-                for (int j = m_anchor_index;j <= m_pressed_index;j++)
-                {
-                    m_model->setSelected(j, select);
-                }
-            }
-            else
-            {
-                for (int j = m_anchor_index;j >= m_pressed_index;j--)
-                {
-                    m_model->setSelected(j, select);
-                }
-            }
+            m_model->setSelected(m_pressed_index, m_anchor_index, true);
             m_anchor_index = m_pressed_index;
         }
         else //ShiftModifier released
@@ -516,7 +502,7 @@ void ListWidget::setModel(PlayListModel *selected, PlayListModel *previous)
     recenterCurrent();
     updateList();
     connect (m_model, SIGNAL(currentChanged()), SLOT(recenterCurrent()));
-    connect (m_model, SIGNAL(listChanged()), SLOT(updateList()));
+    connect (m_model, SIGNAL(listChanged(int)), SLOT(updateList()));
 }
 
 void ListWidget::scroll(int sc)
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp
index 8496903cc..e7c1f266b 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.cpp
+++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp
@@ -204,7 +204,7 @@ void PlayListTitleBar::setModel(PlayListModel *selected, PlayListModel *previous
     if(previous)
         disconnect(previous, 0, this, 0); //disconnect previous model
     m_model = selected;
-    connect (m_model, SIGNAL(listChanged()), SLOT(showCurrent()));
+    connect (m_model, SIGNAL(listChanged(int)), SLOT(showCurrent()));
     showCurrent();
 }
 
@@ -212,7 +212,7 @@ void PlayListTitleBar::readSettings()
 {
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     m_font.fromString(settings.value("Skinned/pl_font", QApplication::font().toString()).toString());
-    m_font.setPointSize(8);
+    m_font.setPointSize(6);
 }
 
 void PlayListTitleBar::updateSkin()
diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index 7f42b6f89..4223dc6b4 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -718,7 +718,7 @@ void Skin::loadVolume()
 
     m_volume.clear();
     for (int i = 0; i < 28; ++i)
-        m_volume.append(pixmap->copy (0,i*15, pixmap->width(),13));
+        m_volume.append(pixmap->copy (0,i*15, qMin(pixmap->width(), 68), 13));
     if (pixmap->height() > 425)
     {
         buttons [BT_VOL_N] = pixmap->copy (15,422,14, pixmap->height() - 422);
diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro
index 58b7c75f4..f1ab2f846 100644
--- a/src/plugins/Ui/skinned/skinned.pro
+++ b/src/plugins/Ui/skinned/skinned.pro
@@ -136,21 +136,3 @@ PKGCONFIG += x11
 INCLUDEPATH += ../../../
 
 RESOURCES += translations/translations.qrc
-TRANSLATIONS = translations/skinned_plugin_ru.ts \
-    translations/skinned_plugin_tr.ts \
-    translations/skinned_plugin_zh_CN.ts \
-    translations/skinned_plugin_cs.ts \
-    translations/skinned_plugin_pt_BR.ts \
-    translations/skinned_plugin_uk_UA.ts \
-    translations/skinned_plugin_zh_TW.ts \
-    translations/skinned_plugin_de.ts \
-    translations/skinned_plugin_pl_PL.ts \
-    translations/skinned_plugin_it.ts \
-    translations/skinned_plugin_lt.ts \
-    translations/skinned_plugin_hu.ts \
-    translations/skinned_plugin_nl.ts \
-    translations/skinned_plugin_ja.ts \
-    translations/skinned_plugin_es.ts \
-    translations/skinned_plugin_sk.ts \
-    translations/skinned_plugin_sr_BA.ts \
-    translations/skinned_plugin_sr_RS.ts