ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

cui: Port Callout tab page from ValueSet to weld::IconView

Browse Source 
Port the widget to select the connector type using a ValueSet
widget to using weld::IconView.

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

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

Increase the item padding in the .ui file to 18 to
use more space for the individual items, to be more
similar to the previous ValueSet implementation.

The tab page can be triggered like this:

* start Draw
* make sure the "Text" toolbar is enabled in
  "View" -> "Toolbars" -> "Text"
* in that "Text" toolbar, select the "Callouts" shape
  and insert it into the document
* right-click on the newly inserted shape to open the context menu
* activate the "Position and Size" menu entry
* switch to the "Callout" tab

Change-Id: I1c23a305322105608d0152bcd0b0fa195be14eff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211882
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-10-07 17:49:09 +02:00
parent e68422786a
commit 373ff268bb
3 changed files with 46 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/source/inc/labdlg.hxx
+3 -4
View File
@@ -18,7 +18,6 @@
*/
#pragma once
#include <svtools/valueset.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/sxctitm.hxx>
#include <svx/sxcecitm.hxx>
@@ -26,6 +25,7 @@
#include <vcl/image.hxx>
#include <vcl/weld/CheckButton.hxx>
#include <vcl/weld/ComboBox.hxx>
#include <vcl/weld/IconView.hxx>
#include <vcl/weld/Label.hxx>
#include <vcl/weld/MetricSpinButton.hxx>
#include <vcl/weld/Window.hxx>
@@ -67,15 +67,14 @@ private:
std::unique_ptr<weld::Label> m_xFT_LENGTHFT;
std::unique_ptr<weld::MetricSpinButton> m_xMF_LENGTH;
std::unique_ptr<weld::CheckButton> m_xCB_OPTIMAL;
std::unique_ptr<ValueSet> m_xCT_CAPTTYPE;
std::unique_ptr<weld::CustomWeld> m_xCT_CAPTTYPEWin;
std::unique_ptr<weld::IconView> m_xCT_CAPTTYPE;
void SetupExtension_Impl( sal_uInt16 nType );
void SetupType_Impl( SdrCaptionType nType );
DECL_LINK(ExtensionSelectHdl_Impl, weld::ComboBox&, void);
DECL_LINK(PositionSelectHdl_Impl, weld::ComboBox&, void);
DECL_LINK(LineOptHdl_Impl, weld::Toggleable&, void);
DECL_LINK(SelectCaptTypeHdl_Impl, ValueSet*, void);
DECL_LINK(CaptionTypeActivatedHdl, const weld::TreeIter&, bool);
public:
SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
cui/source/tabpages/labdlg.cxx
+24 -26
View File
@@ -36,7 +36,6 @@
#include <vcl/tabs.hrc>
#include <vcl/weld/Builder.hxx>
#include <vcl/weld/ScrolledWindow.hxx>
// define ----------------------------------------------------------------
@@ -50,9 +49,9 @@
#define POS_MIDDLE 1
#define POS_BOTTOM 2
#define BMP_CAPTTYPE_1 1
#define BMP_CAPTTYPE_2 2
#define BMP_CAPTTYPE_3 3
#define BMP_CAPTTYPE_1 0
#define BMP_CAPTTYPE_2 1
#define BMP_CAPTTYPE_3 2
// static ----------------------------------------------------------------
@@ -88,12 +87,8 @@ SvxCaptionTabPage::SvxCaptionTabPage(weld::Container* pPage, weld::DialogControl
, m_xFT_LENGTHFT(m_xBuilder->weld_label(u"lengthft"_ustr))
, m_xMF_LENGTH(m_xBuilder->weld_metric_spin_button(u"length"_ustr, FieldUnit::MM))
, m_xCB_OPTIMAL(m_xBuilder->weld_check_button(u"optimal"_ustr))
, m_xCT_CAPTTYPE(new ValueSet(m_xBuilder->weld_scrolled_window(u"valuesetwin"_ustr, true)))
, m_xCT_CAPTTYPEWin(new weld::CustomWeld(*m_xBuilder, u"valueset"_ustr, *m_xCT_CAPTTYPE))
, m_xCT_CAPTTYPE(m_xBuilder->weld_icon_view("iconview"))
{
Size aSize(m_xCT_CAPTTYPE->GetDrawingArea()->get_ref_device().LogicToPixel(Size(187, 38), MapMode(MapUnit::MapAppFont)));
m_xCT_CAPTTYPEWin->set_size_request(aSize.Width(), aSize.Height());
assert(m_xLB_POSITION->get_count() == 6);
for (int i = 0; i < 3; ++i)
m_aStrHorzList.push_back(m_xLB_POSITION->get_text(i));
@@ -107,26 +102,27 @@ SvxCaptionTabPage::SvxCaptionTabPage(weld::Container* pPage, weld::DialogControl
for (int i = 0; i < 3; ++i)
aLineTypes.push_back(m_xLineTypes->get_text(i));
//------------install ValueSet--------------------------
m_xCT_CAPTTYPE->SetStyle( m_xCT_CAPTTYPE->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD );
m_xCT_CAPTTYPE->SetColCount(5);//XXX
m_xCT_CAPTTYPE->SetLineCount(1);
m_xCT_CAPTTYPE->SetSelectHdl(LINK( this, SvxCaptionTabPage, SelectCaptTypeHdl_Impl));
m_xCT_CAPTTYPE->connect_item_activated(LINK(this, SvxCaptionTabPage, CaptionTypeActivatedHdl));
m_xCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_1, Image(StockImage::Yes, RID_SVXBMP_LEGTYP1), aLineTypes[0]);
m_xCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_2, Image(StockImage::Yes, RID_SVXBMP_LEGTYP2), aLineTypes[1]);
m_xCT_CAPTTYPE->InsertItem(BMP_CAPTTYPE_3, Image(StockImage::Yes, RID_SVXBMP_LEGTYP3), aLineTypes[2]);
const Bitmap aBitmapCaptionType1 = Image(StockImage::Yes, RID_SVXBMP_LEGTYP1).GetBitmap();
m_xCT_CAPTTYPE->insert(BMP_CAPTTYPE_1, nullptr, nullptr, &aBitmapCaptionType1, nullptr);
m_xCT_CAPTTYPE->set_item_accessible_name(BMP_CAPTTYPE_1, aLineTypes[0]);
m_xCT_CAPTTYPE->set_item_tooltip_text(BMP_CAPTTYPE_1, aLineTypes[0]);
const Bitmap aBitmapCaptionType2 = Image(StockImage::Yes, RID_SVXBMP_LEGTYP2).GetBitmap();
m_xCT_CAPTTYPE->insert(BMP_CAPTTYPE_2, nullptr, nullptr, &aBitmapCaptionType2, nullptr);
m_xCT_CAPTTYPE->set_item_accessible_name(BMP_CAPTTYPE_2, aLineTypes[1]);
m_xCT_CAPTTYPE->set_item_tooltip_text(BMP_CAPTTYPE_2, aLineTypes[1]);
const Bitmap aBitmapCaptionType3 = Image(StockImage::Yes, RID_SVXBMP_LEGTYP3).GetBitmap();
m_xCT_CAPTTYPE->insert(BMP_CAPTTYPE_3, nullptr, nullptr, &aBitmapCaptionType3, nullptr);
m_xCT_CAPTTYPE->set_item_accessible_name(BMP_CAPTTYPE_3, aLineTypes[2]);
m_xCT_CAPTTYPE->set_item_tooltip_text(BMP_CAPTTYPE_3, aLineTypes[2]);
m_xLB_EXTENSION->connect_changed(LINK(this, SvxCaptionTabPage, ExtensionSelectHdl_Impl));
m_xLB_POSITION->connect_changed(LINK(this, SvxCaptionTabPage, PositionSelectHdl_Impl));
m_xCB_OPTIMAL->connect_toggled(LINK(this, SvxCaptionTabPage, LineOptHdl_Impl));
}
SvxCaptionTabPage::~SvxCaptionTabPage()
{
m_xCT_CAPTTYPEWin.reset();
m_xCT_CAPTTYPE.reset();
}
SvxCaptionTabPage::~SvxCaptionTabPage() { m_xCT_CAPTTYPE.reset(); }
void SvxCaptionTabPage::Construct()
{
@@ -141,7 +137,7 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs)
MapUnit eUnit;
nCaptionType = static_cast<SdrCaptionType>(m_xCT_CAPTTYPE->GetSelectedItemId()-1);
nCaptionType = static_cast<SdrCaptionType>(m_xCT_CAPTTYPE->get_selected_index());
_rOutAttrs->Put( SdrCaptionTypeItem( nCaptionType ) );
@@ -318,7 +314,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
m_xLB_EXTENSION->set_active(nExtension);
SetupExtension_Impl( nExtension );
m_xCT_CAPTTYPE->SelectItem( static_cast<int>(nCaptionType)+1 ); // Enum starts at 0!
m_xCT_CAPTTYPE->select(static_cast<int>(nCaptionType));
SetupType_Impl( nCaptionType );
}
@@ -417,9 +413,11 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, weld::Toggleable&, rButton, void
}
}
IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void)
IMPL_LINK(SvxCaptionTabPage, CaptionTypeActivatedHdl, const weld::TreeIter&, rIter, bool)
{
SetupType_Impl( static_cast<SdrCaptionType>(m_xCT_CAPTTYPE->GetSelectedItemId()) );
SetupType_Impl(
static_cast<SdrCaptionType>(m_xCT_CAPTTYPE->get_iter_index_in_parent(rIter) + 1));
return true;
}
void SvxCaptionTabPage::SetupType_Impl( SdrCaptionType nType )
cui/uiconfig/ui/calloutpage.ui
+19 -23
View File
@@ -17,6 +17,16 @@
<property name="step-increment">0.5</property>
<property name="page-increment">10</property>
</object>
<object class="GtkTreeStore" id="iconview_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="CalloutPage">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -24,31 +34,17 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkScrolledWindow" id="valuesetwin">
<object class="GtkIconView" id="iconview">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="halign">start</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">False</property>
<child>
<object class="GtkDrawingArea" id="valueset">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
<child internal-child="accessible">
<object class="AtkObject" id="valueset-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|valueset">Click the Callout style that you want to apply to the selected callout.</property>
</object>
</child>
</object>
</child>
</object>
</child>
<property name="margin">6</property>
<property name="model">iconview_model</property>
<property name="columns">3</property>
<property name="row-spacing">0</property>
<property name="column-spacing">0</property>
<property name="pixbuf-column">0</property>
<property name="tooltip-column">2</property>
<property name="item-padding">18</property>
</object>
<packing>
<property name="expand">False</property>