diff options
| author | Andras Timar <andras.timar@collabora.com> | 2023-02-13 16:31:19 +0100 |
|---|---|---|
| committer | Ashod Nakashian <ash@collabora.com> | 2023-02-16 12:44:11 +0000 |
| commit | 6cc62ed17bcfa96a9a9c5d15669633bf8ba525d5 (patch) | |
| tree | f555dc6d6666508c951a40c51edc0b54e1155d30 | |
| parent | c3a3895df8871cc1dc3cf253fe879df3d5a62b48 (diff) | |
Revert "cui: add entry "RestProtocol" to language tool dialog"cp-22.05.10-2co-22.05.10-2
This reverts commit 70ff8fc992c06edfd6ae60da39cabed8cb56a5c5.
Reason for revert: it is bad UX to add a new field to the LanguageTool
settings dialog, without any explanation. The user will not find out,
that this field can be used for Duden Korrekturserver. Also, for Duden
Korrekturserver the user name field is not necessary. Until we design
a better dialog, I think it would be better not to have this setting in
desktop Office, because it can be confusing.
Change-Id: Id7b031e79e94475de1add295d64ed6b6018f03ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146913
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Ashod Nakashian <ash@collabora.com>
| -rw-r--r-- | cui/source/options/optlanguagetool.cxx | 3 | ||||
| -rw-r--r-- | cui/source/options/optlanguagetool.hxx | 3 | ||||
| -rw-r--r-- | cui/uiconfig/ui/langtoolconfigpage.ui | 38 |
3 files changed, 2 insertions, 42 deletions
diff --git a/cui/source/options/optlanguagetool.cxx b/cui/source/options/optlanguagetool.cxx index a2cc19b93b68..fc7a42536051 100644 --- a/cui/source/options/optlanguagetool.cxx +++ b/cui/source/options/optlanguagetool.cxx @@ -28,7 +28,6 @@ OptLanguageToolTabPage::OptLanguageToolTabPage(weld::Container* pPage, , m_xBaseURLED(m_xBuilder->weld_entry("baseurl")) , m_xUsernameED(m_xBuilder->weld_entry("username")) , m_xApiKeyED(m_xBuilder->weld_entry("apikey")) - , m_xRestProtocol(m_xBuilder->weld_entry("restprotocol")) , m_xActivateBox(m_xBuilder->weld_check_button("activate")) , m_xSSLDisableVerificationBox(m_xBuilder->weld_check_button("verifyssl")) , m_xApiSettingsFrame(m_xBuilder->weld_frame("apisettings")) @@ -60,7 +59,6 @@ void OptLanguageToolTabPage::Reset(const SfxItemSet*) m_xBaseURLED->set_text(rLanguageOpts.getBaseURL()); m_xUsernameED->set_text(rLanguageOpts.getUsername()); m_xApiKeyED->set_text(rLanguageOpts.getApiKey()); - m_xRestProtocol->set_text(rLanguageOpts.getRestProtocol()); m_xSSLDisableVerificationBox->set_active(rLanguageOpts.getSSLVerification() != true); } @@ -70,7 +68,6 @@ bool OptLanguageToolTabPage::FillItemSet(SfxItemSet*) rLanguageOpts.setBaseURL(m_xBaseURLED->get_text()); rLanguageOpts.setUsername(m_xUsernameED->get_text()); rLanguageOpts.setApiKey(m_xApiKeyED->get_text()); - rLanguageOpts.setRestProtocol(m_xRestProtocol->get_text()); rLanguageOpts.setSSLVerification(m_xSSLDisableVerificationBox->get_active() != true); return false; } diff --git a/cui/source/options/optlanguagetool.hxx b/cui/source/options/optlanguagetool.hxx index 47179f016b2f..85e0238b0318 100644 --- a/cui/source/options/optlanguagetool.hxx +++ b/cui/source/options/optlanguagetool.hxx @@ -35,7 +35,6 @@ private: std::unique_ptr<weld::Entry> m_xBaseURLED; std::unique_ptr<weld::Entry> m_xUsernameED; std::unique_ptr<weld::Entry> m_xApiKeyED; - std::unique_ptr<weld::Entry> m_xRestProtocol; std::unique_ptr<weld::CheckButton> m_xActivateBox; std::unique_ptr<weld::CheckButton> m_xSSLDisableVerificationBox; std::unique_ptr<weld::Frame> m_xApiSettingsFrame; @@ -43,4 +42,4 @@ private: void EnableControls(bool bEnable); DECL_LINK(CheckHdl, weld::Toggleable&, void); -}; +};
\ No newline at end of file diff --git a/cui/uiconfig/ui/langtoolconfigpage.ui b/cui/uiconfig/ui/langtoolconfigpage.ui index 1d7452161998..237040fa76b7 100644 --- a/cui/uiconfig/ui/langtoolconfigpage.ui +++ b/cui/uiconfig/ui/langtoolconfigpage.ui @@ -80,7 +80,7 @@ <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> + <property name="row_spacing">5</property> <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="base"> @@ -192,42 +192,6 @@ </packing> </child> <child> - <object class="GtkLabel" id="restlbl"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="langtoolconfigpage|restlbl">REST protocol:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">restprotocol</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="restprotocol"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="restdesc"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="langtoolconfigpage|restdesc">Your LanguageTool REST API protocol for usage.</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> <placeholder/> </child> <child> |