ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

chart2: Port "Chart Type" dialog from ValueSet to weld::IconView

Browse Source 
Port the widget to select the chart subtype in the "Chart Type"
dialog from using a ValueSet widget to using weld::IconView.

This helps to be more consistent with other platform/toolkit
widgets and reduces custom logic.

Adjust indices used to account for the fact that
weld::IconView indices are 0-based while the ValueSet ones
are 1-based.

The dialog can be triggered like this:

* start Writer
* insert a chart using "Insert" -> "Chart..."
* right-click on one of the bars in the chart to open
  the context menu
* activate the "Chart Type..." menu item

The chart sidebar (ChartTypePanel) will also be ported
in an upcoming commit.

Change-Id: I188f812f2d03fa8cbd97ffaaab3081094809887e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211658
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-10-02 12:10:59 +02:00
parent 4af0e70a49
commit e011f74436
3 changed files with 47 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/controller/dialogs/tp_ChartType.cxx
+16 -26
View File
@@ -31,6 +31,7 @@
#include <tools/mapunit.hxx>
#include <utility>
#include <vcl/weld/IconView.hxx>
#include <vcl/weld/ScrolledWindow.hxx>
#include <vcl/weld/TreeView.hxx>
#include <vcl/outdev.hxx>
@@ -56,12 +57,8 @@ ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogControlle
, m_aTimerTriggeredControllerLock( m_xChartModel )
, m_xFT_ChooseType(m_xBuilder->weld_label(u"FT_CAPTION_FOR_WIZARD"_ustr))
, m_xMainTypeList(m_xBuilder->weld_tree_view(u"charttype"_ustr))
, m_xSubTypeList(new ValueSet(m_xBuilder->weld_scrolled_window(u"subtypewin"_ustr, true)))
, m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, u"subtype"_ustr, *m_xSubTypeList))
, m_xSubTypeList(m_xBuilder->weld_icon_view(u"subtype"_ustr))
{
Size aSize(m_xSubTypeList->GetDrawingArea()->get_ref_device().LogicToPixel(Size(150, 50), MapMode(MapUnit::MapAppFont)));
m_xSubTypeListWin->set_size_request(aSize.Width(), aSize.Height());
if (bShowDescription)
{
m_xFT_ChooseType->show();
@@ -74,16 +71,7 @@ ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogControlle
SetPageTitle(SchResId(STR_PAGE_CHARTTYPE));
m_xMainTypeList->connect_selection_changed(LINK(this, ChartTypeTabPage, SelectMainTypeHdl));
m_xSubTypeList->SetSelectHdl( LINK( this, ChartTypeTabPage, SelectSubTypeHdl ) );
m_xSubTypeList->SetStyle(m_xSubTypeList->GetStyle() |
WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD | WB_FLATVALUESET | WB_3DLOOK );
// Set number of columns in chart type selector.
// TODO: Ideally this would not be hard-coded, but determined
// programmatically based on the maximum number of chart types across all
// controllers.
m_xSubTypeList->SetColCount(4);
m_xSubTypeList->SetLineCount(1);
m_xSubTypeList->connect_item_activated(LINK(this, ChartTypeTabPage, ActivateSubTypeHdl));
bool bEnableComplexChartTypes = true;
uno::Reference< beans::XPropertySet > xProps( static_cast<cppu::OWeakObject*>(m_xChartModel.get()), uno::UNO_QUERY );
@@ -149,14 +137,12 @@ ChartTypeTabPage::~ChartTypeTabPage()
m_pSplineResourceGroup.reset();
m_pGeometryResourceGroup.reset();
m_pSortByXValuesResourceGroup.reset();
m_xSubTypeListWin.reset();
m_xSubTypeList.reset();
}
ChartTypeParameter ChartTypeTabPage::getCurrentParameter() const
{
ChartTypeParameter aParameter;
aParameter.nSubTypeIndex = static_cast<sal_Int32>(m_xSubTypeList->GetSelectedItemId());
aParameter.nSubTypeIndex = static_cast<sal_Int32>(m_xSubTypeList->get_selected_index() + 1);
m_pDim3DLookResourceGroup->fillParameter( aParameter );
m_pStackingResourceGroup->fillParameter( aParameter );
m_pSplineResourceGroup->fillParameter( aParameter );
@@ -224,7 +210,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType()
return pTypeController;
}
IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void)
IMPL_LINK_NOARG(ChartTypeTabPage, ActivateSubTypeHdl, const weld::TreeIter&, bool)
{
if( m_pCurrentMainType )
{
@@ -233,6 +219,8 @@ IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void)
fillAllControls( aParameter, false );
commitToModel( aParameter );
}
return true;
}
IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl, weld::ItemView&, void) { selectMainType(); }
@@ -282,7 +270,7 @@ void ChartTypeTabPage::selectMainType()
void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeController )
{
m_xMainTypeList->show();
m_xSubTypeList->Show();
m_xSubTypeList->show();
bool bShow = rTypeController.shouldShow_3DLookControl();
m_pDim3DLookResourceGroup->showControls( bShow );
@@ -302,17 +290,19 @@ void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bo
m_nChangingCalls++;
if( m_pCurrentMainType && bAlsoResetSubTypeList )
{
m_xSubTypeList->Clear();
m_xSubTypeList->clear();
const std::vector<ChartTypeEntry> aEntries = m_pCurrentMainType->getSubTypes(rParameter);
int nIndex = 1;
int nIndex = 0;
for (const ChartTypeEntry& rEntry : aEntries)
{
m_xSubTypeList->InsertItem(nIndex, rEntry.aImage);
m_xSubTypeList->SetItemText(nIndex, rEntry.sName);
const Bitmap aBitmap = rEntry.aImage.GetBitmap();
m_xSubTypeList->insert(nIndex, nullptr, nullptr, &aBitmap, nullptr);
m_xSubTypeList->set_item_tooltip_text(nIndex, rEntry.sName);
m_xSubTypeList->set_item_accessible_name(nIndex, rEntry.sName);
nIndex++;
}
}
m_xSubTypeList->SelectItem( static_cast<sal_uInt16>( rParameter.nSubTypeIndex) );
m_xSubTypeList->select(rParameter.nSubTypeIndex - 1);
m_pDim3DLookResourceGroup->fillControls( rParameter );
m_pStackingResourceGroup->fillControls( rParameter );
m_pSplineResourceGroup->fillControls( rParameter );
@@ -373,7 +363,7 @@ void ChartTypeTabPage::initializePage()
if( !bFound )
{
m_xMainTypeList->show();
m_xSubTypeList->Show();
m_xSubTypeList->show();
m_pDim3DLookResourceGroup->showControls( false );
m_pStackingResourceGroup->showControls( false );
m_pSplineResourceGroup->showControls( false );
chart2/source/controller/dialogs/tp_ChartType.hxx
+4 -3
View File
@@ -30,7 +30,9 @@
namespace weld
{
class CustomWeld;
class IconView;
class ItemView;
class TreeIter;
}
class ValueSet;
@@ -69,7 +71,7 @@ private:
void selectMainType();
DECL_LINK(SelectMainTypeHdl, weld::ItemView&, void);
DECL_LINK(SelectSubTypeHdl, ValueSet*, void );
DECL_LINK(ActivateSubTypeHdl, const weld::TreeIter&, bool);
std::unique_ptr<Dim3DLookResourceGroup> m_pDim3DLookResourceGroup;
std::unique_ptr<StackingResourceGroup> m_pStackingResourceGroup;
@@ -88,8 +90,7 @@ private:
std::unique_ptr<weld::Label> m_xFT_ChooseType;
std::unique_ptr<weld::TreeView> m_xMainTypeList;
std::unique_ptr<ValueSet> m_xSubTypeList;
std::unique_ptr<weld::CustomWeld> m_xSubTypeListWin;
std::unique_ptr<weld::IconView> m_xSubTypeList;
};
} //namespace chart
chart2/uiconfig/ui/tp_ChartType.ui
+27 -31
View File
@@ -34,6 +34,16 @@
<column type="gchararray"/>
</columns>
</object>
<object class="GtkTreeStore" id="subtype_model">
<columns>
<!-- column-name pixbuf -->
<column type="GdkPixbuf"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name tooltip -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkBox" id="tp_ChartType">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -80,37 +90,6 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row-spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="subtypewin">
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="hscrollbar-policy">never</property>
<property name="vscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">True</property>
<child>
<object class="GtkDrawingArea" id="subtype">
<property name="can-focus">True</property>
<property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
<property name="hexpand">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="subtype-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|subtype">Select a sub type of the basic chart type.</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<!-- n-columns=1 n-rows=3 -->
<object class="GtkGrid" id="3dblock">
@@ -501,6 +480,23 @@
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkIconView" id="subtype">
<property name="name">subtype</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin">6</property>
<property name="model">subtype_model</property>
<property name="columns">4</property>
<property name="pixbuf-column">0</property>
<property name="tooltip-column">2</property>
<property name="activate-on-single-click">True</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>