diff --git a/resources/fa-solid-900.ttf b/resources/fa-solid-900.ttf deleted file mode 100644 index c6c3dd4d..00000000 Binary files a/resources/fa-solid-900.ttf and /dev/null differ diff --git a/resources/font_awesome.otf b/resources/font_awesome.otf new file mode 100644 index 00000000..caade9b6 Binary files /dev/null and b/resources/font_awesome.otf differ diff --git a/resources/resources.qrc b/resources/resources.qrc index db784903..8e11040b 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -1,7 +1,7 @@ - fa-solid-900.ttf + font_awesome.otf noggit_font.ttf diff --git a/src/noggit/Red/AssetBrowser/Ui/AssetBrowser.ui b/src/noggit/Red/AssetBrowser/Ui/AssetBrowser.ui index 76cd5206..ff49f9d6 100644 --- a/src/noggit/Red/AssetBrowser/Ui/AssetBrowser.ui +++ b/src/noggit/Red/AssetBrowser/Ui/AssetBrowser.ui @@ -36,7 +36,7 @@ - -1 + 0 12 diff --git a/src/noggit/ui/SettingsPanel.cpp b/src/noggit/ui/SettingsPanel.cpp index 3ac4fda2..b62ea886 100644 --- a/src/noggit/ui/SettingsPanel.cpp +++ b/src/noggit/ui/SettingsPanel.cpp @@ -213,6 +213,7 @@ namespace noggit _settings->value("additional_file_loading_log", false).toBool()); ui->_theme->setCurrentText(_settings->value("theme", "Dark").toString()); + #ifdef USE_MYSQL_UID_STORAGE ui->_mysql_box->setChecked (_settings->value ("project/mysql/enabled").toBool()); ui->_mysql_server_field->setText (_settings->value ("project/mysql/server").toString()); diff --git a/src/noggit/ui/SettingsPanel.ui b/src/noggit/ui/SettingsPanel.ui index 77f55c68..d4d864f5 100644 --- a/src/noggit/ui/SettingsPanel.ui +++ b/src/noggit/ui/SettingsPanel.ui @@ -82,7 +82,7 @@ - 1 + 4 false @@ -352,7 +352,7 @@ true - false + true _wireframe_type_group @@ -381,7 +381,7 @@ Around cursor - false + true _wireframe_type_group @@ -1340,6 +1340,438 @@ + + + Asset Browser + + + + + + + + + Appearance + + + Qt::AlignCenter + + + + 0 + + + + + + 12 + + + 5 + + + 5 + + + + + + 0 + 0 + + + + Background color: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + + -1 + + + 12 + + + 5 + + + 5 + + + + + + 0 + 0 + + + + Default model: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 60 + 20 + + + + + + + + <html><head/><body><p>Default model to load on Asset Browser startup. Has to be a valid model, else an application crash may occur.</p></body></html> + + + world/wmo/azeroth/buildings/human_farm/farm.wmo + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + + 5 + + + 5 + + + + + + 0 + 0 + + + + Diffuse light: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 70 + 20 + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + + 5 + + + 5 + + + + + + 0 + 0 + + + + Ambient light: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 65 + 20 + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + + + + Control + + + Qt::AlignCenter + + + + + + + 12 + + + 5 + + + 5 + + + + + + 0 + 0 + + + + Move sensitivity: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 45 + 20 + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + + 12 + + + 5 + + + 5 + + + + + + 0 + 0 + + + + Copy to clipboard: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 35 + 20 + + + + + + + + <html><head/><body><p> Automatically copy selected model to clipboard</p></body></html> + + + + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + + + + + diff --git a/src/noggit/ui/font_awesome.cpp b/src/noggit/ui/font_awesome.cpp index 7623470a..226ff770 100644 --- a/src/noggit/ui/font_awesome.cpp +++ b/src/noggit/ui/font_awesome.cpp @@ -53,7 +53,7 @@ namespace noggit if (!_fonts.count (rect.height())) { - auto id (QFontDatabase::addApplicationFont (":/fonts/Font Awesome 5 Pro-Regular-400.otf")); + auto id (QFontDatabase::addApplicationFont (":/fonts/font_awesome.otf")); if (id == -1) {