mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-27 03:54:17 +01:00
Re-show Web tab in the UI
This commit is contained in:
parent
fd6ab2da95
commit
14a4825b65
@ -18,6 +18,7 @@
|
|||||||
#include "lime_qt/configuration/configure_storage.h"
|
#include "lime_qt/configuration/configure_storage.h"
|
||||||
#include "lime_qt/configuration/configure_system.h"
|
#include "lime_qt/configuration/configure_system.h"
|
||||||
#include "lime_qt/configuration/configure_ui.h"
|
#include "lime_qt/configuration/configure_ui.h"
|
||||||
|
#include "lime_qt/configuration/configure_web.h"
|
||||||
#include "lime_qt/hotkeys.h"
|
#include "lime_qt/hotkeys.h"
|
||||||
#include "ui_configure.h"
|
#include "ui_configure.h"
|
||||||
|
|
||||||
@ -37,7 +38,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, Cor
|
|||||||
camera_tab{std::make_unique<ConfigureCamera>(this)},
|
camera_tab{std::make_unique<ConfigureCamera>(this)},
|
||||||
debug_tab{std::make_unique<ConfigureDebug>(is_powered_on, this)},
|
debug_tab{std::make_unique<ConfigureDebug>(is_powered_on, this)},
|
||||||
storage_tab{std::make_unique<ConfigureStorage>(is_powered_on, this)},
|
storage_tab{std::make_unique<ConfigureStorage>(is_powered_on, this)},
|
||||||
ui_tab{std::make_unique<ConfigureUi>(this)} {
|
web_tab{std::make_unique<ConfigureWeb>(this)}, ui_tab{std::make_unique<ConfigureUi>(this)} {
|
||||||
Settings::SetConfiguringGlobal(true);
|
Settings::SetConfiguringGlobal(true);
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
@ -52,9 +53,11 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, Cor
|
|||||||
ui->tabWidget->addTab(camera_tab.get(), tr("Camera"));
|
ui->tabWidget->addTab(camera_tab.get(), tr("Camera"));
|
||||||
ui->tabWidget->addTab(debug_tab.get(), tr("Debug"));
|
ui->tabWidget->addTab(debug_tab.get(), tr("Debug"));
|
||||||
ui->tabWidget->addTab(storage_tab.get(), tr("Storage"));
|
ui->tabWidget->addTab(storage_tab.get(), tr("Storage"));
|
||||||
|
ui->tabWidget->addTab(web_tab.get(), tr("Web"));
|
||||||
ui->tabWidget->addTab(ui_tab.get(), tr("UI"));
|
ui->tabWidget->addTab(ui_tab.get(), tr("UI"));
|
||||||
|
|
||||||
hotkeys_tab->Populate(registry);
|
hotkeys_tab->Populate(registry);
|
||||||
|
web_tab->SetWebServiceConfigEnabled(enable_web_config);
|
||||||
|
|
||||||
PopulateSelectionList();
|
PopulateSelectionList();
|
||||||
|
|
||||||
@ -87,6 +90,7 @@ void ConfigureDialog::SetConfiguration() {
|
|||||||
audio_tab->SetConfiguration();
|
audio_tab->SetConfiguration();
|
||||||
camera_tab->SetConfiguration();
|
camera_tab->SetConfiguration();
|
||||||
debug_tab->SetConfiguration();
|
debug_tab->SetConfiguration();
|
||||||
|
web_tab->SetConfiguration();
|
||||||
ui_tab->SetConfiguration();
|
ui_tab->SetConfiguration();
|
||||||
storage_tab->SetConfiguration();
|
storage_tab->SetConfiguration();
|
||||||
}
|
}
|
||||||
@ -102,6 +106,7 @@ void ConfigureDialog::ApplyConfiguration() {
|
|||||||
audio_tab->ApplyConfiguration();
|
audio_tab->ApplyConfiguration();
|
||||||
camera_tab->ApplyConfiguration();
|
camera_tab->ApplyConfiguration();
|
||||||
debug_tab->ApplyConfiguration();
|
debug_tab->ApplyConfiguration();
|
||||||
|
web_tab->ApplyConfiguration();
|
||||||
ui_tab->ApplyConfiguration();
|
ui_tab->ApplyConfiguration();
|
||||||
storage_tab->ApplyConfiguration();
|
storage_tab->ApplyConfiguration();
|
||||||
system.ApplySettings();
|
system.ApplySettings();
|
||||||
@ -114,7 +119,7 @@ void ConfigureDialog::PopulateSelectionList() {
|
|||||||
ui->selectorList->clear();
|
ui->selectorList->clear();
|
||||||
|
|
||||||
const std::array<std::pair<QString, QList<QWidget*>>, 5> items{
|
const std::array<std::pair<QString, QList<QWidget*>>, 5> items{
|
||||||
{{tr("General"), {general_tab.get(), debug_tab.get(), ui_tab.get()}},
|
{{tr("General"), {general_tab.get(), web_tab.get(), debug_tab.get(), ui_tab.get()}},
|
||||||
{tr("System"), {system_tab.get(), camera_tab.get(), storage_tab.get()}},
|
{tr("System"), {system_tab.get(), camera_tab.get(), storage_tab.get()}},
|
||||||
{tr("Graphics"), {enhancements_tab.get(), graphics_tab.get()}},
|
{tr("Graphics"), {enhancements_tab.get(), graphics_tab.get()}},
|
||||||
{tr("Audio"), {audio_tab.get()}},
|
{tr("Audio"), {audio_tab.get()}},
|
||||||
@ -154,6 +159,7 @@ void ConfigureDialog::RetranslateUI() {
|
|||||||
audio_tab->RetranslateUI();
|
audio_tab->RetranslateUI();
|
||||||
camera_tab->RetranslateUI();
|
camera_tab->RetranslateUI();
|
||||||
debug_tab->RetranslateUI();
|
debug_tab->RetranslateUI();
|
||||||
|
web_tab->RetranslateUI();
|
||||||
ui_tab->RetranslateUI();
|
ui_tab->RetranslateUI();
|
||||||
storage_tab->RetranslateUI();
|
storage_tab->RetranslateUI();
|
||||||
}
|
}
|
||||||
@ -173,6 +179,7 @@ void ConfigureDialog::UpdateVisibleTabs() {
|
|||||||
{camera_tab.get(), tr("Camera")},
|
{camera_tab.get(), tr("Camera")},
|
||||||
{debug_tab.get(), tr("Debug")},
|
{debug_tab.get(), tr("Debug")},
|
||||||
{storage_tab.get(), tr("Storage")},
|
{storage_tab.get(), tr("Storage")},
|
||||||
|
{web_tab.get(), tr("Web")},
|
||||||
{ui_tab.get(), tr("UI")}};
|
{ui_tab.get(), tr("UI")}};
|
||||||
|
|
||||||
ui->tabWidget->clear();
|
ui->tabWidget->clear();
|
||||||
|
@ -29,6 +29,7 @@ class ConfigureAudio;
|
|||||||
class ConfigureCamera;
|
class ConfigureCamera;
|
||||||
class ConfigureDebug;
|
class ConfigureDebug;
|
||||||
class ConfigureStorage;
|
class ConfigureStorage;
|
||||||
|
class ConfigureWeb;
|
||||||
class ConfigureUi;
|
class ConfigureUi;
|
||||||
|
|
||||||
class ConfigureDialog : public QDialog {
|
class ConfigureDialog : public QDialog {
|
||||||
@ -69,5 +70,6 @@ private:
|
|||||||
std::unique_ptr<ConfigureCamera> camera_tab;
|
std::unique_ptr<ConfigureCamera> camera_tab;
|
||||||
std::unique_ptr<ConfigureDebug> debug_tab;
|
std::unique_ptr<ConfigureDebug> debug_tab;
|
||||||
std::unique_ptr<ConfigureStorage> storage_tab;
|
std::unique_ptr<ConfigureStorage> storage_tab;
|
||||||
|
std::unique_ptr<ConfigureWeb> web_tab;
|
||||||
std::unique_ptr<ConfigureUi> ui_tab;
|
std::unique_ptr<ConfigureUi> ui_tab;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user