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

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 527983a71325108838990fbaf95ac10adbfb6cd0
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Mon Aug 3 14:59:58 2015 +0200

    FolderTree: changed root node name ('Root')
    
    Change-Id: I495965e065366880b364578a02af7092d6efbad4

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 26efc2f..12b8a3b 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -1103,12 +1103,11 @@ void RemoteFilesDialog::UpdateControls( const OUString& rURL )
     if( nPos >= 0 && m_bServiceChanged && rURL == m_aServices[nPos]->GetUrl() )
     {
         OUString sURL = m_aServices[nPos]->GetUrl();
-        OUString sName = m_aServices[nPos]->GetName();
 
         m_pPath->SetRootName( m_sRootLabel );
         m_pTreeView->Clear();
 
-        SvTreeListEntry* pRoot = m_pTreeView->InsertEntry( sName, NULL, true );
+        SvTreeListEntry* pRoot = m_pTreeView->InsertEntry( m_sRootLabel, NULL, true );
         OUString* sData = new OUString( rURL );
         pRoot->SetUserData( static_cast< void* >( sData ) );
 
commit 183ac42ea951e886093035552c13471571746687
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Mon Aug 3 14:56:14 2015 +0200

    FolderTree width 100 -> 150
    
    Change-Id: I2d349c19a11679b0c58a1efbd134837f5c3aabdd

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index bc7e102..26efc2f 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -233,7 +233,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, WinBits nBits )
     m_pSplitter->Show();
 
     m_pTreeView = VclPtr< FolderTree >::Create( m_pContainer, WB_BORDER );
-    Size aSize( 100, 200 );
+    Size aSize( 150, 200 );
     m_pTreeView->set_height_request( aSize.Height() );
     m_pTreeView->set_width_request( aSize.Width() );
     m_pTreeView->SetSizePixel( aSize );
commit 018efb9f7fdc2db7a39543218ad5f6d6780bb125
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Mon Aug 3 14:50:44 2015 +0200

    don't invalidate the dialog after every typed character
    
    Change-Id: Ib422edf3b615fec6513887283595f647f5bc197e

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index f8bab58..bc7e102 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -818,7 +818,8 @@ IMPL_LINK_NOARG( RemoteFilesDialog, FileNameGetFocusHdl )
 IMPL_LINK_NOARG( RemoteFilesDialog, FileNameModifyHdl )
 {
     m_pFileView->SetNoSelection();
-    EnableControls();
+    if( !m_pOk_btn->IsEnabled() )
+        EnableControls();
 
     return 1;
 }