[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - 2 commits - cui/source

[Rachit Gupta]

 cui/source/options/personalization.cxx |   14 +++++++++++++-
 cui/source/options/personalization.hxx |    1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit ec40e0e86cd3a65fe554e28bca33f3b6e0ad7373
Author: Rachit Gupta <rachitgupta1792 at gmail.com>
Date:   Fri Jun 13 13:42:25 2014 +0530

    Fixed Bug: Multiple searches result in correct theme to be applied.
    
    The vector that stores the persona settings is cleared every time a
    new search is performed. This results in the correct theme being
    selected for downloading and applying.
    
    Change-Id: I8c0413a117c5a7ed660cd785c292c2fad4abd486

diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 6afdcb6..ffc1d8b 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -179,6 +179,12 @@ void SelectPersonaDialog::AddPersonaSetting( OUString& rPersonaSetting )
     m_vPersonaSettings.push_back( rPersonaSetting );
 }
 
+void SelectPersonaDialog::ClearSearchResults()
+{
+    m_vPersonaSettings.clear();
+    m_aSelectedPersona = "";
+}
+
 SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet )
     : SfxTabPage( pParent, "PersonalizationTabPage", "cui/ui/personalization_tab.ui", rSet )
 {
@@ -377,6 +383,7 @@ void SearchAndParseThread::execute()
 {
     if(m_pPersonaDialog)
     {
+        m_pPersonaDialog->ClearSearchResults();
         OUString sProgress( "Searching.. Please Wait.." );
         m_pPersonaDialog->SetProgress( sProgress );
         Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index d514843..212a4e5 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -81,6 +81,7 @@ public:
     void SetProgress( OUString& );
     void SetImages( std::vector<Image>&);
     void AddPersonaSetting( OUString& );
+    void ClearSearchResults();
 
 private:
     /// Handle the Search button
commit a4fdb0ec00ea484753c279746a16d822bcafa54e
Author: Rachit Gupta <rachitgupta1792 at gmail.com>
Date:   Fri Jun 13 11:34:59 2014 +0530

    Fixed Bug: Progress label was not shown after another search.
    
    If another search was performed with the same instance of the dialog,
    then the progress label was not visible. It is visible now.
    
    Change-Id: Ic9526248d4f79585f59f24197aac832a0bcaaeb9

diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index f428230..6afdcb6 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -155,7 +155,12 @@ void SelectPersonaDialog::SetProgress( OUString& rProgress )
     if(rProgress.isEmpty())
         m_pProgressLabel->Hide();
     else
+    {
+        SolarMutexGuard aGuard;
+        m_pProgressLabel->Show();
         m_pProgressLabel->SetText( rProgress );
+        setOptimalLayoutSize();
+    }
 }
 
 void SelectPersonaDialog::SetImages( std::vector<Image> &rImageList )
@@ -390,7 +395,7 @@ void SearchAndParseThread::execute()
         }
         catch (...)
         {
-        return;
+            return;
         }
 
         xml::sax::InputSource aParserInput;