feat: Don't hide the settings tab when an instance is running
Signed-off-by: Redson <redson@riseup.net>
This commit is contained in:
parent
ce5bb29c44
commit
37a6ef95f0
@ -60,11 +60,15 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
|
|||||||
m_settings = inst->settings();
|
m_settings = inst->settings();
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
// As the signal will (probably) not be triggered once we click edit, let's update it manually instead.
|
||||||
|
updateRunningStatus(m_instance->isRunning());
|
||||||
|
|
||||||
accountMenu = new QMenu(this);
|
accountMenu = new QMenu(this);
|
||||||
// Use undocumented property... https://stackoverflow.com/questions/7121718/create-a-scrollbar-in-a-submenu-qt
|
// Use undocumented property... https://stackoverflow.com/questions/7121718/create-a-scrollbar-in-a-submenu-qt
|
||||||
accountMenu->setStyleSheet("QMenu { menu-scrollable: 1; }");
|
accountMenu->setStyleSheet("QMenu { menu-scrollable: 1; }");
|
||||||
ui->instanceAccountSelector->setMenu(accountMenu);
|
ui->instanceAccountSelector->setMenu(accountMenu);
|
||||||
|
|
||||||
|
connect(m_instance, &BaseInstance::runningStatusChanged, this, &InstanceSettingsPage::updateRunningStatus);
|
||||||
connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
|
connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
|
||||||
connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
|
connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
|
||||||
connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
|
connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
|
||||||
@ -74,7 +78,7 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
|
|||||||
|
|
||||||
bool InstanceSettingsPage::shouldDisplay() const
|
bool InstanceSettingsPage::shouldDisplay() const
|
||||||
{
|
{
|
||||||
return !m_instance->isRunning();
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
InstanceSettingsPage::~InstanceSettingsPage()
|
InstanceSettingsPage::~InstanceSettingsPage()
|
||||||
@ -552,3 +556,8 @@ void InstanceSettingsPage::updateThresholds()
|
|||||||
ui->labelMaxMemIcon->setPixmap(pix);
|
ui->labelMaxMemIcon->setPixmap(pix);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void InstanceSettingsPage::updateRunningStatus(bool running)
|
||||||
|
{
|
||||||
|
setEnabled(!running);
|
||||||
|
}
|
||||||
|
@ -81,6 +81,7 @@ public:
|
|||||||
void updateThresholds();
|
void updateThresholds();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
void updateRunningStatus(bool running);
|
||||||
void on_javaDetectBtn_clicked();
|
void on_javaDetectBtn_clicked();
|
||||||
void on_javaTestBtn_clicked();
|
void on_javaTestBtn_clicked();
|
||||||
void on_javaBrowseBtn_clicked();
|
void on_javaBrowseBtn_clicked();
|
||||||
|
Loading…
Reference in New Issue
Block a user