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

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |   16 ++--------------
 svtools/uiconfig/ui/placeedit.ui            |    1 +
 2 files changed, 3 insertions(+), 14 deletions(-)

New commits:
commit c7f8c86a8c215f733db2f9d007eeaca794c15895
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Tue Aug 4 15:34:51 2015 +0200

    The Add Service dialog width changed to 400+ px
    
    Change-Id: Ied97043e0649c552190b490d41f60579db523625

diff --git a/svtools/uiconfig/ui/placeedit.ui b/svtools/uiconfig/ui/placeedit.ui
index f0cf611..5434102 100644
--- a/svtools/uiconfig/ui/placeedit.ui
+++ b/svtools/uiconfig/ui/placeedit.ui
@@ -33,6 +33,7 @@
     </data>
   </object>
   <object class="GtkDialog" id="PlaceEditDialog">
+    <property name="width_request">400</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">File Services</property>
commit 541c4118db6afe3ffea4479045d8f7982c9e6364
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Tue Aug 4 15:06:37 2015 +0200

    no selection after deletion of a service
    
    Change-Id: Id59a55a2af74851ff7b2fa8d6af30350347eb4c6

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index a120cb8..271f60b 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -723,15 +723,8 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton,
                 m_aServices.erase( m_aServices.begin() + nPos );
                 m_pServices_lb->RemoveEntry( nSelected );
 
-                if( m_pServices_lb->GetEntryCount() > 0 )
-                {
-                    m_pServices_lb->SelectEntryPos( 0 );
-                }
-                else
-                {
-                    m_pServices_lb->SetNoSelection();
-                    m_pAddService_btn->SetPopupMenu( NULL );
-                }
+                m_pServices_lb->SetNoSelection();
+                m_pAddService_btn->SetPopupMenu( NULL );
 
                 m_bIsUpdated = true;
             }
commit 3a6c6ea4d90c8d4bc2bb7d3dc9cfe2d0ac9119a0
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Tue Aug 4 15:03:19 2015 +0200

    do not show Add Service dialog on start
    
    Change-Id: I4548856d6df0e1ae7d57850a5e479635c62b97c0

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 48b0ab6..a120cb8 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -342,11 +342,6 @@ void RemoteFilesDialog::Resize()
 
 short RemoteFilesDialog::Execute()
 {
-    if( m_pServices_lb->GetEntryCount() == 0 )
-    {
-        Show();
-        AddServiceHdl( NULL );
-    }
     if( m_pServices_lb->GetEntryCount() > 0 )
     {
         Show();