[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 2 commits - fpicker/source fpicker/uiconfig include/vcl

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |    3 ++-
 fpicker/source/office/RemoteFilesDialog.hxx |    1 +
 fpicker/source/office/iodlg.src             |    5 +++++
 fpicker/uiconfig/ui/remotefilesdialog.ui    |    2 +-
 include/vcl/fpicker.hrc                     |    1 +
 5 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8210fe60b04abc57abd64eb527c3f8773c39f27d
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Mon Aug 3 14:43:32 2015 +0200

    Breadcrumb: changed first entry label ('Root')
    
    Change-Id: Id15bc1ef92fdab22ba3332dc9b42fb9c785298b4

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 3f577b6..f8bab58 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -206,6 +206,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, WinBits nBits )
     m_pOk_btn->SetClickHdl( LINK( this, RemoteFilesDialog, OkHdl ) );
     m_pCancel_btn->SetClickHdl( LINK( this, RemoteFilesDialog, CancelHdl ) );
 
+    m_sRootLabel = ResId( STR_SVT_ROOTLABEL, *ResMgrHolder::getOrCreate() );
     m_pPath = VclPtr<Breadcrumb>::Create( get< vcl::Window >( "breadcrumb_container" ) );
     m_pPath->set_hexpand( true );
     m_pPath->SetClickHdl( LINK( this, RemoteFilesDialog, SelectBreadcrumbHdl ) );
@@ -1103,7 +1104,7 @@ void RemoteFilesDialog::UpdateControls( const OUString& rURL )
         OUString sURL = m_aServices[nPos]->GetUrl();
         OUString sName = m_aServices[nPos]->GetName();
 
-        m_pPath->SetRootName( sName );
+        m_pPath->SetRootName( m_sRootLabel );
         m_pTreeView->Clear();
 
         SvTreeListEntry* pRoot = m_pTreeView->InsertEntry( sName, NULL, true );
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index bfc6c37..65e4ef2 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -129,6 +129,7 @@ private:
 
     OUString m_sPath;
     OUString m_sStdDir;
+    OUString m_sRootLabel;
     OUString m_sLastServiceUrl;
     unsigned int m_nCurrentFilter;
 
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index bc43b98..775b6ee 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -110,6 +110,11 @@ String STR_SVT_DELETESERVICE
     Text [ en-US ] = "Are you sure you want to delete the service?\n\"$servicename$\"" ;
 };
 
+String STR_SVT_ROOTLABEL
+{
+    Text [ en-US ] = "Root" ;
+};
+
 String STR_SVT_NEW_FOLDER
 {
     Text [ en-US ] = "Folder" ;
diff --git a/include/vcl/fpicker.hrc b/include/vcl/fpicker.hrc
index 7d4bd16..896d9c8 100644
--- a/include/vcl/fpicker.hrc
+++ b/include/vcl/fpicker.hrc
@@ -28,6 +28,7 @@
 #define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION    (STR_SVT_FILEPICKER_START+13)
 #define STR_SVT_ALREADYEXISTOVERWRITE               (STR_SVT_FILEPICKER_START+14)
 #define STR_SVT_DELETESERVICE                       (STR_SVT_FILEPICKER_START+15)
+#define STR_SVT_ROOTLABEL                           (STR_SVT_FILEPICKER_START+16)
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c61022f5570e5e785cc8fcef4b269cf92311215b
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Mon Aug 3 14:28:42 2015 +0200

    changed label text (File name)
    
    Change-Id: Ida5bcd0287b49b7e6e97a7573e9cf12f25d95f6d

diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui
index c9a6ac0..8bf57a3 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -194,7 +194,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Full name</property>
+                <property name="label" translatable="yes">File name</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>