Skip to content

Commit

Permalink
Add simple Palette Option
Browse files Browse the repository at this point in the history
  • Loading branch information
@sithlord48
sithlord48 committed Feb 8, 2020
1 parent a6f751b commit 31ba048
Show file tree
Hide file tree
Showing 8 changed files with 253 additions and 102 deletions.
5 changes: 5 additions & 0 deletions about.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,11 @@ p, li { white-space: pre-wrap; }
<property name="viewMode">
<enum>QListView::ListMode</enum>
</property>
<item>
<property name="text">
<string>Simple light and dark color theme option</string>
</property>
</item>
<item>
<property name="text">
<string>Filename suggestion for Exports</string>
Expand Down
34 changes: 33 additions & 1 deletion bcsettings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
#include <QFile>
#include <QStandardPaths>
#include <QDir>

#include <QApplication>
#include <QStyle>

BCSettings *BCSettings::instance()
{
Expand Down Expand Up @@ -117,4 +118,35 @@ void BCSettings::restoreDefaultSettings()
settings->setValue(SETTINGS::SCALE, 1.00);
settings->setValue(SETTINGS::AUTOGROWTH, true);
settings->setValue(SETTINGS::USENATIVEDIALOGS, false);
settings->setValue(SETTINGS::COLORSCHEME, 0);
}
QPalette BCSettings::paletteForSetting()
{
int index = settings->value(SETTINGS::COLORSCHEME).toInt();
QPalette newPalette;
if( index == 0)
newPalette = qApp->style()->standardPalette();
else {
newPalette.setColor(QPalette::Window, index == 1 ? darkWindow : lightWindow);
newPalette.setColor(QPalette::Base, index == 1 ? darkButton : lightButton);
newPalette.setColor(QPalette::Text, index == 1 ? darkText : lightText);
newPalette.setColor(QPalette::AlternateBase, index == 1 ? darkWindow : lightWindow);
newPalette.setColor(QPalette::WindowText, index == 1 ? darkText : lightText);
newPalette.setColor(QPalette::Button, index == 1 ? darkButton : lightButton);
newPalette.setColor(QPalette::ButtonText,index == 1 ? darkText : lightText);
newPalette.setColor(QPalette::PlaceholderText, index == 1 ? darkPlaceholderText : lightPlaceholderText);
newPalette.setColor(QPalette::Disabled, QPalette::Button, index == 1 ? darkDisableButton : lightDisableButton);
newPalette.setColor(QPalette::Disabled, QPalette::Window, index == 1 ? darkDisableButton : lightDisableButton);
newPalette.setColor(QPalette::Disabled, QPalette::WindowText, index == 1 ? darkInactiveText : lightInactiveText);
newPalette.setColor(QPalette::Disabled,QPalette::ButtonText, index == 1 ? darkInactiveText : lightInactiveText);
newPalette.setColor(QPalette::ToolTipBase, index == 1 ? darkText : lightText);
newPalette.setColor(QPalette::ToolTipText, index == 1 ? darkWindow : lightWindow);
newPalette.setColor(QPalette::Highlight,index == 1 ? darkHighlight : lightHighlight);
newPalette.setColor(QPalette::HighlightedText, index == 1 ? darkWindow : lightWindow);
newPalette.setColor(QPalette::Inactive, QPalette::HighlightedText, index == 1 ? darkButton : lightButton);
newPalette.setColor(QPalette::Active, QPalette::Text, index == 1 ? darkText : lightText);
newPalette.setColor(QPalette::Link, index == 1 ? darkLink : lightLink);
newPalette.setColor(QPalette::LinkVisited, index == 1 ? darkInactiveText : lightInactiveText);
}
return newPalette;
}
69 changes: 46 additions & 23 deletions bcsettings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// GNU General Public License for more details. //
/****************************************************************************/
#pragma once
#include <QColor>
#include <QObject>
#include <QSettings>
#include <QVariant>
Expand All @@ -40,6 +41,7 @@ namespace SETTINGS {
inline const static QString WORLDMAPADVANCED = QStringLiteral("worldMapAdvanced");
inline const static QString USENATIVEDIALOGS = QStringLiteral("useNativeDialogs");
inline const static QString SIDEBARURLS = QStringLiteral("sidebarUrls");
inline const static QString COLORSCHEME = QStringLiteral("colorScheme");
}

class BCSettings : public QObject
Expand All @@ -50,6 +52,7 @@ class BCSettings : public QObject
void setValue(const QString &setting = QString(), const QVariant &value = QVariant());
QVariant value(const QString &setting = QString(), const QVariant &defaultValue = QVariant());
void restoreDefaultSettings();
QPalette paletteForSetting();
signals:
void settingsChanged();
private:
Expand All @@ -61,27 +64,47 @@ class BCSettings : public QObject
void cleanSettings();
QSettings *settings = nullptr;
inline static const QStringList validSettingsNames = {
SETTINGS::MAINGEOMETRY,
SETTINGS::AUTOGROWTH,
SETTINGS::CHARADVANCED,
SETTINGS::STATFOLDER,
SETTINGS::CHOCOADVANCED,
SETTINGS::DEFAULTSAVE,
SETTINGS::EDITABLECOMBOS,
SETTINGS::PROGRESSADVANCED,
SETTINGS::LANG,
SETTINGS::LANGPATH,
SETTINGS::LOADPATH,
SETTINGS::LOCVIEWADVANCED,
SETTINGS::ALWAYSSHOWCONTROLLERMAP,
SETTINGS::CUSTOMDEFAULTSAVE,
SETTINGS::REGION,
SETTINGS::EMUSAVEPATH,
SETTINGS::PCSAVEPATH,
SETTINGS::SCALE,
SETTINGS::ENABLETEST,
SETTINGS::WORLDMAPADVANCED,
SETTINGS::USENATIVEDIALOGS,
SETTINGS::SIDEBARURLS
};
SETTINGS::MAINGEOMETRY,
SETTINGS::AUTOGROWTH,
SETTINGS::CHARADVANCED,
SETTINGS::STATFOLDER,
SETTINGS::CHOCOADVANCED,
SETTINGS::DEFAULTSAVE,
SETTINGS::EDITABLECOMBOS,
SETTINGS::PROGRESSADVANCED,
SETTINGS::LANG,
SETTINGS::LANGPATH,
SETTINGS::LOADPATH,
SETTINGS::LOCVIEWADVANCED,
SETTINGS::ALWAYSSHOWCONTROLLERMAP,
SETTINGS::CUSTOMDEFAULTSAVE,
SETTINGS::REGION,
SETTINGS::EMUSAVEPATH,
SETTINGS::PCSAVEPATH,
SETTINGS::SCALE,
SETTINGS::ENABLETEST,
SETTINGS::WORLDMAPADVANCED,
SETTINGS::USENATIVEDIALOGS,
SETTINGS::SIDEBARURLS,
SETTINGS::COLORSCHEME,
};
//Theme Colors
inline static const QColor lightWindow = QColor(252, 252, 252);
inline static const QColor lightDisableWindow = QColor(192, 192, 192);
inline static const QColor lightText = QColor(35, 38, 39);
inline static const QColor lightButton = QColor(239, 240, 241);
inline static const QColor lightDisableButton = QColor(180, 181, 182);
inline static const QColor lightHighlight = QColor(61,174,233);
inline static const QColor lightInactiveText = QColor(127,140,141);
inline static const QColor lightLink = QColor(41, 128, 185);
inline static const QColor lightPlaceholderText = QColor(96, 96, 96);
inline static const QColor darkWindow = QColor(35, 38, 41);
inline static const QColor darkDisableWindow = QColor(100, 100, 100);
inline static const QColor darkText = QColor(239, 240, 241);
inline static const QColor darkDisableButton = QColor(67, 74, 81);
inline static const QColor darkButton = QColor(49, 54, 59);
inline static const QColor darkHighlight = QColor(61,174,233);
inline static const QColor darkInactiveText = QColor(189, 195, 199);
inline static const QColor darkLink = QColor(41, 128, 185);
inline static const QColor darkPlaceholderText = QColor(196, 196, 196);
};
4 changes: 3 additions & 1 deletion main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <QLocale>
#include <QTranslator>
#include <QTime>
#include "bcsettings.h"
#include "mainwindow.h"

#if defined(STATIC) && (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
Expand Down Expand Up @@ -47,7 +48,8 @@ int main(int argc, char *argv[])
#ifndef Q_OS_LINUX
a.setStyle(QStyleFactory::create("Fusion"));
#endif
a.setAttribute(Qt::AA_DontUseNativeDialogs);
a.setPalette(BCSettings::instance()->paletteForSetting());
a.setAttribute(Qt::AA_DontUseNativeDialogs, !BCSettings::instance()->value(SETTINGS::USENATIVEDIALOGS).toBool());
a.setApplicationName("Black Chocobo");
a.setApplicationVersion(version.toString());

Expand Down
26 changes: 15 additions & 11 deletions mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,17 +428,21 @@ MainWindow::~MainWindow()

void MainWindow::changeEvent(QEvent *e)
{
if (e->type() != QEvent::LanguageChange)
return;

ui->retranslateUi(this);
ui->tabWidget->setTabText(3, tr("Chocobo"));
ui->tabWidget->setTabText(7, tr("Game Options"));
populateCombos();
materiaupdate();
updateStolenMateria();
if (ui->psxExtras->isVisible())
update_hexEditor_PSXInfo();
if (e->type() == QEvent::PaletteChange) {
QPalette palette = BCSettings::instance()->paletteForSetting();
for (QWidget * widget : findChildren<QWidget *>(QString(), Qt::FindChildrenRecursively))
widget->setPalette(palette);
hexEditor->setAddressAreaColor(palette.alternateBase().color());
} else if (e->type() == QEvent::LanguageChange) {
ui->retranslateUi(this);
ui->tabWidget->setTabText(3, tr("Chocobo"));
ui->tabWidget->setTabText(7, tr("Game Options"));
populateCombos();
materiaupdate();
updateStolenMateria();
if (ui->psxExtras->isVisible())
update_hexEditor_PSXInfo();
}
}
void MainWindow::dragEnterEvent(QDragEnterEvent *e)
{
Expand Down
10 changes: 9 additions & 1 deletion options.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ Options::Options(QWidget *parent) : QDialog(parent)
translator->load(translation, dir.absolutePath());
QString lang = translation.mid(7, 2);
ui->comboLanguage->addItem(translator->translate("MainWindow", "TRANSLATE TO YOUR LANGUAGE NAME"), lang);
ui->comboLanguage->setCurrentIndex(ui->comboLanguage->findData(BCSettings::instance()->value(SETTINGS::LANG, QStringLiteral("en"))));
}
ui->comboLanguage->setCurrentIndex(ui->comboLanguage->findData(BCSettings::instance()->value(SETTINGS::LANG, QStringLiteral("en"))));
ui->comboLanguage->setVisible(ui->comboLanguage->count());
ui->lblLanguage->setVisible(ui->comboLanguage->count());

Expand Down Expand Up @@ -117,6 +117,7 @@ void Options::loadSettings()
ui->comboLanguage->setCurrentIndex(ui->comboLanguage->findData(BCSettings::instance()->value(SETTINGS::LANG)));
ui->cbNativeDialogs->setChecked(BCSettings::instance()->value(SETTINGS::USENATIVEDIALOGS).toBool());
ui->btnEditSideBarItems->setVisible(!ui->cbNativeDialogs->isChecked());
ui->comboColorScheme->setCurrentIndex(BCSettings::instance()->value(SETTINGS::COLORSCHEME).toInt());
}

void Options::saveSettings()
Expand All @@ -140,6 +141,7 @@ void Options::saveSettings()
BCSettings::instance()->setValue(SETTINGS::AUTOGROWTH, ui->cbAutoGrowth->isChecked());
BCSettings::instance()->setValue(SETTINGS::LANG, ui->comboLanguage->currentData());
BCSettings::instance()->setValue(SETTINGS::USENATIVEDIALOGS, ui->cbNativeDialogs->isChecked());
BCSettings::instance()->setValue(SETTINGS::COLORSCHEME, ui->comboColorScheme->currentIndex());
}

void Options::restoreDefaultSettings()
Expand Down Expand Up @@ -222,3 +224,9 @@ void Options::on_btnEditSideBarItems_clicked()
{
BCDialog::editSideBarPaths(this);
}

void Options::on_comboColorScheme_currentIndexChanged(int index)
{
BCSettings::instance()->setValue(SETTINGS::COLORSCHEME, index);
qApp->setPalette(BCSettings::instance()->paletteForSetting());
}
3 changes: 2 additions & 1 deletion options.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ private slots:
void on_comboLanguage_currentIndexChanged(const QString &arg1);
void on_cbNativeDialogs_clicked(bool checked);
void on_btnEditSideBarItems_clicked();
void on_comboColorScheme_currentIndexChanged(int index);

private:
Ui::Options *ui;
void loadSettings();
void saveSettings();
void restoreDefaultSettings();
void updateSettings();
};
Loading

0 comments on commit 31ba048

Please sign in to comment.