kopia lustrzana https://gitlab.com/eliggett/wfview
Change default to isdefault!
rodzic
e6713dc516
commit
3b1efbd69e
|
@ -29,7 +29,7 @@ struct clusterSettings {
|
||||||
QString userName;
|
QString userName;
|
||||||
QString password;
|
QString password;
|
||||||
int timeout=30;
|
int timeout=30;
|
||||||
bool default;
|
bool isdefault;
|
||||||
};
|
};
|
||||||
|
|
||||||
class dxClusterClient : public QObject
|
class dxClusterClient : public QObject
|
||||||
|
|
12
wfmain.cpp
12
wfmain.cpp
|
@ -140,7 +140,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
|
||||||
|
|
||||||
for (int f = 0; f < clusters.size(); f++)
|
for (int f = 0; f < clusters.size(); f++)
|
||||||
{
|
{
|
||||||
if (clusters[f].default)
|
if (clusters[f].isdefault)
|
||||||
{
|
{
|
||||||
emit setClusterServerName(clusters[f].server);
|
emit setClusterServerName(clusters[f].server);
|
||||||
emit setClusterTcpPort(clusters[f].port);
|
emit setClusterTcpPort(clusters[f].port);
|
||||||
|
@ -1867,7 +1867,7 @@ void wfmain::loadSettings()
|
||||||
c.userName = settings->value("UserName", "").toString();
|
c.userName = settings->value("UserName", "").toString();
|
||||||
c.password = settings->value("Password", "").toString();
|
c.password = settings->value("Password", "").toString();
|
||||||
c.timeout = settings->value("Timeout", 0).toInt();
|
c.timeout = settings->value("Timeout", 0).toInt();
|
||||||
c.default = settings->value("Default", false).toBool();
|
c.isdefault = settings->value("Default", false).toBool();
|
||||||
if (!c.server.isEmpty()) {
|
if (!c.server.isEmpty()) {
|
||||||
clusters.append(c);
|
clusters.append(c);
|
||||||
}
|
}
|
||||||
|
@ -1878,7 +1878,7 @@ void wfmain::loadSettings()
|
||||||
for (int f = 0; f < clusters.size(); f++)
|
for (int f = 0; f < clusters.size(); f++)
|
||||||
{
|
{
|
||||||
ui->clusterServerNameCombo->addItem(clusters[f].server);
|
ui->clusterServerNameCombo->addItem(clusters[f].server);
|
||||||
if (clusters[f].default) {
|
if (clusters[f].isdefault) {
|
||||||
defaultCluster = f;
|
defaultCluster = f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2254,7 +2254,7 @@ void wfmain::saveSettings()
|
||||||
settings->setValue("Port", clusters[f].port);
|
settings->setValue("Port", clusters[f].port);
|
||||||
settings->setValue("Password", clusters[f].password);
|
settings->setValue("Password", clusters[f].password);
|
||||||
settings->setValue("Timeout", clusters[f].timeout);
|
settings->setValue("Timeout", clusters[f].timeout);
|
||||||
settings->setValue("Default", clusters[f].default);
|
settings->setValue("Default", clusters[f].isdefault);
|
||||||
}
|
}
|
||||||
|
|
||||||
settings->endArray();
|
settings->endArray();
|
||||||
|
@ -7579,9 +7579,9 @@ void wfmain::on_clusterServerNameCombo_currentIndexChanged(int index)
|
||||||
|
|
||||||
for (int i = 0; i < clusters.size(); i++) {
|
for (int i = 0; i < clusters.size(); i++) {
|
||||||
if (i == index)
|
if (i == index)
|
||||||
clusters[index].default = true;
|
clusters[index].isdefault = true;
|
||||||
else
|
else
|
||||||
clusters[index].default = false;
|
clusters[index].isdefault = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
emit setClusterServerName(clusters[index].server);
|
emit setClusterServerName(clusters[index].server);
|
||||||
|
|
Ładowanie…
Reference in New Issue