diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp index a6f8bcafe..360bec8d7 100644 --- a/src/lib/gui/dialogs/SettingsDialog.cpp +++ b/src/lib/gui/dialogs/SettingsDialog.cpp @@ -84,6 +84,7 @@ void SettingsDialog::initConnections() const connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &SettingsDialog::accept); connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + connect(ui->buttonBox->button(QDialogButtonBox::Reset), &QPushButton::clicked, this, &SettingsDialog::loadFromConfig); connect(ui->groupSecurity, &QGroupBox::toggled, this, &SettingsDialog::updateTlsControlsEnabled); connect(ui->groupService, &QGroupBox::toggled, this, &SettingsDialog::updateControls); @@ -187,6 +188,9 @@ void SettingsDialog::updateText() ui->comboLogLevel->setItemData(5, tr("Debug entries"), Qt::ToolTipRole); ui->comboLogLevel->setItemData(6, tr("More debug output"), Qt::ToolTipRole); ui->comboLogLevel->setItemData(7, tr("Verbose debug output"), Qt::ToolTipRole); + ui->buttonBox->button(QDialogButtonBox::Save)->setToolTip(tr("Close and save changes")); + ui->buttonBox->button(QDialogButtonBox::Cancel)->setToolTip(tr("Close and forget changes")); + ui->buttonBox->button(QDialogButtonBox::Reset)->setToolTip(tr("Reset to stored values")); } void SettingsDialog::accept() @@ -397,6 +401,7 @@ void SettingsDialog::setButtonBoxEnabledButtons() const { const bool modified = isModified(); ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(modified); + ui->buttonBox->button(QDialogButtonBox::Reset)->setEnabled(modified); } SettingsDialog::~SettingsDialog() = default; diff --git a/src/lib/gui/dialogs/SettingsDialog.ui b/src/lib/gui/dialogs/SettingsDialog.ui index 187eedafa..642ded743 100644 --- a/src/lib/gui/dialogs/SettingsDialog.ui +++ b/src/lib/gui/dialogs/SettingsDialog.ui @@ -711,7 +711,7 @@ Qt::Orientation::Horizontal - QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Save + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Reset|QDialogButtonBox::StandardButton::Save diff --git a/translations/deskflow_es.ts b/translations/deskflow_es.ts index 7a04f8297..c40928770 100644 --- a/translations/deskflow_es.ts +++ b/translations/deskflow_es.ts @@ -1315,6 +1315,18 @@ Al habilitar esta opción, se deshabilitará la interfaz gráfica de usuario (GU Verbose debug output Salida de depuración detallada + + Close and save changes + Cerrar y guardar los cambios + + + Close and forget changes + Cerrar y olvidar los cambios + + + Reset to stored values + Restablecer los valores almacenados + TLS Certificate Regenerated Certificado TLS regenerado diff --git a/translations/deskflow_it.ts b/translations/deskflow_it.ts index 3d637b60d..ebe787a26 100644 --- a/translations/deskflow_it.ts +++ b/translations/deskflow_it.ts @@ -1315,6 +1315,18 @@ L'abilitazione di questa impostazione disabiliterà l'interfaccia graf Verbose debug output Output di debug dettagliato + + Close and save changes + Chiudi e salva le modifiche + + + Close and forget changes + Chiudi e dimentica le modifiche + + + Reset to stored values + Ripristina i valori memorizzati + TLS Certificate Regenerated Certificato TLS rigenerato diff --git a/translations/deskflow_ja.ts b/translations/deskflow_ja.ts index 6d04d0be8..537ac3496 100644 --- a/translations/deskflow_ja.ts +++ b/translations/deskflow_ja.ts @@ -1344,6 +1344,18 @@ Enabling this setting will disable the server config GUI. Verbose debug output 詳細なデバッグ出力 + + Close and save changes + 変更を保存して閉じる + + + Close and forget changes + 変更を破棄して閉じる + + + Reset to stored values + 変更前の値にリセットする + Enable wl-clipboard support wl-clipboard によるクリップボード対応を有効にする diff --git a/translations/deskflow_ko.ts b/translations/deskflow_ko.ts index 4c99190ec..34cd16c64 100644 --- a/translations/deskflow_ko.ts +++ b/translations/deskflow_ko.ts @@ -1342,6 +1342,18 @@ Enabling this setting will disable the server config GUI. Verbose debug output 상세 디버그 출력 + + Close and save changes + 닫기 및 변경 사항 저장 + + + Close and forget changes + 설정을 저장하고 나면 변경 사항은 더 이상 신경 쓸 필요가 없습니다 + + + Reset to stored values + 저장된 값으로 재설정 + Enable wl-clipboard support wl-clipboard 지원 사용 diff --git a/translations/deskflow_ru.ts b/translations/deskflow_ru.ts index f44ed0a0b..410783973 100644 --- a/translations/deskflow_ru.ts +++ b/translations/deskflow_ru.ts @@ -1346,6 +1346,18 @@ Enabling this setting will disable the server config GUI. Verbose debug output Подробный вывод отладки + + Close and save changes + Закрыть и сохранить изменения + + + Close and forget changes + Закройте изменения и забудьте о них + + + Reset to stored values + Сбросить до сохраненных значений + <html><head/><body><p>Requires the wl-clipboard package</p><p>When using wl-clipboard v2.2.1, there is a focus stealing bug that may make Deskflow harder to use. This has been fixed when using the wl-clipboard master branch, unless your Compositor lacks wlroots-data-control protocol support.</p></body></html> <html><head/><body><p>Требуется пакет wl-clipboard. В версии 2.2.1 есть ошибка перехвата фокуса.</p></body></html> diff --git a/translations/deskflow_zh_CN.ts b/translations/deskflow_zh_CN.ts index 8b40bb599..7d1b2538a 100644 --- a/translations/deskflow_zh_CN.ts +++ b/translations/deskflow_zh_CN.ts @@ -175,7 +175,7 @@ p, li { white-space: pre-wrap; } Close and forget changes - 关闭并忘记更改 + 关闭并放弃修改 Reset to stored values @@ -1344,6 +1344,18 @@ Enabling this setting will disable the server config GUI. Verbose debug output 详细调试输出 + + Close and save changes + 关闭并保存更改 + + + Close and forget changes + 关闭并放弃修改 + + + Reset to stored values + 重置为存储值 + Enable wl-clipboard support 启用 wl-clipboard 支持