Skip to content

Skin preview placeholder #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daschuer wants to merge 3 commits into from
Closed

Skin preview placeholder #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80f9c8a
DlgPrefInterface: show skin preview screenshot
Be-ing Apr 2, 2018
38ed9e3
Added skin preview placeholder image
daschuer Apr 5, 2018
5c76e72
show placeholder preview
daschuer Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added res/images/skin-preview-placeholder.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions res/mixxx.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<file>images/library/ic_library_unchecked.png</file>
<file>images/mixxx-icon.png</file>
<file>images/mixxx-icon-logo-symbolic.svg</file>
<file>images/skin-preview-placeholder.png</file>
<file>images/preferences/ic_preferences_autodj.png</file>
<file>images/preferences/ic_preferences_bpmdetect.png</file>
<file>images/preferences/ic_preferences_broadcast.png</file>
Expand Down
3 changes: 3 additions & 0 deletions src/preferences/dialog/dlgprefinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ DlgPrefInterface::DlgPrefInterface(QWidget * parent, MixxxMainWindow * mixxx,
warningLabel->setText(warningString);

ComboBoxSkinconf->clear();
skinPreviewLabel->setText("");

QList<QDir> skinSearchPaths = m_pSkinLoader->getSkinSearchPaths();
QList<QFileInfo> skins;
Expand All @@ -104,6 +105,7 @@ DlgPrefInterface::DlgPrefInterface(QWidget * parent, MixxxMainWindow * mixxx,
if (skinInfo.absoluteFilePath() == configuredSkinPath) {
m_skin = skinInfo.fileName();
ComboBoxSkinconf->setCurrentIndex(index);
skinPreviewLabel->setPixmap(m_pSkinLoader->getSkinPreview(m_skin));
if (size_ok) {
warningLabel->hide();
} else {
Expand Down Expand Up @@ -319,6 +321,7 @@ void DlgPrefInterface::slotSetScheme(int) {

void DlgPrefInterface::slotSetSkin(int) {
QString newSkin = ComboBoxSkinconf->currentText();
skinPreviewLabel->setPixmap(m_pSkinLoader->getSkinPreview(newSkin));
if (newSkin != m_skin) {
m_skin = newSkin;
m_bRebootMixxxView = newSkin != m_skinOnUpdate;
Expand Down
89 changes: 49 additions & 40 deletions src/preferences/dialog/dlgprefinterfacedlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>562</width>
<width>594</width>
<height>723</height>
</rect>
</property>
Expand Down Expand Up @@ -52,7 +52,7 @@
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<item row="2" column="1" colspan="2">
<widget class="QLabel" name="warningLabel">
<property name="text">
<string/>
Expand All @@ -62,26 +62,7 @@
</property>
</widget>
</item>
<item row="2" column="0" rowspan="2">
<widget class="QLabel" name="labelColorScheme">
<property name="enabled">
<bool>true</bool>
</property>
<property name="font">
<font/>
</property>
<property name="text">
<string>Color scheme</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>ComboBoxSchemeconf</cstring>
</property>
</widget>
</item>
<item row="2" column="1" rowspan="2" colspan="2">
<item row="3" column="1" rowspan="2" colspan="2">
<widget class="QComboBox" name="ComboBoxSchemeconf">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
Expand All @@ -97,7 +78,7 @@
</property>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="textLabelLocale">
<property name="text">
<string>Locale</string>
Expand All @@ -107,14 +88,14 @@
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<item row="6" column="1" colspan="2">
<widget class="QComboBox" name="ComboBoxLocale">
<property name="toolTip">
<string>Locales determine country and language specific settings.</string>
</property>
</widget>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QLabel" name="labelFullscreenOption">
<property name="text">
<string>Full-screen mode</string>
Expand All @@ -124,14 +105,14 @@
</property>
</widget>
</item>
<item row="7" column="1" colspan="2">
<item row="8" column="1" colspan="2">
<widget class="QCheckBox" name="checkBoxStartFullScreen">
<property name="text">
<string>Start in full-screen mode</string>
</property>
</widget>
</item>
<item row="9" column="0">
<item row="10" column="0">
<widget class="QLabel" name="labelTooltips">
<property name="enabled">
<bool>true</bool>
Expand All @@ -150,7 +131,7 @@
</property>
</widget>
</item>
<item row="9" column="1" colspan="2">
<item row="10" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="radioButtonTooltipsOff">
Expand Down Expand Up @@ -184,7 +165,7 @@
</item>
</layout>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QLabel" name="labelScaleFactor">
<property name="text">
<string>HiDPI / Retina scaling</string>
Expand All @@ -194,29 +175,29 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<widget class="QDoubleSpinBox" name="spinBoxScaleFactor">
<property name="toolTip">
<string>Change the size of text, buttons, and other items.</string>
</property>
<property name="decimals">
<number>0</number>
</property>
<property name="suffix">
<string notr="true"> %</string>
</property>
<property name="singleStep">
<double>25.0</double>
<property name="decimals">
<number>0</number>
</property>
<property name="minimum">
<double>50.0</double>
<double>50.000000000000000</double>
</property>
<property name="maximum">
<double>400</double>
<double>400.000000000000000</double>
</property>
<property name="singleStep">
<double>25.000000000000000</double>
</property>
</widget>
</item>
<item row="6" column="2">
<item row="7" column="2">
<widget class="QCheckBox" name="checkBoxScaleFactorAuto">
<property name="toolTip">
<string>Adopt scale factor from the operating system</string>
Expand All @@ -226,16 +207,42 @@
</property>
</widget>
</item>
<item row="10" column="0">
<item row="11" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Screen saver</string>
</property>
</widget>
</item>
<item row="10" column="1" colspan="2">
<item row="11" column="1" colspan="2">
<widget class="QComboBox" name="comboBoxScreensaver"/>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLabel" name="skinPreviewLabel">
<property name="text">
<string notr="true">skin preview screenshot goes here</string>
</property>
</widget>
</item>
<item row="3" column="0" rowspan="2">
<widget class="QLabel" name="labelColorScheme">
<property name="enabled">
<bool>true</bool>
</property>
<property name="font">
<font/>
</property>
<property name="text">
<string>Color scheme</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>ComboBoxSchemeconf</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -264,6 +271,8 @@
<tabstop>radioButtonTooltipsLibrary</tabstop>
<tabstop>radioButtonTooltipsLibraryAndSkin</tabstop>
</tabstops>
<resources/>
<connections/>
<buttongroups>
<buttongroup name="buttonGroupTooltips"/>
</buttongroups>
Expand Down
8 changes: 8 additions & 0 deletions src/skin/skinloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ QString SkinLoader::getSkinPath(const QString& skinName) const {
return QString();
}

QPixmap SkinLoader::getSkinPreview(const QString& skinName) const {
QPixmap preview(getSkinPath(skinName) + "/preferences_preview_screenshot.png");
if (!preview.isNull()){
return preview;
}
return QPixmap(":/images/skin-preview-placeholder.png");
}

QString SkinLoader::getConfiguredSkinPath() const {
QString configSkin = m_pConfig->getValueString(ConfigKey("[Config]", "ResizableSkin"));

Expand Down
1 change: 1 addition & 0 deletions src/skin/skinloader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class SkinLoader {
LaunchImage* loadLaunchImage(QWidget* pParent);

QString getSkinPath(const QString& skinName) const;
QPixmap getSkinPreview(const QString& skinName) const;
QString getConfiguredSkinPath() const;
QString getDefaultSkinName() const;
QList<QDir> getSkinSearchPaths() const;
Expand Down