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

merged from master

Browse Source
This commit is contained in:
itsmattkc
2019-03-16 23:10:15 +11:00
parent 230ce1840d 445c8299e7
commit bf36f68218
28 changed files with 187 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
global/config.cpp
+6 -1
View File
@@ -72,7 +72,8 @@ Config::Config()
add_default_effects_to_clips(true),
invert_timeline_scroll_axes(true),
enable_color_management(false),
style(olive::styling::kOliveDefaultDark)
style(olive::styling::kOliveDefaultDark),
use_native_menu_styling(true)
{}
void Config::load(QString path) {
@@ -218,6 +219,9 @@ void Config::load(QString path) {
} else if (stream.name() == "Style") {
stream.readNext();
style = static_cast<olive::styling::Style>(stream.text().toInt());
} else if (stream.name() == "NativeMenuStyling") {
stream.readNext();
use_native_menu_styling = (stream.text() == "1");
}
}
}
@@ -287,6 +291,7 @@ void Config::save(QString path) {
stream.writeTextElement("EnableColorManagement", QString::number(enable_color_management));
stream.writeTextElement("OCIOConfigPath", ocio_config_path);
stream.writeTextElement("Style", QString::number(style));
stream.writeTextElement("NativeMenuStyling", QString::number(use_native_menu_styling));
stream.writeEndElement(); // configuration
stream.writeEndDocument(); // doc