Added playlist fontsize setting.
This commit is contained in:
parent
0050afd285
commit
c08a635673
5 changed files with 72 additions and 4 deletions
|
@ -187,7 +187,6 @@ PlaylistWindow::leaveEvent (QEvent *event)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
PlaylistWidget::PlaylistWidget (QWidget *parent) : QWidget (parent)
|
PlaylistWidget::PlaylistWidget (QWidget *parent) : QWidget (parent)
|
||||||
{
|
{
|
||||||
Skin *skin = Skin::getInstance ();
|
Skin *skin = Skin::getInstance ();
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
|
|
||||||
#include <QPaintEvent>
|
#include <QPaintEvent>
|
||||||
#include <QDrag>
|
#include <QDrag>
|
||||||
|
#include <QSettings>
|
||||||
#include <QStyleOptionHeader>
|
#include <QStyleOptionHeader>
|
||||||
|
|
||||||
PlaylistItem::PlaylistItem (PlaylistList *pl, uint id)
|
PlaylistItem::PlaylistItem (PlaylistList *pl, uint id)
|
||||||
|
@ -39,9 +40,13 @@ PlaylistItem::text (void)
|
||||||
|
|
||||||
PlaylistList::PlaylistList (QWidget *parent) : QWidget (parent)
|
PlaylistList::PlaylistList (QWidget *parent) : QWidget (parent)
|
||||||
{
|
{
|
||||||
|
QSettings s;
|
||||||
XMMSHandler *xmmsh = XMMSHandler::getInstance ();
|
XMMSHandler *xmmsh = XMMSHandler::getInstance ();
|
||||||
Skin *skin = Skin::getInstance ();
|
Skin *skin = Skin::getInstance ();
|
||||||
|
|
||||||
|
if (!s.contains("playlist/fontsize"))
|
||||||
|
s.setValue ("playlist/fontsize", 10);
|
||||||
|
|
||||||
setAttribute (Qt::WA_NoBackground);
|
setAttribute (Qt::WA_NoBackground);
|
||||||
setFocusPolicy (Qt::StrongFocus);
|
setFocusPolicy (Qt::StrongFocus);
|
||||||
|
|
||||||
|
@ -73,6 +78,22 @@ PlaylistList::PlaylistList (QWidget *parent) : QWidget (parent)
|
||||||
|
|
||||||
connect (xmmsh, SIGNAL(playbackStatusChanged(uint)),
|
connect (xmmsh, SIGNAL(playbackStatusChanged(uint)),
|
||||||
this, SLOT(setStatus(uint)));
|
this, SLOT(setStatus(uint)));
|
||||||
|
|
||||||
|
connect (xmmsh, SIGNAL(settingsSaved()),
|
||||||
|
this, SLOT(settingsSaved()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
PlaylistList::settingsSaved ()
|
||||||
|
{
|
||||||
|
QSettings s;
|
||||||
|
m_font->setPixelSize (s.value ("playlist/fontsize").toInt ());
|
||||||
|
|
||||||
|
if (m_fontmetrics) {
|
||||||
|
delete m_fontmetrics;
|
||||||
|
}
|
||||||
|
m_fontmetrics = new QFontMetrics (*m_font);
|
||||||
|
update ();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -578,6 +599,7 @@ PlaylistList::getFontH (void)
|
||||||
void
|
void
|
||||||
PlaylistList::setPixmaps (Skin *skin)
|
PlaylistList::setPixmaps (Skin *skin)
|
||||||
{
|
{
|
||||||
|
QSettings s;
|
||||||
QPalette pal;
|
QPalette pal;
|
||||||
QColor c;
|
QColor c;
|
||||||
c.setNamedColor (skin->getPLeditValue ("normalbg"));
|
c.setNamedColor (skin->getPLeditValue ("normalbg"));
|
||||||
|
@ -589,7 +611,7 @@ PlaylistList::setPixmaps (Skin *skin)
|
||||||
delete m_font;
|
delete m_font;
|
||||||
}
|
}
|
||||||
m_font = new QFont (skin->getPLeditValue ("font"));
|
m_font = new QFont (skin->getPLeditValue ("font"));
|
||||||
m_font->setPixelSize (10);
|
m_font->setPixelSize (s.value ("playlist/fontsize").toInt ());
|
||||||
|
|
||||||
if (m_fontmetrics) {
|
if (m_fontmetrics) {
|
||||||
delete m_fontmetrics;
|
delete m_fontmetrics;
|
||||||
|
|
|
@ -27,6 +27,7 @@ class PlaylistList : public QWidget {
|
||||||
void playlistChanged (QHash<QString,QString>);
|
void playlistChanged (QHash<QString,QString>);
|
||||||
void currentID (uint);
|
void currentID (uint);
|
||||||
void setStatus (uint);
|
void setStatus (uint);
|
||||||
|
void settingsSaved ();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void paintEvent (QPaintEvent *event);
|
void paintEvent (QPaintEvent *event);
|
||||||
|
|
|
@ -36,7 +36,7 @@ SettingsWindow::SettingsWindow (QWidget *parent) : QMainWindow (parent)
|
||||||
hbox->addWidget (ok);
|
hbox->addWidget (ok);
|
||||||
|
|
||||||
m_mainwindow = new SettingsTabMain (tab);
|
m_mainwindow = new SettingsTabMain (tab);
|
||||||
m_playlistwin = new QWidget (tab);
|
m_playlistwin = new SettingsTabPlaylist (tab);
|
||||||
m_medialib = new QWidget (tab);
|
m_medialib = new QWidget (tab);
|
||||||
|
|
||||||
tab->addTab (m_mainwindow, tr ("Main Window"));
|
tab->addTab (m_mainwindow, tr ("Main Window"));
|
||||||
|
@ -49,11 +49,46 @@ SettingsWindow::okButton (void)
|
||||||
{
|
{
|
||||||
XMMSHandler *xmmsh = XMMSHandler::getInstance ();
|
XMMSHandler *xmmsh = XMMSHandler::getInstance ();
|
||||||
m_mainwindow->saveSettings ();
|
m_mainwindow->saveSettings ();
|
||||||
|
m_playlistwin->saveSettings ();
|
||||||
|
|
||||||
close ();
|
close ();
|
||||||
xmmsh->updateSettings ();
|
xmmsh->updateSettings ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SettingsTabPlaylist::SettingsTabPlaylist (QWidget *parent) : QWidget (parent)
|
||||||
|
{
|
||||||
|
QSettings s;
|
||||||
|
|
||||||
|
s.beginGroup("playlist");
|
||||||
|
QWidget *dummy = new QWidget (this);
|
||||||
|
|
||||||
|
QVBoxLayout *vbox = new QVBoxLayout (dummy);
|
||||||
|
QWidget *c = new QWidget (dummy);
|
||||||
|
QHBoxLayout *h = new QHBoxLayout (c);
|
||||||
|
|
||||||
|
vbox->addWidget (c);
|
||||||
|
|
||||||
|
m_fontsize = new QSpinBox (c);
|
||||||
|
m_fontsize->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
|
||||||
|
m_fontsize->setMinimum (6);
|
||||||
|
m_fontsize->setMaximum (20);
|
||||||
|
m_fontsize->setValue (s.value("fontsize").toInt ());
|
||||||
|
h->addWidget (m_fontsize);
|
||||||
|
|
||||||
|
QLabel *l = new QLabel (tr ("Playlist fontsize"), c);
|
||||||
|
l->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
|
||||||
|
h->addWidget (l);
|
||||||
|
|
||||||
|
s.endGroup ();
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
SettingsTabPlaylist::saveSettings (void)
|
||||||
|
{
|
||||||
|
QSettings s;
|
||||||
|
s.setValue ("playlist/fontsize", m_fontsize->value ());
|
||||||
|
}
|
||||||
|
|
||||||
SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent)
|
SettingsTabMain::SettingsTabMain (QWidget *parent) : QWidget (parent)
|
||||||
{
|
{
|
||||||
QSettings s;
|
QSettings s;
|
||||||
|
|
|
@ -10,6 +10,17 @@
|
||||||
#include <QSpinBox>
|
#include <QSpinBox>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
|
|
||||||
|
class SettingsTabPlaylist : public QWidget {
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
SettingsTabPlaylist (QWidget *parent);
|
||||||
|
~SettingsTabPlaylist () {}
|
||||||
|
void saveSettings (void);
|
||||||
|
|
||||||
|
private:
|
||||||
|
QSpinBox *m_fontsize;
|
||||||
|
};
|
||||||
|
|
||||||
class SettingsTabMain : public QWidget {
|
class SettingsTabMain : public QWidget {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
|
@ -40,7 +51,7 @@ class SettingsWindow : public QMainWindow {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SettingsTabMain *m_mainwindow;
|
SettingsTabMain *m_mainwindow;
|
||||||
QWidget *m_playlistwin;
|
SettingsTabPlaylist *m_playlistwin;
|
||||||
QWidget *m_medialib;
|
QWidget *m_medialib;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue