ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

weld: Move weld::TriStateEnabled to own header/source

Browse Source 
Move the class definition and implementation out of weld.hxx
and weldutils.cxx into its own header and source file, in
order to make it easier to keep an overview and to avoid
having to recompile ~all UI code when the class is
modified.

Change-Id: I97768bf75dac492e32e1d387853d123481aa643a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205902
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-06-03 23:19:47 +02:00
parent e9ca262b55
commit 0bcb591b0c
12 changed files with 73 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/controller/dialogs/res_DataLabel.hxx
+1
View File
@@ -24,6 +24,7 @@
#include <vcl/weld/ComboBox.hxx>
#include <vcl/weld/Label.hxx>
#include <vcl/weld/MetricSpinButton.hxx>
#include <vcl/weld/TriStateEnabled.hxx>
#include <TextDirectionListBox.hxx>
#include <map>
cui/source/inc/FontFeaturesDialog.hxx
+1
View File
@@ -17,6 +17,7 @@
#include <vcl/weld/Grid.hxx>
#include <vcl/weld/Label.hxx>
#include <vcl/weld/ScrolledWindow.hxx>
#include <vcl/weld/TriStateEnabled.hxx>
#include <vcl/weld/Window.hxx>
#include <vcl/weld/weld.hxx>
#include <vcl/font/Feature.hxx>
cui/source/inc/align.hxx
+1
View File
@@ -45,6 +45,7 @@ enum VerticalAlign {
#include <vcl/weld/ComboBox.hxx>
#include <vcl/weld/Label.hxx>
#include <vcl/weld/MetricSpinButton.hxx>
#include <vcl/weld/TriStateEnabled.hxx>
#include <vcl/weld/weld.hxx>
class SvxJustifyMethodItem;
cui/source/inc/chardlg.hxx
+1
View File
@@ -30,6 +30,7 @@
#include <vcl/weld/MetricSpinButton.hxx>
#include <vcl/weld/Notebook.hxx>
#include <vcl/weld/TreeView.hxx>
#include <vcl/weld/TriStateEnabled.hxx>
#include <vcl/weld/weld.hxx>
#include <memory>
cui/source/inc/paragrph.hxx
+1
View File
@@ -25,6 +25,7 @@
#include <vcl/weld/Label.hxx>
#include <vcl/weld/MetricSpinButton.hxx>
#include <vcl/weld/SpinButton.hxx>
#include <vcl/weld/TriStateEnabled.hxx>
class SvxLineSpacingItem;
include/svtools/editbrowsebox.hxx
+1
View File
@@ -34,6 +34,7 @@
#include <vcl/weld/FormattedSpinButton.hxx>
#include <vcl/weld/MenuButton.hxx>
#include <vcl/weld/TextView.hxx>
#include <vcl/weld/TriStateEnabled.hxx>
#include <vcl/weld/weldutils.hxx>
#include <o3tl/typed_flags_set.hxx>
include/vcl/weld/TriStateEnabled.hxx
+30
View File
@@ -0,0 +1,30 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* 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/.
*/
#pragma once
#include <vcl/dllapi.h>
#include <vcl/weld/weld.hxx>
namespace weld
{
struct VCL_DLLPUBLIC TriStateEnabled
{
TriState eState;
bool bTriStateEnabled;
TriStateEnabled()
: eState(TRISTATE_INDET)
, bTriStateEnabled(true)
{
}
void CheckButtonToggled(CheckButton& rToggle);
};
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
include/vcl/weld/weld.hxx
-12
View File
@@ -131,18 +131,6 @@ public:
virtual void set_label_wrap(bool wrap) = 0;
};
struct VCL_DLLPUBLIC TriStateEnabled
{
TriState eState;
bool bTriStateEnabled;
TriStateEnabled()
: eState(TRISTATE_INDET)
, bTriStateEnabled(true)
{
}
void CheckButtonToggled(CheckButton& rToggle);
};
class VCL_DLLPUBLIC RadioButton : virtual public Toggleable
{
public:
sc/source/ui/inc/tabpages.hxx
+1
View File
@@ -20,6 +20,7 @@
#pragma once
#include <sfx2/tabdlg.hxx>
#include <vcl/weld/TriStateEnabled.hxx>
class ScTabPageProtection : public SfxTabPage
{
vcl/Library_vcl.mk
+1
View File
@@ -614,6 +614,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/weld/TextView \
vcl/source/weld/TextWidget \
vcl/source/weld/TreeView \
vcl/source/weld/TriStateEnabled \
vcl/source/weld/WaitObject \
vcl/source/weld/Widget \
vcl/source/weld/weldutils \
vcl/source/weld/TriStateEnabled.cxx
+35
View File
@@ -0,0 +1,35 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* 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/.
*/
#include <vcl/weld/TriStateEnabled.hxx>
namespace weld
{
void TriStateEnabled::CheckButtonToggled(weld::CheckButton& rToggle)
{
if (bTriStateEnabled)
{
switch (eState)
{
case TRISTATE_INDET:
rToggle.set_state(TRISTATE_FALSE);
break;
case TRISTATE_TRUE:
rToggle.set_state(TRISTATE_INDET);
break;
case TRISTATE_FALSE:
rToggle.set_state(TRISTATE_TRUE);
break;
}
}
eState = rToggle.get_state();
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
vcl/source/weld/weldutils.cxx
-20
View File
@@ -41,26 +41,6 @@ BuilderPage::~BuilderPage() {}
namespace weld
{
void TriStateEnabled::CheckButtonToggled(weld::CheckButton& rToggle)
{
if (bTriStateEnabled)
{
switch (eState)
{
case TRISTATE_INDET:
rToggle.set_state(TRISTATE_FALSE);
break;
case TRISTATE_TRUE:
rToggle.set_state(TRISTATE_INDET);
break;
case TRISTATE_FALSE:
rToggle.set_state(TRISTATE_TRUE);
break;
}
}
eState = rToggle.get_state();
}
size_t GetAbsPos(const weld::TreeView& rTreeView, const weld::TreeIter& rIter)
{
size_t nAbsPos = 0;