oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged with slight code cleanup

Browse Source
This commit is contained in:
itsmattkc
2019-01-12 13:55:53 +11:00
parent 6c31e458f7 345328432d
commit a447891050
53 changed files with 659 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+14 -14
View File
@@ -107,7 +107,7 @@ MainWindow::MainWindow(QWidget *parent, const QString &an) :
// set up style?
qApp->setStyle(QStyleFactory::create("Fusion"));
setStyleSheet(DEFAULT_CSS);
setStyleSheet(DEFAULT_CSS);
QPalette darkPalette;
darkPalette.setColor(QPalette::Window, QColor(53,53,53));
@@ -199,10 +199,10 @@ MainWindow::MainWindow(QWidget *parent, const QString &an) :
if (QFileInfo::exists(config_fn)) {
config.load(config_fn);
if (!config.css_path.isEmpty()) {
load_css_from_file(config.css_path);
}
}
if (!config.css_path.isEmpty()) {
load_css_from_file(config.css_path);
}
}
}
alloc_panels(this);
@@ -335,18 +335,18 @@ void MainWindow::save_shortcuts(const QString& fn) {
shortcut_file_io.close();
} else {
qCritical() << "Failed to save shortcut file";
}
}
}
void MainWindow::load_css_from_file(const QString &fn) {
QFile css_file(fn);
if (css_file.exists() && css_file.open(QFile::ReadOnly)) {
setStyleSheet(css_file.readAll());
css_file.close();
} else {
// set default stylesheet
setStyleSheet(DEFAULT_CSS);
}
QFile css_file(fn);
if (css_file.exists() && css_file.open(QFile::ReadOnly)) {
setStyleSheet(css_file.readAll());
css_file.close();
} else {
// set default stylesheet
setStyleSheet(DEFAULT_CSS);
}
}
void MainWindow::show_about() {