diff options
Diffstat (limited to 'src/ui/dialog/settings')
-rw-r--r-- | src/ui/dialog/settings/SettingsDialog.cpp | 6 | ||||
-rw-r--r-- | src/ui/dialog/settings/SettingsGeneral.cpp | 18 | ||||
-rw-r--r-- | src/ui/dialog/settings/SettingsKeyServer.cpp | 6 | ||||
-rw-r--r-- | src/ui/dialog/settings/SettingsNetwork.cpp | 18 |
4 files changed, 24 insertions, 24 deletions
diff --git a/src/ui/dialog/settings/SettingsDialog.cpp b/src/ui/dialog/settings/SettingsDialog.cpp index 5f083408..9815ba76 100644 --- a/src/ui/dialog/settings/SettingsDialog.cpp +++ b/src/ui/dialog/settings/SettingsDialog.cpp @@ -114,12 +114,12 @@ void SettingsDialog::SlotAccept() { key_server_tab_->ApplySettings(); network_tab_->ApplySettings(); - SPDLOG_DEBUG("apply done"); + GF_UI_LOG_DEBUG("apply done"); // write settings to filesystem GlobalSettingStation::GetInstance().SyncSettings(); - SPDLOG_DEBUG("restart needed: {}", get_restart_needed()); + GF_UI_LOG_DEBUG("restart needed: {}", get_restart_needed()); if (get_restart_needed()) { emit SignalRestartNeeded(get_restart_needed()); } @@ -138,7 +138,7 @@ QHash<QString, QString> SettingsDialog::ListLanguages() { for (int i = 0; i < file_names.size(); ++i) { QString locale = file_names[i]; - SPDLOG_DEBUG("locale: {}", locale.toStdString()); + GF_UI_LOG_DEBUG("locale: {}", locale.toStdString()); if (locale == "." || locale == "..") continue; // this works in qt 4.8 diff --git a/src/ui/dialog/settings/SettingsGeneral.cpp b/src/ui/dialog/settings/SettingsGeneral.cpp index eb698468..da5b4d05 100644 --- a/src/ui/dialog/settings/SettingsGeneral.cpp +++ b/src/ui/dialog/settings/SettingsGeneral.cpp @@ -127,7 +127,7 @@ void GeneralTab::SetSettings() { if (save_key_checked) ui_->saveCheckedKeysCheckBox->setCheckState(Qt::Checked); } catch (...) { - SPDLOG_ERROR("setting operation error: save_key_checked"); + GF_UI_LOG_ERROR("setting operation error: save_key_checked"); } try { @@ -136,7 +136,7 @@ void GeneralTab::SetSettings() { if (clear_gpg_password_cache) ui_->clearGpgPasswordCacheCheckBox->setCheckState(Qt::Checked); } catch (...) { - SPDLOG_ERROR("setting operation error: clear_gpg_password_cache"); + GF_UI_LOG_ERROR("setting operation error: clear_gpg_password_cache"); } try { @@ -145,24 +145,24 @@ void GeneralTab::SetSettings() { if (restore_text_editor_page) ui_->restoreTextEditorPageCheckBox->setCheckState(Qt::Checked); } catch (...) { - SPDLOG_ERROR("setting operation error: restore_text_editor_page"); + GF_UI_LOG_ERROR("setting operation error: restore_text_editor_page"); } try { bool longer_expiration_date = settings.lookup("general.longer_expiration_date"); - SPDLOG_DEBUG("longer_expiration_date: {}", longer_expiration_date); + GF_UI_LOG_DEBUG("longer_expiration_date: {}", longer_expiration_date); if (longer_expiration_date) ui_->longerKeyExpirationDateCheckBox->setCheckState(Qt::Checked); } catch (...) { - SPDLOG_ERROR("setting operation error: longer_expiration_date"); + GF_UI_LOG_ERROR("setting operation error: longer_expiration_date"); } #ifdef SUPPORT_MULTI_LANG try { std::string lang_key = settings.lookup("general.lang"); QString lang_value = lang_.value(lang_key.c_str()); - SPDLOG_DEBUG("lang settings current: {}", lang_value.toStdString()); + GF_UI_LOG_DEBUG("lang settings current: {}", lang_value.toStdString()); if (!lang_.empty()) { ui_->langSelectBox->setCurrentIndex( ui_->langSelectBox->findText(lang_value)); @@ -170,17 +170,17 @@ void GeneralTab::SetSettings() { ui_->langSelectBox->setCurrentIndex(0); } } catch (...) { - SPDLOG_ERROR("setting operation error: lang"); + GF_UI_LOG_ERROR("setting operation error: lang"); } #endif try { bool confirm_import_keys = settings.lookup("general.confirm_import_keys"); - SPDLOG_DEBUG("confirm_import_keys: {}", confirm_import_keys); + GF_UI_LOG_DEBUG("confirm_import_keys: {}", confirm_import_keys); if (confirm_import_keys) ui_->importConfirmationCheckBox->setCheckState(Qt::Checked); } catch (...) { - SPDLOG_ERROR("setting operation error: confirm_import_keys"); + GF_UI_LOG_ERROR("setting operation error: confirm_import_keys"); } } diff --git a/src/ui/dialog/settings/SettingsKeyServer.cpp b/src/ui/dialog/settings/SettingsKeyServer.cpp index 784721bf..617955f7 100644 --- a/src/ui/dialog/settings/SettingsKeyServer.cpp +++ b/src/ui/dialog/settings/SettingsKeyServer.cpp @@ -77,7 +77,7 @@ KeyserverTab::KeyserverTab(QWidget* parent) connect(ui_->keyServerListTable, &QTableWidget::itemChanged, [=](QTableWidgetItem* item) { - SPDLOG_DEBUG("item edited: {}", item->column()); + GF_UI_LOG_DEBUG("item edited: {}", item->column()); if (item->column() != 1) return; const auto row_size = ui_->keyServerListTable->rowCount(); // Update Actions @@ -141,7 +141,7 @@ void KeyserverTab::SetSettings() { key_server_str_list_.append(default_key_server.c_str()); default_key_server_ = QString::fromStdString(default_key_server); } catch (const std::exception& e) { - SPDLOG_ERROR("Error reading key-server settings: ", e.what()); + GF_UI_LOG_ERROR("Error reading key-server settings: ", e.what()); } } @@ -192,7 +192,7 @@ void KeyserverTab::ApplySettings() { } void KeyserverTab::slot_refresh_table() { - SPDLOG_INFO("start refreshing key server table"); + GF_UI_LOG_INFO("start refreshing key server table"); ui_->keyServerListTable->blockSignals(true); ui_->keyServerListTable->setRowCount(key_server_str_list_.size()); diff --git a/src/ui/dialog/settings/SettingsNetwork.cpp b/src/ui/dialog/settings/SettingsNetwork.cpp index 46941062..f6b96300 100644 --- a/src/ui/dialog/settings/SettingsNetwork.cpp +++ b/src/ui/dialog/settings/SettingsNetwork.cpp @@ -104,28 +104,28 @@ void GpgFrontend::UI::NetworkTab::SetSettings() { std::string proxy_host = settings.lookup("proxy.proxy_host"); ui_->proxyServerAddressEdit->setText(proxy_host.c_str()); } catch (...) { - SPDLOG_ERROR("setting operation error: proxy_host"); + GF_UI_LOG_ERROR("setting operation error: proxy_host"); } try { std::string std_username = settings.lookup("proxy.username"); ui_->usernameEdit->setText(std_username.c_str()); } catch (...) { - SPDLOG_ERROR("setting operation error: username"); + GF_UI_LOG_ERROR("setting operation error: username"); } try { std::string std_password = settings.lookup("proxy.password"); ui_->passwordEdit->setText(std_password.c_str()); } catch (...) { - SPDLOG_ERROR("setting operation error: password"); + GF_UI_LOG_ERROR("setting operation error: password"); } try { int port = settings.lookup("proxy.port"); ui_->portSpin->setValue(port); } catch (...) { - SPDLOG_ERROR("setting operation error: port"); + GF_UI_LOG_ERROR("setting operation error: port"); } ui_->proxyTypeComboBox->setCurrentText("HTTP"); @@ -133,7 +133,7 @@ void GpgFrontend::UI::NetworkTab::SetSettings() { std::string proxy_type = settings.lookup("proxy.proxy_type"); ui_->proxyTypeComboBox->setCurrentText(proxy_type.c_str()); } catch (...) { - SPDLOG_ERROR("setting operation error: proxy_type"); + GF_UI_LOG_ERROR("setting operation error: proxy_type"); } switch_ui_proxy_type(ui_->proxyTypeComboBox->currentText()); @@ -145,7 +145,7 @@ void GpgFrontend::UI::NetworkTab::SetSettings() { else ui_->enableProxyCheckBox->setCheckState(Qt::Unchecked); } catch (...) { - SPDLOG_ERROR("setting operation error: proxy_enable"); + GF_UI_LOG_ERROR("setting operation error: proxy_enable"); } ui_->forbidALLGnuPGNetworkConnectionCheckBox->setCheckState(Qt::Unchecked); @@ -158,7 +158,7 @@ void GpgFrontend::UI::NetworkTab::SetSettings() { ui_->forbidALLGnuPGNetworkConnectionCheckBox->setCheckState( Qt::Unchecked); } catch (...) { - SPDLOG_ERROR("setting operation error: forbid_all_gnupg_connection"); + GF_UI_LOG_ERROR("setting operation error: forbid_all_gnupg_connection"); } ui_->prohibitUpdateCheck->setCheckState(Qt::Unchecked); @@ -170,7 +170,7 @@ void GpgFrontend::UI::NetworkTab::SetSettings() { else ui_->prohibitUpdateCheck->setCheckState(Qt::Unchecked); } catch (...) { - SPDLOG_ERROR("setting operation error: prohibit_update_checking"); + GF_UI_LOG_ERROR("setting operation error: prohibit_update_checking"); } ui_->autoImportMissingKeyCheckBox->setCheckState(Qt::Unchecked); @@ -182,7 +182,7 @@ void GpgFrontend::UI::NetworkTab::SetSettings() { else ui_->autoImportMissingKeyCheckBox->setCheckState(Qt::Unchecked); } catch (...) { - SPDLOG_ERROR("setting operation error: auto_import_missing_key"); + GF_UI_LOG_ERROR("setting operation error: auto_import_missing_key"); } switch_ui_enabled(ui_->enableProxyCheckBox->isChecked()); |