mirror of
https://github.com/debauchee/barrier.git
synced 2024-11-22 15:45:22 +03:00
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:
parent
d85a47ad80
commit
c54424794f
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Приложи</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Aplicar</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Použít</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Anvend</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Anwenden</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&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.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Rakenda</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Käytä</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Appliquer</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&שמור שינויים</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Primijeni</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Alkalmaz</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Applica</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">適用</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">적용(&A)</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Toep&assen</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Bruk</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Zastosuj</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Aplicar</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Aplicar</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Aplică</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Применить</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">&Apliko</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Verkställ</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Uygula</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">Застосувати</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">应用</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
Binary file not shown.
@ -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>&Apply</source>
|
||||
<source>&Reload</source>
|
||||
<translation type="finished">應用</translation>
|
||||
</message>
|
||||
<message>
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -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();
|
||||
|
||||
};
|
||||
|
@ -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>&Apply</string>
|
||||
<string>&Reload</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
Loading…
Reference in New Issue
Block a user