natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make SettingsPanel work once again

Browse Source
This commit is contained in:
Skarn
2020-11-06 01:17:36 +03:00
parent a743462c93
commit 4073f67d42
3 changed files with 151 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

295
src/noggit/ui/SettingsPanel.cpp
View File

@@ -24,121 +24,110 @@
#include <algorithm>
namespace util
{
namespace noggit
{
namespace ui
{
settings::settings(QWidget* parent)
: QDialog (parent)
, _settings (new QSettings (this))
settings::settings(QWidget *parent)
: QDialog(parent), _settings(new QSettings(this))
{
Ui::SettingsPanel SettingsPanelUi;
SettingsPanelUi.setupUi(this);
SettingsPanelUi = new Ui::SettingsPanel;
SettingsPanelUi->setupUi(this);
connect(SettingsPanelUi.gamePathField, &QLineEdit::textChanged
, [&](QString value)
{
_settings->setValue("project/game_path", value);
}
);
connect ( SettingsPanelUi.gamePathFieldBrowse, &QPushButton::clicked
, [=]
{
auto result(QFileDialog::getExistingDirectory(
nullptr, "WoW Client Path", SettingsPanelUi.gamePathField->text()));
if (!result.isNull())
{
if (!(result.endsWith ("/") || result.endsWith ("\\")))
connect(SettingsPanelUi->gamePathField, &QLineEdit::textChanged, [&](QString value)
{
result += "/";
_settings->setValue("project/game_path", value);
}
SettingsPanelUi.gamePathField->setText(result);
}
}
);
connect(SettingsPanelUi.projectPathField, &QLineEdit::textChanged
, [&](QString value)
connect(SettingsPanelUi->gamePathField_browse, &QPushButton::clicked, [=]
{
auto result(QFileDialog::getExistingDirectory(
nullptr, "WoW Client Path", SettingsPanelUi->gamePathField->text()));
if (!result.isNull())
{
if (!(result.endsWith("/") || result.endsWith("\\")))
{
result += "/";
}
SettingsPanelUi->gamePathField->setText(result);
}
}
);
connect(SettingsPanelUi->projectPathField, &QLineEdit::textChanged, [&](QString value)
{
_settings->setValue("project/path", value);
}
);
connect ( SettingsPanelUi.projectPathFieldBrowse, &QPushButton::clicked
, [=]
connect(SettingsPanelUi->projectPathField_browse, &QPushButton::clicked, [=]
{
auto result(QFileDialog::getExistingDirectory(
nullptr, "Project Path", SettingsPanelUi->projectPathField->text()));
if (!result.isNull())
{
auto result(QFileDialog::getExistingDirectory(
nullptr, "Project Path", SettingsPanelUi.projectPathField->text()));
if (!result.isNull())
if (!(result.endsWith("/") || result.endsWith("\\")))
{
if (!(result.endsWith ("/") || result.endsWith ("\\")))
{
result += "/";
}
SettingsPanelUi.projectPathField->setText(result);
result += "/";
}
SettingsPanelUi->projectPathField->setText(result);
}
}
);
connect(SettingsPanelUi.importPathField, &QLineEdit::textChanged
, [&](QString value)
connect(SettingsPanelUi->importPathField, &QLineEdit::textChanged, [&](QString value)
{
_settings->setValue("project/import_file", value);
}
);
connect ( SettingsPanelUi.importPathFieldBrowse, &QPushButton::clicked
, [=]
{
auto result(QFileDialog::getOpenFileName(
nullptr, "Import File Path", SettingsPanelUi.importPathField->text()));
connect(SettingsPanelUi->importPathField_browse, &QPushButton::clicked, [=]
{
auto result(QFileDialog::getOpenFileName(
nullptr, "Import File Path", SettingsPanelUi->importPathField->text()));
if (!result.isNull())
{
SettingsPanelUi.importPathField->setText(result);
}
if (!result.isNull())
{
SettingsPanelUi->importPathField->setText(result);
}
}
);
connect(SettingsPanelUi.wmvLogPathField, &QLineEdit::textChanged
, [&](QString value)
connect(SettingsPanelUi->wmvLogPathField, &QLineEdit::textChanged, [&](QString value)
{
_settings->setValue("project/import_file", value);
}
);
connect ( SettingsPanelUi.wmvLogPathFieldBrowse, &QPushButton::clicked
, [=]
{
auto result(QFileDialog::getOpenFileName(
nullptr, "WMV Log Path", SettingsPanelUi.wmvLogPathField->text()));
connect(SettingsPanelUi->wmvLogPathField_browse, &QPushButton::clicked, [=]
{
auto result(QFileDialog::getOpenFileName(
nullptr, "WMV Log Path", SettingsPanelUi->wmvLogPathField->text()));
if (!result.isNull())
{
SettingsPanelUi.wmvLogPathField->setText(result);
}
if (!result.isNull())
{
SettingsPanelUi->wmvLogPathField->setText(result);
}
}
);
#ifdef USE_MYSQL_UID_STORAGE
SettingsPanelUi.MySQL_box->setEnabled(true);
SettingsPanelUi.mysql_warning->setVisible(false);
#endif
#ifdef USE_MYSQL_UID_STORAGE
SettingsPanelUi->MySQL_box->setEnabled(true);
SettingsPanelUi->mysql_warning->setVisible(false);
#endif
SettingsPanelUi._theme->addItem("System");
SettingsPanelUi->_theme->addItem("System");
QDir theme_dir = QDir("./themes/");
if (theme_dir.exists())
@@ -147,50 +136,48 @@ namespace noggit
{
if (QDir(theme_dir.path() + "/" + dir).exists("theme.qss"))
{
SettingsPanelUi._theme->addItem(dir);
SettingsPanelUi->_theme->addItem(dir);
}
}
}
else
} else
{
LogError << "Failed to load themes. The \"themes/\" folder does not exist in Noggit directory. Using system theme." << std::endl;
LogError
<< "Failed to load themes. The \"themes/\" folder does not exist in Noggit directory. Using system theme."
<< std::endl;
}
connect ( SettingsPanelUi._theme, &QComboBox::currentTextChanged
, [&] (QString s)
connect(SettingsPanelUi->_theme, &QComboBox::currentTextChanged, [&](QString s)
{
if (s == "System")
{
if (s == "System")
{
qApp->setStyleSheet("");
return;
}
QFile file((boost::format("./themes/%s/theme.qss") % s.toStdString().c_str()).str().c_str());
if (file.open(QFile::ReadOnly))
{
QString style_sheet = QLatin1String(file.readAll());
qApp->setStyleSheet(style_sheet);;
}
qApp->setStyleSheet("");
return;
}
QFile file((boost::format("./themes/%s/theme.qss") % s.toStdString().c_str()).str().c_str());
if (file.open(QFile::ReadOnly))
{
QString style_sheet = QLatin1String(file.readAll());
qApp->setStyleSheet(style_sheet);;
}
}
);
SettingsPanelUi._wireframe_color->setColor(Qt::white);
SettingsPanelUi->_wireframe_color->setColor(Qt::white);
connect ( SettingsPanelUi.saveButton, &QPushButton::clicked
, [this]
{
hide();
save_changes();
}
);
connect(SettingsPanelUi->saveButton, &QPushButton::clicked, [this]
{
hide();
save_changes();
}
);
connect ( SettingsPanelUi.discardButton, &QPushButton::clicked
, [this]
{
hide();
discard_changes();
}
);
connect(SettingsPanelUi->discardButton, &QPushButton::clicked, [this]
{
hide();
discard_changes();
}
);
// load the values in the fields
discard_changes();
@@ -198,56 +185,60 @@ namespace noggit
void settings::discard_changes()
{
gamePathField->actual->setText (_settings->value ("project/game_path").toString());
projectPathField->actual->setText (_settings->value ("project/path").toString());
importPathField->actual->setText (_settings->value ("project/import_file", "import.txt").toString());
wmvLogPathField->actual->setText (_settings->value ("project/wmv_log_file").toString());
viewDistanceField->setValue (_settings->value ("view_distance", 1000.f).toFloat());
farZField->setValue (_settings->value ("farZ", 2048.f).toFloat());
tabletModeCheck->setChecked (_settings->value ("tablet/enabled", false).toBool());
_undock_tool_properties->setChecked (_settings->value ("undock_tool_properties/enabled", true).toBool());
_undock_small_texture_palette->setChecked (_settings->value ("undock_small_texture_palette/enabled", true).toBool());
_vsync_cb->setChecked (_settings->value ("vsync", false).toBool());
_anti_aliasing_cb->setChecked (_settings->value ("anti_aliasing", false).toBool());
_fullscreen_cb->setChecked (_settings->value ("fullscreen", false).toBool());
_adt_unload_dist->setValue(_settings->value("unload_dist", 5).toInt());
_adt_unload_check_interval->setValue(_settings->value("unload_interval", 5).toInt());
_uid_cb->setChecked(_settings->value("uid_startup_check", true).toBool());
_additional_file_loading_log->setChecked(_settings->value("additional_file_loading_log", false).toBool());
_theme->setCurrentText(_settings->value("theme", "Dark").toString());
SettingsPanelUi->gamePathField->setText(_settings->value("project/game_path").toString());
SettingsPanelUi->projectPathField->setText(_settings->value("project/path").toString());
SettingsPanelUi->importPathField->setText(_settings->value("project/import_file", "import.txt").toString());
SettingsPanelUi->wmvLogPathField->setText(_settings->value("project/wmv_log_file").toString());
SettingsPanelUi->viewDistanceField->setValue(_settings->value("view_distance", 1000.f).toFloat());
SettingsPanelUi->farZField->setValue(_settings->value("farZ", 2048.f).toFloat());
SettingsPanelUi->tabletModeCheck->setChecked(_settings->value("tablet/enabled", false).toBool());
SettingsPanelUi->_undock_tool_properties->setChecked(
_settings->value("undock_tool_properties/enabled", true).toBool());
SettingsPanelUi->_undock_small_texture_palette->setChecked(
_settings->value("undock_small_texture_palette/enabled", true).toBool());
SettingsPanelUi->_vsync_cb->setChecked(_settings->value("vsync", false).toBool());
SettingsPanelUi->_anti_aliasing_cb->setChecked(_settings->value("anti_aliasing", false).toBool());
SettingsPanelUi->_fullscreen_cb->setChecked(_settings->value("fullscreen", false).toBool());
SettingsPanelUi->_adt_unload_dist->setValue(_settings->value("unload_dist", 5).toInt());
SettingsPanelUi->_adt_unload_check_interval->setValue(_settings->value("unload_interval", 5).toInt());
SettingsPanelUi->_uid_cb->setChecked(_settings->value("uid_startup_check", true).toBool());
SettingsPanelUi->_additional_file_loading_log->setChecked(
_settings->value("additional_file_loading_log", false).toBool());
SettingsPanelUi->_theme->setCurrentText(_settings->value("theme", "Dark").toString());
#ifdef USE_MYSQL_UID_STORAGE
_mysql_box->setChecked (_settings->value ("project/mysql/enabled").toBool());
_mysql_server_field->setText (_settings->value ("project/mysql/server").toString());
_mysql_user_field->setText(_settings->value ("project/mysql/user").toString());
_mysql_pwd_field->setText (_settings->value ("project/mysql/pwd").toString());
_mysql_db_field->setText (_settings->value ("project/mysql/db").toString());
SettingsPanelUi->_mysql_box->setChecked (_settings->value ("project/mysql/enabled").toBool());
SettingsPanelUi->_mysql_server_field->setText (_settings->value ("project/mysql/server").toString());
SettingsPanelUi->_mysql_user_field->setText(_settings->value ("project/mysql/user").toString());
SettingsPanelUi->_mysql_pwd_field->setText (_settings->value ("project/mysql/pwd").toString());
SettingsPanelUi->_mysql_db_field->setText (_settings->value ("project/mysql/db").toString());
#endif
_wireframe_type_group->button (_settings->value ("wireframe/type", 0).toInt())->toggle();
_wireframe_radius->setValue (_settings->value ("wireframe/radius", 1.5f).toFloat());
_wireframe_width->setValue (_settings->value ("wireframe/width", 1.f).toFloat());
_wireframe_color->setColor(_settings->value("wireframe/color").value<QColor>());
//SettingsPanelUi->_wireframe_type_group->button(_settings->value("wireframe/type", 0).toInt())->toggle();
SettingsPanelUi->_wireframe_radius->setValue(_settings->value("wireframe/radius", 1.5f).toFloat());
SettingsPanelUi->_wireframe_width->setValue(_settings->value("wireframe/width", 1.f).toFloat());
SettingsPanelUi->_wireframe_color->setColor(_settings->value("wireframe/color").value<QColor>());
}
void settings::save_changes()
{
_settings->setValue ("project/game_path", gamePathField->actual->text());
_settings->setValue ("project/path", projectPathField->actual->text());
_settings->setValue ("project/import_file", importPathField->actual->text());
_settings->setValue ("project/wmv_log_file", wmvLogPathField->actual->text());
_settings->setValue ("farZ", farZField->value());
_settings->setValue ("view_distance", viewDistanceField->value());
_settings->setValue ("tablet/enabled", tabletModeCheck->isChecked());
_settings->setValue ("undock_tool_properties/enabled", _undock_tool_properties->isChecked());
_settings->setValue ("undock_small_texture_palette/enabled", _undock_small_texture_palette->isChecked());
_settings->setValue ("vsync", _vsync_cb->isChecked());
_settings->setValue ("anti_aliasing", _anti_aliasing_cb->isChecked());
_settings->setValue ("fullscreen", _fullscreen_cb->isChecked());
_settings->setValue ("unload_dist", _adt_unload_dist->value());
_settings->setValue ("unload_interval", _adt_unload_check_interval->value());
_settings->setValue ("uid_startup_check", _uid_cb->isChecked());
_settings->setValue ("additional_file_loading_log", _additional_file_loading_log->isChecked());
_settings->setValue("project/game_path", SettingsPanelUi->gamePathField->text());
_settings->setValue("project/path", SettingsPanelUi->projectPathField->text());
_settings->setValue("project/import_file", SettingsPanelUi->importPathField->text());
_settings->setValue("project/wmv_log_file", SettingsPanelUi->wmvLogPathField->text());
_settings->setValue("farZ", SettingsPanelUi->farZField->value());
_settings->setValue("view_distance", SettingsPanelUi->viewDistanceField->value());
_settings->setValue("tablet/enabled", SettingsPanelUi->tabletModeCheck->isChecked());
_settings->setValue("undock_tool_properties/enabled", SettingsPanelUi->_undock_tool_properties->isChecked());
_settings->setValue("undock_small_texture_palette/enabled",
SettingsPanelUi->_undock_small_texture_palette->isChecked());
_settings->setValue("vsync", SettingsPanelUi->_vsync_cb->isChecked());
_settings->setValue("anti_aliasing", SettingsPanelUi->_anti_aliasing_cb->isChecked());
_settings->setValue("fullscreen", SettingsPanelUi->_fullscreen_cb->isChecked());
_settings->setValue("unload_dist", SettingsPanelUi->_adt_unload_dist->value());
_settings->setValue("unload_interval", SettingsPanelUi->_adt_unload_check_interval->value());
_settings->setValue("uid_startup_check", SettingsPanelUi->_uid_cb->isChecked());
_settings->setValue("additional_file_loading_log", SettingsPanelUi->_additional_file_loading_log->isChecked());
#ifdef USE_MYSQL_UID_STORAGE
_settings->setValue ("project/mysql/enabled", _mysql_box->isChecked());
@@ -257,13 +248,13 @@ namespace noggit
_settings->setValue ("project/mysql/db", _mysql_db_field->text());
#endif
_settings->setValue ("wireframe/type", _wireframe_type_group->checkedId());
_settings->setValue ("wireframe/radius", _wireframe_radius->value());
_settings->setValue ("wireframe/width", _wireframe_width->value());
_settings->setValue ("wireframe/color", _wireframe_color->color());
_settings->setValue ("theme", _theme->currentText());
_settings->setValue("wireframe/type", SettingsPanelUi->_wireframe_type_group->checkedId());
_settings->setValue("wireframe/radius", SettingsPanelUi->_wireframe_radius->value());
_settings->setValue("wireframe/width", SettingsPanelUi->_wireframe_width->value());
_settings->setValue("wireframe/color", SettingsPanelUi->_wireframe_color->color());
_settings->setValue("theme", SettingsPanelUi->_theme->currentText());
_settings->sync();
_settings->sync();
}
}
}
}

4
src/noggit/ui/SettingsPanel.h
View File

@@ -5,7 +5,8 @@
#include <qt-color-widgets/color_selector.hpp>
#include <QtCore/QSettings>
#include <QDialog>
#include <ui_SettingsPanel.h>
namespace noggit
@@ -15,6 +16,7 @@ namespace noggit
class settings : public QDialog
{
QSettings* _settings;
Ui::SettingsPanel* SettingsPanelUi;
public:
settings(QWidget* parent = nullptr);
void discard_changes();

7
src/noggit/ui/SettingsPanel.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>418</width>
<height>552</height>
<height>560</height>
</rect>
</property>
<property name="sizePolicy">
@@ -52,7 +52,7 @@
<string/>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<property name="tabBarAutoHide">
<bool>false</bool>
@@ -302,6 +302,9 @@
</item>
<item>
<widget class="QRadioButton" name="radio_wire_cursor">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Around cursor</string>
</property>