[Libreoffice-commits] core.git: sw/source

[Olivier Hallot]

 sw/source/ui/chrdlg/drpcps.cxx |   20 ++++++++++++--------
 sw/source/ui/inc/drpcps.hxx    |   13 ++++---------
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 753624e9e423366bd60c6b128c2f0697c778d9a4
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date:   Sun Jun 30 18:25:36 2013 -0300

    Finishing touch on Drop Caps widget UI conversion.
    
    Change-Id: I896d64d602cab9671373c619a6a02807ec6bc6ac
    Reviewed-on: https://gerrit.libreoffice.org/4643
    Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
    Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 6b33d81..5bd791f 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -544,11 +544,15 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet)
     get(m_pDropCapsField,"spinFLD_DROPCAPS");
     get(m_pLinesField,"spinFLD_LINES");
     get(m_pDistanceField,"spinFLD_DISTANCE");
-    get(m_pContentFL,"frameFL_CONTENT");
+    get(m_pSwitchText,"labelFT_DROPCAPS");
+    get(m_pLinesText,"labelTXT_LINES");
+    get(m_pDistanceText,"labelTXT_DISTANCE");
+    get(m_pTemplateText,"labelTXT_TEMPLATE");
     get(m_pTextText,"labelTXT_TEXT");
     get(m_pTextEdit,"entryEDT_TEXT");
     get(m_pTemplateBox,"comboBOX_TEMPLATE");
     get(m_pPict,"drawingareaWN_EXAMPLE");
+
     m_pPict->SetDropCapsPage(this);
 
     SetExchangeSupport();
@@ -563,7 +567,6 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet)
     // Metrics
     SetMetric( *m_pDistanceField, GetDfltMetric(bHtmlMode) );
 
-
     m_pPict->SetBorderStyle( WINDOW_BORDER_MONO );
 
     // Install handler
@@ -675,16 +678,16 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl)
 
     m_pWholeWordCB->Enable( bChecked && !bHtmlMode );
 
-    //aSwitchText.Enable( bChecked && !m_pWholeWordCB->IsChecked() );
+    m_pSwitchText->Enable( bChecked && !m_pWholeWordCB->IsChecked() );
     m_pDropCapsField->Enable( bChecked && !m_pWholeWordCB->IsChecked() );
-    //aLinesText   .Enable( bChecked );
+    m_pLinesText->Enable( bChecked );
     m_pLinesField->Enable( bChecked );
-    //aDistanceText.Enable( bChecked );
+    m_pDistanceText->Enable( bChecked );
     m_pDistanceField->Enable( bChecked );
-    //aTemplateText .Enable( bChecked );
+    m_pTemplateText->Enable( bChecked );
     m_pTemplateBox->Enable( bChecked );
     m_pTextEdit->Enable( bChecked && !bFormat );
-    //aTextText     .Enable( bChecked && !bFormat );
+    m_pTextText->Enable( bChecked && !bFormat );
 
     if ( bChecked )
     {
@@ -692,7 +695,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl)
         m_pDropCapsField->GrabFocus();
     }
     else
-        m_pPict->SetText(OUString());
+        m_pPict->SetText("");
 
     bModified = sal_True;
 
@@ -707,6 +710,7 @@ Page: CheckBox's Click-Handler
 IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl)
 {
     m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() );
+    m_pSwitchText->Enable(!m_pWholeWordCB->IsChecked());
 
     ModifyHdl(m_pDropCapsField);
 
diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx
index d0bcd7401..52ec44a 100644
--- a/sw/source/ui/inc/drpcps.hxx
+++ b/sw/source/ui/inc/drpcps.hxx
@@ -53,22 +53,17 @@ class SwDropCapsPict;
 class SwDropCapsPage : public SfxTabPage
 {
 friend class SwDropCapsPict;
-    // TODO: Work in progress
-    VclGrid*         m_pSwDropCapsGrid;
-    //FixedLine       aSettingsFL;
     CheckBox*        m_pDropCapsBox;
     CheckBox*        m_pWholeWordCB;
-    //FixedText       aSwitchText;
+    FixedText*       m_pSwitchText;
     NumericField*    m_pDropCapsField;
-    //FixedText       aLinesText;
+    FixedText*       m_pLinesText;
     NumericField*    m_pLinesField;
-    //FixedText       aDistanceText;
+    FixedText*       m_pDistanceText;
     MetricField*     m_pDistanceField;
-
-    VclFrame*        m_pContentFL;
     FixedText*       m_pTextText;
     Edit*            m_pTextEdit;
-    //FixedText       aTemplateText;
+    FixedText*       m_pTemplateText;
     ListBox*         m_pTemplateBox;
 
     SwDropCapsPict*  m_pPict;