diff --git a/PlaylistShade.cpp b/PlaylistShade.cpp index 19fb4bc..2a6a1ac 100644 --- a/PlaylistShade.cpp +++ b/PlaylistShade.cpp @@ -3,10 +3,16 @@ #include "PlaylistShade.h" #include "Playlist.h" +#include + PlaylistShade::PlaylistShade (QWidget *parent) : QWidget (parent) { + QSettings s; XMMSHandler *xmmsh = XMMSHandler::getInstance (); + if (!s.contains ("playlist/shadedsize")) + s.setValue ("playlist/shadedsize", 8); + Skin *skin = Skin::getInstance (); setMinimumSize (275, 14); connect (skin, SIGNAL (skinChanged (Skin *)), @@ -15,9 +21,21 @@ PlaylistShade::PlaylistShade (QWidget *parent) : QWidget (parent) connect (xmmsh, SIGNAL(currentSong (QHash)), this, SLOT(setMediainfo (QHash))); + connect (xmmsh, SIGNAL(settingsSaved ()), + this, SLOT(settingsSaved ())); + m_text = "Promoe 0.1 - A very neat XMMS2 client"; } +void +PlaylistShade::settingsSaved () +{ + QSettings s; + + m_font.setPixelSize (s.value ("playlist/shadedsize").toInt ()); + update (); +} + void PlaylistShade::setMediainfo (QHash h) { @@ -35,6 +53,7 @@ PlaylistShade::setMediainfo (QHash h) void PlaylistShade::setPixmaps (Skin *skin) { + QSettings s; m_pixmap_le = skin->getPls (Skin::PLS_WS_LE_0); m_pixmap_re_0 = skin->getPls (Skin::PLS_WS_RE_0); @@ -43,7 +62,7 @@ PlaylistShade::setPixmaps (Skin *skin) m_pixmap_re = m_pixmap_re_0; m_font = QFont (skin->getPLeditValue ("font")); - m_font.setPixelSize (8); + m_font.setPixelSize (s.value ("playlist/shadedsize").toInt ()); m_color.setNamedColor (skin->getPLeditValue ("normal")); update (); diff --git a/PlaylistShade.h b/PlaylistShade.h index aeeb69f..9b5e52e 100644 --- a/PlaylistShade.h +++ b/PlaylistShade.h @@ -19,6 +19,7 @@ class PlaylistShade : public QWidget { public slots: void setPixmaps (Skin *skin); void setMediainfo (QHash h); + void settingsSaved (); private: QPixmap m_pixmap_le; diff --git a/SettingsWindow.cpp b/SettingsWindow.cpp index 56ae972..97de4c5 100644 --- a/SettingsWindow.cpp +++ b/SettingsWindow.cpp @@ -66,7 +66,7 @@ SettingsTabPlaylist::SettingsTabPlaylist (QWidget *parent) : QWidget (parent) QWidget *c = new QWidget (dummy); QHBoxLayout *h = new QHBoxLayout (c); - vbox->addWidget (c); + vbox->addWidget (c, 1); m_fontsize = new QSpinBox (c); m_fontsize->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed)); @@ -76,9 +76,23 @@ SettingsTabPlaylist::SettingsTabPlaylist (QWidget *parent) : QWidget (parent) h->addWidget (m_fontsize); QLabel *l = new QLabel (tr ("Playlist fontsize"), c); - l->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed)); - h->addWidget (l); + h->addWidget (l, 1); + c = new QWidget (dummy); + h = new QHBoxLayout (c); + + vbox->addWidget (c, 1); + + m_shadesize = new QSpinBox (c); + m_shadesize->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed)); + m_shadesize->setMinimum (6); + m_shadesize->setMaximum (20); + m_shadesize->setValue (s.value("shadedsize").toInt ()); + h->addWidget (m_shadesize); + + l = new QLabel (tr ("Playlist shaded mode fontsize"), c); + h->addWidget (l, 1); + s.endGroup (); } @@ -87,6 +101,7 @@ SettingsTabPlaylist::saveSettings (void) { QSettings s; s.setValue ("playlist/fontsize", m_fontsize->value ()); + s.setValue ("playlist/shadedsize", m_shadesize->value ()); } SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) @@ -99,7 +114,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) QWidget *c = new QWidget (dummy); QHBoxLayout *h = new QHBoxLayout (c); - vbox->addWidget (c); + vbox->addWidget (c, 1); m_quitonclose = new QCheckBox (tr ("Quit XMMS2D when closing Promoe"), c); if (s.contains ("promoe/quitonclose")) @@ -110,7 +125,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) c = new QWidget (dummy); h = new QHBoxLayout (c); - vbox->addWidget (c); + vbox->addWidget (c, 1); QLabel *l = new QLabel (tr ("Unshaded view"), c); @@ -122,7 +137,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) c = new QWidget (dummy); h = new QHBoxLayout (c); - vbox->addWidget (c); + vbox->addWidget (c, 1); s.beginGroup ("display_main"); m_mainscroll = new QCheckBox (tr ("Scroll titlebar"), c); @@ -148,7 +163,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) c = new QWidget (dummy); h = new QHBoxLayout (c); - vbox->addWidget (c); + vbox->addWidget (c, 1); m_mainttf = new QCheckBox (tr ("Draw text with TrueType fonts"), dummy); m_mainttf->setCheckState (s.value ("ttf").toBool () ? Qt::Checked : Qt::Unchecked); @@ -161,7 +176,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) c = new QWidget (dummy); h = new QHBoxLayout (c); - vbox->addWidget (c); + vbox->addWidget (c, 1); l = new QLabel (tr ("Shaded view"), c); @@ -173,7 +188,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) c = new QWidget (dummy); h = new QHBoxLayout (c); - vbox->addWidget (c); + vbox->addWidget (c, 1); s.beginGroup ("display_shaded"); m_shadescroll = new QCheckBox (tr ("Scroll titlebar"), c); @@ -199,7 +214,7 @@ SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent) c = new QWidget (dummy); h = new QHBoxLayout (c); - vbox->addWidget (c); + vbox->addWidget (c, 1); m_shadettf = new QCheckBox (tr ("Draw text with TrueType fonts"), dummy); m_shadettf->setCheckState (s.value ("ttf").toBool () ? Qt::Checked : Qt::Unchecked); diff --git a/SettingsWindow.h b/SettingsWindow.h index de7cfd5..fd07657 100644 --- a/SettingsWindow.h +++ b/SettingsWindow.h @@ -19,6 +19,7 @@ class SettingsTabPlaylist : public QWidget { private: QSpinBox *m_fontsize; + QSpinBox *m_shadesize; }; class SettingsTabMain : public QWidget {