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

[Rachit Gupta]

 cui/source/options/personalization.cxx |    3 +++
 cui/source/options/personalization.hxx |    1 +
 cui/uiconfig/ui/personalization_tab.ui |    9 ++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 53b5adcbc8c03a6ec15d9abdf4ae3136315d569b
Author: Rachit Gupta <rachitgupta1792 at gmail.com>
Date:   Tue Jul 8 22:09:30 2014 +0530

    The "Select personas installed via extensions" label is invisible by default.
    
    The label is not shown if there are no persona extensions installed.
    
    Change-Id: I758bb7ff7f22d56bfb7fe212908f9f5f1f3e7979

diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 69afe39..e67318a 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -250,6 +250,8 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const Sfx
 
     get( m_pExtensionPersonaPreview, "persona_preview" );
 
+    get ( m_pExtensionLabel, "extensions_label" );
+
     LoadDefaultImages();
     LoadExtensionThemes();
 }
@@ -371,6 +373,7 @@ void SvxPersonalizationTabPage::LoadExtensionThemes()
         return;
 
     m_pPersonaList->Show();
+    m_pExtensionLabel->Show();
 
     for( sal_Int32 nIndex = 0; nIndex < nLength; nIndex++ )
     {
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index e3f40c6..a09226e 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -33,6 +33,7 @@ private:
     PushButton *m_pExtensionPersonaPreview;     ///< Buttons to show the last 3 personas installed via extensions
     ListBox* m_pPersonaList;                    ///< The ListBox to show the list of installed personas
     OUString m_aPersonaSettings;                ///< Header and footer images + color to be set in the settings.
+    FixedText *m_pExtensionLabel;               ///< The "select persona installed via extensions" label
 
     std::vector<OUString> m_vDefaultPersonaSettings;
     std::vector<OUString> m_vExtensionPersonaSettings;
diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui
index c76e00f..f288a90 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -151,8 +151,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
+                  <object class="GtkLabel" id="extensions_label">
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Or, select from the personas installed via extensions</property>
commit f28e4bd999efc5ea2bd76b2a921efc9f89a50c7c
Author: Rachit Gupta <rachitgupta1792 at gmail.com>
Date:   Tue Jul 8 21:53:28 2014 +0530

    Improved UI: Large buttons are not shown.
    
    * In the Personalization Tab Page, the button sizes are not affected
      by the presence of the preview buttons. THey remain their original
      size.
    * Added some padding and spacing to avoid cluttering of the widgets.
    
    Change-Id: Iea919b9fbfce4a7bfc82f73ccb49f94aa10ec804

diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui
index f19e1db..c76e00f 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -18,13 +18,14 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="top_padding">6</property>
+            <property name="bottom_padding">6</property>
             <property name="left_padding">12</property>
+            <property name="right_padding">6</property>
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">2</property>
-                <property name="homogeneous">True</property>
+                <property name="spacing">12</property>
                 <child>
                   <object class="GtkRadioButton" id="no_persona">
                     <property name="label" translatable="yes">Plain look, do not use Themes</property>
@@ -169,7 +170,6 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkTreeView" id="installed_personas:border">
-                        <property name="visible">False</property>
                         <property name="can_focus">True</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection2"/>