Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up the appearance settings page and add sensible defaults

This commit is contained in:
David Sansome 2013-02-17 14:03:39 +11:00
parent c03f69daa7
commit 122d5ad139
4 changed files with 63 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/playlist/playlistview.cpp
View File

@ -54,6 +54,9 @@ const int PlaylistView::kDropIndicatorGradientWidth = 5;
const char* PlaylistView::kSettingBackgroundImageType = "playlistview_background_type"; const char* PlaylistView::kSettingBackgroundImageType = "playlistview_background_type";
const char* PlaylistView::kSettingBackgroundImageFilename = "playlistview_background_image_file"; const char* PlaylistView::kSettingBackgroundImageFilename = "playlistview_background_image_file";
const int PlaylistView::kDefaultBlurRadius = 0;
const int PlaylistView::kDefaultOpacityLevel = 40;
PlaylistProxyStyle::PlaylistProxyStyle(QStyle* base) PlaylistProxyStyle::PlaylistProxyStyle(QStyle* base)
: QProxyStyle(base), : QProxyStyle(base),
@ -1015,8 +1018,8 @@ void PlaylistView::ReloadSettings() {
} }
} }
QString background_image_filename = s.value(kSettingBackgroundImageFilename).toString(); QString background_image_filename = s.value(kSettingBackgroundImageFilename).toString();
int blur_radius = s.value("blur_radius").toInt(); int blur_radius = s.value("blur_radius", kDefaultBlurRadius).toInt();
int opacity_level = s.value("opacity_level").toInt(); int opacity_level = s.value("opacity_level", kDefaultOpacityLevel).toInt();
// Check if background properties have changed. // Check if background properties have changed.
// We change properties only if they have actually changed, to avoid to call // We change properties only if they have actually changed, to avoid to call
// set_background_image when it is not needed, as this will cause the fading // set_background_image when it is not needed, as this will cause the fading

4
src/playlist/playlistview.h
View File

@ -59,7 +59,6 @@ private:
class PlaylistView : public QTreeView { class PlaylistView : public QTreeView {
Q_OBJECT Q_OBJECT
public: public:
enum BackgroundImageType { enum BackgroundImageType {
Default, Default,
None, None,
@ -74,6 +73,9 @@ class PlaylistView : public QTreeView {
static const char* kSettingBackgroundImageType; static const char* kSettingBackgroundImageType;
static const char* kSettingBackgroundImageFilename; static const char* kSettingBackgroundImageFilename;
static const int kDefaultBlurRadius;
static const int kDefaultOpacityLevel;
static ColumnAlignmentMap DefaultColumnAlignment(); static ColumnAlignmentMap DefaultColumnAlignment();
void SetApplication(Application* app); void SetApplication(Application* app);

6
src/ui/appearancesettingspage.cpp
View File

@ -129,8 +129,10 @@ void AppearanceSettingsPage::Load() {
DisableBlurSlider(true); DisableBlurSlider(true);
} }
ui_->background_image_filename->setText(playlist_view_background_image_filename_); ui_->background_image_filename->setText(playlist_view_background_image_filename_);
ui_->blur_slider->setValue(s.value("blur_radius").toInt()); ui_->blur_slider->setValue(
ui_->opacity_slider->setValue(s.value("opacity_level").toInt()); s.value("blur_radius", PlaylistView::kDefaultBlurRadius).toInt());
ui_->opacity_slider->setValue(
s.value("opacity_level", PlaylistView::kDefaultOpacityLevel).toInt());
s.endGroup(); s.endGroup();

115
src/ui/appearancesettingspage.ui
View File

@ -90,42 +90,30 @@
<property name="title"> <property name="title">
<string>Background image</string> <string>Background image</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <widget class="QRadioButton" name="use_default_background">
<item> <property name="text">
<widget class="QRadioButton" name="use_default_background"> <string>Default background image</string>
<property name="text"> </property>
<string>Default background image</string> </widget>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <widget class="QRadioButton" name="use_album_cover_background">
<item> <property name="toolTip">
<widget class="QRadioButton" name="use_album_cover_background"> <string>The album cover of the currently playing song</string>
<property name="toolTip"> </property>
<string>The album cover of the currently playing song</string> <property name="text">
</property> <string>Album cover</string>
<property name="text"> </property>
<string>Album cover</string> </widget>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <widget class="QRadioButton" name="use_no_background">
<item> <property name="text">
<widget class="QRadioButton" name="use_no_background"> <string>No background image</string>
<property name="text"> </property>
<string>No background image</string> </widget>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
@ -156,28 +144,18 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QGridLayout" name="gridLayout">
<item> <item row="0" column="0">
<widget class="QLabel" name="select_background_blur_label"> <widget class="QLabel" name="select_background_blur_label">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Select blur radius:</string> <string>Blur amount</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QLabel" name="background_blur_radius_label">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>0px</string>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="blur_slider"> <widget class="QSlider" name="blur_slider">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>0</number>
@ -185,9 +163,6 @@
<property name="maximum"> <property name="maximum">
<number>10</number> <number>10</number>
</property> </property>
<property name="value">
<number>0</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -199,35 +174,47 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="0" column="2">
</item> <widget class="QLabel" name="background_blur_radius_label">
<item> <property name="enabled">
<layout class="QHBoxLayout" name="horizontalLayout_9"> <bool>true</bool>
<item> </property>
<property name="text">
<string>0px</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="select_opacity_level_label"> <widget class="QLabel" name="select_opacity_level_label">
<property name="text"> <property name="text">
<string>Opacity level:</string> <string>Opacity</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<widget class="QLabel" name="background_opacity_label">
<property name="text">
<string>40%</string>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="opacity_slider"> <widget class="QSlider" name="opacity_slider">
<property name="maximum"> <property name="maximum">
<number>100</number> <number>100</number>
</property> </property>
<property name="value"> <property name="singleStep">
<number>40</number> <number>10</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="background_opacity_label">
<property name="text">
<string>40%</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>