Rename the "Apply" button to "Reload"

The "Apply" button in the main window calls stopBarrier() immediately
followed by startBarrier(). The startBarrier() function reloads the
configuration. The fact that the "Apply" button applies configuration
changes is incidental; the "Start" button also applies new settings.

"Reload" more accurately describes the function that the button
performs.

Issue #284
This commit is contained in:
Mike Salvatore 2019-04-12 19:34:13 -04:00
parent d85a47ad80
commit c54424794f
95 changed files with 55 additions and 55 deletions

View File

@ -456,7 +456,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Приложи</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Aplicar</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Použít</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Anvend</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Anwenden</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Aplicar</translation>
</message>
<message>
@ -1408,4 +1408,4 @@ Server response:
<translation type="unfinished"></translation>
</message>
</context>
</TS>
</TS>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Rakenda</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Käytä</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Appliquer</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;שמור שינויים</translation>
</message>
<message>

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Primijeni</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Alkalmaz</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Applica</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">(&amp;A)</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Toep&amp;assen</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Bruk</translation>
</message>
<message>

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Zastosuj</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Aplicar</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Aplicar</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Aplică</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Применить</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">&amp;Apliko</translation>
</message>
<message>

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Verkställ</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Uygula</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished">Застосувати</translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="unfinished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished"></translation>
</message>
<message>

Binary file not shown.

View File

@ -454,7 +454,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
</message>
<message>
<location filename="res/MainWindowBase.ui" line="373"/>
<source>&amp;Apply</source>
<source>&amp;Reload</source>
<translation type="finished"></translation>
</message>
<message>

View File

@ -763,14 +763,14 @@ void MainWindow::setBarrierState(qBarrierState state)
disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartBarrier, SLOT(trigger()));
connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopBarrier, SLOT(trigger()));
m_pButtonToggleStart->setText(tr("&Stop"));
m_pButtonApply->setEnabled(true);
m_pButtonReload->setEnabled(true);
}
else if (state == barrierDisconnected)
{
disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopBarrier, SLOT(trigger()));
connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartBarrier, SLOT(trigger()));
m_pButtonToggleStart->setText(tr("&Start"));
m_pButtonApply->setEnabled(false);
m_pButtonReload->setEnabled(false);
}
bool connected = false;
@ -1040,7 +1040,7 @@ void MainWindow::on_m_pButtonConfigureServer_clicked()
showConfigureServer();
}
void MainWindow::on_m_pButtonApply_clicked()
void MainWindow::on_m_pButtonReload_clicked()
{
restartBarrier();
}

View File

@ -205,7 +205,7 @@ public slots:
private slots:
void on_m_pCheckBoxAutoConfig_toggled(bool checked);
void on_m_pComboServerList_currentIndexChanged(QString );
void on_m_pButtonApply_clicked();
void on_m_pButtonReload_clicked();
void installBonjour();
};

View File

@ -278,12 +278,12 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="m_pButtonApply">
<widget class="QPushButton" name="m_pButtonReload">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Apply</string>
<string>&amp;Reload</string>
</property>
</widget>
</item>