[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 2 commits - fpicker/source include/svtools svtools/source svtools/uiconfig
Szymon Kłos
eszkadev at gmail.com
Mon Aug 10 07:19:22 PDT 2015
fpicker/source/office/RemoteFilesDialog.cxx | 1
include/svtools/PlaceEditDialog.hxx | 5 +++
svtools/source/dialogs/PlaceEditDialog.cxx | 12 +++++++++
svtools/uiconfig/ui/placeedit.ui | 37 ++++++++++++++++++++++++----
4 files changed, 51 insertions(+), 4 deletions(-)
New commits:
commit df8017eee8fe6f196d529a8f144cb90abee8ca4a
Author: Szymon Kłos <eszkadev at gmail.com>
Date: Mon Aug 10 16:17:23 2015 +0200
added mnemonic_widget properties
Change-Id: I36b2b5bdbc597b82e746c5f81b99064efb06da75
diff --git a/svtools/uiconfig/ui/placeedit.ui b/svtools/uiconfig/ui/placeedit.ui
index 55867ff..07b0835 100644
--- a/svtools/uiconfig/ui/placeedit.ui
+++ b/svtools/uiconfig/ui/placeedit.ui
@@ -174,6 +174,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Host:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">host</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -213,6 +214,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Share:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">share</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -238,6 +240,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Repository:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">repositories</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -335,6 +338,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Port:</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">port-nospin</property>
</object>
<packing>
<property name="expand">False</property>
@@ -408,9 +412,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Password*:</property>
- <accessibility>
- <relation type="description-for" target="password"/>
- </accessibility>
+ <property name="mnemonic_widget">password</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -423,9 +425,6 @@
<property name="can_focus">True</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
- <accessibility>
- <relation type="described-by" target="passwordLabel"/>
- </accessibility>
</object>
<packing>
<property name="left_attach">1</property>
commit 692a4e5afbf176c6555e202709b9b81cb22e6600
Author: Szymon Kłos <eszkadev at gmail.com>
Date: Mon Aug 10 16:07:40 2015 +0200
added password field in the Add service dialog
Change-Id: I1074a3a2980e939de3f578cb566bab1e0ed96aed
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 7b90ae0..37c9535 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -655,6 +655,7 @@ void RemoteFilesDialog::DisableControls()
IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl )
{
ScopedVclPtrInstance< PlaceEditDialog > aDlg( this );
+ aDlg->ShowPasswordControl();
short aRetCode = aDlg->Execute();
switch( aRetCode )
diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx
index e492978..cfcfe67 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -34,6 +34,8 @@ private:
std::shared_ptr< DetailsContainer > m_xCurrentDetails;
VclPtr<Edit> m_pEDUsername;
+ VclPtr<Edit> m_pEDPassword;
+ VclPtr<FixedText> m_pFTPasswordLabel;
VclPtr<OKButton> m_pBTOk;
VclPtr<CancelButton> m_pBTCancel;
@@ -67,6 +69,9 @@ public :
OUString GetServerName() { return m_pEDServerName->GetText(); }
OUString GetServerUrl();
+ OUString GetPassword() { return m_pEDPassword->GetText(); };
+
+ void ShowPasswordControl( bool bShow = true ) { m_pEDPassword->Show( bShow ); m_pFTPasswordLabel->Show( bShow ); }
private:
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 8ead056..b02e927 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -31,6 +31,11 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent)
get( m_pBTCancel, "cancel" );
get( m_pBTDelete, "delete" );
get( m_pBTRepoRefresh, "repositoriesRefresh" );
+ get( m_pEDPassword, "password" );
+ get( m_pFTPasswordLabel, "passwordLabel" );
+
+ m_pEDPassword->Hide();
+ m_pFTPasswordLabel->Hide();
m_pBTOk->SetClickHdl( LINK( this, PlaceEditDialog, OKHdl) );
m_pBTOk->Enable( false );
@@ -59,6 +64,11 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Pla
get( m_pBTCancel, "cancel" );
get( m_pBTDelete, "delete" );
get( m_pTypeGrid, "TypeGrid" );
+ get( m_pEDPassword, "password" );
+ get( m_pFTPasswordLabel, "passwordLabel" );
+
+ m_pEDPassword->Hide();
+ m_pFTPasswordLabel->Hide();
m_pBTOk->SetClickHdl( LINK( this, PlaceEditDialog, OKHdl) );
m_pBTDelete->SetClickHdl ( LINK( this, PlaceEditDialog, DelHdl) );
@@ -105,6 +115,8 @@ void PlaceEditDialog::dispose()
m_pBTOk.clear();
m_pBTCancel.clear();
m_pBTDelete.clear();
+ m_pEDPassword.clear();
+ m_pFTPasswordLabel.clear();
ModalDialog::dispose();
}
diff --git a/svtools/uiconfig/ui/placeedit.ui b/svtools/uiconfig/ui/placeedit.ui
index ec5c41e..55867ff 100644
--- a/svtools/uiconfig/ui/placeedit.ui
+++ b/svtools/uiconfig/ui/placeedit.ui
@@ -191,7 +191,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
@@ -203,7 +203,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
@@ -295,7 +295,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -307,7 +307,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -403,6 +403,36 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="passwordLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Password*:</property>
+ <accessibility>
+ <relation type="description-for" target="password"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ <accessibility>
+ <relation type="described-by" target="passwordLabel"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
</object>
More information about the Libreoffice-commits
mailing list