cui/source/options/optinet2.cxx | 62 --------------------------
cui/source/options/optinet2.hxx | 7 ---
cui/uiconfig/ui/optproxypage.ui | 93 ----------------------------------------
3 files changed, 2 insertions(+), 160 deletions(-)
New commits:
commit 7e5630b7b09f605aaba6ea8f54ff4c3761fe63db
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Nov 7 12:46:37 2023 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Nov 9 16:53:15 2023 +0100
tdf#146386 cui: remove FTP UI, SvxProxyTabPage
Change-Id: I0831b1d99052c1fa8f0be38bee08eb712a168445
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159072
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 979d920bc38f..083c3e40f784 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -98,8 +98,6 @@ constexpr OUString g_aHttpProxyPN =
u"ooInetHTTPProxyName"_ustr;
constexpr OUString g_aHttpPortPN = u"ooInetHTTPProxyPort"_ustr;
constexpr OUString g_aHttpsProxyPN = u"ooInetHTTPSProxyName"_ustr;
constexpr OUString g_aHttpsPortPN = u"ooInetHTTPSProxyPort"_ustr;
-constexpr OUString g_aFtpProxyPN = u"ooInetFTPProxyName"_ustr;
-constexpr OUString g_aFtpPortPN = u"ooInetFTPProxyPort"_ustr;
constexpr OUString g_aNoProxyDescPN = u"ooInetNoProxy"_ustr;
IMPL_STATIC_LINK(SvxProxyTabPage, NumberOnlyTextFilterHdl, OUString&, rTest,
bool)
@@ -142,12 +140,6 @@ SvxProxyTabPage::SvxProxyTabPage(weld::Container* pPage,
weld::DialogController*
, m_xHttpsPortFT(m_xBuilder->weld_label("httpsportft"))
, m_xHttpsPortED(m_xBuilder->weld_entry("httpsport"))
, m_xHttpsPortImg(m_xBuilder->weld_widget("lockhttpsport"))
- , m_xFtpProxyFT(m_xBuilder->weld_label("ftpft"))
- , m_xFtpProxyED(m_xBuilder->weld_entry("ftp"))
- , m_xFtpProxyImg(m_xBuilder->weld_widget("lockftp"))
- , m_xFtpPortFT(m_xBuilder->weld_label("ftpportft"))
- , m_xFtpPortED(m_xBuilder->weld_entry("ftpport"))
- , m_xFtpPortImg(m_xBuilder->weld_widget("lockftpport"))
, m_xNoProxyForFT(m_xBuilder->weld_label("noproxyft"))
, m_xNoProxyForED(m_xBuilder->weld_entry("noproxy"))
, m_xNoProxyForImg(m_xBuilder->weld_widget("locknoproxy"))
@@ -159,14 +151,10 @@ SvxProxyTabPage::SvxProxyTabPage(weld::Container* pPage,
weld::DialogController*
m_xHttpsProxyED->connect_insert_text(LINK(this, SvxProxyTabPage,
NoSpaceTextFilterHdl));
m_xHttpsPortED->connect_insert_text(LINK(this, SvxProxyTabPage,
NumberOnlyTextFilterHdl));
m_xHttpsPortED->connect_changed(LINK(this, SvxProxyTabPage,
PortChangedHdl));
- m_xFtpProxyED->connect_insert_text(LINK(this, SvxProxyTabPage,
NoSpaceTextFilterHdl));
- m_xFtpPortED->connect_insert_text(LINK(this, SvxProxyTabPage,
NumberOnlyTextFilterHdl));
- m_xFtpPortED->connect_changed(LINK(this, SvxProxyTabPage, PortChangedHdl));
Link<weld::Widget&,void> aLink = LINK( this, SvxProxyTabPage,
LoseFocusHdl_Impl );
m_xHttpPortED->connect_focus_out( aLink );
m_xHttpsPortED->connect_focus_out( aLink );
- m_xFtpPortED->connect_focus_out( aLink );
m_xProxyModeLB->connect_changed(LINK( this, SvxProxyTabPage, ProxyHdl_Impl
));
@@ -226,16 +214,6 @@ void SvxProxyTabPage::ReadConfigData_Impl()
else
m_xHttpsPortED->set_text( "" );
- m_xFtpProxyED->set_text(
officecfg::Inet::Settings::ooInetFTPProxyName::get() );
- x = officecfg::Inet::Settings::ooInetFTPProxyPort::get();
- if (x)
- {
- nIntValue = *x;
- m_xFtpPortED->set_text( OUString::number( nIntValue ));
- }
- else
- m_xFtpPortED->set_text( "" );
-
m_xNoProxyForED->set_text( officecfg::Inet::Settings::ooInetNoProxy::get()
);
}
@@ -268,16 +246,6 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl()
m_xHttpsPortED->set_text( OUString::number( nIntValue ));
}
- if( xPropertyState->getPropertyDefault(g_aFtpProxyPN) >>= aStringValue
)
- {
- m_xFtpProxyED->set_text( aStringValue );
- }
-
- if( xPropertyState->getPropertyDefault(g_aFtpPortPN) >>= nIntValue )
- {
- m_xFtpPortED->set_text( OUString::number( nIntValue ));
- }
-
if( xPropertyState->getPropertyDefault(g_aNoProxyDescPN) >>=
aStringValue )
{
m_xNoProxyForED->set_text( aStringValue );
@@ -308,8 +276,6 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl()
xPropertyState->setPropertyToDefault(g_aHttpPortPN);
xPropertyState->setPropertyToDefault(g_aHttpsProxyPN);
xPropertyState->setPropertyToDefault(g_aHttpsPortPN);
- xPropertyState->setPropertyToDefault(g_aFtpProxyPN);
- xPropertyState->setPropertyToDefault(g_aFtpPortPN);
xPropertyState->setPropertyToDefault(g_aNoProxyDescPN);
Reference< util::XChangesBatch >
xChangesBatch(m_xConfigurationUpdateAccess, UNO_QUERY_THROW);
@@ -338,8 +304,6 @@ void SvxProxyTabPage::Reset(const SfxItemSet*)
m_xHttpPortED->save_value();
m_xHttpsProxyED->save_value();
m_xHttpsPortED->save_value();
- m_xFtpProxyED->save_value();
- m_xFtpPortED->save_value();
m_xNoProxyForED->save_value();
EnableControls_Impl();
@@ -348,8 +312,8 @@ void SvxProxyTabPage::Reset(const SfxItemSet*)
OUString SvxProxyTabPage::GetAllStrings()
{
OUString sAllStrings;
- OUString labels[] = { "label1", "label2", "httpft", "httpsft",
"ftpft",
- "noproxyft", "httpportft", "httpsportft",
"ftpportft", "noproxydesc" };
+ OUString labels[] = { "label1", "label2", "httpft", "httpsft",
+ "noproxyft", "httpportft", "httpsportft",
"noproxydesc" };
for (const auto& label : labels)
{
@@ -404,18 +368,6 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
bModified = true;
}
- if( m_xFtpProxyED->get_value_changed_from_saved())
- {
- xPropertySet->setPropertyValue( g_aFtpProxyPN,
Any(m_xFtpProxyED->get_text()) );
- bModified = true;
- }
-
- if ( m_xFtpPortED->get_value_changed_from_saved() )
- {
- xPropertySet->setPropertyValue( g_aFtpPortPN,
Any(m_xFtpPortED->get_text().toInt32()));
- bModified = true;
- }
-
if ( m_xNoProxyForED->get_value_changed_from_saved() )
{
xPropertySet->setPropertyValue( g_aNoProxyDescPN, Any(
m_xNoProxyForED->get_text()));
@@ -473,16 +425,6 @@ void SvxProxyTabPage::EnableControls_Impl()
m_xHttpsPortED->set_sensitive(bHTTPSProxyPortEnabled);
m_xHttpsPortImg->set_visible(!bEnable);
- bEnable = !officecfg::Inet::Settings::ooInetFTPProxyName::isReadOnly();
- const bool bFTPProxyNameEnabled = bManualConfig && bEnable;
- const bool bFTPProxyPortEnabled = bManualConfig && bEnable;
- m_xFtpProxyFT->set_sensitive(bFTPProxyNameEnabled);
- m_xFtpProxyED->set_sensitive(bFTPProxyNameEnabled);
- m_xFtpProxyImg->set_visible(!bEnable);
- m_xFtpPortFT->set_sensitive(bFTPProxyPortEnabled);
- m_xFtpPortED->set_sensitive(bFTPProxyPortEnabled);
- m_xFtpPortImg->set_visible(!bEnable);
-
bEnable = !officecfg::Inet::Settings::ooInetNoProxy::isReadOnly();
const bool bInetNoProxyEnabled = bManualConfig && bEnable;
m_xNoProxyForFT->set_sensitive(bInetNoProxyEnabled);
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index efec0d530f61..e05a79be029b 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -48,13 +48,6 @@ private:
std::unique_ptr<weld::Entry> m_xHttpsPortED;
std::unique_ptr<weld::Widget> m_xHttpsPortImg;
- std::unique_ptr<weld::Label> m_xFtpProxyFT;
- std::unique_ptr<weld::Entry> m_xFtpProxyED;
- std::unique_ptr<weld::Widget> m_xFtpProxyImg;
- std::unique_ptr<weld::Label> m_xFtpPortFT;
- std::unique_ptr<weld::Entry> m_xFtpPortED;
- std::unique_ptr<weld::Widget> m_xFtpPortImg;
-
std::unique_ptr<weld::Label> m_xNoProxyForFT;
std::unique_ptr<weld::Entry> m_xNoProxyForED;
std::unique_ptr<weld::Widget> m_xNoProxyForImg;
diff --git a/cui/uiconfig/ui/optproxypage.ui b/cui/uiconfig/ui/optproxypage.ui
index 292c5249fb07..96e744c8cc61 100644
--- a/cui/uiconfig/ui/optproxypage.ui
+++ b/cui/uiconfig/ui/optproxypage.ui
@@ -71,25 +71,6 @@
<property name="top-attach">2</property>
</packing>
</child>
- <child>
- <object class="GtkEntry" id="ftp">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="ftp-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|ftp">Type the name of the proxy server
for FTP.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">2</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
<child>
<object class="GtkEntry" id="noproxy">
<property name="visible">True</property>
@@ -151,27 +132,6 @@
<property name="top-attach">2</property>
</packing>
</child>
- <child>
- <object class="GtkEntry" id="ftpport">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="valign">center</property>
- <property name="max-length">5</property>
- <property name="activates-default">True</property>
- <property name="width-chars">5</property>
- <property name="truncate-multiline">True</property>
- <property name="input-purpose">digits</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="ftpport-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|ftpport">Type the port for the
corresponding proxy server.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">5</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
<child>
<object class="GtkComboBoxText" id="proxymode">
<property name="visible">True</property>
@@ -233,20 +193,6 @@
<property name="top-attach">2</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="ftpft">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="optproxypage|ftpft">_FTP proxy:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">ftp</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
<child>
<object class="GtkLabel" id="noproxyft">
<property name="visible">True</property>
@@ -274,19 +220,6 @@
<property name="top-attach">2</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="ftpportft">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="optproxypage|ftpportft">P_ort:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">ftpport</property>
- </object>
- <packing>
- <property name="left-attach">4</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
<child>
<object class="GtkLabel" id="noproxydesc">
<property name="visible">True</property>
@@ -339,19 +272,6 @@
<property name="top-attach">2</property>
</packing>
</child>
- <child>
- <object class="GtkImage" id="lockftp">
- <property name="can-focus">False</property>
- <property name="no-show-all">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="icon-name">res/lock.png</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
<child>
<object class="GtkImage" id="locknoproxy">
<property name="can-focus">False</property>
@@ -391,19 +311,6 @@
<property name="top-attach">2</property>
</packing>
</child>
- <child>
- <object class="GtkImage" id="lockftpport">
- <property name="can-focus">False</property>
- <property name="no-show-all">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="icon-name">res/lock.png</property>
- </object>
- <packing>
- <property name="left-attach">3</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
<child>
<placeholder/>
</child>
