aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui/qsui
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Ui/qsui')
-rw-r--r--src/plugins/Ui/qsui/forms/qsuisettings.ui46
-rw-r--r--src/plugins/Ui/qsui/qsuisettings.cpp10
-rw-r--r--src/plugins/Ui/qsui/qsuitabwidget.cpp4
3 files changed, 51 insertions, 9 deletions
diff --git a/src/plugins/Ui/qsui/forms/qsuisettings.ui b/src/plugins/Ui/qsui/forms/qsuisettings.ui
index 6ea7d17c2..ae9bb1024 100644
--- a/src/plugins/Ui/qsui/forms/qsuisettings.ui
+++ b/src/plugins/Ui/qsui/forms/qsuisettings.ui
@@ -194,7 +194,7 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>-28</y>
+ <y>0</y>
<width>454</width>
<height>535</height>
</rect>
@@ -1242,34 +1242,68 @@
<attribute name="title">
<string>Miscellaneous</string>
</attribute>
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>Tabs</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="tabsClosableCheckBox">
<property name="text">
<string>Show close buttons</string>
</property>
</widget>
</item>
- <item>
+ <item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="showTabListMenuCheckBox">
<property name="text">
<string>Show tab list menu</string>
</property>
</widget>
</item>
- <item>
+ <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="showNewPLCheckBox">
<property name="text">
<string>Show 'New Playlist' button</string>
</property>
</widget>
</item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_25">
+ <property name="text">
+ <string>Tab position:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QComboBox" name="tabPositionComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_14">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
diff --git a/src/plugins/Ui/qsui/qsuisettings.cpp b/src/plugins/Ui/qsui/qsuisettings.cpp
index af6f856c2..9d2c50457 100644
--- a/src/plugins/Ui/qsui/qsuisettings.cpp
+++ b/src/plugins/Ui/qsui/qsuisettings.cpp
@@ -21,6 +21,7 @@
#include <QSettings>
#include <QDir>
#include <QFontDialog>
+#include <QTabBar>
#include <qmmp/qmmp.h>
#include <qmmpui/filedialog.h>
#include <qmmpui/uihelper.h>
@@ -46,6 +47,10 @@ QSUiSettings::QSUiSettings(QWidget *parent) : QWidget(parent)
m_ui.toolBarIconSizeComboBox->addItem(tr("48x48"), 48);
m_ui.toolBarIconSizeComboBox->addItem(tr("64x64"), 64);
//other settings
+ m_ui.tabPositionComboBox->addItem(tr("Top"), QTabBar::RoundedNorth);
+ m_ui.tabPositionComboBox->addItem(tr("Bottom"), QTabBar::RoundedSouth);
+ m_ui.tabPositionComboBox->addItem(tr("Left"), QTabBar::RoundedWest);
+ m_ui.tabPositionComboBox->addItem(tr("Right"), QTabBar::RoundedEast);
m_ui.wfsbProgressBarColor->setOptions(QColorDialog::ShowAlphaChannel);
//load settings
readSettings();
@@ -178,6 +183,8 @@ void QSUiSettings::readSettings()
m_ui.tabsClosableCheckBox->setChecked(settings.value("pl_tabs_closable", false).toBool());
m_ui.showNewPLCheckBox->setChecked(settings.value("pl_show_new_pl_button", false).toBool());
m_ui.showTabListMenuCheckBox->setChecked(settings.value("pl_show_tab_list_menu", false).toBool());
+ int index = m_ui.tabPositionComboBox->findData(settings.value("pl_tab_position", QTabBar::RoundedNorth).toInt());
+ m_ui.tabPositionComboBox->setCurrentIndex(index);
//view
m_ui.hiddenCheckBox->setChecked(settings.value("start_hidden", false).toBool());
m_ui.hideOnCloseCheckBox->setChecked(settings.value("hide_on_close", false).toBool());
@@ -215,7 +222,7 @@ void QSUiSettings::readSettings()
m_ui.wfsbWaveFormColor->setColor(settings.value("wfsb_waveform_color", "#BECBFF").toString());
m_ui.wfsbProgressBarColor->setColor(settings.value("wfsb_progressbar_color", "#9633CA10").toString());
//toolbar
- int index = m_ui.toolBarIconSizeComboBox->findData(settings.value("toolbar_icon_size", -1).toInt());
+ index = m_ui.toolBarIconSizeComboBox->findData(settings.value("toolbar_icon_size", -1).toInt());
m_ui.toolBarIconSizeComboBox->setCurrentIndex(index > 0 ? index : 0);
settings.endGroup();
}
@@ -234,6 +241,7 @@ void QSUiSettings::writeSettings()
settings.setValue("pl_tabs_closable", m_ui.tabsClosableCheckBox->isChecked());
settings.setValue("pl_show_new_pl_button", m_ui.showNewPLCheckBox->isChecked());
settings.setValue("pl_show_tab_list_menu", m_ui.showTabListMenuCheckBox->isChecked());
+ settings.setValue("pl_tab_position", m_ui.tabPositionComboBox->currentData().toInt());
settings.setValue("start_hidden", m_ui.hiddenCheckBox->isChecked());
settings.setValue("hide_on_close", m_ui.hideOnCloseCheckBox->isChecked());
settings.setValue("window_title_format", m_ui.windowTitleLineEdit->text());
diff --git a/src/plugins/Ui/qsui/qsuitabwidget.cpp b/src/plugins/Ui/qsui/qsuitabwidget.cpp
index 402a8e9e7..e0e4aee98 100644
--- a/src/plugins/Ui/qsui/qsuitabwidget.cpp
+++ b/src/plugins/Ui/qsui/qsuitabwidget.cpp
@@ -97,6 +97,7 @@ void QSUiTabWidget::readSettings()
tab_font.fromString(settings.value("pl_tabs_font", tab_font.toString()).toString());
}
m_tabBar->setFont(tab_font);
+ m_tabBar->setShape(static_cast<QTabBar::Shape>(settings.value("pl_tab_position", QTabBar::RoundedNorth).toInt()));
settings.endGroup();
m_tabBar->updateGeometry();
setUpLayout();
@@ -184,6 +185,7 @@ void QSUiTabWidget::initStyleOption(QStyleOptionTabWidgetFrame *option) const
return;
option->initFrom(this);
+ option->shape = m_tabBar->shape();
option->lineWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, this);
int exth = style()->pixelMetric(QStyle::PM_TabBarBaseHeight, nullptr, this);
@@ -213,8 +215,6 @@ void QSUiTabWidget::initStyleOption(QStyleOptionTabWidgetFrame *option) const
option->leftCornerWidgetSize = QSize(0, 0);
}
-
- option->shape = QTabBar::RoundedNorth;
option->tabBarSize = t;
QRect tbRect = m_tabBar->geometry();