renamed XSettings to XConfig.

src/Display.cpp

@@ -74,6 +74,7 @@ SkinDisplay::paintEvent (QPaintEvent *event)
 	paint.end();
 }
 
+
 void
 SkinDisplay::fileOpen (void)
 {

src/XMMSHandler.cpp

@@ -179,6 +179,7 @@ XMMSHandler::DictToQHash (const std::string &key,
 	}
 }
 
+/*
 void
 XMMSHandler::PropDictToQHash (const std::string &key,
                               const Xmms::Dict::Variant &value,
@@ -196,7 +197,7 @@ XMMSHandler::PropDictToQHash (const std::string &key,
 		             QString::fromUtf8 (boost::get< std::string > (value).c_str()));
 	}
 }
-
+*/
 /*
 uint
 XMMSHandler::medialibQuery (QString q)

src/XMMSHandler.h

@@ -103,10 +103,10 @@ class XMMSHandler : public XClient {
 		void DictToQHash (const std::string &key,
 		                  const Xmms::Dict::Variant &value,
 		                  QHash<QString, QString> &hash);
-	void PropDictToQHash (const std::string &key,
-		                      const Xmms::Dict::Variant &value,
-		                      const std::string &source,
-		                      QHash<QString, QString> &hash);
+//	void PropDictToQHash (const std::string &key,
+//		                      const Xmms::Dict::Variant &value,
+//		                      const std::string &source,
+//		                      QHash<QString, QString> &hash);
 
 		bool volume_get (const Xmms::Dict &levels);
 		bool volume_error (const std::string &error);

src/equalizer/equalizerwidget.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "XMMSHandler.h"
-#include "xsettings.h"
+#include "xconfig.h"
 
 #include "equalizerwidget.h"
 
@@ -49,7 +49,7 @@ EqualizerWidget::EqualizerWidget (QWidget *parent) : QWidget (parent)
 {
 	Skin *skin = Skin::getInstance ();
 	XMMSHandler &client = XMMSHandler::getInstance ();
-	m_xsettings = client.settings ();
+	m_xconfig = client.xconfig ();
 
 	connect (skin, SIGNAL(skinChanged(Skin *)),
 	         this, SLOT(setPixmaps(Skin *)));
@@ -93,25 +93,25 @@ EqualizerWidget::EqualizerWidget (QWidget *parent) : QWidget (parent)
 		         this, SLOT (updateServerBands (int, int)));
 	}
 
-	connect (m_xsettings, SIGNAL (configChanged (QString, QString)),
+	connect (m_xconfig, SIGNAL (configChanged (QString, QString)),
 	         this, SLOT (serverConfigChanged (QString, QString)));
 
-	// if the settings from the server were already loaded, we will only
+	// if the config from the server were already loaded, we will only
 	// receive configChanged signals for values that really change
 	// so we must request the existing values manually
-	if (m_xsettings->isReady()) {
+	if (m_xconfig->isReady()) {
 		QString key;
 		QString value;
 		// set enabled checkbox
 		key = QString ("equalizer.enabled");
-		value = m_xsettings->value_get (key);
+		value = m_xconfig->value_get (key);
 		serverConfigChanged (key, value);
 		// set preamp
 
 		// Set band-sliders
 		for (int i=0; i < 10; i++) {
 			key = QString ("equalizer.legacy%1").arg(i);
-			value = m_xsettings->value_get (key);
+			value = m_xconfig->value_get (key);
 			serverConfigChanged (key, value);
 		}
 	}
@@ -185,22 +185,22 @@ EqualizerWidget::serverConfigChanged (QString key, QString value)
 void
 EqualizerWidget::setEqualizerEnabled (bool enabled) {
 	if (enabled) {
-		m_xsettings->value_set ("equalizer.enabled", "1");
-		m_xsettings->value_set ("equalizer.use_legacy", "1");
+		m_xconfig->value_set ("equalizer.enabled", "1");
+		m_xconfig->value_set ("equalizer.use_legacy", "1");
 	} else {
-		m_xsettings->value_set ("equalizer.enabled", "0");
+		m_xconfig->value_set ("equalizer.enabled", "0");
 	}
 }
 
 void
 EqualizerWidget::updateServerPreamp (int value)
 {
-	m_xsettings->value_set ("equalizer.preamp", QString::number (value));
+	m_xconfig->value_set ("equalizer.preamp", QString::number (value));
 }
 
 void
 EqualizerWidget::updateServerBands (int value, int id)
 {
 	QString key = QString ("equalizer.legacy%1").arg (id);
-	m_xsettings->value_set (key, QString::number (value));
+	m_xconfig->value_set (key, QString::number (value));
 }

src/equalizer/equalizerwidget.h

@@ -23,7 +23,7 @@ class QPixmap;
 class QPaintEvent;
 
 #include "VolumeSlider.h"
-class XSettings;
+class XConfig;
 class Skin;
 class Button;
 class ToggleButton;
@@ -66,7 +66,7 @@ class EqualizerWidget : public QWidget
 		void updateServerBands (int value, int id);
 
 	private:
-		XSettings *m_xsettings;
+		XConfig *m_xconfig;
 		QPixmap m_pixmap;
 		QPixmap m_graph;
 		ToggleButton *m_enable;

src/playlist/playlistwidget.cpp

@@ -180,17 +180,17 @@ PlaylistWidget::PlaylistWidget (QWidget *parent) : QWidget (parent)
 
 	m_view = new PlaylistView (this);
 	m_view->move (10, 20);
-	m_view->resize (size().width()-30, size().height()-20-38);
+//	m_view->resize (size().width()-30, size().height()-20-38);
 	// TODO: creation of Playlistmodel should be done elsewhere
 	m_view->setModel (XMMSHandler::getInstance().getPlaylistModel());
 
-	//m_list = new PlaylistList (m_view);
-
 	/*
 	 * This is a hack to make PlaylistScrollBar work with PlaylistView.
 	 * It is necessery because of limitations and at least one Bug in the
 	 *  QT library (as of Version 4.3)
 	 * TODO: This might break in a future Qt version. Try to find a better solution
+	 * FIXME: scrollbar is only visible if playlist was closed on startup or
+	 * after resizing the playlist
 	 */
 	m_scrollBar = new PlaylistScrollBar (this);
 	m_view->setVerticalScrollBar (m_scrollBar);
@@ -208,7 +208,7 @@ PlaylistWidget::PlaylistWidget (QWidget *parent) : QWidget (parent)
 	addButtons ();
 
 	setMinimumSize (275, 116);
-	resize (275, 300);
+//	resize (275, 300);
 }
 
 void
@@ -246,7 +246,6 @@ PlaylistWidget::addButtons (void)
 								Skin::PLS_DEL_FIL_1);
 	connect (b, SIGNAL (activated ()),
 	         m_view, SLOT (removeSelected ()));
-//	connect (b, SIGNAL(activated ()), m_list, SLOT (deleteFiles ()));
 
 	/* Selection menu */
 	m_sel = new PlaylistMenu (this, Skin::PLS_SEL,
@@ -370,7 +369,8 @@ void
 PlaylistWidget::setPixmaps (Skin *skin)
 {
 	setActive (m_active);
-	resize (size().width(), size().height());
+
+	update ();
 }
 
 void

src/playlist/playlistwidget.h

@@ -19,23 +19,19 @@
 
 #include "XMMSHandler.h"
 
-#include <QMainWindow>
-#include <QFont>
 #include <QScrollBar>
 #include <QSizeGrip>
 
-class MainWindow;
 class PlaylistWidget;
 class PlaylistScroller;
 
 #include "Button.h"
 
 class Skin;
-//class PlaylistList;
 class PlaylistView;
-class PlaylistShade;
 class PlaylistMenu;
 
+
 class PlaylistSizeGrip : public QSizeGrip {
 	Q_OBJECT