aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/skinned
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Ui/skinned')
-rw-r--r--src/plugins/Ui/skinned/forms/skinnedsettings.ui99
-rw-r--r--src/plugins/Ui/skinned/listwidget.cpp3
-rw-r--r--src/plugins/Ui/skinned/listwidgetdrawer.cpp2
-rw-r--r--src/plugins/Ui/skinned/playlistheader.cpp12
-rw-r--r--src/plugins/Ui/skinned/playlistheader.h2
-rw-r--r--src/plugins/Ui/skinned/skinnedsettings.cpp36
-rw-r--r--src/plugins/Ui/skinned/skinnedsettings.h4
7 files changed, 108 insertions, 50 deletions
diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
index 84ed72403..a896a5428 100644
--- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui
+++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>447</width>
- <height>391</height>
+ <width>489</width>
+ <height>424</height>
</rect>
</property>
<property name="windowTitle">
@@ -131,30 +131,34 @@
<string>Fonts</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="label">
+ <item row="0" column="2">
+ <widget class="QLabel" name="mainFontLabel">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
- <size>
- <width>80</width>
- <height>16777215</height>
- </size>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
</property>
<property name="text">
- <string>Player:</string>
+ <string>???</string>
</property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QToolButton" name="mainFontButton">
+ <property name="text">
+ <string>...</string>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QLabel" name="mainFontLabel">
+ <item row="1" column="2">
+ <widget class="QLabel" name="plFontLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -172,14 +176,41 @@
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QToolButton" name="mainFontButton">
+ <item row="1" column="3">
+ <widget class="QToolButton" name="plFontButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="3" column="0" colspan="4">
+ <widget class="QCheckBox" name="useBitmapCheckBox">
+ <property name="text">
+ <string>Use bitmap font if available</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QLabel" name="headerFontLabel">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text">
+ <string>???</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Playlist header:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -201,36 +232,32 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLabel" name="plFontLabel">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="label">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
+ <property name="maximumSize">
+ <size>
+ <width>80</width>
+ <height>16777215</height>
+ </size>
</property>
<property name="text">
- <string>???</string>
+ <string>Player:</string>
</property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QToolButton" name="plFontButton">
- <property name="text">
- <string>...</string>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3">
- <widget class="QCheckBox" name="useBitmapCheckBox">
+ <item row="2" column="3">
+ <widget class="QToolButton" name="headerFontButton">
<property name="text">
- <string>Use bitmap font if available</string>
+ <string>...</string>
</property>
</widget>
</item>
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index aaddcc695..8566e82e6 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -91,6 +91,7 @@ void ListWidget::readSettings()
m_header->readSettings();
m_header->setVisible(ACTION(ActionManager::PL_SHOW_HEADER)->isChecked());
+ m_header->setGeometry(0,0,width(), m_header->requiredHeight());
if (m_update)
{
@@ -247,7 +248,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e)
void ListWidget::resizeEvent(QResizeEvent *e)
{
m_resize = true;
- m_header->setGeometry(0,0,width(), m_drawer.rowHeight());
+ m_header->setGeometry(0,0,width(), m_header->requiredHeight());
m_resize = false;
m_row_count = (e->size().height() - (m_header->isVisibleTo(this) ? m_header->height() : 0)) / m_drawer.rowHeight();
updateList(PlayListModel::STRUCTURE);
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index 43a1b7bc0..5380bfad8 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -58,7 +58,7 @@ void ListWidgetDrawer::readSettings()
m_show_anchor = settings.value("pl_show_anchor", false).toBool();
m_show_number = settings.value ("pl_show_numbers", true).toBool();
m_align_numbres = settings.value ("pl_align_numbers", false).toBool();
- m_font.fromString(settings.value("pl_font", QApplication::font().toString()).toString());
+ m_font.fromString(settings.value("pl_font", qApp->font().toString()).toString());
m_extra_font = m_font;
m_extra_font.setPointSize(m_font.pointSize() - 1);
if (m_update)
diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index 6698f557d..27e2439af 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -65,6 +65,7 @@ PlayListHeader::PlayListHeader(QWidget *parent) :
setMouseTracking(true);
m_metrics = 0;
m_padding = 0;
+ m_pl_padding = 0;
m_show_number = false;
m_align_numbres = false;
m_number_width = 0;
@@ -110,6 +111,10 @@ void PlayListHeader::readSettings()
m_align_numbres = settings.value ("pl_align_numbers", false).toBool();
m_padding = m_metrics->width("9")/2;
+ QFont pl_font;
+ pl_font.fromString(settings.value("pl_font", qApp->font().toString()).toString());
+ m_pl_padding = QFontMetrics(pl_font).width("9")/2;
+
settings.endGroup();
updateColumns();
}
@@ -131,7 +136,7 @@ void PlayListHeader::updateColumns()
int sx = 5;
if(m_number_width)
- sx += m_number_width + 2 * m_padding;
+ sx += m_number_width + 2 * m_pl_padding;
if(m_model->count() == 1)
{
@@ -171,6 +176,11 @@ void PlayListHeader::updateColumns()
update();
}
+int PlayListHeader::requiredHeight() const
+{
+ return m_metrics->lineSpacing() + 1;
+}
+
void PlayListHeader::showSortIndicator(int column, bool reverted)
{
if(m_sorting_column == column && m_reverted == reverted)
diff --git a/src/plugins/Ui/skinned/playlistheader.h b/src/plugins/Ui/skinned/playlistheader.h
index 7bf07f741..c389ea0d5 100644
--- a/src/plugins/Ui/skinned/playlistheader.h
+++ b/src/plugins/Ui/skinned/playlistheader.h
@@ -46,6 +46,7 @@ public:
void readSettings();
void setNumberWidth(int width);
void updateColumns();
+ int requiredHeight() const;
public slots:
void showSortIndicator(int column, bool reverted);
@@ -89,6 +90,7 @@ private:
int m_old_size;
int m_press_offset;
int m_padding;
+ int m_pl_padding;
int m_sorting_column;
enum
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index 4708867ed..7fb1b438a 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2014 by Ilya Kotov *
+ * Copyright (C) 2011-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -82,6 +82,20 @@ void SkinnedSettings::on_plFontButton_clicked()
}
}
+void SkinnedSettings::on_headerFontButton_clicked()
+{
+ bool ok;
+ QFont font = m_ui.plFontLabel->font();
+ font = QFontDialog::getFont (&ok, font, this);
+ if (ok)
+ {
+ m_ui.headerFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
+ m_ui.headerFontLabel->setFont(font);
+ QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
+ settings.setValue ("Skinned/header_font", font.toString());
+ }
+}
+
void SkinnedSettings::on_mainFontButton_clicked()
{
bool ok;
@@ -116,20 +130,24 @@ void SkinnedSettings::showEvent(QShowEvent *)
void SkinnedSettings::loadFonts()
{
+ QFont font;
QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
- QString fontname = settings.value ("Skinned/pl_font").toString();
- QFont font = QApplication::font();
- if(!fontname.isEmpty())
- font.fromString(fontname);
+
+ QString fontname = settings.value ("Skinned/pl_font", qApp->font().toString()).toString();
+ font.fromString(fontname);
m_ui.plFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
m_ui.plFontLabel->setFont(font);
- font = QApplication::font ();
- fontname = settings.value ("Skinned/mw_font").toString();
- if(!fontname.isEmpty())
- font.fromString(fontname);
+ fontname = settings.value ("Skinned/header_font", qApp->font().toString()).toString();
+ font.fromString(fontname);
+ m_ui.headerFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
+ m_ui.headerFontLabel->setFont(font);
+
+ fontname = settings.value ("Skinned/mw_font", qApp->font().toString()).toString();
+ font.fromString(fontname);
m_ui.mainFontLabel->setText (font.family () + " " + QString::number(font.pointSize ()));
m_ui.mainFontLabel->setFont(font);
+
m_ui.useBitmapCheckBox->setChecked(settings.value("Skinned/bitmap_font", false).toBool());
}
diff --git a/src/plugins/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h
index 607278f57..47aee8504 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.h
+++ b/src/plugins/Ui/skinned/skinnedsettings.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2014 by Ilya Kotov *
+ * Copyright (C) 2011-2015 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -36,10 +36,10 @@ public:
virtual ~SkinnedSettings();
void writeSettings();
-
private slots:
void on_listWidget_itemClicked(QListWidgetItem *);
void on_plFontButton_clicked();
+ void on_headerFontButton_clicked();
void on_mainFontButton_clicked();
void on_skinInstallButton_clicked();
void loadSkins();
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 14:38:14 +0000