rework to get panel and dialog working at the same time

Change-Id: I0a2adcd606842c6b39665ecc641d2fd92c4eb7e7

sd/AllLangResTarget_sd.mk

@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
     sd/source/ui/dlg/tpaction.src \
     sd/source/ui/dlg/vectdlg.src \
     sd/source/ui/slideshow/slideshow.src \
-    sd/source/ui/table/TableDesignPane.src \
     sd/source/ui/view/DocumentRenderer.src \
 ))
 

sd/source/ui/table/TableDesignPane.cxx

@@ -44,7 +44,6 @@
 #include <svx/sdr/table/tabledesign.hxx>
 
 #include "TableDesignPane.hxx"
-#include <svtools/valueset.hxx>
 
 #include "DrawDocShell.hxx"
 #include "ViewShellBase.hxx"
@@ -92,17 +91,14 @@ static const OUString* getPropertyNames()
 }
 // --------------------------------------------------------------------
 
-TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase,
-    bool bModal )
-    : PanelLayout(pParent, "TableDesignPanel",
-        "modules/simpress/ui/tabledesignpanel.ui", cssu::Reference<css::frame::XFrame>())
-    , mrBase( rBase )
-    , msTableTemplate( "TableTemplate" )
-    , mbModal( bModal )
-    , mbStyleSelected( false )
-    , mbOptionsChanged( false )
+TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal )
+    : mrBase(rBase)
+    , msTableTemplate("TableTemplate")
+    , mbModal(bModal)
+    , mbStyleSelected(false)
+    , mbOptionsChanged(false)
 {
-    get(m_pValueSet, "previews");
+    pParent->get(m_pValueSet, "previews");
     m_pValueSet->SetStyle(m_pValueSet->GetStyle() | WB_NO_DIRECTSELECT | WB_FLATVALUESET | WB_ITEMBORDER);
     m_pValueSet->SetExtraSpacing(8);
     m_pValueSet->setModal(mbModal);
@@ -115,13 +111,13 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase,
         m_pValueSet->SetColor( Color( COL_WHITE ) );
         m_pValueSet->SetBackground( Color( COL_WHITE ) );
     }
-    m_pValueSet->SetSelectHdl (LINK(this, TableDesignPane, implValueSetHdl));
+    m_pValueSet->SetSelectHdl (LINK(this, TableDesignWidget, implValueSetHdl));
 
     const OUString* pPropNames = getPropertyNames();
     for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i)
     {
-        get(m_aCheckBoxes[i], OUStringToOString(pPropNames[i], RTL_TEXTENCODING_UTF8));
-        m_aCheckBoxes[i]->SetClickHdl( LINK( this, TableDesignPane, implCheckBoxHdl ) );
+        pParent->get(m_aCheckBoxes[i], OUStringToOString(pPropNames[i], RTL_TEXTENCODING_UTF8));
+        m_aCheckBoxes[i]->SetClickHdl( LINK( this, TableDesignWidget, implCheckBoxHdl ) );
     }
 
     // get current controller and initialize listeners
@@ -147,20 +143,13 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase,
 
 // --------------------------------------------------------------------
 
-TableDesignPane::~TableDesignPane()
+TableDesignWidget::~TableDesignWidget()
 {
     removeListener();
 }
 
 // --------------------------------------------------------------------
 
-void TableDesignPane::DataChanged( const DataChangedEvent& /*rDCEvt*/ )
-{
-    m_pValueSet->updateSettings();
-}
-
-// --------------------------------------------------------------------
-
 static SfxBindings* getBindings( ViewShellBase& rBase )
 {
     if( rBase.GetMainViewShell().get() && rBase.GetMainViewShell()->GetViewFrame() )
@@ -181,7 +170,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
 
 // --------------------------------------------------------------------
 
-IMPL_LINK_NOARG(TableDesignPane, implValueSetHdl)
+IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl)
 {
     mbStyleSelected = true;
     if( !mbModal )
@@ -191,7 +180,7 @@ IMPL_LINK_NOARG(TableDesignPane, implValueSetHdl)
 
 // --------------------------------------------------------------------
 
-void TableDesignPane::ApplyStyle()
+void TableDesignWidget::ApplyStyle()
 {
     try
     {
@@ -236,13 +225,13 @@ void TableDesignPane::ApplyStyle()
     }
     catch( Exception& )
     {
-        OSL_FAIL("TableDesignPane::implValueSetHdl(), exception caught!");
+        OSL_FAIL("TableDesignWidget::implValueSetHdl(), exception caught!");
     }
 }
 
 // --------------------------------------------------------------------
 
-IMPL_LINK_NOARG(TableDesignPane, implCheckBoxHdl)
+IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl)
 {
     mbOptionsChanged = true;
 
@@ -255,7 +244,7 @@ IMPL_LINK_NOARG(TableDesignPane, implCheckBoxHdl)
 
 // --------------------------------------------------------------------
 
-void TableDesignPane::ApplyOptions()
+void TableDesignWidget::ApplyOptions()
 {
     static const sal_uInt16 gParamIds[CB_COUNT] =
     {
@@ -293,7 +282,7 @@ void TableDesignPane::ApplyOptions()
 
 // --------------------------------------------------------------------
 
-void TableDesignPane::onSelectionChanged()
+void TableDesignWidget::onSelectionChanged()
 {
     Reference< XPropertySet > xNewSelection;
 
@@ -325,7 +314,7 @@ void TableDesignPane::onSelectionChanged()
     }
     catch( Exception& )
     {
-        OSL_FAIL( "sd::TableDesignPane::onSelectionChanged(), Exception caught!" );
+        OSL_FAIL( "sd::TableDesignWidget::onSelectionChanged(), Exception caught!" );
     }
 
     if( mxSelectedTable != xNewSelection )
@@ -381,6 +370,11 @@ TableValueSet::TableValueSet(Window *pParent, WinBits nStyle)
 {
 }
 
+void TableValueSet::DataChanged( const DataChangedEvent& /*rDCEvt*/ )
+{
+    updateSettings();
+}
+
 void TableValueSet::updateSettings()
 {
     if( !m_bModal )
@@ -408,7 +402,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeTableValueSet(::Window *p
 
 // --------------------------------------------------------------------
 
-void TableDesignPane::updateControls()
+void TableDesignWidget::updateControls()
 {
     static const sal_Bool gDefaults[CB_COUNT] = { sal_True, sal_False, sal_True, sal_False, sal_False, sal_False };
 
@@ -424,7 +418,7 @@ void TableDesignPane::updateControls()
         }
         catch( Exception& )
         {
-            OSL_FAIL("sd::TableDesignPane::updateControls(), exception caught!");
+            OSL_FAIL("sd::TableDesignWidget::updateControls(), exception caught!");
         }
         m_aCheckBoxes[i]->Check(bUse ? true : false);
         m_aCheckBoxes[i]->Enable(bHasTable ? true : false);
@@ -463,9 +457,9 @@ void TableDesignPane::updateControls()
 
 // --------------------------------------------------------------------
 
-void TableDesignPane::addListener()
+void TableDesignWidget::addListener()
 {
-    Link aLink( LINK(this,TableDesignPane,EventMultiplexerListener) );
+    Link aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->AddEventListener (
         aLink,
         tools::EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION
@@ -477,15 +471,15 @@ void TableDesignPane::addListener()
 
 // --------------------------------------------------------------------
 
-void TableDesignPane::removeListener()
+void TableDesignWidget::removeListener()
 {
-    Link aLink( LINK(this,TableDesignPane,EventMultiplexerListener) );
+    Link aLink( LINK(this,TableDesignWidget,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
 // --------------------------------------------------------------------
 
-IMPL_LINK(TableDesignPane,EventMultiplexerListener,
+IMPL_LINK(TableDesignWidget,EventMultiplexerListener,
     tools::EventMultiplexerEvent*,pEvent)
 {
     switch (pEvent->meEventId)
@@ -785,7 +779,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
     return aPreviewBmp;
 }
 
-void TableDesignPane::FillDesignPreviewControl()
+void TableDesignWidget::FillDesignPreviewControl()
 {
     sal_uInt16 nSelectedItem = m_pValueSet->GetSelectItemId();
     m_pValueSet->Clear();
@@ -822,52 +816,48 @@ void TableDesignPane::FillDesignPreviewControl()
         }
         catch( Exception& )
         {
-            OSL_FAIL("sd::TableDesignPane::FillDesignPreviewControl(), exception caught!");
+            OSL_FAIL("sd::TableDesignWidget::FillDesignPreviewControl(), exception caught!");
         }
-        m_pValueSet->SetColCount(3);
-        m_pValueSet->SetLineCount((nCount+2)/3);
+        sal_Int32 nCols = 3;
+        sal_Int32 nRows = (nCount+2)/3;
+        m_pValueSet->SetColCount(nCols);
+        m_pValueSet->SetLineCount(nRows);
+        WinBits nStyle = m_pValueSet->GetStyle() & ~(WB_VSCROLL);
+        m_pValueSet->SetStyle(nStyle);
         Size aSize(m_pValueSet->GetOptimalSize());
+        aSize.Width() += (10 * nCols);
+        aSize.Height() += (10 * nRows);
         m_pValueSet->set_width_request(aSize.Width());
         m_pValueSet->set_height_request(aSize.Height());
     }
     catch( Exception& )
     {
-        OSL_FAIL("sd::TableDesignPane::FillDesignPreviewControl(), exception caught!");
+        OSL_FAIL("sd::TableDesignWidget::FillDesignPreviewControl(), exception caught!");
     }
     m_pValueSet->SelectItem(nSelectedItem);
 }
 
 // ====================================================================
 
-TableDesignDialog::TableDesignDialog(::Window* pParent, ViewShellBase& rBase )
-    : ModalDialog(pParent, "TableDesignDialog",
-        "modules/sdraw/ui/tabledesigndialog.ui")
-{
-    mxDesignPane.reset( new TableDesignPane( get_content_area(), rBase, true ) );
-    mxDesignPane->Hide();
-}
-
-// --------------------------------------------------------------------
-
 short TableDesignDialog::Execute()
 {
     if( ModalDialog::Execute() )
     {
-        if( mxDesignPane->isStyleChanged() )
-            mxDesignPane->ApplyStyle();
+        if( aImpl.isStyleChanged() )
+            aImpl.ApplyStyle();
 
-        if( mxDesignPane->isOptionsChanged() )
-            mxDesignPane->ApplyOptions();
-        return sal_True;
+        if( aImpl.isOptionsChanged() )
+            aImpl.ApplyOptions();
+        return true;
     }
-    return sal_False;
+    return false;
 }
 
 // ====================================================================
 
 ::Window * createTableDesignPanel( ::Window* pParent, ViewShellBase& rBase )
 {
-    return new TableDesignPane( pParent, rBase, false );
+    return new TableDesignPane( pParent, rBase );
 }
 
 // ====================================================================

sd/source/ui/table/TableDesignPane.hrc

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SD_TABLEDESIGNPANE_HRC
-#define _SD_TABLEDESIGNPANE_HRC
-
-#define FL_STYLE_OPTIONS    0
-#define CB_HEADER_ROW       1
-#define CB_TOTAL_ROW        2
-#define CB_BANDED_ROWS      3
-#define CB_FIRST_COLUMN     4
-#define CB_LAST_COLUMN      5
-#define CB_BANDED_COLUMNS   6
-
-#define FL_TABLE_STYLES     7
-#define CT_TABLE_STYLES     8
-
-#define DESIGNPANE_CONTROL_COUNT 9
-
-#endif // _SD_TABLEDESIGNPANE_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/table/TableDesignPane.hxx

@@ -60,21 +60,20 @@ private:
 public:
     TableValueSet(Window *pParent, WinBits nStyle);
     virtual void Resize();
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
     void updateSettings();
     void setModal(bool bModal) { m_bModal = bModal; }
 };
 
-class TableDesignPane : public PanelLayout
+class TableDesignWidget
 {
 public:
-    TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool bModal );
-    virtual ~TableDesignPane();
+    TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal );
+    virtual ~TableDesignWidget();
 
     // callbacks
     void onSelectionChanged();
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
     void ApplyOptions();
     void ApplyStyle();
 
@@ -109,16 +108,33 @@ private:
     bool mbOptionsChanged;
 };
 
+class TableDesignPane : public PanelLayout
+{
+private:
+    TableDesignWidget aImpl;
+public:
+    TableDesignPane( ::Window* pParent, ViewShellBase& rBase )
+        : PanelLayout(pParent, "TableDesignPanel",
+        "modules/simpress/ui/tabledesignpanel.ui", com::sun::star::uno::Reference<css::frame::XFrame>())
+        , aImpl(this, rBase, false)
+    {
+    }
+};
+
 // --------------------------------------------------------------------
 
 class TableDesignDialog : public ModalDialog
 {
+private:
+    TableDesignWidget aImpl;
 public:
-    TableDesignDialog( ::Window* pParent, ViewShellBase& rBase );
-
+    TableDesignDialog( ::Window* pParent, ViewShellBase& rBase )
+        : ModalDialog(pParent, "TableDesignDialog",
+        "modules/sdraw/ui/tabledesigndialog.ui")
+        , aImpl(this, rBase, true)
+    {
+    }
     virtual short Execute();
-private:
-    boost::scoped_ptr< TableDesignPane > mxDesignPane;
 };
 
 }

sd/source/ui/table/TableDesignPane.src

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "TableDesignPane.hrc"
-#include "glob.hrc"
-
-Control DLG_TABLEDESIGNPANE
-{
-    OutputSize = TRUE;
-    DialogControl = TRUE;
-    Border = FALSE;
-
-    Size = MAP_APPFONT( 264, 134 );
-    Text [ en-US ] = "Table Design";
-
-    FixedLine FL_STYLE_OPTIONS+1
-    {
-        Pos = MAP_APPFONT ( 143, 3 ) ;
-        Size = MAP_APPFONT ( 120, 10 ) ;
-        OutputSize = TRUE;
-        Text [ en-US ] = "Show";
-    };
-
-    CheckBox CB_HEADER_ROW+1
-    {
-        Pos = MAP_APPFONT ( 146, 3 ) ;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Header Row" ;
-    };
-
-    CheckBox CB_TOTAL_ROW+1
-    {
-        Pos = MAP_APPFONT ( 146, 16 ) ;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Tot~al Row" ;
-    };
-
-    CheckBox CB_BANDED_ROWS+1
-    {
-        Pos = MAP_APPFONT ( 146, 29 ) ;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Banded Rows" ;
-    };
-
-    CheckBox CB_FIRST_COLUMN+1
-    {
-        Pos = MAP_APPFONT ( 146, 42 ) ;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Fi~rst Column" ;
-    };
-
-    CheckBox CB_LAST_COLUMN+1
-    {
-        Pos = MAP_APPFONT ( 146, 55 ) ;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Last Column" ;
-    };
-
-    CheckBox CB_BANDED_COLUMNS+1
-    {
-        Pos = MAP_APPFONT ( 146, 68 ) ;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Ba~nded Columns" ;
-    };
-
-    FixedLine FL_TABLE_STYLES+1
-    {
-        Pos = MAP_APPFONT ( 6, 3 ) ;
-        Size = MAP_APPFONT( 120, 8 );
-        OutputSize = TRUE;
-        Text [ en-US ] = "Styles";
-    };
-
-    Control CT_TABLE_STYLES+1
-    {
-        Pos = MAP_APPFONT ( 4, 3 ) ;
-        Size = MAP_APPFONT( 120, 143 );
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/uiconfig/sdraw/ui/tabledesigndialog.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires LibreOffice 1.0 -->
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="TableDesignDialog">
     <property name="can_focus">False</property>
@@ -69,7 +70,136 @@
           </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkGrid" id="grid1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <property name="column_homogeneous">True</property>
+            <child>
+              <object class="GtkCheckButton" id="UseFirstRowStyle">
+                <property name="label" translatable="yes">_Header Row</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="UseLastRowStyle">
+                <property name="label" translatable="yes">Tot_al Row</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="UseBandingRowStyle">
+                <property name="label" translatable="yes">_Banded Rows</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="UseFirstColumnStyle">
+                <property name="label" translatable="yes">Fi_rst Column</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="UseLastColumnStyle">
+                <property name="label" translatable="yes">_Last Column</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="UseBandingColumnStyle">
+                <property name="label" translatable="yes">Ba_nded Columns</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">5</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sdlo-TableValueSet" id="previews:border">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">6</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>