[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/options/optjava.cxx |8
cui/source/options/optjava.hxx |2
cui/source/options/optupdt.cxx |9 +
cui/source/options/optupdt.hxx |4
cui/uiconfig/ui/optadvancedpage.ui | 208 +--
cui/uiconfig/ui/optonlineupdatepage.ui | 287 -
6 files changed, 316 insertions(+), 202 deletions(-)
New commits:
commit 860b98657ccc54210575db6b6f81de1db05512c8
Author: Balazs Varga
AuthorDate: Thu Oct 26 11:56:58 2023 +0200
Commit: Balazs Varga
CommitDate: Fri Oct 27 08:52:05 2023 +0200
tdf#157853 - UI: Part 11 - Unify lockdown behavior of Options dialog
for Advanced Page.
Change-Id: I3ef33e98cd5a39313f51eb90682f20cdc172f042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158496
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index a35a6cb42130..6c6d3d07cdc3 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -77,7 +77,9 @@ SvxJavaOptionsPage::SvxJavaOptionsPage(weld::Container*
pPage, weld::DialogContr
, m_xClassPathBtn(m_xBuilder->weld_button("classpath"))
, m_xExpertConfigBtn(m_xBuilder->weld_button("expertconfig"))
, m_xExperimentalCB(m_xBuilder->weld_check_button("experimental"))
+, m_xExperimentalImg(m_xBuilder->weld_widget("lockexperimental"))
, m_xMacroCB(m_xBuilder->weld_check_button("macrorecording"))
+, m_xMacroImg(m_xBuilder->weld_widget("lockmacrorecording"))
, m_xAddDialogText(m_xBuilder->weld_label("selectruntime"))
, m_xJavaFrame(m_xBuilder->weld_widget("javaframe"))
{
@@ -109,10 +111,16 @@ SvxJavaOptionsPage::SvxJavaOptionsPage(weld::Container*
pPage, weld::DialogContr
m_xExpertConfigBtn->set_sensitive(false);
if (officecfg::Office::Common::Misc::MacroRecorderMode::isReadOnly())
+{
m_xMacroCB->set_sensitive(false);
+m_xMacroImg->set_visible(true);
+}
if (officecfg::Office::Common::Misc::ExperimentalMode::isReadOnly())
+{
m_xExperimentalCB->set_sensitive(false);
+m_xExperimentalImg->set_visible(true);
+}
xDialogListener->SetDialogClosedLink( LINK( this, SvxJavaOptionsPage,
DialogClosedHdl ) );
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 080c5bcb748b..84422c903056 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -75,7 +75,9 @@ private:
std::unique_ptr m_xPathDlg;
std::unique_ptr m_xExperimentalCB;
+std::unique_ptr m_xExperimentalImg;
std::unique_ptr m_xMacroCB;
+std::unique_ptr m_xMacroImg;
std::unique_ptr m_xAddDialogText;
diff --git a/cui/uiconfig/ui/optadvancedpage.ui
b/cui/uiconfig/ui/optadvancedpage.ui
index bbc6062a832c..7e0449861bab 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -1,5 +1,5 @@
-
+
@@ -26,39 +26,39 @@
True
-False
+False
True
True
-6
+6
vertical
18
True
-False
+False
True
True
-0
-none
+0
+none
True
-False
+False
+12
+6
True
True
vertical
6
-12
-6
_Use a Java runtime environment
True
-True
-False
+True
+False
start
-True
-True
+True
+True
Allows you to run
extensions written with Java.
@@ -72,52 +72,52 @@
-
+
True
-False
+False
start
+12
True
True
vertical
-12
-12
+12
True
-False
+False
start
_Java runtime environments (JRE) already
installed:
-True
-javas
+True
+javas
-0
-0
+0
+0
-
+
True
-False
+False
True
True
-12
+12
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/options/optopencl.cxx |3
cui/source/options/optopencl.hxx |1
cui/source/options/personalization.cxx | 12 +
cui/source/options/personalization.hxx |2
cui/uiconfig/ui/optopenclpage.ui | 70 +++
cui/uiconfig/ui/personalization_tab.ui | 206 +++--
6 files changed, 189 insertions(+), 105 deletions(-)
New commits:
commit ee368cc3f97886b9574e22fdf8a15c8225e785d5
Author: Balazs Varga
AuthorDate: Wed Oct 25 14:07:56 2023 +0200
Commit: Balazs Varga
CommitDate: Thu Oct 26 09:22:53 2023 +0200
tdf#157843 - UI: Part 8 - Unify lockdown behavior of Options dialog
for OpenCL Page.
Change-Id: I94c4a1afc7703de378ae65c0173d178954f647a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158424
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index c3e154083c97..129cbc1b01b7 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -30,11 +30,13 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(weld::Container* pPage,
weld::DialogControlle
: SfxTabPage(pPage, pController, "cui/ui/optopenclpage.ui",
"OptOpenCLPage", &rSet)
, maConfig(OpenCLConfig::get())
, mxUseOpenCL(m_xBuilder->weld_check_button("useopencl"))
+, mxUseOpenImg(m_xBuilder->weld_widget("lockuseopencl"))
, mxOclUsed(m_xBuilder->weld_label("openclused"))
, mxOclNotUsed(m_xBuilder->weld_label("openclnotused"))
{
mxUseOpenCL->set_active(maConfig.mbUseOpenCL);
mxUseOpenCL->set_sensitive(!officecfg::Office::Common::Misc::UseOpenCL::isReadOnly());
+
mxUseOpenImg->set_visible(officecfg::Office::Common::Misc::UseOpenCL::isReadOnly());
bool bCLUsed = openclwrapper::GPUEnv::isOpenCLEnabled();
mxOclUsed->set_visible(bCLUsed);
@@ -97,6 +99,7 @@ void SvxOpenCLTabPage::Reset( const SfxItemSet* )
maConfig = OpenCLConfig::get();
mxUseOpenCL->set_active(maConfig.mbUseOpenCL);
+
mxUseOpenImg->set_visible(officecfg::Office::Common::Misc::UseOpenCL::isReadOnly());
mxUseOpenCL->save_state();
}
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index 1fce5e3ea9aa..e6414245da8f 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -27,6 +27,7 @@ private:
OpenCLConfig maConfig;
std::unique_ptr mxUseOpenCL;
+std::unique_ptr mxUseOpenImg;
std::unique_ptr mxOclUsed;
std::unique_ptr mxOclNotUsed;
diff --git a/cui/uiconfig/ui/optopenclpage.ui b/cui/uiconfig/ui/optopenclpage.ui
index ac5cac268df2..8014e3711e1c 100644
--- a/cui/uiconfig/ui/optopenclpage.ui
+++ b/cui/uiconfig/ui/optopenclpage.ui
@@ -1,32 +1,58 @@
-
+
True
-False
+False
True
-6
-0
-none
+6
+0
+none
True
-False
+False
+12
+6
True
True
vertical
12
-12
-6
-
-Allow use of OpenCL
+
+
True
-True
-False
-True
-True
+False
+True
+6
+
+
+Allow use of OpenCL
+True
+True
+False
+True
+True
+
+
+1
+0
+
+
+
+
+False
+True
+center
+center
+res/lock.png
+
+
+0
+0
+
+
False
@@ -35,10 +61,9 @@
-
-False
-False
-OpenCL is available for use.
+
+False
+OpenCL is not used.
False
@@ -47,10 +72,9 @@
-
-False
-False
-OpenCL is not used.
+
+False
+OpenCL is available for use.
False
@@ -63,7 +87,7 @@
True
-False
+False
OpenCL Options
commit 54aa9a9cb7f283d2ed2853e064573564f16e353b
Author: Balazs Varga
AuthorDate: Wed Oct 25 10:31:47 2023 +0200
Commit: Balazs Varga
CommitDate: Thu Oct 26 09:22:40 2023 +0200
tdf#157842 - UI: Part 7 - Unify lockdown behavior of Options dialog
for Personalization Page.
Change-Id: I5f2b674b9548610be8f918e6713e6ea91be7442e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158418
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/cui/source/options/personalization.cxx
b/cui/sour
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig vcl/source
cui/source/dialogs/FontFeaturesDialog.cxx | 30 --
cui/source/inc/FontFeaturesDialog.hxx |8 +++-
cui/uiconfig/ui/fontfragment.ui |1 +
vcl/source/gdi/metaact.cxx|2 ++
4 files changed, 34 insertions(+), 7 deletions(-)
New commits:
commit 4d6fcd7908f6db892e8d5fb3cabf7e0fe49328c4
Author: Caolán McNamara
AuthorDate: Mon Apr 24 12:52:22 2023 +0100
Commit: Caolán McNamara
CommitDate: Mon Apr 24 20:47:55 2023 +0200
Resolves: tdf#153441 use a TriStateEnabled helper
Change-Id: I976e4271a072bfb53c676091509e1d4ef7dbcccb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150934
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx
b/cui/source/dialogs/FontFeaturesDialog.cxx
index 1656f50bb5b1..e9aba0a6e409 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -109,19 +109,21 @@ int
FontFeaturesDialog::fillGrid(std::vector const& rFontFea
{
nIdx = nStylisticSets++;
m_xStylisticSetsBox->set_visible(true);
-m_aFeatureItems.emplace_back(m_xStylisticSetsGrid.get());
+m_aFeatureItems.emplace_back(
+std::make_unique(m_xStylisticSetsGrid.get()));
}
else if (rFontFeature.isCharacterVariant())
{
nIdx = nCharacterVariants++;
m_xCharacterVariantsBox->set_visible(true);
-m_aFeatureItems.emplace_back(m_xCharacterVariantsGrid.get());
+m_aFeatureItems.emplace_back(
+
std::make_unique(m_xCharacterVariantsGrid.get()));
}
else
{
nIdx = nOtherFeatures++;
m_xContentBox->set_visible(true);
-m_aFeatureItems.emplace_back(m_xContentGrid.get());
+
m_aFeatureItems.emplace_back(std::make_unique(m_xContentGrid.get()));
}
int32_t nValue = 0;
@@ -130,7 +132,7 @@ int
FontFeaturesDialog::fillGrid(std::vector const& rFontFea
else
nValue = aDefinition.getDefault();
-FontFeatureItem& aCurrentItem = m_aFeatureItems.back();
+FontFeatureItem& aCurrentItem = *m_aFeatureItems.back();
aCurrentItem.m_aFeatureCode = nFontFeatureCode;
aCurrentItem.m_nDefault = aDefinition.getDefault();
@@ -158,11 +160,19 @@ int
FontFeaturesDialog::fillGrid(std::vector const& rFontFea
else
{
if (nValue < 0)
+{
aCurrentItem.m_xCheck->set_state(TRISTATE_INDET);
+aCurrentItem.m_aTriStateEnabled.bTriStateEnabled = true;
+aCurrentItem.m_aTriStateEnabled.eState = TRISTATE_INDET;
+}
else
+{
aCurrentItem.m_xCheck->set_state(nValue > 0 ? TRISTATE_TRUE :
TRISTATE_FALSE);
+aCurrentItem.m_aTriStateEnabled.bTriStateEnabled = false;
+aCurrentItem.m_aTriStateEnabled.eState =
aCurrentItem.m_xCheck->get_state();
+}
aCurrentItem.m_xCheck->set_label(aDefinition.getDescription());
-aCurrentItem.m_xCheck->connect_toggled(aCheckBoxToggleHandler);
+aCurrentItem.m_aToggleHdl = aCheckBoxToggleHandler;
aCurrentItem.m_xCheck->show();
}
@@ -188,6 +198,13 @@ void FontFeaturesDialog::updateFontPreview()
m_aPreviewWindow.SetFont(rPreviewFont, rPreviewFontCJK, rPreviewFontCTL);
}
+IMPL_LINK(FontFeatureItem, CheckBoxToggledHdl, weld::Toggleable&, rToggle,
void)
+{
+m_aTriStateEnabled.ButtonToggled(rToggle);
+m_aTriStateEnabled.bTriStateEnabled = false;
+m_aToggleHdl.Call(rToggle);
+}
+
IMPL_LINK_NOARG(FontFeaturesDialog, CheckBoxToggledHdl, weld::Toggleable&,
void)
{
updateFontPreview();
@@ -204,8 +221,9 @@ OUString FontFeaturesDialog::createFontNameWithFeatures()
OUStringBuffer sNameSuffix;
bool bFirst = true;
-for (const FontFeatureItem& rItem : m_aFeatureItems)
+for (const auto& rEntry : m_aFeatureItems)
{
+const FontFeatureItem& rItem(*rEntry);
if (rItem.m_xCheck->get_visible())
{
if (rItem.m_xCheck->get_state() != TRISTATE_INDET)
diff --git a/cui/source/inc/FontFeaturesDialog.hxx
b/cui/source/inc/FontFeaturesDialog.hxx
index c4eb43b79e98..93ba0cb9f80d 100644
--- a/cui/source/inc/FontFeaturesDialog.hxx
+++ b/cui/source/inc/FontFeaturesDialog.hxx
@@ -29,21 +29,27 @@ struct FontFeatureItem
, m_xCombo(m_xBuilder->weld_combo_box("combo"))
, m_xCheck(m_xBuilder->weld_check_button("check"))
{
+m_xCheck->connect_toggled(LINK(this, FontFeatureItem,
CheckBoxToggledHdl));
}
sal_uInt32 m_aFeatureCode;
sal_Int32 m_nDefault;
+weld::TriStateEnabled m_aTriStateEnabled;
+Link m_aToggleHdl;
std::unique_ptr m_xBuilder;
std::unique_ptr m_xContainer;
std::unique_ptr m_xText;
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/sfx2 sc/qa sfx2/source vcl/jsdialog
cui/source/dialogs/SpellDialog.cxx| 31 ---
cui/source/inc/SpellDialog.hxx|1 +
cui/uiconfig/ui/spelloptionsdialog.ui | 20 +---
include/sfx2/basedlgs.hxx |4
sc/qa/uitest/calc_tests8/tdf125051.py |3 +--
sfx2/source/dialog/basedlgs.cxx | 11 +++
vcl/jsdialog/enabled.cxx |2 ++
7 files changed, 56 insertions(+), 16 deletions(-)
New commits:
commit 735437b3b663f43dd7ef6bb2e8c873c14c49
Author: Szymon Kłos
AuthorDate: Tue Mar 21 17:47:01 2023 +0100
Commit: Szymon Kłos
CommitDate: Mon Apr 3 14:03:16 2023 +0200
jsdialog: keep button under content in SpellCheck Options
Change-Id: I75b1424fe688f975b88634d6355cd0311fc07057
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149227
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149825
Tested-by: Jenkins
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index ebf684dfef47..09b8a9fc43f9 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -469,7 +469,8 @@ IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl,
weld::Toggleable&, void)
void SpellDialog::StartSpellOptDlg_Impl()
{
auto xSet =
std::make_shared>(
SfxGetpApp()->GetPool() );
-m_xOptionsDlg =
std::make_shared(m_xDialog.get(), xSet.get(),
"cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
+m_xOptionsDlg = std::make_shared(
+m_xDialog.get(), xSet.get(), "content",
"cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
std::unique_ptr xPage =
SvxLinguTabPage::Create(m_xOptionsDlg->get_content_area(), m_xOptionsDlg.get(),
xSet.get());
static_cast(xPage.get())->HideGroups( GROUP_MODULES );
diff --git a/cui/uiconfig/ui/spelloptionsdialog.ui
b/cui/uiconfig/ui/spelloptionsdialog.ui
index ef690fd7da60..d5e80649731d 100644
--- a/cui/uiconfig/ui/spelloptionsdialog.ui
+++ b/cui/uiconfig/ui/spelloptionsdialog.ui
@@ -17,6 +17,23 @@
False
vertical
12
+
+
+True
+False
+vertical
+12
+
+
+
+
+
+True
+True
+begin
+0
+
+
False
@@ -74,9 +91,6 @@
0
-
-
-
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 9b74669b3f33..f87fe22c1dbd 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -107,6 +107,10 @@ public:
const OUString& rUIXMLDescription =
OUString("sfx/ui/singletabdialog.ui"),
const OUString& rID = OUString("SingleTabDialog"));
+SfxSingleTabDialogController(weld::Widget* pParent, const SfxItemSet*
pOptionsSet,
+const OUString& rContainerId, const OUString& rUIXMLDescription,
+const OUString& rID);
+
weld::Container* get_content_area() { return m_xContainer.get(); }
virtual ~SfxSingleTabDialogController() override;
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 285c3b5b526e..acbed68f87bc 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -233,6 +233,17 @@
SfxSingleTabDialogController::SfxSingleTabDialogController(weld::Widget *pParent
m_xOKBtn->connect_clicked(LINK(this, SfxSingleTabDialogController,
OKHdl_Impl));
}
+SfxSingleTabDialogController::SfxSingleTabDialogController(weld::Widget
*pParent, const SfxItemSet* pSet,
+const OUString& rContainerId, const OUString& rUIXMLDescription, const
OUString& rID)
+: SfxOkDialogController(pParent, rUIXMLDescription, rID)
+, m_pInputSet(pSet)
+, m_xContainer(m_xBuilder->weld_container(rContainerId))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
+, m_xHelpBtn(m_xBuilder->weld_button("help"))
+{
+m_xOKBtn->connect_clicked(LINK(this, SfxSingleTabDialogController,
OKHdl_Impl));
+}
+
SfxSingleTabDialogController::~SfxSingleTabDialogController()
{
}
commit 778e034d89f1e8236cc5afdff902f165637ce9ca
Author: Szymon Kłos
AuthorDate: Tue Mar 21 09:51:31 2023 +0100
Commit: Szymon Kłos
CommitDate: Mon Apr 3 14:03:04 2023 +0200
jsdialog: enable spelling options dialog
and make it async
Change-Id: Idbf8661aa106d69e60ab6037052fd3d6dec28c06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149205
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149824
Tested-by: Jenkins
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index b5356aa30a45..ebf684dfef47 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -225,6 +225,12 @@ SpellDialog::Spel
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig framework/source
cui/source/options/optgdlg.cxx | 36 -
cui/source/options/optgdlg.hxx |5
cui/uiconfig/ui/optviewpage.ui | 129 -
framework/source/accelerators/acceleratorcache.cxx | 19 ++-
4 files changed, 18 insertions(+), 171 deletions(-)
New commits:
commit c6dffdf014127af23b0b20b1015a4b6fdf0e1ac9
Author: Juergen Funk
AuthorDate: Wed Feb 15 12:02:31 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Mar 20 11:37:04 2023 +
tdf#153587 If one of the multiple shortcuts is deleted,
the next one is not displayed
This patch solve the part 2 of the bug, the problem was
that it did not take into account whether a command was assigned
multiple keys, it simply deleted the whole command
Change-Id: I4e09096d3bc112ed49a4210dd294d1acf7a48159
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147093
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/framework/source/accelerators/acceleratorcache.cxx
b/framework/source/accelerators/acceleratorcache.cxx
index 342b9701f99d..0163654d4bf7 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -90,8 +90,23 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent&
aKey)
// remove key from primary list
m_lKey2Commands.erase(aKey);
-// remove key from optimized command list
-m_lCommand2Keys.erase(sCommand);
+// get keylist for that command
+TCommand2Keys::iterator pCommand = m_lCommand2Keys.find(sCommand);
+if (pCommand == m_lCommand2Keys.end())
+return;
+TKeyList& lKeys = pCommand->second;
+
+// one or more keys assign
+if (lKeys.size() == 1)
+// remove key from optimized command list
+m_lCommand2Keys.erase(sCommand);
+else // only remove this key from the keylist
+{
+auto pKeys = ::std::find(lKeys.begin(), lKeys.end(), aKey);
+
+if (pKeys != lKeys.end())
+lKeys.erase(pKeys);
+}
}
void AcceleratorCache::removeCommand(const OUString& sCommand)
commit 770eea32b68a95e493a86a97eba5003c46ed736b
Author: Caolán McNamara
AuthorDate: Mon Mar 20 09:44:16 2023 +
Commit: Caolán McNamara
CommitDate: Mon Mar 20 11:37:01 2023 +
tdf#152898 remove "show context menu shortcuts" from options page
Change-Id: I44acae51ca72ece735f264e826f8d254e85be8f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149148
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 71ac0594cd15..8a30f35535a9 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -530,9 +530,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xFontAntiAliasing(m_xBuilder->weld_check_button("aafont"))
, m_xAAPointLimitLabel(m_xBuilder->weld_label("aafrom"))
, m_xAAPointLimit(m_xBuilder->weld_metric_spin_button("aanf",
FieldUnit::PIXEL))
-, m_xMenuIconBox(m_xBuilder->weld_widget("menuiconsbox"))
-, m_xMenuIconsLB(m_xBuilder->weld_combo_box("menuicons"))
-,
m_xContextMenuShortcutsLB(m_xBuilder->weld_combo_box("contextmenushortcuts"))
, m_xFontShowCB(m_xBuilder->weld_check_button("showfontpreview"))
, m_xUseHardwareAccell(m_xBuilder->weld_check_button("useaccel"))
, m_xUseAntiAliase(m_xBuilder->weld_check_button("useaa"))
@@ -547,9 +544,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage,
weld::DialogController* p
, m_sAutoStr(m_xIconStyleLB->get_text(0))
{
OUString sToolKitName(Application::GetToolkitName());
-if (sToolKitName.startsWith("gtk"))
-m_xMenuIconBox->hide();
-
const bool bHasDarkMode = sToolKitName.startsWith("gtk") || sToolKitName
== "osx" || sToolKitName == "win";
if (!bHasDarkMode)
m_xDarkModeFrame->hide();
@@ -781,33 +775,12 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
bModified = true;
}
-if (m_xMenuIconsLB->get_value_changed_from_saved())
-{
-
officecfg::Office::Common::View::Menu::IsSystemIconsInMenus::set(m_xMenuIconsLB->get_active()
== 0, xChanges);
-
officecfg::Office::Common::View::Menu::ShowIconsInMenues::set(m_xMenuIconsLB->get_active()
== 2, xChanges);
-bModified = true;
-bMenuOptModified = true;
-bAppearanceChanged = true;
-}
-
if (m_xAppearanceStyleLB->get_value_changed_from_saved())
{
bDarkModeOptModified = true;
bModified = true;
}
-if (m_xContextMenuShortcutsLB->get_value_changed_from_saved())
-{
-officecfg::Office::Common::View::Menu::ShortcutsInContextMenus::set(
-m_xContextMenuShortcutsLB->get_active() == 0 ?
-TRISTATE_INDET :
-static_cast(m_xContextMenuShortcutsLB->get_active() - 1),
-xChanges);
-
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig external/zxing
cui/source/options/optgdlg.cxx | 39
cui/source/options/optgdlg.hxx |7 -
cui/uiconfig/ui/optgeneralpage.ui | 21 +++--
external/zxing/UnpackedTarball_zxing.mk |1
external/zxing/invalid_argument.patch.1 | 22 ++
5 files changed, 47 insertions(+), 43 deletions(-)
New commits:
commit 05079016e97d0b41c45cc71695d922fce9ae1e6c
Author: Mike Kaganski
AuthorDate: Sun Feb 26 17:08:28 2023 +0300
Commit: Mike Kaganski
CommitDate: Sun Feb 26 16:08:11 2023 +
Cleanup general options tab a bit
The crashreporter feature (and thus, the whole frame visibility) depends
not on OS, but on the HAVE_FEATURE_BREAKPAD define. No need to control
the checkbox visibility separate from the label, when we can show the
whole frame selectively.
The quickstarter feature is only available on Windows, since the systray
support was removed in commit 3e9c908b73f0fe0978c9980750a06bbc9e02295e
(remove Linux ("UNX") systray "Quickstarter", 2018-05-23).
Change-Id: Id990b53a6bbfa6b42defec0cc196e7fe817a1924
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147738
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1037cdd7ed1f..57eaee46d908 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -164,15 +164,13 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xYearFrame(m_xBuilder->weld_widget("yearframe"))
, m_xYearValueField(m_xBuilder->weld_spin_button("year"))
, m_xToYearFT(m_xBuilder->weld_label("toyear"))
+#if HAVE_FEATURE_BREAKPAD
+, m_xPrivacyFrame(m_xBuilder->weld_widget("privacyframe"))
, m_xCrashReport(m_xBuilder->weld_check_button("crashreport"))
-, m_xQuickStarterFrame(m_xBuilder->weld_widget("quickstarter"))
-, m_xHelpImproveLabel(m_xBuilder->weld_label("label7")) //"Help Improve"
-#if defined(UNX)
-, m_xQuickLaunchCB(m_xBuilder->weld_check_button("systray"))
-#else
-, m_xQuickLaunchCB(m_xBuilder->weld_check_button("quicklaunch"))
#endif
#if defined(_WIN32)
+, m_xQuickStarterFrame(m_xBuilder->weld_widget("quickstarter"))
+, m_xQuickLaunchCB(m_xBuilder->weld_check_button("quicklaunch"))
, m_xFileAssocFrame(m_xBuilder->weld_widget("fileassoc"))
, m_xFileAssocBtn(m_xBuilder->weld_button("assocfiles"))
,
m_xPerformFileExtCheck(m_xBuilder->weld_check_button("cbPerformFileExtCheck"))
@@ -186,21 +184,16 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
m_xFileDlgCB->set_sensitive(false);
}
-m_xQuickLaunchCB->show();
-
-//Only available in Win or if building the gtk systray
-#if !defined(_WIN32)
-m_xQuickStarterFrame->hide();
-//Hide frame label in case of no content
-m_xHelpImproveLabel->hide();
-#else
-// Store-packaged apps (located under the protected Program
Files\WindowsApps) can't use normal
-// shell shortcuts to their exe; hide. TODO: show a button to open
"Startup Apps" system applet?
-if (sal::systools::IsStorePackagedApp())
-m_xQuickStarterFrame->hide();
+#if HAVE_FEATURE_BREAKPAD
+m_xPrivacyFrame->show();
#endif
#if defined(_WIN32)
+// Store-packaged apps (located under the protected Program
Files\WindowsApps) can't use normal
+// shell shortcuts to their exe. TODO: show a button to open "Startup
Apps" system applet?
+if (!sal::systools::IsStorePackagedApp())
+m_xQuickStarterFrame->show();
+
m_xFileAssocFrame->show();
m_xFileAssocBtn->connect_clicked(LINK(this, OfaMiscTabPage,
FileAssocClick));
#endif
@@ -272,15 +265,15 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
m_xPerformFileExtCheck->get_active(), batch);
bModified = true;
}
-#endif
-
-batch->commit();
if( m_xQuickLaunchCB->get_state_changed_from_saved())
{
rSet->Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER,
m_xQuickLaunchCB->get_active()));
bModified = true;
}
+#endif
+
+batch->commit();
return bModified;
}
@@ -312,10 +305,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get()
&& CrashReporter::IsDumpEnable());
m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly()
&& CrashReporter::IsDumpEnable());
m_xCrashReport->save_state();
-#else
-m_xCrashReport->hide();
#endif
+#if defined(_WIN32)
const SfxPoolItem* pItem = nullptr;
SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false,
&pItem );
if ( SfxItemState::SET == eState )
@@ -328,7 +320,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_xQuickLaunchCB->save_state();
-#if defined(_WIN32)
m_xPerformFileExtCheck->set_active(
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/customize/eventdlg.cxx |1
cui/source/customize/macropg.cxx | 64
cui/source/customize/macropg_impl.hxx |1
cui/source/inc/macropg.hxx|2
cui/uiconfig/ui/eventsconfigpage.ui | 14 +
cui/uiconfig/ui/macroassignpage.ui| 90 +++---
6 files changed, 125 insertions(+), 47 deletions(-)
New commits:
commit e1de95f72b1e6467510f7c3b32b25d7528c93a75
Author: Caolán McNamara
AuthorDate: Thu Dec 8 16:47:32 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 13:53:38 2022 +
Related: tdf#152266 add a remove all button
Change-Id: Ibf6b749089d2d6da71a9ce00779bce8886453856
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143833
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/customize/eventdlg.cxx
b/cui/source/customize/eventdlg.cxx
index 7aa67e3f5a81..755fd16b416a 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -44,6 +44,7 @@ SvxEventConfigPage::SvxEventConfigPage(weld::Container*
pPage, weld::DialogContr
mpImpl->xEventLB = m_xBuilder->weld_tree_view("events");
mpImpl->xAssignPB = m_xBuilder->weld_button("macro");
mpImpl->xDeletePB = m_xBuilder->weld_button("delete");
+mpImpl->xDeleteAllPB = m_xBuilder->weld_button("deleteall");
mpImpl->xAssignComponentPB = m_xBuilder->weld_button("component");
mpImpl->xEventLB->set_size_request(mpImpl->xEventLB->get_approximate_digit_width()
* 70,
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 34eb44849d84..3980c8b6c3f7 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -61,21 +61,20 @@
MacroEventListBox::MacroEventListBox(std::unique_ptr xTreeView)
// and it is not read only
void SvxMacroTabPage_::EnableButtons()
{
+mpImpl->xDeleteAllPB->set_sensitive(m_nAssignedEvents != 0);
int nEvent = mpImpl->xEventLB->get_selected_index();
-if (nEvent != -1)
-{
-const EventPair* pEventPair =
LookupEvent(mpImpl->xEventLB->get_id(nEvent));
-const bool bAssigned = pEventPair && !pEventPair->second.isEmpty();
-mpImpl->xDeletePB->set_sensitive(!mpImpl->bReadOnly && bAssigned);
-mpImpl->xAssignPB->set_sensitive( !mpImpl->bReadOnly );
-if( mpImpl->xAssignComponentPB )
-mpImpl->xAssignComponentPB->set_sensitive( !mpImpl->bReadOnly );
-}
+const EventPair* pEventPair = nEvent == -1 ? nullptr :
LookupEvent(mpImpl->xEventLB->get_id(nEvent));
+const bool bAssigned = pEventPair && !pEventPair->second.isEmpty();
+mpImpl->xDeletePB->set_sensitive(!mpImpl->bReadOnly && bAssigned);
+mpImpl->xAssignPB->set_sensitive(!mpImpl->bReadOnly);
+if (mpImpl->xAssignComponentPB)
+mpImpl->xAssignComponentPB->set_sensitive( !mpImpl->bReadOnly );
}
SvxMacroTabPage_::SvxMacroTabPage_(weld::Container* pPage,
weld::DialogController* pController, const OUString& rUIXMLDescription,
const OString& rID, const SfxItemSet& rAttrSet)
: SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
+, m_nAssignedEvents(0)
, bDocModified(false)
, bAppEvents(false)
, bInitialized(false)
@@ -308,6 +307,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
mpImpl->xEventLB->freeze();
mpImpl->xEventLB->clear();
+m_nAssignedEvents = 0;
EventsHash* eventsHash;
Reference< container::XNameReplace> nameReplace;
if(bAppEvents)
@@ -348,6 +348,9 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
mpImpl->xEventLB->append(sEventName, displayName);
mpImpl->xEventLB->set_image(nRow, GetEventDisplayImage(eventURL), 1);
mpImpl->xEventLB->set_text(nRow,
OUString(GetEventDisplayText(eventURL)), 2);
+
+if (!eventURL.isEmpty())
+++m_nAssignedEvents;
}
mpImpl->xEventLB->thaw();
@@ -427,6 +430,9 @@ void SvxMacroTabPage_::GenericHandler_Impl(const
weld::Button* pBtn)
sEventURL = pEventPair->second;
}
+if (!sEventURL.isEmpty())
+--m_nAssignedEvents;
+
bool bDoubleClick = (pBtn == nullptr);
bool bUNOAssigned = sEventURL.startsWith( aVndSunStarUNO );
if (pBtn == mpImpl->xDeletePB.get())
@@ -484,6 +490,9 @@ void SvxMacroTabPage_::GenericHandler_Impl(const
weld::Button* pBtn)
h_it->second.second = sEventURL;
}
+if (!sEventURL.isEmpty())
+++m_nAssignedEvents;
+
rListBox.set_image(nEntry, GetEventDisplayImage(sEventURL), 1);
rListBox.set_text(nEntry, OUString(GetEventDisplayText(sEventURL)), 2);
@@ -493,6 +502,41 @@ void SvxMacroTabPage_::GenericHandler_Impl(const
weld::Button* pBtn)
EnableButtons();
}
+IMPL_LINK_NOARG(SvxMacroTabPage_, DeleteAllHdl_Impl, weld::Button&, void)
+{
+OUString sEventType = "Script" ;
+OUString sEmptyString;
+
+mpImpl->xEventLB->all_foreach([this, &s
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/customize/SvxNotebookbarConfigPage.cxx |7
cui/source/customize/cfg.cxx |2
cui/source/inc/cfg.hxx|2
cui/uiconfig/ui/menuassignpage.ui | 541 ++
4 files changed, 265 insertions(+), 287 deletions(-)
New commits:
commit e7f62648f01ba776357e9fcbb9f49c2fb3490ab1
Author: Caolán McNamara
AuthorDate: Thu Dec 8 20:34:21 2022 +
Commit: Caolán McNamara
CommitDate: Fri Dec 9 09:05:04 2022 +
make Notebookbar customize page match indent with the others
remove intermediate grids with just one child, name the containers
of the groups of widgets to be hidden and hide the container rather
than the individual members so the container space doesn't push
this page out of alignment with the others.
Change-Id: Ie3fb291da49a6b43ca4516e5fe55b828543631e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143838
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 91ce6352ddca..35dc04aacbaa 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -107,14 +107,11 @@
SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
m_xDescriptionField->set_visible(false);
m_xMoveUpButton->set_visible(false);
m_xMoveDownButton->set_visible(false);
-m_xAddCommandButton->set_visible(false);
-m_xRemoveCommandButton->set_visible(false);
+m_xCommandButtons->set_visible(false);
m_xLeftFunctionLabel->set_visible(false);
m_xSearchLabel->set_visible(false);
m_xCategoryLabel->set_visible(false);
-m_xInsertBtn->set_visible(false);
-m_xModifyBtn->set_visible(false);
-m_xResetBtn->set_visible(false);
+m_xCustomizeBox->set_visible(false);
m_xCustomizeLabel->set_visible(false);
weld::TreeView& rCommandCategoryBox = m_xFunctions->get_widget();
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 030307879738..fe59621c1c4b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1009,9 +1009,11 @@ SvxConfigPage::SvxConfigPage(weld::Container* pPage,
weld::DialogController* pCo
, m_xMoveUpButton(m_xBuilder->weld_button("up"))
, m_xMoveDownButton(m_xBuilder->weld_button("down"))
, m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
+, m_xCustomizeBox(m_xBuilder->weld_widget("customizebox"))
, m_xInsertBtn(m_xBuilder->weld_menu_button("insert"))
, m_xModifyBtn(m_xBuilder->weld_menu_button("modify"))
, m_xResetBtn(m_xBuilder->weld_button("defaultsbtn"))
+, m_xCommandButtons(m_xBuilder->weld_widget("arrowgrid"))
, m_xAddCommandButton(m_xBuilder->weld_button("add"))
, m_xRemoveCommandButton(m_xBuilder->weld_button("remove"))
{
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 87b17b1c912f..10ce7d89af7b 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -411,12 +411,14 @@ protected:
std::unique_ptrm_xSaveInListBox;
+std::unique_ptr m_xCustomizeBox;
std::unique_ptr m_xInsertBtn;
std::unique_ptr m_xModifyBtn;
// Used to reset the selected toolbar/menu/context menu
std::unique_ptr m_xResetBtn;
// Middle buttons
+std::unique_ptr m_xCommandButtons;
std::unique_ptr m_xAddCommandButton;
std::unique_ptr m_xRemoveCommandButton;
diff --git a/cui/uiconfig/ui/menuassignpage.ui
b/cui/uiconfig/ui/menuassignpage.ui
index b67c24b24f1f..b545c193a352 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -674,7 +674,7 @@
-
+
True
False
5
@@ -762,7 +762,7 @@
-
+
True
False
center
@@ -770,32 +770,20 @@
6
6
-
-
+
True
-False
-5
-
-
-True
-True
-True
-Add item
-center
-start
-5
-image3
-True
-
-
-Click on the right
arrow button to select a function on the left display box and copy to the right
display box. This will add the function to the selected menu.
-
-
+True
+True
+Add item
+center
+start
+10
+
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/tabpages/macroass.cxx|3
cui/uiconfig/ui/eventassignpage.ui | 136 ++--
cui/uiconfig/ui/eventsconfigpage.ui | 94
3 files changed, 118 insertions(+), 115 deletions(-)
New commits:
commit c2c7c378ff8c1e3ba12420aa75189b9b1fe8515b
Author: Caolán McNamara
AuthorDate: Thu Dec 8 16:53:47 2022 +
Commit: Caolán McNamara
CommitDate: Thu Dec 8 19:44:28 2022 +
update assign/delete state after positioning cursor in treeview
Change-Id: I9fe2d9d4a3575e0b67c8421d215f65f46c2ac1f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143832
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e80e471ff228..baff7c87b0ae 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -221,7 +221,10 @@ void SfxMacroTabPage::Reset( const SfxItemSet* rSet )
weld::TreeView& rListBox = mpImpl->m_xEventLB->GetListBox();
std::unique_ptr xIter(rListBox.make_iterator());
if (rListBox.get_iter_first(*xIter))
+{
rListBox.set_cursor(*xIter);
+EnableButtons();
+}
}
bool SfxMacroTabPage::IsReadOnly() const
commit 9fc0e4fa50e22c464dde702fcaa25420fa5ce5a4
Author: Caolán McNamara
AuthorDate: Thu Dec 8 16:33:57 2022 +
Commit: Caolán McNamara
CommitDate: Thu Dec 8 19:44:18 2022 +
resave with latest glade
Change-Id: I089e6c872b52ef530d0e6279fa8fd10576ccc6dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143831
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/uiconfig/ui/eventassignpage.ui
b/cui/uiconfig/ui/eventassignpage.ui
index 78bf01cc4d92..86f0a7044ef0 100644
--- a/cui/uiconfig/ui/eventassignpage.ui
+++ b/cui/uiconfig/ui/eventassignpage.ui
@@ -1,5 +1,5 @@
-
+
@@ -32,43 +32,43 @@
-
+
True
-False
+False
True
True
-6
-12
-12
-True
+6
+12
+12
+True
True
-False
+False
True
True
-0
-none
+0
+none
True
-True
-True
-True
-in
+True
12
6
+True
+True
+in
True
-True
-True
+True
+True
True
True
liststore3
-0
-False
+0
+False
@@ -110,7 +110,7 @@
True
-False
+False
Assignments
@@ -119,25 +119,25 @@
-0
-0
+0
+0
True
-False
+False
vertical
6
-start
+start
Assign
True
False
-True
-True
-True
+True
+True
+True
Assigns the
selected macro to the selected event.
@@ -154,9 +154,9 @@
Remove
True
-True
-True
-True
+True
+True
+True
Removes the
macro assignment from the selected entry.
@@ -171,47 +171,47 @@
-1
-0
+1
+0
2
-
+
True
-False
-6
-True
+False
+6
+True
True
-False
+False
True
True
-0
-none
+0
+none
True
-True
-True
-True
-in
+True
12
6
+True
+True
+in
--1
+-1
True
-True
-True
+True
+True
True
True
liststore1
-False
-1
-True
+False
+1
+True
@@ -244,7 +244,7 @@
True
-
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig vcl/unx
cui/source/dialogs/QrCodeGenDialog.cxx | 10 +++-
cui/source/inc/QrCodeGenDialog.hxx |2
cui/uiconfig/ui/qrcodegen.ui| 80 ++--
vcl/unx/generic/gdi/cairotextrender.cxx |6 ++
4 files changed, 62 insertions(+), 36 deletions(-)
New commits:
commit ebc7e13c0a79dbc5f21e78bcd9bb63a58c585f4a
Author: Caolán McNamara
AuthorDate: Thu Dec 8 11:00:00 2022 +
Commit: Caolán McNamara
CommitDate: Thu Dec 8 13:57:49 2022 +
Resolves: tdf#146395 allow newlines in QR Codes
Change-Id: Ib390d97866ab013770e4f1cbdfb529296d64c140
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143811
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 3e7b48e7af86..e028d4d10e94 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -156,7 +156,7 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent,
Reference xModel
bool bEditExisting)
: GenericDialogController(pParent, "cui/ui/qrcodegen.ui",
"QrCodeGenDialog")
, m_xModel(std::move(xModel))
-, m_xEdittext(m_xBuilder->weld_entry("edit_text"))
+, m_xEdittext(m_xBuilder->weld_text_view("edit_text"))
, m_xECC{ m_xBuilder->weld_radio_button("button_low"),
m_xBuilder->weld_radio_button("button_medium"),
m_xBuilder->weld_radio_button("button_quartile"),
@@ -167,16 +167,22 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent,
Reference xModel
, mpParent(pParent)
#endif
{
+m_xEdittext->set_size_request(m_xEdittext->get_approximate_digit_width() *
28,
+ m_xEdittext->get_height_rows(6));
if (!bEditExisting)
{
+OUString sSelection;
// TODO: This only works in Writer doc. Should also work in shapes
Reference xSelections(m_xModel->getCurrentSelection(),
UNO_QUERY);
if (xSelections.is())
{
Reference xSelection(xSelections->getByIndex(0),
UNO_QUERY);
if (xSelection.is())
-m_xEdittext->set_text(xSelection->getString());
+sSelection = xSelection->getString();
}
+if (!sSelection.isEmpty())
+m_xEdittext->set_text(sSelection);
+m_xEdittext->select_region(0, -1);
return;
}
diff --git a/cui/source/inc/QrCodeGenDialog.hxx
b/cui/source/inc/QrCodeGenDialog.hxx
index 2c205c6a85d4..001df88c5581 100644
--- a/cui/source/inc/QrCodeGenDialog.hxx
+++ b/cui/source/inc/QrCodeGenDialog.hxx
@@ -30,7 +30,7 @@ protected:
private:
css::uno::Reference m_xModel;
-std::unique_ptr m_xEdittext;
+std::unique_ptr m_xEdittext;
std::unique_ptr m_xECC[4];
std::unique_ptr m_xSpinBorder;
std::unique_ptr m_xComboType;
diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index 4f015dccfde3..7078e3aa44a5 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -1,5 +1,5 @@
-
+
@@ -8,9 +8,12 @@
1
10
+
+www.libreoffice.org
+
-False
-6
+False
+6
QR and Barcode
True
0
@@ -95,43 +98,27 @@
True
False
True
+True
0
none
-
+
True
False
6
+True
+True
6
12
-
-
-True
-True
-True
-True
-True
-www.libreoffice.org
-
-
-The text from which to generate the
code.
-
-
-
-
-1
-0
-
-
True
False
start
+start
URL/Text:
True
-edit_text
0
@@ -157,22 +144,22 @@
True
-False
+False
start
Type:
-True
-choose_type
+True
+choose_type
0
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig officecfg/registry vcl/skia
cui/source/options/optgdlg.cxx | 43 -
cui/source/options/optgdlg.hxx |2
cui/uiconfig/ui/optviewpage.ui | 21 +-
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 ++
vcl/skia/SkiaHelper.cxx| 12 +++
vcl/skia/zone.cxx |5 -
6 files changed, 85 insertions(+), 6 deletions(-)
New commits:
commit 67770fc41f409e9d7e179b34eb84434ed237a6ce
Author: Luboš Luňák
AuthorDate: Fri Feb 7 15:55:21 2020 +0100
Commit: Luboš Luňák
CommitDate: Mon Feb 10 10:10:17 2020 +0100
if OpenGL is forced, do not enable Skia in order to allow GL
Change-Id: I013db819b66252a25e0a6fddd8e777c3d8d36372
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88210
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index cdbb2c0b7977..39588aedcf53 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -122,6 +122,12 @@ bool isVCLSkiaEnabled()
{
bRet = true;
}
+else if (getenv("SAL_FORCEGL"))
+{
+// Skia usage is checked before GL usage, so if GL is forced (and Skia
is not), do not
+// enable Skia in order to allow GL.
+bRet = false;
+}
else if (bSupportsVCLSkia)
{
static bool bEnableSkiaEnv = !!getenv("SAL_ENABLESKIA");
commit 90b02dd4a465f312a6b9c27ff572b5a304e857de
Author: Luboš Luňák
AuthorDate: Fri Feb 7 15:36:26 2020 +0100
Commit: Luboš Luňák
CommitDate: Mon Feb 10 10:10:01 2020 +0100
in case of Skia problems force raster mode, don't disable it all
Skia's CPU-based raster mode should be safe (at least from driver problems),
so it should be enough to make the failsafe mechanism just disable Vulkan
use.
Also add UI option controlling forced raster rendering.
Change-Id: I6be1745782816e5468e55635ae5613b6a6afded6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88206
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e10f743361c8..fb73341b9897 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -188,6 +188,7 @@ class SkiaCfg
private:
bool mbUseSkia;
bool mbForceSkia;
+bool mbForceSkiaRaster;
bool mbModified;
public:
@@ -196,9 +197,11 @@ public:
bool useSkia() const;
bool forceSkia() const;
+bool forceSkiaRaster() const;
void setUseSkia(bool bSkia);
void setForceSkia(bool bSkia);
+void setForceSkiaRaster(bool bSkia);
void reset();
};
@@ -213,6 +216,7 @@ void SkiaCfg::reset()
{
mbUseSkia = officecfg::Office::Common::VCL::UseSkia::get();
mbForceSkia = officecfg::Office::Common::VCL::ForceSkia::get();
+mbForceSkiaRaster = officecfg::Office::Common::VCL::ForceSkiaRaster::get();
mbModified = false;
}
@@ -227,6 +231,8 @@ SkiaCfg::~SkiaCfg()
officecfg::Office::Common::VCL::UseSkia::set(mbUseSkia, batch);
if (!officecfg::Office::Common::VCL::ForceSkia::isReadOnly())
officecfg::Office::Common::VCL::ForceSkia::set(mbForceSkia,
batch);
+if (!officecfg::Office::Common::VCL::ForceSkiaRaster::isReadOnly())
+
officecfg::Office::Common::VCL::ForceSkiaRaster::set(mbForceSkiaRaster, batch);
batch->commit();
}
catch (...)
@@ -245,6 +251,11 @@ bool SkiaCfg::forceSkia() const
return mbForceSkia;
}
+bool SkiaCfg::forceSkiaRaster() const
+{
+return mbForceSkiaRaster;
+}
+
void SkiaCfg::setUseSkia(bool bSkia)
{
if (bSkia != mbUseSkia)
@@ -263,6 +274,15 @@ void SkiaCfg::setForceSkia(bool bSkia)
}
}
+void SkiaCfg::setForceSkiaRaster(bool bSkia)
+{
+if (mbForceSkiaRaster != bSkia)
+{
+mbForceSkiaRaster = bSkia;
+mbModified = true;
+}
+}
+
}
// class OfaMiscTabPage --
@@ -759,6 +779,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xForceOpenGL(m_xBuilder->weld_check_button("forceopengl"))
, m_xUseSkia(m_xBuilder->weld_check_button("useskia"))
, m_xForceSkia(m_xBuilder->weld_check_button("forceskia"))
+, m_xForceSkiaRaster(m_xBuilder->weld_check_button("forceskiaraster"))
, m_xOpenGLStatusEnabled(m_xBuilder->weld_label("openglenabled"))
, m_xOpenGLStatusDisabled(m_xBuilder->weld_label("opengldisabled"))
, m_xSkiaStatusEnabled(m_xBuilder->weld_label("skiaenabled"))
@@ -774,6 +795,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage,
weld::DialogController* p
m_xOpenGLStatusDisabled->hide();
m_xUseSkia->hide();
m_xForceSkia->hide();
+m_xForceSkiaRaster->hide();
m_xSkiaStatusEnabled->hide();
m_xS
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/vcl sc/source vcl/source
cui/source/dialogs/screenshotannotationdlg.cxx | 299 -
cui/source/factory/dlgfact.cxx | 10
cui/source/factory/dlgfact.hxx | 13 -
cui/source/inc/screenshotannotationdlg.hxx |5
cui/uiconfig/ui/screenshotannotationdialog.ui | 14 -
include/vcl/abstdlg.hxx|3
sc/source/core/data/dpcache.cxx|3
vcl/source/window/layout.cxx |2
8 files changed, 182 insertions(+), 167 deletions(-)
New commits:
commit 3a1043284b99823191ff4ee4d7285d5703288216
Author: Caolán McNamara
AuthorDate: Mon Oct 7 09:27:23 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 7 20:24:18 2019 +0200
cid#1454630 Uninitialized scalar field
Change-Id: Id8b7e4dfb021b836d5d14ce9ca73f3835288a7a4
Reviewed-on: https://gerrit.libreoffice.org/80343
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 8a834614f94e..e2d595a5bef4 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -172,7 +172,8 @@ struct Bucket
ScDPItemData maValue;
SCROW mnOrderIndex;
SCROW mnDataIndex;
-Bucket() {}
+Bucket() :
+mnOrderIndex(0), mnDataIndex(0) {}
Bucket(const ScDPItemData& rValue, SCROW nData) :
maValue(rValue), mnOrderIndex(0), mnDataIndex(nData) {}
};
commit d46456b07df11bf774c3a7dcbcd843bb97efbe38
Author: Caolán McNamara
AuthorDate: Mon Oct 7 13:36:56 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 7 20:24:04 2019 +0200
weld ScreenshotAnnotationDlg
Change-Id: I94e42c1d10922170f53af917bba6848c9f006a11
Reviewed-on: https://gerrit.libreoffice.org/80383
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx
b/cui/source/dialogs/screenshotannotationdlg.cxx
index fb1f41d29525..f9ed955f2afa 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -29,17 +29,16 @@
#include
#include
-#include
#include
#include
#include
+#include
#include
-#include
+#include
#include
#include
#include
-#include
-#include
+#include
#include
#include
#include
@@ -128,20 +127,39 @@ private:
typedef std::vector< ControlDataEntry > ControlDataCollection;
+class Picture : public weld::CustomWidgetController
+{
+private:
+ScreenshotAnnotationDlg_Impl *m_pDialog;
+bool m_bMouseOver;
+private:
+virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&) override;
+virtual bool MouseMove(const MouseEvent& rMouseEvent) override;
+virtual bool MouseButtonUp(const MouseEvent& rMouseEvent) override;
+public:
+Picture(ScreenshotAnnotationDlg_Impl* pDialog)
+: m_pDialog(pDialog)
+, m_bMouseOver(false)
+{
+}
+
+bool IsMouseOver() const
+{
+return m_bMouseOver;
+}
+};
+
class ScreenshotAnnotationDlg_Impl
{
public:
ScreenshotAnnotationDlg_Impl(
-ScreenshotAnnotationDlg& rParent,
+weld::Builder& rParent,
Dialog& rParentDialog);
~ScreenshotAnnotationDlg_Impl();
private:
// Handler for click on save
-DECL_LINK(saveButtonHandler, Button*, void);
-
-// Handler for clicks on picture frame
-DECL_LINK(pictureFrameListener, VclWindowEvent&, void);
+DECL_LINK(saveButtonHandler, weld::Button&, void);
// helper methods
void CollectChildren(
@@ -167,7 +185,7 @@ private:
SizemaParentDialogSize;
// VirtualDevice for buffered interaction paints
-VclPtr mpVirtualBufferDevice;
+VclPtr mxVirtualBufferDevice;
// all detected children
ControlDataCollection maAllChildren;
@@ -178,9 +196,10 @@ private:
maSelected;
// list of detected controls
-VclPtr mpPicture;
-VclPtrmpText;
-VclPtr mpSave;
+Picture maPicture;
+std::unique_ptr mxPicture;
+std::unique_ptr mxText;
+std::unique_ptr mxSave;
// save as text
OUStringmaSaveAsText;
@@ -188,24 +207,26 @@ private:
// folder URL
static OUString maLastFolderURL;
+public:
+void Paint(vcl::RenderContext& rRenderContext);
+bool MouseMove(const MouseEvent& rMouseEvent);
+bool MouseButtonUp();
};
OUString ScreenshotAnnotationDlg_Impl::maLastFolderURL = OUString();
ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
-ScreenshotAnnotationDlg& rParent,
+weld::Builder& rParent,
Dialog& rParentDialog)
: mrParentDialog(rParentDialog),
maParentDialogBitmap(rParentDialog.createScreenshot()),
maDimmedDialogBitmap(maParentDialogBitmap),
maParentDialogSize(maParentDialogBitmap.Get
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/vcl vcl/source vcl/unx
cui/source/options/fontsubs.cxx | 564 +++-
cui/source/options/fontsubs.hxx | 82 +
cui/uiconfig/ui/optfontspage.ui | 238 +++-
include/vcl/weld.hxx|1
vcl/source/app/salvtables.cxx |5
vcl/source/treelist/svtabbx.cxx |7
vcl/unx/gtk3/gtk3gtkinst.cxx| 20 +
7 files changed, 423 insertions(+), 494 deletions(-)
New commits:
commit b3cf88ffa1fe7f4d0dc2a7fdca755eaaef323c81
Author: Caolán McNamara
AuthorDate: Wed Jul 31 11:30:47 2019 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 31 21:03:40 2019 +0200
weld SvxFontSubstTabPage
Change-Id: If24e80da4042ea37ea2613a6c62e015d0d925dc8
Reviewed-on: https://gerrit.libreoffice.org/76753
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index b80dc786dcf9..3d9c7550a961 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -35,165 +35,153 @@
/* */
/*/
-SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
-const SfxItemSet& rSet )
-: SfxTabPage(pParent, "OptFontsPage", "cui/ui/optfontspage.ui", &rSet)
-, pConfig(new SvtFontSubstConfig)
+SvxFontSubstTabPage::SvxFontSubstTabPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optfontspage.ui", "OptFontsPage", &rSet)
+, m_xConfig(new SvtFontSubstConfig)
+, m_bSorted(false)
+, m_xUseTableCB(m_xBuilder->weld_check_button("usetable"))
+, m_xFont1CB(m_xBuilder->weld_combo_box("font1"))
+, m_xFont2CB(m_xBuilder->weld_combo_box("font2"))
+, m_xApply(m_xBuilder->weld_button("apply"))
+, m_xDelete(m_xBuilder->weld_button("delete"))
+, m_xCheckLB(m_xBuilder->weld_tree_view("checklb"))
+, m_xFontNameLB(m_xBuilder->weld_combo_box("fontname"))
+, m_xNonPropFontsOnlyCB(m_xBuilder->weld_check_button("nonpropfontonly"))
+, m_xFontHeightLB(m_xBuilder->weld_combo_box("fontheight"))
{
-get(m_pUseTableCB, "usetable");
-get(m_pReplacements, "replacements");
-get(m_pFont1CB, "font1");
-get(m_pFont2CB, "font2");
-m_pFont1CB->SetStyle(m_pFont1CB->GetStyle() | WB_SORT);
-m_pFont2CB->SetStyle(m_pFont2CB->GetStyle() | WB_SORT);
-get(m_pApply, "apply");
-get(m_pDelete, "delete");
-get(m_pFontNameLB, "fontname");
-m_sAutomatic = m_pFontNameLB->GetEntry(0);
+m_xFont1CB->make_sorted();
+m_xFont1CB->set_size_request(1, -1);
+m_xFont2CB->make_sorted();
+m_xFont2CB->set_size_request(1, -1);
+m_sAutomatic = m_xFontNameLB->get_text(0);
assert(!m_sAutomatic.isEmpty());
-get(m_pNonPropFontsOnlyCB, "nonpropfontonly");
-get(m_pFontHeightLB, "fontheight");
-
-SvSimpleTableContainer *pCheckLBContainer =
get("checklb");
-Size aControlSize(248, 75);
-aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
-pCheckLBContainer->set_width_request(aControlSize.Width());
-pCheckLBContainer->set_height_request(aControlSize.Height());
-
-m_pCheckLB = VclPtr::Create(*pCheckLBContainer,
0);
-m_pCheckLB->SetHelpId(HID_OFA_FONT_SUBST_CLB);
-
-m_pCheckLB->SetStyle(m_pCheckLB->GetStyle()|WB_HSCROLL|WB_VSCROLL);
-m_pCheckLB->SetSelectionMode(SelectionMode::Multiple);
-m_pCheckLB->SortByCol(2);
-long aStaticTabs[] = { 0, 0, 0, 0 };
-m_pCheckLB->SvSimpleTable::SetTabs(SAL_N_ELEMENTS(aStaticTabs),
aStaticTabs);
-
-OUString sHeader1(get("always")->GetText());
-OUString sHeader2(get("screenonly")->GetText());
-OUString sHeader = sHeader1 + "\t" + sHeader2
-+ "\t " + get("font")->GetText()
-+ "\t " + get("replacewith")->GetText();
-m_pCheckLB->InsertHeaderEntry(sHeader);
-
-HeaderBar &rBar = m_pCheckLB->GetTheHeaderBar();
-HeaderBarItemBits nBits = rBar.GetItemBits(1) |
HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED;
-nBits &= ~HeaderBarItemBits::CLICKABLE;
-rBar.SetItemBits(1, nBits);
-rBar.SetItemBits(2, nBits);
-
-m_pCheckLB->setColSizes();
-
-aTextColor = m_pCheckLB->GetTextColor();
-Link aLink(LINK(this, SvxFontSubstTabPage, SelectEditHdl));
-Link aLink2(LINK(this, SvxFontSubstTabPage,
SelectComboBoxHdl));
-Link aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl));
-
-m_pCheckLB->SetSelectHdl(LINK(this, SvxFontSubstTabPage,
TreeListBoxSelectHdl));
-m_pUseTableCB->SetClickHdl(aClickLink);
-m_pFont1CB->SetSelectHdl(aLink2);
-m_pFont1CB->SetModifyHdl(aLink);
-m_pFont2CB->SetSelectHdl(aLink2);
-m_pFont2CB->SetModifyHdl(aLink);
-m_pApply->SetClickHdl(aClickLink);
-m_pDelete->SetClickHdl(aClickLink);
-
-m_pNonPropFontsOnlyCB->SetClickHdl(LINK(this, SvxFontSubstTabPage,
NonPropFontsHdl));
+
+m_xC
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/options/optctl.cxx | 111 +++-
cui/source/options/optctl.hxx | 22 +--
cui/source/options/optgdlg.cxx | 268 ++---
cui/source/options/optgdlg.hxx | 57
cui/uiconfig/ui/optctlpage.ui |3
cui/uiconfig/ui/optviewpage.ui | 16 --
6 files changed, 208 insertions(+), 269 deletions(-)
New commits:
commit 16073ff56f792144bf262795869f7e5413eca8fc
Author: Caolán McNamara
AuthorDate: Mon Jul 29 20:01:09 2019 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 30 09:52:54 2019 +0200
weld OfaViewTabPage
Change-Id: I259e10ad8bdf3d1630ab1d24590c43919a351a86
Reviewed-on: https://gerrit.libreoffice.org/76567
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index a1e6e777656c..32802f75a3ed 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -605,8 +605,8 @@ static bool DisplayNameCompareLessThan(const
vcl::IconThemeInfo& rInfo1, const v
return rInfo1.GetDisplayName().compareTo(rInfo2.GetDisplayName()) < 0;
}
-OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
-: SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet)
+OfaViewTabPage::OfaViewTabPage(TabPageParent pParent, const SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optviewpage.ui", "OptViewPage", &rSet)
, nSizeLB_InitialSelection(0)
, nSidebarSizeLB_InitialSelection(0)
, nNotebookbarSizeLB_InitialSelection(0)
@@ -615,50 +615,48 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
, pCanvasSettings(new CanvasSettings)
, mpDrawinglayerOpt(new SvtOptionsDrawinglayer)
, mpOpenGLConfig(new svt::OpenGLCfg)
+, m_xIconSizeLB(m_xBuilder->weld_combo_box("iconsize"))
+, m_xSidebarIconSizeLB(m_xBuilder->weld_combo_box("sidebariconsize"))
+,
m_xNotebookbarIconSizeLB(m_xBuilder->weld_combo_box("notebookbariconsize"))
+, m_xIconStyleLB(m_xBuilder->weld_combo_box("iconstyle"))
+, m_xFontAntiAliasing(m_xBuilder->weld_check_button("aafont"))
+, m_xAAPointLimitLabel(m_xBuilder->weld_label("aafrom"))
+, m_xAAPointLimit(m_xBuilder->weld_metric_spin_button("aanf",
FieldUnit::PIXEL))
+, m_xMenuIconsLB(m_xBuilder->weld_combo_box("menuicons"))
+,
m_xContextMenuShortcutsLB(m_xBuilder->weld_combo_box("contextmenushortcuts"))
+, m_xFontShowCB(m_xBuilder->weld_check_button("showfontpreview"))
+, m_xUseHardwareAccell(m_xBuilder->weld_check_button("useaccel"))
+, m_xUseAntiAliase(m_xBuilder->weld_check_button("useaa"))
+, m_xUseOpenGL(m_xBuilder->weld_check_button("useopengl"))
+, m_xForceOpenGL(m_xBuilder->weld_check_button("forceopengl"))
+, m_xOpenGLStatusEnabled(m_xBuilder->weld_label("openglenabled"))
+, m_xOpenGLStatusDisabled(m_xBuilder->weld_label("opengldisabled"))
+, m_xMousePosLB(m_xBuilder->weld_combo_box("mousepos"))
+, m_xMouseMiddleLB(m_xBuilder->weld_combo_box("mousemiddle"))
{
-get(m_pIconSizeLB, "iconsize");
-get(m_pSidebarIconSizeLB, "sidebariconsize");
-get(m_pNotebookbarIconSizeLB, "notebookbariconsize");
-get(m_pIconStyleLB, "iconstyle");
-
-get(m_pFontAntiAliasing, "aafont");
-get(m_pAAPointLimitLabel, "aafrom");
-get(m_pAAPointLimit, "aanf");
-get(m_pMenuIconsLB, "menuicons");
-get(m_pContextMenuShortcutsLB, "contextmenushortcuts");
-get(m_pFontShowCB, "showfontpreview");
-get(m_pUseHardwareAccell, "useaccel");
-get(m_pUseAntiAliase, "useaa");
-get(m_pUseOpenGL, "useopengl");
-get(m_pForceOpenGL, "forceopengl");
-get(m_pOpenGLStatusEnabled, "openglenabled");
-get(m_pOpenGLStatusDisabled, "opengldisabled");
-get(m_pMousePosLB, "mousepos");
-get(m_pMouseMiddleLB, "mousemiddle");
-
if (Application::GetToolkitName() == "gtk3")
{
-m_pUseOpenGL->Hide();
-m_pForceOpenGL->Hide();
-m_pOpenGLStatusEnabled->Hide();
-m_pOpenGLStatusDisabled->Hide();
+m_xUseOpenGL->hide();
+m_xForceOpenGL->hide();
+m_xOpenGLStatusEnabled->hide();
+m_xOpenGLStatusDisabled->hide();
}
#if defined( UNX )
-m_pFontAntiAliasing->SetToggleHdl( LINK( this, OfaViewTabPage,
OnAntialiasingToggled ) );
+m_xFontAntiAliasing->connect_toggled( LINK( this, OfaViewTabPage,
OnAntialiasingToggled ) );
#else
// on this platform, we do not have the anti aliasing options
-m_pFontAntiAliasing->Hide();
-m_pAAPointLimitLabel->Hide();
-m_pAAPointLimit->Hide();
+m_xFontAntiAliasing->hide();
+m_xAAPointLimitLabel->hide();
+m_xAAPointLimit->hide();
#endif
-m_pForceOpenGL->SetToggleHdl(LINK(this, OfaViewTabPage,
OnForceOpenGLToggled));
+m_xForceOpenGL->connect_toggled(LINK(this, OfaViewTabPage,
OnForceOpenGLToggled));
// Set known icon themes
-OUString sAutoStr( m_pIconStyl
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/inc/optasian.hxx | 45 +++-
cui/source/options/optaccessibility.cxx | 80 ++-
cui/source/options/optaccessibility.hxx | 18 +--
cui/source/options/optasian.cxx | 169 ++--
cui/uiconfig/ui/optasianpage.ui | 21 +--
5 files changed, 142 insertions(+), 191 deletions(-)
New commits:
commit 31bdf49b8c96f408d7b02c9925633eb419f65211
Author: Caolán McNamara
AuthorDate: Fri Jul 26 20:32:10 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Jul 27 12:52:26 2019 +0200
weld SvxAsianLayoutPage
Change-Id: I0bea0026177dcb056edd073cdd9c51e76273d169
Reviewed-on: https://gerrit.libreoffice.org/76456
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index c6999c279460..1aaeafa583df 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -21,41 +21,34 @@
#include
#include
-#include
-#include
-#include
-#include
#include
+
struct SvxAsianLayoutPage_Impl;
class SvxAsianLayoutPage : public SfxTabPage
{
-VclPtr m_pCharKerningRB;
-VclPtr m_pCharPunctKerningRB;
-
-VclPtr m_pNoCompressionRB;
-VclPtr m_pPunctCompressionRB;
-VclPtr m_pPunctKanaCompressionRB;
-
-VclPtr m_pLanguageFT;
-VclPtr m_pLanguageLB;
-VclPtr m_pStandardCB;
-
-VclPtr m_pStartFT;
-VclPtrm_pStartED;
-VclPtr m_pEndFT;
-VclPtrm_pEndED;
-VclPtr m_pHintFT;
-
std::unique_ptr pImpl;
-DECL_LINK(LanguageHdl, ListBox&, void);
-DECL_LINK(ChangeStandardHdl, Button*, void);
-DECL_LINK(ModifyHdl, Edit&, void);
+std::unique_ptr m_xCharKerningRB;
+std::unique_ptr m_xCharPunctKerningRB;
+std::unique_ptr m_xNoCompressionRB;
+std::unique_ptr m_xPunctCompressionRB;
+std::unique_ptr m_xPunctKanaCompressionRB;
+std::unique_ptr m_xLanguageFT;
+std::unique_ptr m_xLanguageLB;
+std::unique_ptr m_xStandardCB;
+std::unique_ptr m_xStartFT;
+std::unique_ptr m_xStartED;
+std::unique_ptr m_xEndFT;
+std::unique_ptr m_xEndED;
+std::unique_ptr m_xHintFT;
+
+DECL_LINK(LanguageHdl, weld::ComboBox&, void);
+DECL_LINK(ChangeStandardHdl, weld::ToggleButton&, void);
+DECL_LINK(ModifyHdl, weld::Entry&, void);
public:
-SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet );
+SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet );
virtual ~SvxAsianLayoutPage() override;
-virtual void dispose() override;
static VclPtr Create( TabPageParent pParent, const
SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 8c4dc9e90e0d..883bcbb984a7 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -102,81 +102,60 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters(USHRT_MAX);
-SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const
SfxItemSet& rSet ) :
-SfxTabPage(pParent, "OptAsianPage", "cui/ui/optasianpage.ui", &rSet),
-pImpl(new SvxAsianLayoutPage_Impl)
+SvxAsianLayoutPage::SvxAsianLayoutPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/optasianpage.ui", "OptAsianPage", &rSet)
+, pImpl(new SvxAsianLayoutPage_Impl)
+, m_xCharKerningRB(m_xBuilder->weld_radio_button("charkerning"))
+, m_xCharPunctKerningRB(m_xBuilder->weld_radio_button("charpunctkerning"))
+, m_xNoCompressionRB(m_xBuilder->weld_radio_button("nocompression"))
+, m_xPunctCompressionRB(m_xBuilder->weld_radio_button("punctcompression"))
+,
m_xPunctKanaCompressionRB(m_xBuilder->weld_radio_button("punctkanacompression"))
+, m_xLanguageFT(m_xBuilder->weld_label("languageft"))
+, m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("language")))
+, m_xStandardCB(m_xBuilder->weld_check_button("standard"))
+, m_xStartFT(m_xBuilder->weld_label("startft"))
+, m_xStartED(m_xBuilder->weld_entry("start"))
+, m_xEndFT(m_xBuilder->weld_label("endft"))
+, m_xEndED(m_xBuilder->weld_entry("end"))
+, m_xHintFT(m_xBuilder->weld_label("hintft"))
{
-get(m_pCharKerningRB, "charkerning");
-get(m_pCharPunctKerningRB, "charpunctkerning");
-get(m_pNoCompressionRB, "nocompression");
-get(m_pPunctCompressionRB, "punctcompression");
-get(m_pPunctKanaCompressionRB, "punctkanacompression");
-get(m_pLanguageFT, "languageft");
-get(m_pLanguageLB, "language");
-get(m_pStandardCB, "standard");
-get(m_pStartFT, "startft");
-get(m_pStartED, "start");
-get(m_pEndFT, "endft");
-get(m_pEndED, "end");
-get(m_pHintFT, "hintft");
+LanguageHdl(*m_xLanguageLB->get_widget());
+m_xLanguageLB->connect_changed(LINK(this, SvxAsianLayoutPage,
L
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig solenv/sanitizers sw/inc sw/source sw/uiconfig
cui/source/customize/SvxToolbarConfigPage.cxx |9
cui/source/customize/cfg.cxx | 277 +-
cui/source/inc/cfg.hxx| 29 +-
cui/uiconfig/ui/iconselectordialog.ui | 36 ++-
solenv/sanitizers/ui/modules/swriter.suppr|4
sw/inc/swabstdlg.hxx |2
sw/source/ui/dialog/abstract.cxx | 21 -
sw/source/ui/dialog/swdlgfact.cxx | 15 -
sw/source/ui/dialog/swdlgfact.hxx | 10
sw/source/uibase/app/docsh2.cxx |2
sw/source/uibase/inc/abstract.hxx | 11 -
sw/uiconfig/swriter/ui/abstractdialog.ui | 26 +-
12 files changed, 195 insertions(+), 247 deletions(-)
New commits:
commit 91548e11b37f52aed476996d7d97ad2b45e43ed5
Author: Caolán McNamara
AuthorDate: Fri Mar 1 17:22:49 2019 +
Commit: Caolán McNamara
CommitDate: Sat Mar 2 14:05:50 2019 +0100
weld SvxIconSelectorDialog
and use a ValueSet here instead of the odd toolbar use
Change-Id: Ic2e78664ebde31751055d2c9fec66c7dabe8d05f
Reviewed-on: https://gerrit.libreoffice.org/68598
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 6775c37e4a86..56c9c85c6734 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -557,15 +557,14 @@ IMPL_LINK( SvxToolbarConfigPage, ModifyItemHdl,
MenuButton *, pButton, void )
// TODO: Add a GetSelectionPos() method to the SvTreeListBox class
sal_uInt16 nSelectionPos = m_pContentsListBox->GetModel()->GetAbsPos(
pActEntry );
-ScopedVclPtr pIconDialog(
-VclPtr::Create( nullptr,
+SvxIconSelectorDialog aIconDialog(GetDialogFrameWeld(),
GetSaveInData()->GetImageManager(),
-GetSaveInData()->GetParentImageManager() ));
+GetSaveInData()->GetParentImageManager());
-if ( pIconDialog->Execute() == RET_OK )
+if (aIconDialog.run() == RET_OK)
{
css::uno::Reference< css::graphic::XGraphic > newgraphic =
-pIconDialog->GetSelectedIcon();
+aIconDialog.GetSelectedIcon();
if ( newgraphic.is() )
{
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index cb5b083dddc4..45301ee71b60 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2841,30 +2841,20 @@ SvxNewToolbarDialog::~SvxNewToolbarDialog()
* The SvxIconSelectorDialog class
*
***/
-SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow,
+SvxIconSelectorDialog::SvxIconSelectorDialog(weld::Window *pWindow,
const uno::Reference< css::ui::XImageManager >& rXImageManager,
-const uno::Reference< css::ui::XImageManager >& rXParentImageManager )
-:
-ModalDialog ( pWindow, "IconSelector",
"cui/ui/iconselectordialog.ui" ),
-m_nNextId( 0 ),
-m_xImageManager ( rXImageManager ),
-m_xParentImageManager( rXParentImageManager )
-{
-get(pTbSymbol, "symbolsToolbar");
-get(pFtNote, "noteLabel");
-get(pBtnImport, "importButton");
-get(pBtnDelete, "deleteButton");
-
-Size aTbSize = pTbSymbol->LogicToPixel(Size(160, 80),
MapMode(MapUnit::MapAppFont));
-pTbSymbol->set_width_request(aTbSize.Width());
-pTbSymbol->set_height_request(aTbSize.Height());
-pTbSymbol->SetStyle(pTbSymbol->GetStyle() | WB_SCROLL);
-pTbSymbol->SetLineSpacing(true);
-
+const uno::Reference< css::ui::XImageManager >& rXParentImageManager)
+: GenericDialogController(pWindow, "cui/ui/iconselectordialog.ui",
"IconSelector")
+, m_xImageManager(rXImageManager)
+, m_xParentImageManager(rXParentImageManager)
+, m_xTbSymbol(new
SvtValueSet(m_xBuilder->weld_scrolled_window("symbolswin")))
+, m_xTbSymbolWin(new weld::CustomWeld(*m_xBuilder, "symbolsToolbar",
*m_xTbSymbol))
+, m_xFtNote(m_xBuilder->weld_label("noteLabel"))
+, m_xBtnImport(m_xBuilder->weld_button("importButton"))
+, m_xBtnDelete(m_xBuilder->weld_button("deleteButton"))
+{
typedef std::unordered_map< OUString, bool > ImageInfo;
-pTbSymbol->SetPageScroll( true );
-
m_nExpectedSize = 16;
if (SvxConfigPageHelper::GetImageType() & css::ui::ImageType::SIZE_LARGE)
m_nExpectedSize = 26;
@@ -2873,9 +2863,18 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(
vcl::Window *pWindow,
if ( m_nExpectedSize != 16 )
{
-pFtNote->SetText( SvxConfigPageHelper::replaceSixteen(
pFtNote->GetText(), m_nExpectedSize ) );
+
m_xFtNote->set_label(SvxConfigPageHelper::replaceSixteen(m_xFtNote->get_label(),
m_nExpectedSize));
}
+m_xTbSymbol->SetStyle(m_xTbSymbol-
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig extras/source include/vcl solenv/bin solenv/sanitizers vcl/source vcl/unx
cui/source/dialogs/hangulhanjadlg.cxx | 267 ++---
cui/source/inc/hangulhanjadlg.hxx | 84 ---
cui/uiconfig/ui/hangulhanjaeditdictdialog.ui | 149 +++--
extras/source/glade/libreoffice-catalog.xml.in |3
include/vcl/weld.hxx |2
solenv/bin/native-code.py |1
solenv/sanitizers/ui/cui.suppr |4
vcl/source/app/salvtables.cxx | 63 +
vcl/unx/gtk3/gtk3gtkinst.cxx | 12 +
9 files changed, 305 insertions(+), 280 deletions(-)
New commits:
commit 1213cfde6b9052c1eb50b46d5cae2eef28d4b8b5
Author: Caolán McNamara
AuthorDate: Sat Feb 16 20:19:12 2019 +
Commit: Caolán McNamara
CommitDate: Sun Feb 17 16:46:13 2019 +0100
weld HangulHanjaEditDictDialog
Change-Id: If0d49a65735b66eaa8db11686099ed29b01711c4
Reviewed-on: https://gerrit.libreoffice.org/67929
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 53d72894911e..46fa519c8f3f 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1063,8 +1063,8 @@ namespace svx
DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call
of edit should not be possible with no selection!" );
if( pEntry )
{
-ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this,
m_aDictList, m_pDictsLB->GetSelectedEntryPos());
-aEdDlg->Execute();
+HangulHanjaEditDictDialog aEdDlg(GetFrameWeld(), m_aDictList,
m_pDictsLB->GetSelectedEntryPos());
+aEdDlg.run();
}
}
@@ -1324,12 +1324,12 @@ namespace svx
if( _bUp )
{
if( !m_pPrev )
-bRet = m_pScrollBar->GetThumbPos() >
m_pScrollBar->GetRangeMin();
+bRet = m_pScrollBar->vadjustment_get_value() >
m_pScrollBar->vadjustment_get_lower();
}
else
{
if( !m_pNext )
-bRet = m_pScrollBar->GetThumbPos() < (
m_pScrollBar->GetRangeMax() - 4 );
+bRet = m_pScrollBar->vadjustment_get_value() < (
m_pScrollBar->vadjustment_get_upper() - 4 );
}
return bRet;
@@ -1337,92 +1337,71 @@ namespace svx
void SuggestionEdit::DoJump( bool _bUp )
{
-const Link& rLoseFocusHdl = GetLoseFocusHdl();
-rLoseFocusHdl.Call( *this );
-m_pScrollBar->SetThumbPos( m_pScrollBar->GetThumbPos() + ( _bUp? -1 :
1 ) );
-
-static_cast< HangulHanjaEditDictDialog* >( GetParentDialog()
)->UpdateScrollbar();
+m_pScrollBar->vadjustment_set_value(
m_pScrollBar->vadjustment_get_value() + ( _bUp? -1 : 1 ) );
+m_pParent->UpdateScrollbar();
}
-SuggestionEdit::SuggestionEdit( vcl::Window* pParent, WinBits nBits )
-: Edit(pParent, nBits)
+SuggestionEdit::SuggestionEdit(std::unique_ptr xEntry,
HangulHanjaEditDictDialog* pParent)
+: m_pParent(pParent)
, m_pPrev(nullptr)
, m_pNext(nullptr)
, m_pScrollBar(nullptr)
+, m_xEntry(std::move(xEntry))
{
+m_xEntry->connect_key_press(LINK(this, SuggestionEdit, KeyInputHdl));
}
-SuggestionEdit::~SuggestionEdit()
-{
-disposeOnce();
-}
-
-void SuggestionEdit::dispose()
-{
-m_pPrev.clear();
-m_pNext.clear();
-m_pScrollBar.clear();
-Edit::dispose();
-}
-
-bool SuggestionEdit::PreNotify( NotifyEvent& rNEvt )
+IMPL_LINK(SuggestionEdit, KeyInputHdl, const KeyEvent&, rKEvt, bool)
{
bool bHandled = false;
-if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
+
+const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode();
+sal_uInt16 nMod = rKeyCode.GetModifier();
+sal_uInt16 nCode = rKeyCode.GetCode();
+if( nCode == KEY_TAB && ( !nMod || KEY_SHIFT == nMod ) )
{
-const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-const vcl::KeyCode& rKeyCode = pKEvt->GetKeyCode();
-sal_uInt16 nMod = rKeyCode.GetModifier();
-sal_uInt16 nCode = rKeyCode.GetCode();
-if( nCode == KEY_TAB && ( !nMod || KEY_SHIFT == nMod ) )
+boolbUp = KEY_SHIFT == nMod;
+if( ShouldScroll( bUp ) )
{
-boolbUp = KEY_SHIFT == nMod;
-if( ShouldScroll( bUp ) )
-{
-DoJump( bUp );
-SetSelection( Selection( 0, SELECTION_MAX ) );
-// Tab-travel doesn't really happen, so emulate it by
setting a selection manually
-bHandled = true;
-}
+DoJump( bUp );
+m_xEntry->select_region(0, -1);
+
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig extras/source include/svx solenv/bin svx/source vcl/unx
cui/source/dialogs/srchxtra.cxx| 60 +--
cui/source/factory/dlgfact.cxx | 11
cui/source/factory/dlgfact.hxx |4
cui/source/inc/optdict.hxx | 76 +---
cui/source/inc/srchxtra.hxx| 22 -
cui/source/options/optdict.cxx | 468 +++--
cui/source/options/optlingu.cxx|2
cui/uiconfig/ui/editdictionarydialog.ui| 147 ++-
cui/uiconfig/ui/searchattrdialog.ui| 63 +++
extras/source/glade/libreoffice-catalog.xml.in |3
include/svx/svxdlg.hxx |5
solenv/bin/native-code.py |1
svx/source/dialog/srchdlg.cxx |2
vcl/unx/gtk3/gtk3gtkinst.cxx | 21 +
14 files changed, 483 insertions(+), 402 deletions(-)
New commits:
commit f50f0ae2fc9f0df7cc105cd075481172d33bc70a
Author: Caolán McNamara
AuthorDate: Fri Feb 8 21:39:14 2019 +
Commit: Caolán McNamara
CommitDate: Sat Feb 9 17:24:54 2019 +0100
weld SvxSearchAttributeDialog
Change-Id: Ib929afd143cd02b49f87ae6d910500354197e826
Reviewed-on: https://gerrit.libreoffice.org/67572
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index ecd2b1697d35..94ae52d9e0b4 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -102,20 +102,21 @@ void SvxSearchFormatDialog::PageCreated(const OString&
rId, SfxTabPage& rPage)
}
}
-SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
+SvxSearchAttributeDialog::SvxSearchAttributeDialog(weld::Window* pParent,
SearchAttrItemList& rLst, const sal_uInt16* pWhRanges)
-: ModalDialog(pParent, "SearchAttrDialog", "cui/ui/searchattrdialog.ui")
+: GenericDialogController(pParent, "cui/ui/searchattrdialog.ui",
"SearchAttrDialog")
, rList(rLst)
+, m_xAttrLB(m_xBuilder->weld_tree_view("treeview"))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
{
-get(m_pOKBtn, "ok");
-get(m_pAttrLB, "treeview");
-m_pAttrLB->set_height_request(m_pAttrLB->GetTextHeight() * 12);
-m_pAttrLB->set_width_request(m_pAttrLB->approximate_char_width() * 56);
+m_xAttrLB->set_size_request(m_xAttrLB->get_approximate_digit_width() * 50,
+m_xAttrLB->get_height_rows(12));
-m_pAttrLB->SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
-m_pAttrLB->GetModel()->SetSortMode( SortAscending );
+std::vector aWidths;
+aWidths.push_back(m_xAttrLB->get_approximate_digit_width() * 3 + 6);
+m_xAttrLB->set_column_fixed_widths(aWidths);
-m_pOKBtn->SetClickHdl( LINK( this, SvxSearchAttributeDialog, OKHdl ) );
+m_xOKBtn->connect_clicked(LINK( this, SvxSearchAttributeDialog, OKHdl));
SfxObjectShell* pSh = SfxObjectShell::Current();
DBG_ASSERT( pSh, "No DocShell" );
@@ -143,47 +144,38 @@
SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent,
// item resources are in svx
sal_uInt32 nId = SvxAttrNameTable::FindIndex(nSlot);
-SvTreeListEntry* pEntry = nullptr;
-if ( RESARRAY_INDEX_NOTFOUND != nId )
-pEntry =
m_pAttrLB->SvTreeListBox::InsertEntry(SvxAttrNameTable::GetString(nId));
-else
-SAL_WARN( "cui.dialogs", "no resource for slot id " <<
static_cast(nSlot) );
-
-if ( pEntry )
+if (RESARRAY_INDEX_NOTFOUND != nId)
{
-m_pAttrLB->SetCheckButtonState( pEntry, bChecked ?
SvButtonState::Checked : SvButtonState::Unchecked );
-pEntry->SetUserData( reinterpret_cast(nSlot) );
+m_xAttrLB->insert(nullptr, -1, nullptr, nullptr, nullptr,
+ nullptr, nullptr, false);
+const int nRow = m_xAttrLB->n_children() - 1;
+m_xAttrLB->set_toggle(nRow, bChecked, 0);
+m_xAttrLB->set_text(nRow, SvxAttrNameTable::GetString(nId), 1);
+m_xAttrLB->set_id(nRow, OUString::number(nSlot));
}
+else
+SAL_WARN( "cui.dialogs", "no resource for slot id " <<
static_cast(nSlot) );
}
nWhich = aIter.NextWhich();
}
-m_pAttrLB->SetHighlightRange();
-m_pAttrLB->SelectEntryPos( 0 );
+m_xAttrLB->make_sorted();
+m_xAttrLB->select(0);
}
SvxSearchAttributeDialog::~SvxSearchAttributeDialog()
{
-disposeOnce();
}
-void SvxSearchAttributeDialog::dispose()
-{
-m_pAttrLB.clear();
-m_pOKBtn.clear();
-ModalDialog::dispose();
-}
-
-
-IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl, Button*, void)
+IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl, weld::Button&, void)
{
SearchAttrItem aInvalidItem;
aInvalidItem.pItem = INVALID_POOL_ITEM;
-f
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig extensions/source extensions/uiconfig include/vcl vcl/unx
cui/source/options/personalization.cxx| 139 --
cui/source/options/personalization.hxx| 37 +-
cui/uiconfig/ui/select_persona_dialog.ui |8
extensions/source/propctrlr/formcomponenthandler.cxx |7
extensions/source/propctrlr/selectlabeldialog.cxx | 185 ++
extensions/source/propctrlr/selectlabeldialog.hxx | 46 +--
extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui | 64
include/vcl/weld.hxx | 14 -
vcl/unx/gtk3/gtk3gtkinst.cxx |2
9 files changed, 259 insertions(+), 243 deletions(-)
New commits:
commit f69b5dd07a910dd48e087664e31642af50b5fb9a
Author: Caolán McNamara
AuthorDate: Mon Feb 4 15:23:27 2019 +
Commit: Caolán McNamara
CommitDate: Mon Feb 4 20:46:00 2019 +0100
weld OSelectLabelDialog
Change-Id: Icbf9f05e69667cb8161942dde84ded6b3fc61138
Reviewed-on: https://gerrit.libreoffice.org/67367
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 99ef87995ebc..7dfa51afabcf 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2855,11 +2855,12 @@ namespace pcr
bool FormComponentPropertyHandler::impl_dialogChooseLabelControl_nothrow(
Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
-ScopedVclPtrInstance< OSelectLabelDialog > dlgSelectLabel(
impl_getDefaultDialogParent_nothrow(), m_xComponent );
+vcl::Window* pParent = impl_getDefaultDialogParent_nothrow();
+OSelectLabelDialog dlgSelectLabel(pParent ? pParent->GetFrameWeld() :
nullptr, m_xComponent);
_rClearBeforeDialog.clear();
-bool bSuccess = ( RET_OK == dlgSelectLabel->Execute() );
+bool bSuccess = (RET_OK == dlgSelectLabel.run());
if ( bSuccess )
-_out_rNewValue <<= dlgSelectLabel->GetSelected();
+_out_rNewValue <<= dlgSelectLabel.GetSelected();
return bSuccess;
}
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx
b/extensions/source/propctrlr/selectlabeldialog.cxx
index 5ec3a91d15e7..c1a356abf187 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -48,32 +48,20 @@ namespace pcr
// OSelectLabelDialog
-
-
-OSelectLabelDialog::OSelectLabelDialog( vcl::Window* pParent, Reference<
XPropertySet > const & _xControlModel )
-:ModalDialog(pParent, "LabelSelectionDialog",
"modules/spropctrlr/ui/labelselectiondialog.ui")
-,m_xControlModel(_xControlModel)
-,m_pInitialSelection(nullptr)
-,m_pLastSelected(nullptr)
-,m_bHaveAssignableControl(false)
+OSelectLabelDialog::OSelectLabelDialog(weld::Window* pParent, Reference<
XPropertySet > const & _xControlModel)
+: GenericDialogController(pParent,
"modules/spropctrlr/ui/labelselectiondialog.ui", "LabelSelectionDialog")
+, m_xControlModel(_xControlModel)
+, m_bLastSelected(false)
+, m_bHaveAssignableControl(false)
+, m_xMainDesc(m_xBuilder->weld_label("label"))
+, m_xControlTree(m_xBuilder->weld_tree_view("control"))
+, m_xNoAssignment(m_xBuilder->weld_check_button("noassignment"))
{
-get(m_pMainDesc, "label");
-get(m_pControlTree, "control");
-get(m_pNoAssignment, "noassignment");
-
-// initialize the TreeListBox
-m_pControlTree->SetSelectionMode( SelectionMode::Single );
-m_pControlTree->SetDragDropMode( DragDropMode::NONE );
-m_pControlTree->EnableInplaceEditing( false );
-m_pControlTree->SetStyle(m_pControlTree->GetStyle() | WB_BORDER |
WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT |
WB_HSCROLL);
-
-m_pControlTree->SetNodeBitmaps(Image(StockImage::Yes,
RID_EXTBMP_COLLAPSEDNODE),
- Image(StockImage::Yes,
RID_EXTBMP_EXPANDEDNODE));
-m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog,
OnEntrySelected));
-m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog,
OnEntrySelected));
+m_xControlTree->connect_changed(LINK(this, OSelectLabelDialog,
OnEntrySelected));
+m_xControlTree->set_size_request(-1,
m_xControlTree->get_height_rows(8));
// fill the description
-OUString sDescription = m_pMainDesc->GetText();
+OUString sDescription = m_xMainDesc->get_label();
sal_Int16 nClassID = FormComponentType::CONTROL;
if (::comphelper::hasProperty(PROPERTY_CLASSID, m_xControlModel))
nClassID =
::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID));
@@ -82,7 +70,7 @@ na
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/vcl vcl/source
cui/source/inc/autocdlg.hxx|9 +--
cui/source/tabpages/autocdlg.cxx | 94 +++--
cui/uiconfig/ui/acoroptionspage.ui | 58 --
include/vcl/floatwin.hxx | 10 ---
vcl/source/window/floatwin.cxx |8 +--
vcl/source/window/winproc.cxx | 14 ++---
6 files changed, 120 insertions(+), 73 deletions(-)
New commits:
commit a89e8c54e8aa95e7f59f204cc3396e2acbdd860a
Author: Noel Grandin
AuthorDate: Mon Dec 3 21:13:14 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Dec 4 09:54:24 2018 +0100
remove enum HitTest
since we only care about one of the values, we can just use a bool
Change-Id: Id4fd0c60cd7421861b2e605604b7d3ecbf8bf915
Reviewed-on: https://gerrit.libreoffice.org/64485
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index aa6c6c0b3130..10b45c8e5fb4 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -72,14 +72,6 @@ enum class FloatWinTitleType
NONE = 4,
};
-enum HitTest
-{
-HITTEST_OUTSIDE,
-HITTEST_WINDOW,
-HITTEST_RECT
-};
-
-
class VCL_DLLPUBLIC FloatingWindow : public SystemWindow
{
class ImplData;
@@ -116,7 +108,7 @@ protected:
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
public:
-SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( vcl::Window* pReference,
const Point& rPos, HitTest& rHitTest );
+SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( vcl::Window* pReference,
const Point& rPos, bool& rbHitTestInsideRect );
SAL_DLLPRIVATE FloatingWindow* ImplFindLastLevelFloat();
SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const
vcl::Window* pWindow );
SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; }
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 91482016b557..e632f97696b3 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -507,9 +507,10 @@ tools::Rectangle
FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, co
return aFloatRect;
}
-FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference,
const Point& rPos, HitTest& rHitTest )
+FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference,
const Point& rPos, bool& rbHitTestInsideRect )
{
FloatingWindow* pWin = this;
+rbHitTestInsideRect = false;
Point aAbsolute(FloatingWindow::ImplConvertToAbsPos(pReference, rPos));
@@ -524,7 +525,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest(
vcl::Window* pReference, const
tools::Rectangle devRect(
pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( tools::Rectangle(
Point(), pBorderWin->GetSizePixel()) ) ) ;
if ( devRect.IsInside( aAbsolute ) )
{
-rHitTest = HITTEST_WINDOW;
+// inside the window
return pWin;
}
@@ -534,7 +535,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest(
vcl::Window* pReference, const
// is already in absolute device coordinates
if ( pWin->maFloatRect.IsInside( aAbsolute ) )
{
-rHitTest = HITTEST_RECT;
+rbHitTestInsideRect = true;
return pWin;
}
@@ -542,7 +543,6 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest(
vcl::Window* pReference, const
}
while ( pWin );
-rHitTest = HITTEST_OUTSIDE;
return nullptr;
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index add5c3b45957..a4cce43051c7 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -75,8 +75,8 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild,
const Point& rMousePo
* #93895# since floats are system windows, coordinates have
* to be converted to float relative for the hittest
*/
-HitTest nHitTest = HITTEST_OUTSIDE;
-FloatingWindow* pFloat =
pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( pChild, rMousePos, nHitTest
);
+boolbHitTestInsideRect = false;
+FloatingWindow* pFloat =
pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( pChild, rMousePos,
bHitTestInsideRect );
FloatingWindow* pLastLevelFloat;
FloatWinPopupFlags nPopupFlags;
if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE )
@@ -84,7 +84,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild,
const Point& rMousePo
if ( bMouseLeave )
return true;
-if ( !pFloat || (nHitTest == HITTEST_RECT) )
+if ( !pFloat || bHitTestInsideRect )
{
if ( pSVData->maHelpData.mpHelpWin &&
!pSVData->maHelpData.mbKeyboardHelp )
ImplDestroyHelpWindow( true );
@@ -104,7 +104,7 @@ static bool ImplHandleMouseFloatMode( vcl::Windo
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/vcl sd/inc sd/qa sd/source sd/uiconfig solenv/sanitizers
cui/source/inc/backgrnd.hxx| 84 +++--
cui/source/tabpages/backgrnd.cxx | 484 +++--
cui/uiconfig/ui/backgroundpage.ui | 138 ++---
include/vcl/customweld.hxx |1
sd/inc/sdabstdlg.hxx |2
sd/qa/unit/dialogs-test.cxx| 18 -
sd/source/ui/dlg/dlgchar.cxx | 29 -
sd/source/ui/dlg/sddlgfact.cxx |4
sd/source/ui/dlg/sddlgfact.hxx |2
sd/source/ui/func/fuchar.cxx |2
sd/source/ui/inc/dlg_char.hxx | 12
sd/uiconfig/sdraw/ui/drawchardialog.ui | 128 +++-
solenv/sanitizers/ui/cui.suppr |1
13 files changed, 505 insertions(+), 400 deletions(-)
New commits:
commit 88582ebee383c63c3fba588924f36ff7655af9c1
Author: Caolán McNamara
AuthorDate: Mon Sep 17 11:45:19 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 17 18:12:14 2018 +0200
weld SdCharDlg
Change-Id: If0c072c0a0a1548034dca37258f72294536ec566
Reviewed-on: https://gerrit.libreoffice.org/60578
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index f9c364c3a428..e8b1ed936ce1 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -170,7 +170,7 @@ public:
virtual VclPtr CreateBreakDlg(weld::Window*
pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong
nSumActionCount, sal_uLong nObjCount ) = 0;
virtual VclPtrCreateCopyDlg(vcl::Window*
pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView ) = 0;
virtual VclPtr
CreateSdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc) = 0;
-virtual VclPtr
CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell) = 0;
+virtual VclPtr
CreateSdTabCharDialog(weld::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell) = 0;
virtual VclPtr
CreateSdTabPageDialog(weld::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell, bool bAreaPage) = 0;
virtual VclPtr
CreateSdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField,
const SfxItemSet& rSet) = 0;
virtual VclPtr
CreateSdSnapLineDlg(weld::Window* pParent, const SfxItemSet& rInAttrs,
::sd::View* pView) = 0;
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 1fe44cc04243..0988949f415d 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -305,10 +305,8 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
CPPUNIT_ASSERT(pDrawDoc);
-auto const parent = getViewShell()->GetActiveWindow();
pRetval = getSdAbstractDialogFactory()->CreateSdCustomShowDlg(
-parent == nullptr ? nullptr : parent->GetFrameWeld(),
-*pDrawDoc);
+getViewShell()->GetFrameWeld(), *pDrawDoc);
break;
}
case 4:
@@ -317,7 +315,7 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
// needs an SfxItemSet, use an empty constructed one
// needs a 'SfxObjectShell* pDocShell', crashes without
pRetval = getSdAbstractDialogFactory()->CreateSdTabCharDialog(
-getViewShell()->GetActiveWindow(),
+getViewShell()->GetFrameWeld(),
&getEmptySfxItemSet(),
getDocShell());
break;
@@ -327,9 +325,8 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
// CreateSdTabPageDialog(const SfxItemSet* pAttr, SfxObjectShell*
pDocShell, bool bAreaPage = true) override;
// needs a special SfxItemSet with merged content from page and
other stuff, crashes without that (2nd page)
// needs a 'SfxObjectShell* pDocShell', crashes without. Also
sufficient: FillStyleItemSet with XFILL_NONE set
-auto const parent = getViewShell()->GetActiveWindow();
pRetval = getSdAbstractDialogFactory()->CreateSdTabPageDialog(
-parent == nullptr ? nullptr : parent->GetFrameWeld(),
+getViewShell()->GetFrameWeld(),
&getEmptyFillStyleSfxItemSet(),
getDocShell(),
true);
@@ -338,9 +335,8 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
case 6:
{
// CreateSdModifyFieldDlg(weld::Window* pWindow, const
SvxFieldData* pInField, const SfxItemSet& rSet) override;
-auto const parent = getViewShell()->GetActiveWindow();
pRetval = getSdAbstractDialogFactory()->CreateSdModifyFieldDlg(
-parent == nullptr ? nullptr : parent->GetFrameWeld(),
+getViewShell()->GetFrameWeld(),
nullptr,
getEmptySfxItemSet());
b
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/svx include/vcl svx/source
cui/source/inc/numpages.hxx | 24 +-
cui/source/tabpages/numpages.cxx| 83 +++-
cui/uiconfig/ui/pickbulletpage.ui | 25 ++
cui/uiconfig/ui/picknumberingpage.ui| 22 +-
include/svx/numvset.hxx | 38 +++
include/vcl/customweld.hxx |1
svx/source/dialog/svxbmpnumvalueset.cxx | 330
7 files changed, 463 insertions(+), 60 deletions(-)
New commits:
commit a27ae800fed5a974c9b255f7ce2b38ec2dbaa426
Author: Caolán McNamara
AuthorDate: Mon Sep 10 13:51:08 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 10 18:20:55 2018 +0200
weld SvxSingleNumPickTabPage
Change-Id: I6d8cf1d63b30472072e2d464c3ba6f173f4d030f
Reviewed-on: https://gerrit.libreoffice.org/60264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 2d22a18b8076..bef652167040 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -88,7 +88,6 @@ class SvxSingleNumPickTabPage final : public SfxTabPage
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
-VclPtr m_pExamplesVS;
SvxNumSettingsArr_Impl aNumSettingsArr;
std::unique_ptr pActNum;
std::unique_ptr pSaveNum;
@@ -98,12 +97,14 @@ class SvxSingleNumPickTabPage final : public SfxTabPage
sal_uInt16 nNumItemId;
-DECL_LINK(NumSelectHdl_Impl, ValueSet*, void);
-DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void);
+std::unique_ptr m_xExamplesVS;
+std::unique_ptr m_xExamplesVSWin;
+
+DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
+DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
public:
-SvxSingleNumPickTabPage(vcl::Window* pParent,
- const SfxItemSet& rSet);
+SvxSingleNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~SvxSingleNumPickTabPage() override;
virtual void dispose() override;
@@ -116,7 +117,6 @@ public:
virtual voidReset( const SfxItemSet* rSet ) override;
};
-
class SvxBulletPickTabPage final : public SfxTabPage
{
using TabPage::ActivatePage;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index aa40c183bc51..f8a411f9ff4f 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -170,19 +170,19 @@ static const vcl::Font& lcl_GetDefaultBulletFont()
return aDefBulletFont;
}
-SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent,
- const SfxItemSet& rSet)
-: SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui",
&rSet)
+SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(TabPageParent pParent, const
SfxItemSet& rSet)
+: SfxTabPage(pParent, "cui/ui/picknumberingpage.ui", "PickNumberingPage",
&rSet)
, nActNumLvl(SAL_MAX_UINT16)
, bModified(false)
, bPreset(false)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
+, m_xExamplesVS(new NumValueSet)
+, m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset",
*m_xExamplesVS))
{
SetExchangeSupport();
-get(m_pExamplesVS, "valueset");
-m_pExamplesVS->init(NumberingPageType::SINGLENUM);
-m_pExamplesVS->SetSelectHdl(LINK(this, SvxSingleNumPickTabPage,
NumSelectHdl_Impl));
-m_pExamplesVS->SetDoubleClickHdl(LINK(this, SvxSingleNumPickTabPage,
DoubleClickHdl_Impl));
+m_xExamplesVS->init(NumberingPageType::SINGLENUM);
+m_xExamplesVS->SetSelectHdl(LINK(this, SvxSingleNumPickTabPage,
NumSelectHdl_Impl));
+m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxSingleNumPickTabPage,
DoubleClickHdl_Impl));
Reference xDefNum =
SvxNumOptionsTabPageHelper::GetNumberingProvider();
if(xDefNum.is())
@@ -208,7 +208,7 @@
SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent,
{
}
Reference xFormat(xDefNum, UNO_QUERY);
-m_pExamplesVS->SetNumberingSettings(aNumberings, xFormat, rLocale);
+m_xExamplesVS->SetNumberingSettings(aNumberings, xFormat, rLocale);
}
}
@@ -219,16 +219,15 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
void SvxSingleNumPickTabPage::dispose()
{
-pActNum.reset();
-pSaveNum.reset();
-m_pExamplesVS.clear();
+m_xExamplesVSWin.reset();
+m_xExamplesVS.reset();
SfxTabPage::dispose();
}
-VclPtr SvxSingleNumPickTabPage::Create( TabPageParent pParent,
-const SfxItemSet* rAttrSet)
+VclPtr SvxSingleNumPickTabPage::Create(TabPageParent pParent,
+ const SfxItemSet* rAttrSet)
{
-return VclPtr::Create(pParent.pParent, *rAttrSet);
+return VclPtr::Create(pParent, *rAttrSet);
}
bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -263,13 +262,13 @@ void SvxSingleNumPickTabPage::Activ
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/customize/macropg.cxx | 34 ++---
cui/source/customize/macropg_impl.hxx| 16 +-
cui/source/options/optjava.cxx | 165 ---
cui/source/options/optjava.hxx | 82 ++---
cui/uiconfig/ui/assigncomponentdialog.ui | 14 +-
cui/uiconfig/ui/javastartparametersdialog.ui | 48 ++-
6 files changed, 184 insertions(+), 175 deletions(-)
New commits:
commit 10bf9023791dae0a11c96e0e8fd05ccee3bc304f
Author: Caolán McNamara
Date: Wed May 16 15:42:05 2018 +0100
weld SvxJavaParameterDlg
Change-Id: Ibcd19071aae42e07d9411d9c4ac4fbbb566aec45
Reviewed-on: https://gerrit.libreoffice.org/54441
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 36d33c6116f5..4d847ebaa9eb 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -111,7 +111,6 @@ public:
SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const
SfxItemSet& rSet )
: SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui",
&rSet)
-, m_pParamDlg(nullptr)
, m_pPathDlg(nullptr)
, m_aResetIdle("cui options SvxJavaOptionsPage Reset")
, xDialogListener(new ::svt::DialogClosedListener())
@@ -184,7 +183,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
void SvxJavaOptionsPage::dispose()
{
m_pJavaList.disposeAndClear();
-m_pParamDlg.disposeAndClear();
+m_xParamDlg.reset();
m_pPathDlg.disposeAndClear();
ClearJavaInfo();
#if HAVE_FEATURE_JAVA
@@ -265,27 +264,27 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl,
Button*, void)
{
#if HAVE_FEATURE_JAVA
std::vector< OUString > aParameterList;
-if ( !m_pParamDlg )
+if (!m_xParamDlg)
{
-m_pParamDlg = VclPtr::Create( this );
+m_xParamDlg.reset(new SvxJavaParameterDlg(GetFrameWeld()));
javaFrameworkError eErr = jfw_getVMParameters( &m_parParameters );
if ( JFW_E_NONE == eErr && !m_parParameters.empty() )
{
aParameterList = m_parParameters;
-m_pParamDlg->SetParameters( aParameterList );
+m_xParamDlg->SetParameters( aParameterList );
}
}
else
{
-aParameterList = m_pParamDlg->GetParameters();
-m_pParamDlg->DisableButtons(); //disable add, edit and remove button
when dialog is reopened
+aParameterList = m_xParamDlg->GetParameters();
+m_xParamDlg->DisableButtons(); //disable add, edit and remove button
when dialog is reopened
}
-if ( m_pParamDlg->Execute() == RET_OK )
+if (m_xParamDlg->execute() == RET_OK)
{
-if ( aParameterList != m_pParamDlg->GetParameters() )
+if ( aParameterList != m_xParamDlg->GetParameters() )
{
-aParameterList = m_pParamDlg->GetParameters();
+aParameterList = m_xParamDlg->GetParameters();
if ( jfw_isVMRunning() )
{
RequestRestart(
svtools::RESTART_REASON_ASSIGNING_JAVAPARAMETERS );
@@ -293,7 +292,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl,
Button*, void)
}
}
else
-m_pParamDlg->SetParameters( aParameterList );
+m_xParamDlg->SetParameters( aParameterList );
#else
(void) this;// Silence loplugin:staticmethods
#endif
@@ -596,9 +595,9 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet*
/*rCoreSet*/ )
#if HAVE_FEATURE_JAVA
javaFrameworkError eErr = JFW_E_NONE;
-if ( m_pParamDlg )
+if (m_xParamDlg)
{
-eErr = jfw_setVMParameters( m_pParamDlg->GetParameters() );
+eErr = jfw_setVMParameters(m_xParamDlg->GetParameters());
SAL_WARN_IF(JFW_E_NONE != eErr, "cui.options",
"SvxJavaOptionsPage::FillItemSet(): error in jfw_setVMParameters");
bModified = true;
}
@@ -698,101 +697,87 @@ void SvxJavaOptionsPage::FillUserData()
// class SvxJavaParameterDlg -
-SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) :
-
-ModalDialog( pParent, "JavaStartParameters",
- "cui/ui/javastartparametersdialog.ui" )
+SvxJavaParameterDlg::SvxJavaParameterDlg(weld::Window* pParent)
+: GenericDialogController(pParent, "cui/ui/javastartparametersdialog.ui",
+"JavaStartParameters")
+, m_xParameterEdit(m_xBuilder->weld_entry("parameterfield"))
+, m_xAssignBtn(m_xBuilder->weld_button("assignbtn"))
+, m_xAssignedList(m_xBuilder->weld_tree_view("assignlist"))
+, m_xRemoveBtn(m_xBuilder->weld_button("removebtn"))
+, m_xEditBtn(m_xBuilder->weld_button("editbtn"))
{
-get( m_pParameterEdit, "parameterfield");
-get( m_pAssignBtn, "assignbtn");
-get( m_pAssignedList, "assignlist");
-m_pAssignedList->SetDropDownLineCount(6);
-
m_pAssignedList->set_width_request(m_pAssignedList->approximate_char_width() *
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/svx svx/inc svx/source svx/uiconfig
cui/source/dialogs/cuitbxform.cxx | 28 +-
cui/source/factory/dlgfact.cxx| 15 +++--
cui/source/factory/dlgfact.hxx| 11 +++-
cui/source/inc/cuitbxform.hxx | 17 ++
cui/uiconfig/ui/recordnumberdialog.ui | 77 +-
include/svx/svxdlg.hxx|2
svx/inc/extrusiondepthdialog.hxx | 12 +---
svx/source/form/fmshell.cxx |4 -
svx/source/tbxctrls/extrusioncontrols.cxx | 19 +--
svx/source/toolbars/extrusionbar.cxx |8 +--
svx/uiconfig/ui/extrustiondepthdialog.ui | 19 ---
11 files changed, 101 insertions(+), 111 deletions(-)
New commits:
commit 6f2bbb3641f4e8fc26c20181ba790362e7472892
Author: Caolán McNamara
Date: Mon May 14 11:50:32 2018 +0100
weld ExtrusionDepthDialog
Change-Id: I5905fea310a7f29574d94eaf61c80b6ca09a7467
Reviewed-on: https://gerrit.libreoffice.org/54310
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index fb306b992c5b..0e06add86b9e 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -22,21 +22,17 @@
#include
-#include
-#include
-#include
-#include
+#include
namespace svx {
-class ExtrusionDepthDialog : public ModalDialog
+class ExtrusionDepthDialog : public weld::GenericDialogController
{
-VclPtr m_pMtrDepth;
+std::unique_ptr m_xMtrDepth;
public:
-ExtrusionDepthDialog( vcl::Window* pParent, double fDepth, FieldUnit
eDefaultUnit );
+ExtrusionDepthDialog(weld::Window* pParent, double fDepth, FieldUnit
eDefaultUnit);
virtual ~ExtrusionDepthDialog() override;
-virtual void dispose() override;
double getDepth() const;
};
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 2b8ddd842639..71e4a56eec34 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -346,34 +346,25 @@ OUString SAL_CALL
ExtrusionDirectionControl::getImplementationName( )
return ExtrusionDirectionControl_getImplementationName();
}
-
Sequence< OUString > SAL_CALL
ExtrusionDirectionControl::getSupportedServiceNames( )
{
return ExtrusionDirectionControl_getSupportedServiceNames();
}
-ExtrusionDepthDialog::ExtrusionDepthDialog( vcl::Window* pParent, double
fDepth, FieldUnit eDefaultUnit )
-: ModalDialog( pParent, "ExtrustionDepthDialog",
"svx/ui/extrustiondepthdialog.ui" )
+ExtrusionDepthDialog::ExtrusionDepthDialog(weld::Window* pParent, double
fDepth, FieldUnit eDefaultUnit)
+: GenericDialogController(pParent, "svx/ui/extrustiondepthdialog.ui",
"ExtrustionDepthDialog")
+, m_xMtrDepth(m_xBuilder->weld_metric_spin_button("depth", eDefaultUnit))
{
-get(m_pMtrDepth, "depth");
-m_pMtrDepth->SetUnit( eDefaultUnit );
-m_pMtrDepth->SetValue( static_cast(fDepth) * 100, FUNIT_100TH_MM );
+m_xMtrDepth->set_value(static_cast(fDepth) * 100, FUNIT_100TH_MM);
}
ExtrusionDepthDialog::~ExtrusionDepthDialog()
{
-disposeOnce();
-}
-
-void ExtrusionDepthDialog::dispose()
-{
-m_pMtrDepth.clear();
-ModalDialog::dispose();
}
double ExtrusionDepthDialog::getDepth() const
{
-return static_cast( m_pMtrDepth->GetValue( FUNIT_100TH_MM ) ) /
100.0;
+return static_cast(m_xMtrDepth->get_value(FUNIT_100TH_MM)) / 100.0;
}
double const aDepthListInch[] = { 0, 1270,2540,5080,10160 };
diff --git a/svx/source/toolbars/extrusionbar.cxx
b/svx/source/toolbars/extrusionbar.cxx
index f3e0b30bea98..c7fc165671bb 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -570,11 +570,11 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest
const & rReq, SfxBindi
double fDepth =
rReq.GetArgs()->GetItem(SID_EXTRUSION_DEPTH)->GetValue();
FieldUnit eUnit =
static_cast(rReq.GetArgs()->GetItem(SID_ATTR_METRIC)->GetValue());
-ScopedVclPtrInstance< ExtrusionDepthDialog > aDlg(nullptr,
fDepth, eUnit);
-sal_uInt16 nRet = aDlg->Execute();
-if( nRet != 0 )
+ExtrusionDepthDialog aDlg(rReq.GetFrameWeld(), fDepth, eUnit);
+sal_uInt16 nRet = aDlg.run();
+if (nRet == RET_OK)
{
-fDepth = aDlg->getDepth();
+fDepth = aDlg.getDepth();
SvxDoubleItem aItem( fDepth, SID_EXTRUSION_DEPTH );
SfxPoolItem* aItems[] = { &aItem, nullptr };
diff --git a/svx/uiconfig/ui/extrustiondepthdialog.ui
b/svx/uiconfig/ui/extrustiondepthdialog.ui
index a1f357c39947..ad07eb7040f8 100644
--- a/svx/uiconfig/ui/extrustiondepthdialog.ui
+++ b/svx/uiconfig/ui/extrustiondepthdialog.ui
@@ -1,6 +1,7 @@
+
-
+
338.666
0.10001
@@ -
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/vcl sc/inc sc/qa sc/source sc/uiconfig vcl/source vcl/unx
cui/source/dialogs/multipat.cxx|2
cui/source/dialogs/pastedlg.cxx|2
cui/uiconfig/ui/textanimtabpage.ui | 55 ++-
include/vcl/weld.hxx | 15 +-
sc/inc/scabstdlg.hxx |2
sc/qa/unit/screenshots/screenshots.cxx |2
sc/source/ui/attrdlg/scdlgfact.cxx | 24 +--
sc/source/ui/attrdlg/scdlgfact.hxx | 10 +
sc/source/ui/inc/mvtabdlg.hxx | 38 ++---
sc/source/ui/miscdlgs/mvtabdlg.cxx | 242 +++--
sc/source/ui/miscdlgs/shtabdlg.cxx |2
sc/source/ui/view/tabvwshf.cxx |2
sc/uiconfig/scalc/ui/movecopysheet.ui | 48 +-
vcl/source/app/salvtables.cxx | 14 +
vcl/unx/gtk3/gtk3gtkinst.cxx | 14 +
15 files changed, 244 insertions(+), 228 deletions(-)
New commits:
commit cfe137da10080b3d626ee9791e3b0b1dd0e7bb6e
Author: Caolán McNamara
Date: Tue May 1 17:15:27 2018 +0100
inline GtkComboBoxText liststore
Change-Id: Ide9ce3a90995a722b3d2c55ddaa4b5d3ad843092
Reviewed-on: https://gerrit.libreoffice.org/53699
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/uiconfig/ui/textanimtabpage.ui
b/cui/uiconfig/ui/textanimtabpage.ui
index d0457ee5d882..5209db93caeb 100644
--- a/cui/uiconfig/ui/textanimtabpage.ui
+++ b/cui/uiconfig/ui/textanimtabpage.ui
@@ -1,5 +1,5 @@
-
+
@@ -37,36 +37,6 @@
False
gtk-go-up
-
-
-
-
-
-
-
-
-
-No Effect
-0
-
-
-Blink
-1
-
-
-Scroll Through
-2
-
-
-Scroll Back and Forth
-3
-
-
-Scroll In
-4
-
-
-
True
False
@@ -90,10 +60,10 @@
True
False
-0
E_ffect:
True
LB_EFFECT
+0
False
@@ -102,11 +72,17 @@
-
+
True
False
center
-liststoreEFFECT
+
+ No Effect
+ Blink
+ Scroll Through
+ Scroll Back and Forth
+ Scroll In
+
False
@@ -322,8 +298,8 @@
True
False
-0
Animation cycles:
+0
False
@@ -364,6 +340,7 @@
True
False
start
+True
@@ -385,8 +362,8 @@
True
False
-0
Increment:
+0
False
@@ -427,6 +404,7 @@
True
False
start
+True
@@ -448,8 +426,8 @@
True
False
-0
Delay:
+0
False
@@ -490,6 +468,7 @@
True
False
start
+True
@@ -515,8 +494,8 @@
True
False
-0
Properties
+0
commit ab4609c8f9756e4fe6959a10e54ebee9105edbf7
Author: Caolán McNamara
Date: Tue May 1 16:03:24 2018 +0100
weld ScMoveTableDlg
Change-Id: I4d5601d0fb02a20bf6c83fc10411f610bdb5ce32
Reviewed-on: https://gerrit.libreoffice.org/53698
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index d703b914acf7..ec1ecffa957f 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -115,7 +115,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl,
weld::Button&, void)
OUString sInsPath;
osl::FileBase::getSystemPathFromFileURL(aURL, sInsPath);
-if (m_xPathLB->find(sInsPath) != -1)
+if (m_xPathLB->find_text(sInsPath) != -1)
{
OUString sMsg( CuiResId( RID_MULTIPATH_DBL_ERR ) );
sMsg = sMsg.rep
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/svx
cui/source/factory/dlgfact.cxx| 13 +++--
cui/source/factory/dlgfact.hxx| 14 -
cui/source/inc/optdict.hxx| 25 --
cui/source/options/optdict.cxx| 75 ++
cui/source/options/optlingu.cxx | 62 +---
cui/uiconfig/ui/breaknumberoption.ui | 13 +++--
cui/uiconfig/ui/optnewdictionarydialog.ui | 42 ++--
include/svx/langbox.hxx |1
include/svx/svxdlg.hxx|2
9 files changed, 117 insertions(+), 130 deletions(-)
New commits:
commit 1595604169f7643cf134f71e218ea512887ed8a3
Author: Caolán McNamara
Date: Fri Mar 30 21:24:28 2018 +0100
weld SvxNewDictionaryDialog
Change-Id: Idf9a4a74615b3216918dde50563e9d081c61cd52
Reviewed-on: https://gerrit.libreoffice.org/52174
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 6dc1f279693d..a3b1ced56c74 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -119,7 +119,11 @@ IMPL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractFmInputRecordNoDialog_Impl);
-IMPL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl);
+
+short AbstractSvxNewDictionaryDialog_Impl::Execute()
+{
+return m_xDlg->run();
+}
short AbstractSvxNameDialog_Impl::Execute()
{
@@ -586,7 +590,7 @@ long AbstractFmInputRecordNoDialog_Impl::GetValue() const
::Reference< css::linguistic2::XDictionary >
AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary()
{
-return pDlg->GetNewDictionary();
+return m_xDlg->GetNewDictionary();
}
void AbstractSvxNameDialog_Impl::GetName(OUString& rName)
@@ -1116,10 +1120,9 @@ VclPtr
AbstractDialogFactory_Impl::CreateFmInputR
return VclPtr::Create( pDlg );
}
-VclPtr
AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent )
+VclPtr
AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog(weld::Window* pParent)
{
-VclPtrInstance pDlg( pParent );
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
SvxNewDictionaryDialog(pParent));
}
VclPtr
AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 25573f60a19e..2b36adee6204 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -300,7 +300,14 @@ class AbstractFmInputRecordNoDialog_Impl :public
AbstractFmInputRecordNoDialog
class SvxNewDictionaryDialog;
class AbstractSvxNewDictionaryDialog_Impl :public
AbstractSvxNewDictionaryDialog
{
-
DECL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl,SvxNewDictionaryDialog)
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractSvxNewDictionaryDialog_Impl(SvxNewDictionaryDialog* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
virtual css::uno::Reference< css::linguistic2::XDictionary >
GetNewDictionary() override;
};
@@ -599,9 +606,8 @@ public:
const SfxItemSet&
rOptionsSet,
TransliterationFlags nInitialFlags) override;
virtual VclPtr
CreateFmInputRecordNoDialog() override;
-virtual VclPtr
CreateSvxNewDictionaryDialog( vcl::Window* pParent ) override;
-virtual VclPtr CreateSvxEditDictionaryDialog(
vcl::Window* pParent,
-const OUString& rName) override;
+virtual VclPtr
CreateSvxNewDictionaryDialog(weld::Window* pParent) override;
+virtual VclPtr
CreateSvxEditDictionaryDialog(vcl::Window* pParent, const OUString& rName)
override;
virtual VclPtr CreateSvxNameDialog(weld::Window*
pParent,
const OUString& rName, const
OUString& rDesc) override;
// #i68101#
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index e2dc53bf9e6e..e50accd43276 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -47,27 +47,22 @@ namespace linguistic2{
// class SvxNewDictionaryDialog --
-class SvxNewDictionaryDialog : public ModalDialog
+class SvxNewDictionaryDialog : public weld::GenericDialogController
{
private:
-VclPtrpNameEdit;
-VclPtr pLanguageLB;
-VclPtrpExceptBtn;
-VclPtrpOKBtn;
-css::uno::Reference<
-css::linguistic2::XDictionary >xNewDic;
+std::unique_ptr m_xNameEdit;
+std::unique_ptr m_xLanguageLB;
+std::unique_ptr m_xExceptBtn;
+std::unique_ptr m_xOKBtn;
+css::uno::Reference m_xNewDic;
-DECL_LINK(O
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig filter/source include/filter
cui/source/options/optinet2.cxx | 27
cui/source/options/optinet2.hxx |2
cui/source/options/securityoptions.cxx | 96 +--
cui/source/options/securityoptions.hxx | 60 ++-
cui/uiconfig/ui/securityoptionsdialog.ui | 26 +---
filter/source/msfilter/msdffimp.cxx |9 ++
filter/source/msfilter/svdfppt.cxx | 19 ++
include/filter/msfilter/msdffimp.hxx |2
include/filter/msfilter/svdfppt.hxx |1
9 files changed, 134 insertions(+), 108 deletions(-)
New commits:
commit 8e9e26066333f287476a8ed7b354acceac9f2879
Author: Caolán McNamara
Date: Sun Mar 4 17:05:19 2018 +
weld Security Options Dialog
Change-Id: I0975ce9e096283d060ba5486aedc0d6cb3086f9d
Reviewed-on: https://gerrit.libreoffice.org/50747
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 99ddbae652e8..0118938f53b5 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -559,7 +559,6 @@ IMPL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl,
Control&, rControl, void )
SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet&
rSet)
: SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui",
&rSet)
, mpSecOptions(new SvtSecurityOptions)
-, mpSecOptDlg(nullptr)
, mpCertPathDlg(nullptr)
{
get(m_pSecurityOptionsPB, "options");
@@ -611,7 +610,7 @@ void SvxSecurityTabPage::dispose()
delete mpSecOptions;
mpSecOptions = nullptr;
mpCertPathDlg.disposeAndClear();
-mpSecOptDlg.clear();
+m_xSecOptDlg.reset();
m_pSecurityOptionsPB.clear();
m_pSavePasswordsCB.clear();
m_pShowConnectionsPB.clear();
@@ -630,9 +629,9 @@ void SvxSecurityTabPage::dispose()
IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void)
{
-if ( !mpSecOptDlg )
-mpSecOptDlg = VclPtr::Create( this,
mpSecOptions );
-mpSecOptDlg->Execute();
+if (!m_xSecOptDlg)
+m_xSecOptDlg.reset(new svx::SecurityOptionsDialog(GetFrameWeld(),
mpSecOptions));
+m_xSecOptDlg->run();
}
IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, Button*, void)
@@ -898,16 +897,16 @@ bool SvxSecurityTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
-if ( mpSecOptDlg )
+if (m_xSecOptDlg)
{
-CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnSaveOrSend,
mpSecOptDlg->IsSaveOrSendDocsChecked(), bModified );
-CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnSigning, mpSecOptDlg->IsSignDocsChecked(),
bModified );
-CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnPrint, mpSecOptDlg->IsPrintDocsChecked(),
bModified );
-CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnCreatePdf,
mpSecOptDlg->IsCreatePdfChecked(), bModified );
-CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo,
mpSecOptDlg->IsRemovePersInfoChecked(), bModified );
-CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnRecommendPassword,
mpSecOptDlg->IsRecommPasswdChecked(), bModified );
-CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::CtrlClickHyperlink,
mpSecOptDlg->IsCtrlHyperlinkChecked(), bModified );
-CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::BlockUntrustedRefererLinks,
mpSecOptDlg->IsBlockUntrustedRefererLinksChecked(), bModified );
+CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnSaveOrSend,
m_xSecOptDlg->IsSaveOrSendDocsChecked(), bModified );
+CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnSigning, m_xSecOptDlg->IsSignDocsChecked(),
bModified );
+CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnPrint, m_xSecOptDlg->IsPrintDocsChecked(),
bModified );
+CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnCreatePdf,
m_xSecOptDlg->IsCreatePdfChecked(), bModified );
+CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnRemovePersonalInfo,
m_xSecOptDlg->IsRemovePersInfoChecked(), bModified );
+CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::DocWarnRecommendPassword,
m_xSecOptDlg->IsRecommPasswdChecked(), bModified );
+CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::CtrlClickHyperlink,
m_xSecOptDlg->IsCtrlHyperlinkChecked(), bModified );
+CheckAndSave( *mpSecOptions,
SvtSecurityOptions::EOption::BlockUntrustedRefererLinks,
m_xSecOptDlg->IsBlockUntrustedRefererLinksChecked(), bModified );
}
return bModified;
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 634975e91f6b..cd402a4513bd 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/svtools svtools/source svtools/uiconfig
cui/source/options/optgdlg.cxx | 33 +--
cui/uiconfig/ui/optviewpage.ui |9
include/svtools/restartdialog.hxx|5 +++-
svtools/source/dialogs/restartdialog.cxx |3 ++
svtools/uiconfig/ui/restartdialog.ui | 17 +++
5 files changed, 47 insertions(+), 20 deletions(-)
New commits:
commit 4e8bc5462a01818f0f9c92a09f1bdc68821187f4
Author: Caolán McNamara
Date: Tue Aug 2 21:04:44 2016 +0100
Related: tdf#101196 prompt to restart after OpenGL config changes
Change-Id: If0ade12ed4cf360bdac8cfbec7bb09c9a640fc6d
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1f6019f..5c7944d 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -868,8 +868,13 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
}
}
-mpOpenGLConfig->setUseOpenGL(m_pUseOpenGL->IsChecked());
-mpOpenGLConfig->setForceOpenGL(m_pForceOpenGL->IsChecked());
+if (m_pUseOpenGL->IsValueChangedFromSaved() ||
+m_pForceOpenGL->IsValueChangedFromSaved())
+{
+mpOpenGLConfig->setUseOpenGL(m_pUseOpenGL->IsChecked());
+mpOpenGLConfig->setForceOpenGL(m_pForceOpenGL->IsChecked());
+bModified = true;
+}
if( bMenuOptModified )
{
@@ -898,6 +903,15 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
}
}
+if (m_pUseOpenGL->IsValueChangedFromSaved() ||
+m_pForceOpenGL->IsValueChangedFromSaved())
+{
+SolarMutexGuard aGuard;
+svtools::executeRestartDialog(
+comphelper::getProcessComponentContext(), nullptr,
+svtools::RESTART_REASON_OPENGL);
+}
+
return bModified;
}
@@ -985,6 +999,9 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
#endif
m_pFontShowCB->SaveValue();
+m_pUseOpenGL->SaveValue();
+m_pForceOpenGL->SaveValue();
+
#if defined( UNX )
LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call(
*m_pFontAntiAliasing );
#endif
diff --git a/include/svtools/restartdialog.hxx
b/include/svtools/restartdialog.hxx
index 2d0ccd8..74aba87 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -50,9 +50,12 @@ enum RestartReason {
RESTART_REASON_EXP_FEATURES,
// "For the modified experimental features to take effect,
// %PRODUCTNAME must be restarted."
-RESTART_REASON_EXTENSION_INSTALL
+RESTART_REASON_EXTENSION_INSTALL,
// "For the extension to work properly,
// %PRODUCTNAME must be restarted."
+RESTART_REASON_OPENGL
+// "For the OpenGL changes to take effect,
+// %PRODUCTNAME must be restarted."
};
// Must be called with the solar mutex locked:
diff --git a/svtools/source/dialogs/restartdialog.cxx
b/svtools/source/dialogs/restartdialog.cxx
index a905d21..adf4827 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -61,6 +61,9 @@ public:
case svtools::RESTART_REASON_EXTENSION_INSTALL:
get(reason_, "reason_extension_install");
break;
+case svtools::RESTART_REASON_OPENGL:
+get(reason_, "reason_opengl");
+break;
default:
assert(false); // this cannot happen
}
diff --git a/svtools/uiconfig/ui/restartdialog.ui
b/svtools/uiconfig/ui/restartdialog.ui
index c9765e7..3edc5cc 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -211,6 +211,21 @@
+
+False
+True
+For the OpenGL
changes to take effect, %PRODUCTNAME must be restarted.
+True
+50
+0
+
+
+False
+True
+10
+
+
+
True
False
@@ -221,7 +236,7 @@
False
True
-10
+11
commit 40c889105ff758ae09c7d9f423fbc3b85d5e2a53
Author: Caolán McNamara
Date: Tue Aug 2 20:53:57 2016 +0100
Related: tdf#101196 shorten description, move info into tooltip
Change-Id: Id3e083dc45135c8af724c64530b6eb4e36c7f6d2
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index fb7aa58..1f6019f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -644,18 +644,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const
SfxItemSet& rSet)
m_pOpenGLStatusEnabled->Hide();
m_pOpenGLStatusDisabled->Hide();
}
-else
-{
-//tdf#191196, we need height-for-width support here, but for now we can
-//bodge it
-Size aPrefSize(m_pForceOpenGL->get_preferred_size());
-
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/svx sd/source vcl/inc vcl/unx
cui/source/inc/textattr.hxx |8 cui/source/tabpages/textanim.cxx | 17 +- cui/source/tabpages/textattr.cxx | 131 cui/uiconfig/ui/textattrtabpage.ui | 286 --- include/svx/svxids.hrc |2 sd/source/ui/dlg/prltempl.cxx|5 sd/source/ui/dlg/tabtempl.cxx|5 vcl/inc/unx/gtk/gtkgdi.hxx |5 vcl/unx/gtk/gtkinst.cxx |4 vcl/unx/gtk/salnativewidgets-gtk.cxx | 10 - 10 files changed, 273 insertions(+), 200 deletions(-) New commits: commit 8d51397bfd98615e74e116582a50e29846ecb76e Author: Caolán McNamara Date: Thu Jun 9 13:03:57 2016 +0100 Related: tdf#93135 adjust the ui to reflect the text fit options entanglement We have two major groups of text fitting options in draw/impress ones that apply only to custom shapes * Word wrap text in shape * Resize shape to fit text those that apply to other elements, e.g. text boxes, legacy rectangles and lines * Fit width to text * Fit height to text * Fit to frame * Adjust to contour Of the second group, only "fit to frame" is always available. Text boxes have "Fit width to text" and "Fit height to text", while stuff like legacy rectangles and lines etc have "Adjust to contour" instead. A fun issue is that (currently anyway) the bit for "resize shape to fit text" in custom shapes and the bit for "fit height to text" in text boxes is the same bit, SDRATTR_TEXT_AUTOGROWHEIGHT. So before this change in all circumstances the same collection of checkboxes for all settings was visible. With context used to enable or disable which ones could be set according to the type of shape it was. Simultaneously there is logic to enable/disable checkboxes depending on if other checkboxes that control contradictionary options were checked/unchecked. e.g. "Fit to frame" disabled if "fit height to text" is enabled. So its not apparently why some can be enabled and some disabled by clicking about the place in the shared collection. In this commit we split the sizing options into their two families, one frame and column for each of "custom shapes" and "everything else". When adjusting a single selected object we use context to determine which column to show or hide. When editing multiple objects or the underlying graphic styles we show both columns. When editing a presentation style we show just the text box column. (The use of HasText in the original code is a concern, cause it doesn't make sense to me, using it like that means that in the original dialog format->text on an empty text box from F2 shows the contour option, but after entering text and then format->text it shows a set of different text box sizing options, so that's dropped here) Because (currently) the same SDRATTR_TEXT_AUTOGROWHEIGHT bit it used for two apparently different things then we visually toggle on all things that use that bit in multi-column mode when its togged on, i.e. on editing a style visually both "fit height to text" and "resize shape to fix text" are kept in sync when you toggle one or the other. We don't disable the "resize shape to fit text" checkbox (unlike the fit height to text checkbox which controls the same bit) if "fit to frame" and "adjust to contour" are set, and give it additional powers to unset those if clicked. This hopefully makes the ui describe the way things actually are. Because this SDRATTR_TEXT_AUTOGROWHEIGHT is currently sort of doing two purposes selecting a freshly drawn custom rectangle and using format->default formatting will cause it to change properties because the underlying SDRATTR_TEXT_AUTOGROWHEIGHT bit is cleared. The way things should probably be I guess is that there should be a SDRATTR_TEXT_AUTOGROWSIZE property (which used to exist but wasn't hooked up to anything) just for custom shapes which overrides the old family of options if set. Change-Id: I49241c90d919eeb5caa8775beab57746d5c6df04 diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 7d67d86..a826b2f 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -20,6 +20,7 @@ #define INCLUDED_CUI_SOURCE_INC_TEXTATTR_HXX #include +#include #include @@ -39,6 +40,9 @@ class SvxTextAttrPage : public SvxTabPage private: static const sal_uInt16 pRanges[]; +VclPtrm_pDrawingText; +VclPtrm_pCustomShapeText; + VclPtr m_pTsbAutoGrowWidth; VclPtr m_pTsbAutoGrowHeight; VclPtr m_pTsbFitToSize; @@ -57,7 +61,7 @@ private: VclPtr m_pTsbFullWidth; const SfxItemSet& rOutAttrs; -const SdrView* pView; +SdrObjKindm_eObjKind; bool
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig formula/source sal/qa sal/workben sc/qa scripting/source sc/source sc/workben sfx2/uiconfig svtools/source
cui/source/dialogs/SpellDialog.cxx | 43 +++-
cui/source/inc/SpellDialog.hxx |7 +
cui/uiconfig/ui/spellingdialog.ui| 143 ++-
formula/source/core/api/FormulaCompiler.cxx | 12 +-
formula/source/ui/dlg/structpg.hxx |2
sal/qa/osl/process/osl_process.cxx |2
sal/workben/measure_oustrings.cxx|2
sc/qa/unit/helper/qahelper.hxx |2
sc/qa/unit/helper/shared_test_impl.hxx |2
sc/qa/unit/helper/sorthelper.hxx |2
sc/qa/unit/subsequent_filters-test.cxx |2
sc/qa/unit/ucalc.cxx |4
sc/source/core/data/cellvalues.cxx |2
sc/source/core/data/colorscale.cxx |2
sc/source/core/data/column4.cxx | 14 +-
sc/source/core/data/columnspanset.cxx|2
sc/source/core/data/documen6.cxx |2
sc/source/core/data/documen7.cxx |2
sc/source/core/data/document.cxx |4
sc/source/core/data/document10.cxx |2
sc/source/core/data/documentimport.cxx |2
sc/source/core/data/documentstreamaccess.cxx |2
sc/source/core/data/dpcache.cxx |8 -
sc/workben/test.cxx |2
scripting/source/vbaevents/eventhelper.cxx |6 -
sfx2/uiconfig/ui/templatedlg.ui |2
svtools/source/contnr/fileview.cxx |6 -
svtools/source/control/ctrltool.cxx |2
28 files changed, 168 insertions(+), 115 deletions(-)
New commits:
commit b08b76774fbd253cba587207d471f9bf0c0b0a82
Author: Caolán McNamara
Date: Fri Nov 13 09:56:01 2015 +
Resolves: tdf#95682 spell dialog: add a button to open special character
Change-Id: I0d070dee9e940b93b294c6b2de180005a5c2248e
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index fbb23b8..d632fd5 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -221,6 +221,8 @@ SpellDialog::SpellDialog(SpellDialogChildWindow*
pChildWindow,
get(m_pOptionsPB, "options");
get(m_pUndoPB, "undo");
get(m_pClosePB, "close");
+get(m_pToolbar, "toolbar");
+m_pSentenceED->Init(m_pToolbar);
xSpell = LinguMgr::GetSpellChecker();
pImpl = new SpellDialog_Impl;
@@ -242,8 +244,6 @@ SpellDialog::SpellDialog(SpellDialogChildWindow*
pChildWindow,
LINK( this, SpellDialog, InitHdl ), nullptr, true );
}
-
-
SpellDialog::~SpellDialog()
{
disposeOnce();
@@ -281,6 +281,7 @@ void SpellDialog::dispose()
m_pOptionsPB.clear();
m_pUndoPB.clear();
m_pClosePB.clear();
+m_pToolbar.clear();
SfxModelessDialog::dispose();
}
@@ -317,8 +318,6 @@ void SpellDialog::Init_Impl()
SvxGetChangeAllList()->clear();
}
-
-
void SpellDialog::UpdateBoxes_Impl()
{
sal_Int32 i;
@@ -442,6 +441,7 @@ void SpellDialog::SpellContinue_Impl(bool
bUseSavedSentence, bool bIgnoreCurrent
*/
IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void)
{
+m_pToolbar->Disable();
SetUpdateMode( false );
//show or hide AutoCorrect depending on the modules abilities
m_pAutoCorrPB->Show(rParent.HasAutoCorrection());
@@ -1537,9 +1537,44 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent&
rNEvt )
else
bChange = false;
}
+else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS && m_xToolbar)
+{
+m_xToolbar->Enable();
+}
+else if(rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && m_xToolbar)
+{
+m_xToolbar->Disable();
+}
return bChange || VclMultiLineEdit::PreNotify(rNEvt);
}
+void SentenceEditWindow_Impl::Init(VclPtr &rToolbar)
+{
+m_xToolbar = rToolbar;
+m_xToolbar->SetSelectHdl(LINK(this,SentenceEditWindow_Impl,ToolbarHdl));
+}
+
+IMPL_LINK_NOARG_TYPED(SentenceEditWindow_Impl, ToolbarHdl, ToolBox *, void)
+{
+const sal_uInt16 nCurItemId = m_xToolbar->GetCurItemId();
+if (nCurItemId == m_xToolbar->GetItemId("paste"))
+Paste();
+else if (nCurItemId == m_xToolbar->GetItemId("insert"))
+{
+if (Edit::GetGetSpecialCharsFunction())
+{
+OUString aChars = Edit::GetGetSpecialCharsFunction()( this,
GetFont() );
+if (!aChars.isEmpty())
+ReplaceSelected(aChars);
+}
+}
+}
+
+void SentenceEditWindow_Impl::dispose()
+{
+m_xToolbar.clear();
+VclMultiLineEdit::dispose();
+}
bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError,
css::uno::Reference xSpell )
{
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 449271d..c6b5ef8 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
@@ -62,6 +63,7 @@ class SentenceEditWindow_Impl : public VclMultiLineEdit
priv
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/customize/cfg.cxx | 238 ++---
cui/source/customize/cfg.src |5
cui/source/inc/cfg.hxx | 50 ++-
cui/source/inc/cuires.hrc |1
cui/uiconfig/ui/customizedialog.ui | 22 ++-
5 files changed, 288 insertions(+), 28 deletions(-)
New commits:
commit c65e00d908a2dcf47d3ff925d09e336d9b0939f7
Author: Maxim Monastirsky
Date: Sat Nov 7 22:01:20 2015 +0200
tdf#93837 Make customization actually work
Change-Id: I004c9ad3a7d389228b9bb532a1b2c5d6294f7e42
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index ba0829f..9491228 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -775,6 +775,25 @@ bool showKeyConfigTabPage( const css::uno::Reference<
css::frame::XFrame >& xFra
&& sModuleId != "com.sun.star.frame.StartModule";
}
+bool EntrySort( SvxConfigEntry* a, SvxConfigEntry* b )
+{
+return a->GetName().compareTo( b->GetName() ) < 0;
+}
+
+bool SvxConfigEntryModified( SvxConfigEntry* pEntry )
+{
+SvxEntries* pEntries = pEntry->GetEntries();
+if ( !pEntries )
+return false;
+
+for ( const auto& entry : *pEntries )
+{
+if ( entry->IsModified() || SvxConfigEntryModified( entry ) )
+return true;
+}
+return false;
+}
+
}
/**
@@ -1071,7 +1090,7 @@ MenuSaveInData::SetEntries( SvxEntries* pNewEntries )
pRootEntry->SetEntries( pNewEntries );
}
-bool MenuSaveInData::LoadSubMenus(
+bool SaveInData::LoadSubMenus(
const uno::Reference< container::XIndexAccess >& xMenuSettings,
const OUString& rBaseTitle,
SvxConfigEntry* pParentData )
@@ -,7 +1130,7 @@ bool MenuSaveInData::LoadSubMenus(
// If custom label not set retrieve it from the command
// to info service
-if ( aLabel.equals( OUString() ) )
+if ( aLabel.isEmpty() )
{
uno::Sequence< beans::PropertyValue > aPropSeq;
if ( a >>= aPropSeq )
@@ -1257,7 +1276,7 @@ void MenuSaveInData::Apply(
}
}
-void MenuSaveInData::ApplyMenu(
+void SaveInData::ApplyMenu(
uno::Reference< container::XIndexContainer >& rMenuBar,
uno::Reference< lang::XSingleComponentFactory >& rFactory,
SvxConfigEntry* pMenuData )
@@ -1282,13 +1301,14 @@ void MenuSaveInData::ApplyMenu(
sal_Int32 nIndex = aPropValueSeq.getLength();
aPropValueSeq.realloc( nIndex + 1 );
-aPropValueSeq[nIndex].Name = m_aDescriptorContainer;
+aPropValueSeq[nIndex].Name = ITEM_DESCRIPTOR_CONTAINER;
aPropValueSeq[nIndex].Value <<= xSubMenuBar;
rMenuBar->insertByIndex(
rMenuBar->getCount(), uno::makeAny( aPropValueSeq ));
ApplyMenu( xSubMenuBar, rFactory, pEntry );
+pEntry->SetModified( false );
}
else if ( pEntry->IsSeparator() )
{
@@ -1303,6 +1323,7 @@ void MenuSaveInData::ApplyMenu(
rMenuBar->getCount(), uno::makeAny( aPropValueSeq ));
}
}
+pMenuData->SetModified( false );
}
void
@@ -1324,6 +1345,177 @@ MenuSaveInData::Reset()
}
}
+ContextMenuSaveInData::ContextMenuSaveInData(
+const css::uno::Reference< css::ui::XUIConfigurationManager >& xCfgMgr,
+const css::uno::Reference< css::ui::XUIConfigurationManager >&
xParentCfgMgr,
+const OUString& aModuleId, bool bIsDocConfig )
+: SaveInData( xCfgMgr, xParentCfgMgr, aModuleId, bIsDocConfig )
+{
+}
+
+ContextMenuSaveInData::~ContextMenuSaveInData()
+{
+}
+
+SvxEntries* ContextMenuSaveInData::GetEntries()
+{
+if ( !m_pRootEntry )
+{
+typedef std::unordered_map< OUString, bool, OUStringHash,
std::equal_to< OUString > > MenuInfo;
+MenuInfo aMenuInfo;
+
+m_pRootEntry.reset( new SvxConfigEntry( "ContextMenus", OUString(),
true ) );
+css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >
aElementsInfo;
+try
+{
+aElementsInfo = GetConfigManager()->getUIElementsInfo(
css::ui::UIElementType::POPUPMENU );
+}
+catch ( const css::lang::IllegalArgumentException& )
+{}
+
+for ( const auto& aElement : aElementsInfo )
+{
+OUString aUrl;
+for ( const auto& aElementProp : aElement )
+{
+if ( aElementProp.Name == ITEM_DESCRIPTOR_RESOURCEURL )
+aElementProp.Value >>= aUrl;
+}
+
+css::uno::Reference< css::container::XIndexAccess > xPopupMenu;
+try
+{
+xPopupMenu = GetConfigManager()->getSettings( aUrl, sal_False
);
+}
+catch ( const css::uno::Exception& )
+{}
+
+if ( xPopupMenu.is() )
+{
+OUSt
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source
cui/UIConfig_cui.mk|2
cui/source/customize/eventdlg.cxx | 20 --
cui/source/customize/eventdlg.hxx |2
cui/source/customize/macropg.cxx | 220 +++
cui/source/customize/macropg.src | 69 ---
cui/source/customize/macropg_impl.hxx | 15 -
cui/source/inc/headertablistbox.hxx|4
cui/source/inc/macropg.hxx | 26 --
cui/uiconfig/ui/macroassigndialog.ui | 82
cui/uiconfig/ui/macroassignpage.ui | 231 +
extras/source/glade/libreoffice-catalog.xml.in |3
11 files changed, 410 insertions(+), 264 deletions(-)
New commits:
commit 121b8691b31b3eae459844d377b6d7d80ded83b6
Author: Caolán McNamara
Date: Thu Jan 23 11:10:08 2014 +
adjust macro assign dialog to have horizontal buttons
Change-Id: I9acb9a85f7172e492818fecea73f64a2a1071a4b
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index db4c9ba..87ed9afe 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
cui/uiconfig/ui/linestyletabpage \
+ cui/uiconfig/ui/macroassigndialog \
cui/uiconfig/ui/macroassignpage \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/messbox \
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 734c598..3542706 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -930,7 +930,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl,
Button *, pButton )
SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(Window *pParent,
const SfxItemSet& rSet)
-: SfxSingleTabDialog(pParent, rSet)
+: SfxSingleTabDialog(pParent, rSet, "MacroAssignDialog",
"cui/ui/macroassigndialog.ui")
{
GetOKButton()->SetClickHdl( LINK( this, SvxMacroAssignSingleTabDialog,
OKHdl_Impl ) );
}
diff --git a/cui/uiconfig/ui/macroassigndialog.ui
b/cui/uiconfig/ui/macroassigndialog.ui
new file mode 100644
index 000..3b16131
--- /dev/null
+++ b/cui/uiconfig/ui/macroassigndialog.ui
@@ -0,0 +1,82 @@
+
+
+
+
+
+False
+6
+Assign action
+dialog
+
+
+False
+vertical
+12
+
+
+False
+end
+
+
+gtk-ok
+True
+True
+True
+True
+True
+True
+
+
+False
+True
+0
+
+
+
+
+gtk-cancel
+True
+True
+True
+True
+
+
+False
+True
+1
+
+
+
+
+gtk-help
+True
+True
+True
+True
+
+
+False
+True
+2
+
+
+
+
+False
+True
+end
+0
+
+
+
+
+
+
+
+
+ ok
+ cancel
+ help
+
+
+
commit 39366b11bfed35408f16057fdb27b5b3ee6c2eaa
Author: Caolán McNamara
Date: Wed Jan 22 19:58:48 2014 +
convert macro assign page to .ui
as seen in calc->right click on tab->sheet events
Change-Id: I4df1e1c7f79f4f6431905bfc286a0f9d214ccf6c
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 0b59749..db4c9ba 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
cui/uiconfig/ui/linestyletabpage \
+ cui/uiconfig/ui/macroassignpage \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/messbox \
cui/uiconfig/ui/movemenu \
diff --git a/cui/source/customize/eventdlg.cxx
b/cui/source/customize/eventdlg.cxx
index 2fcb6cf..faacfdc 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -61,14 +61,14 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent,
const SfxItemSet& rSet,
aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
bAppConfig ( sal_True )
{
-mpImpl->pStrEvent = new OUString( CUI_RES( STR_EVENT ));
-mpImpl->pAssignedMacro = new OUString( CUI_RES( STR_ASSMACRO ));
+mpImpl->sStrEvent = OUString( CUI_RES( STR_EVENT ));
+mpImpl->sAssignedMacro = OUString( CUI_RES( STR_ASSMACRO ));
mpImpl->pEvent
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/dialogs/scriptdlg.cxx | 77 -
cui/source/dialogs/scriptdlg.src | 56 -
cui/source/inc/cuires.hrc|1
cui/source/inc/scriptdlg.hxx | 21 ++--
cui/uiconfig/ui/newlibdialog.ui | 168 +++
6 files changed, 200 insertions(+), 124 deletions(-)
New commits:
commit e6f6818b44fe1dbaba815aed31510609ec456bc6
Author: Caolán McNamara
Date: Sat Jan 4 16:55:30 2014 +
convert new lib dialog to .ui
Change-Id: I99043f2c259b56a7bfc2e7251f128b692e7d0e7f
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index d059ad0..9a3b15a 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/messbox \
cui/uiconfig/ui/movemenu \
cui/uiconfig/ui/namedialog \
+ cui/uiconfig/ui/newlibdialog \
cui/uiconfig/ui/newtabledialog \
cui/uiconfig/ui/newtoolbardialog \
cui/uiconfig/ui/numberingformatpage \
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 15217c6..6339593 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -427,68 +427,36 @@ void SFTreeListBox::ExpandedHdl()
// CuiInputDialog
//
CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode )
-: ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ),
-aText( this, CUI_RES( FT_NEWLIB ) ),
-aEdit( this, CUI_RES( ED_LIBNAME ) ),
-aOKButton( this, CUI_RES( PB_OK ) ),
-aCancelButton( this, CUI_RES( PB_CANCEL ) )
+: ModalDialog(pParent, "NewLibDialog",
+"cui/ui/newlibdialog.ui")
{
-aEdit.GrabFocus();
-if ( nMode == INPUTMODE_NEWLIB )
-{
-SetText( OUString( CUI_RES( STR_NEWLIB ) ) );
-}
-else if ( nMode == INPUTMODE_NEWMACRO )
+get(m_pEdit, "entry");
+m_pEdit->GrabFocus();
+
+FixedText *pNewLibFT = get("newlibft");
+
+if ( nMode == INPUTMODE_NEWMACRO )
{
-SetText( OUString( CUI_RES( STR_NEWMACRO ) ) );
-aText.SetText( OUString( CUI_RES( STR_FT_NEWMACRO ) ) );
+pNewLibFT->Hide();
+FixedText *pNewMacroFT = get("newmacroft");
+pNewMacroFT->Show();
+SetText(get("altmacrotitle")->GetText());
}
else if ( nMode == INPUTMODE_RENAME )
{
-SetText( OUString( CUI_RES( STR_RENAME ) ) );
-aText.SetText( OUString( CUI_RES( STR_FT_RENAME ) ) );
+pNewLibFT->Hide();
+FixedText *pRenameFT = get("renameft");
+pRenameFT->Show();
+SetText(get("altrenametitle")->GetText());
}
-FreeResource();
-
-// some resizing so that the text fits
-Point point, newPoint;
-Size siz, newSiz;
-long gap;
-
-sal_uInt16 style = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP |
- TEXT_DRAW_LEFT | TEXT_DRAW_WORDBREAK;
-
-// get dimensions of dialog instructions control
-point = aText.GetPosPixel();
-siz = aText.GetSizePixel();
-
-// get dimensions occupied by text in the control
-Rectangle rect =
-GetTextRect( Rectangle( point, siz ), aText.GetText(), style );
-newSiz = rect.GetSize();
-
-// the gap is the difference between the text width and its control width
-gap = siz.Height() - newSiz.Height();
-
-//resize the text field
-newSiz = Size( siz.Width(), siz.Height() - gap );
-aText.SetSizePixel( newSiz );
-
-//move the OK & cancel buttons
-point = aEdit.GetPosPixel();
-newPoint = Point( point.X(), point.Y() - gap );
-aEdit.SetPosPixel( newPoint );
-
}
-CuiInputDialog::~CuiInputDialog()
-{
-}
//
// ScriptOrgDialog
//
SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, OUString language )
-: SfxModalDialog(pParent, "ScriptOrganizerDialog",
"cui/ui/scriptorganizer.ui")
+: SfxModalDialog(pParent, "ScriptOrganizerDialog",
+"cui/ui/scriptorganizer.ui")
, m_sLanguage(language)
, m_delErrStr(CUI_RESSTR(RID_SVXSTR_DELFAILED))
, m_delErrTitleStr(CUI_RESSTR(RID_SVXSTR_DELFAILED_TITLE))
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index e1e2a13..b2ea470 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -21,62 +21,6 @@
#include "scriptdlg.hrc"
#include "helpid.hrc"
-ModalDialog RID_DLG_NEWLIB
-{
-HelpID = "cui:ModalDialog:RID_DLG_NEWLIB";
-Text [ en-US ] = "Create Library" ;
-Size = MAP_APPFONT ( 160 , 50 ) ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-OKButton PB_OK
-{
-P
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk vcl/source
cui/UIConfig_cui.mk |1
cui/source/dialogs/cuigaldlg.cxx | 19 +---
cui/source/dialogs/gallery.src | 41
cui/source/inc/cuigaldlg.hxx | 13 +-
cui/source/inc/gallery.hrc |5 -
cui/source/inc/helpid.hrc|1
cui/uiconfig/ui/gallerysearchprogress.ui | 142 +++
vcl/source/control/fixed.cxx | 11 ++
8 files changed, 168 insertions(+), 65 deletions(-)
New commits:
commit bd225bc2b8e0c46a2aa0e7366211452439caa622
Author: Caolán McNamara
Date: Tue Dec 17 11:59:11 2013 +
convert gallery search progress dialog to .ui
Change-Id: I77d9530ebc6529d87e2484c8440794e246aab5b9
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8101925..1ae0d83 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
+ cui/uiconfig/ui/gallerysearchprogress \
cui/uiconfig/ui/gallerythemeiddialog \
cui/uiconfig/ui/gallerytitledialog \
cui/uiconfig/ui/hangulhanjaadddialog \
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a81dbd8..b49e8a5 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -204,17 +204,16 @@ void SearchThread::ImplSearch( const INetURLObject&
rStartURL,
// - SearchProgress -
// --
-SearchProgress::SearchProgress( Window* pParent, const INetURLObject&
rStartURL ) :
-ModalDialog ( pParent, CUI_RES(RID_SVXDLG_GALLERY_SEARCH_PROGRESS ) ),
-aFtSearchDir( this, CUI_RES( FT_SEARCH_DIR ) ),
-aFLSearchDir ( this, CUI_RES( FL_SEARCH_DIR ) ),
-aFtSearchType ( this, CUI_RES( FT_SEARCH_TYPE ) ),
-aFLSearchType ( this, CUI_RES( FL_SEARCH_TYPE ) ),
-aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
-parent_(pParent), startUrl_(rStartURL)
+SearchProgress::SearchProgress( Window* pParent, const INetURLObject&
rStartURL )
+: ModalDialog(pParent, "GallerySearchProgress",
"cui/ui/gallerysearchprogress.ui")
+, parent_(pParent)
+, startUrl_(rStartURL)
{
-FreeResource();
-aBtnCancel.SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
+get(m_pFtSearchDir, "dir");
+get(m_pFtSearchType, "file");
+
m_pFtSearchType->set_width_request(m_pFtSearchType->get_preferred_size().Width());
+get(m_pBtnCancel, "cancel");
+m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
}
//
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index cba3d94..a80d604 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -219,47 +219,6 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
/**/
-ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS
-{
-HelpId = HID_GALLERY_SEARCH ;
-OutputSize = TRUE ;
-Border = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 124 , 86 ) ;
-Text [ en-US ] = "Find" ;
-Moveable = TRUE ;
-FixedLine FL_SEARCH_DIR
-{
-Pos = MAP_APPFONT ( 6 , 33 ) ;
-Size = MAP_APPFONT ( 112 , 8 ) ;
-Text [ en-US ] = "Directory" ;
-};
-FixedText FT_SEARCH_DIR
-{
-Pos = MAP_APPFONT ( 12 , 44 ) ;
-Size = MAP_APPFONT ( 100 , 10 ) ;
-};
-CancelButton BTN_CANCEL
-{
-Pos = MAP_APPFONT ( 37 , 66 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-FixedLine FL_SEARCH_TYPE
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 112 , 8 ) ;
-Text [ en-US ] = "File type" ;
-};
-FixedText FT_SEARCH_TYPE
-{
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 100 , 10 ) ;
-};
-};
-
-/**/
-
ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS
{
HelpId = HID_GALLERY_APPLY ;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 67d2f9e..2e8d829 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -80,12 +80,9 @@ public:
class SearchProgress : public ModalDialog
{
private:
-
-FixedText aFtSearchDir;
-FixedLine aFLSearchDir;
-FixedText aFtSearchType;
-FixedLine aFLSearchType;
-CancelButtonaBtnCancel;
+FixedText* m_pFtSearchDir;
+FixedText* m_pFtSearchType;
+CancelButton* m_pBtnCancel;
Window * parent_;
INetURLObject startUrl_;
rtl::Reference< SearchThread > maSearchThread;
@@ -101,8 +98,8 @@ public:
virtual short Execute();
virtual void
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig extras/source
cui/source/options/optaboutconfig.cxx |2 +-
cui/uiconfig/ui/aboutconfigvaluedialog.ui | 10 ++
extras/source/glade/libreoffice-catalog.xml.in |3 +++
3 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 7bf2f528ef22f50aa167ba57f2e25d4452977060
Author: Jan Holesovsky
Date: Thu Dec 12 10:32:13 2013 +0100
About config: Make the value box dialog a bit nicer.
Change-Id: I5e25401b76458e712070bc76c86083bbd9ae2daa
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 56b945a..08cfbc5 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -121,7 +121,7 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent&
rKeyEvent )
Size CuiCustomMultilineEdit::GetOptimalSize() const
{
-return LogicToPixel(Size(150,30),MAP_APPFONT);
+return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT);
}
Size CuiAboutConfigTabPage::GetOptimalSize() const
diff --git a/cui/uiconfig/ui/aboutconfigvaluedialog.ui
b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
index 8c359d7..8995bd5 100644
--- a/cui/uiconfig/ui/aboutconfigvaluedialog.ui
+++ b/cui/uiconfig/ui/aboutconfigvaluedialog.ui
@@ -1,6 +1,7 @@
+
False
6
@@ -9,12 +10,12 @@
False
+vertical
12
False
-vertical
-start
+end
gtk-ok
@@ -72,6 +73,7 @@
True
False
True
+True
vertical
6
@@ -79,7 +81,7 @@
True
False
0
-Value
+Value:
False
@@ -91,7 +93,7 @@
True
True
-True
+True
char
commit b3708761fbecda222af806a9606c63ab4e340c0c
Author: Jan Holesovsky
Date: Thu Dec 12 10:15:21 2013 +0100
Add CuiCustomMultilineEdit to the catalog.
Change-Id: I80cbd580e4fd59330a4f9b38dca5eb3fc0aec29a
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 7391791..157a34f 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -278,6 +278,9 @@
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/customize/macropg.cxx| 11 +++
cui/source/dialogs/cuigrfflt.cxx|5 -
cui/source/dialogs/iconcdlg.cxx |5 +
cui/source/inc/headertablistbox.hxx |2 +-
cui/source/tabpages/tparea.cxx |3 +++
cui/uiconfig/ui/bitmaptabpage.ui|2 +-
cui/uiconfig/ui/colorpage.ui| 10 ++
cui/uiconfig/ui/connectortabpage.ui |7 ++-
8 files changed, 33 insertions(+), 12 deletions(-)
New commits:
commit 52cd29a3388ec29d4de8423bb0979bcfb7a7cfcd
Author: Caolán McNamara
Date: Tue Nov 26 12:04:21 2013 +
add accessibility names to .ui
Change-Id: I09fc4a0166e1b9e9949ed9e3407e709954c88b1e
diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui
index 42c0998..10f6d68 100644
--- a/cui/uiconfig/ui/bitmaptabpage.ui
+++ b/cui/uiconfig/ui/bitmaptabpage.ui
@@ -60,7 +60,7 @@
start
-Example
+Pattern Editor
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 0630cb8..104ba54 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -177,6 +177,11 @@
False
True
True
+
+
+Old Color
+
+
1
@@ -191,6 +196,11 @@
False
True
True
+
+
+New Color
+
+
1
diff --git a/cui/uiconfig/ui/connectortabpage.ui
b/cui/uiconfig/ui/connectortabpage.ui
index c2d6939..811b42f 100644
--- a/cui/uiconfig/ui/connectortabpage.ui
+++ b/cui/uiconfig/ui/connectortabpage.ui
@@ -1,7 +1,7 @@
-
+
100
1
@@ -369,6 +369,11 @@
Preview
True
True
+
+
+Example
+
+
False
commit abbe6ce54c1ad96b1c12f019825916e078a02cb3
Author: Steve Yin
Date: Tue Nov 26 12:02:05 2013 +
Integrate branch of IAccessible2
Change-Id: Ic7d66abbfe8d88bfad66b1dbc8dd5bd103419714
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index acad203..2880494 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -146,12 +146,15 @@ long _HeaderTabListBox::Notify( NotifyEvent& rNEvt )
return nRet;
}
-_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
-Control( pParent, rId ),
-maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
-maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId )
+: Control( pParent, rId )
+, maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+, maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
{
maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
+
+// enable the cell focus to show visible focus
+maListBox.EnableCellFocus();
}
_HeaderTabListBox::~_HeaderTabListBox()
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 4d34a68..0b6da15 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -311,8 +311,6 @@ GraphicFilterSolarize::GraphicFilterSolarize( Window*
pParent, const Graphic& rG
maCbxInvert.Check( bInvert );
maCbxInvert.SetToggleHdl( GetModifyHdl() );
-
-maMtrThreshold.GrabFocus();
}
//
-
@@ -371,8 +369,6 @@ GraphicFilterSepia::GraphicFilterSepia( Window* pParent,
const Graphic& rGraphic
maMtrSepia.SetValue( nSepiaPercent );
maMtrSepia.SetModifyHdl( GetModifyHdl() );
-
-maMtrSepia.GrabFocus();
}
//
-
@@ -423,7 +419,6 @@ GraphicFilterPoster::GraphicFilterPoster( Window* pParent,
const Graphic& rGraph
maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() );
maNumPoster.SetValue( nPosterCount );
maNumPoster.SetModifyHdl( GetModifyHdl() );
-maNumPoster.GrabFocus();
}
//
-
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 18ffc57..3768911 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -412,6 +412,11 @@ void IconChoiceDialog::ShowPage( sal_uInt16 nId )
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/inc/helpid.hrc |1 - cui/uiconfig/ui/connectortabpage.ui |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit f4226034189d65b0a90f4e40969bfe6f80b63869 Author: Caolán McNamara Date: Thu Sep 12 17:08:13 2013 +0100 drop unused hid Change-Id: I70c9e272d52809ba0c166085f24fec672a18ab1b diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 4aa58c6..073fa2e 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -218,7 +218,6 @@ #define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3" #define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS" -#define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW" #define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE" #define HID_SVXPAGE_GRFCROP "CUI_HID_SVXPAGE_GRFCROP" #define HID_CAPTION "CUI_HID_CAPTION" commit 08275e40dcd4d7dc052a20f633def55e6092ab73 Author: Caolán McNamara Date: Thu Sep 12 16:57:54 2013 +0100 oops, forgot about my debugging 'a' Change-Id: I339a490cfeda0de170772a396241b939a1dd1a59 diff --git a/cui/uiconfig/ui/connectortabpage.ui b/cui/uiconfig/ui/connectortabpage.ui index fc3f139..6bc51b1 100644 --- a/cui/uiconfig/ui/connectortabpage.ui +++ b/cui/uiconfig/ui/connectortabpage.ui @@ -178,7 +178,7 @@ True False 0 -Line skewa +Line skew ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig sw/uiconfig
cui/source/tabpages/transfrm.hrc |1 - cui/uiconfig/ui/possizetabpage.ui | 20 sw/uiconfig/swriter/ui/fldfuncpage.ui |5 - 3 files changed, 16 insertions(+), 10 deletions(-) New commits: commit 1e689e18701a21728dd2b02ea459a62fec5b561e Author: Caolán McNamara Date: Mon Aug 19 11:04:36 2013 +0100 tweak a bit Change-Id: Ic2ea51faf0fcec0a7d6fdc4a52e2e930e8461e20 diff --git a/cui/source/tabpages/transfrm.hrc b/cui/source/tabpages/transfrm.hrc index 36535ad..72feeb7 100644 --- a/cui/source/tabpages/transfrm.hrc +++ b/cui/source/tabpages/transfrm.hrc @@ -53,7 +53,6 @@ #define FT_REFERENCE37 #define FT_POSPRESETS 38 #define FT_ANGLEPRESETS 39 -#define LB_ORIENT 40 #define FT_SIZEREFERENCE41 #define CTL_SIZERECT42 #define FT_POSREFERENCE 43 diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui index bf5fc3d..4482675 100644 --- a/cui/uiconfig/ui/possizetabpage.ui +++ b/cui/uiconfig/ui/possizetabpage.ui @@ -7,7 +7,7 @@ False 6 vertical -6 +12 True @@ -124,6 +124,7 @@ True False +start False @@ -259,13 +260,10 @@ 0 2 -1 +2 1 - - - False @@ -298,6 +296,7 @@ True False +start False @@ -514,9 +513,14 @@ - - - + + + + + + + + commit 7ed90fdf548978d640a7ed26ffda99c10586aac9 Author: Caolán McNamara Date: Mon Aug 19 10:59:16 2013 +0100 wrong mnemonic widget Change-Id: I539fb2599743ed2eda3b33895f73230cc2342055 diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui index 83d4277..e5f77b3 100644 --- a/sw/uiconfig/swriter/ui/fldfuncpage.ui +++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui @@ -428,6 +428,9 @@ True True True + + + 0 @@ -507,7 +510,7 @@ 0 Na_me True -name +listname 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/svx include/vcl svx/source
cui/source/tabpages/tpbitmap.cxx | 21 -
cui/uiconfig/ui/bitmaptabpage.ui | 492 ---
include/svx/dlgctrl.hxx |2
include/vcl/layout.hxx |2
svx/source/dialog/dlgctrl.cxx| 47 ++-
5 files changed, 303 insertions(+), 261 deletions(-)
New commits:
commit adf9406450652046e19dbfc4246ce1228b8aceea
Author: Caolán McNamara
Date: Mon Jul 29 10:28:11 2013 +0100
let the pixel control find parent tabpage in layout
Change-Id: I3097e7d33bdf1331a71621af6dee823a803a17b7
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 9107b68..f5ff805 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -184,6 +184,8 @@ public:
virtual void Paint( const Rectangle& rRect );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
+virtual void Resize();
+virtual Size GetOptimalSize() const;
voidSetXBitmap( const BitmapEx& rBitmapEx );
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 1463569..bdcbedf 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -755,7 +755,7 @@ VCL_DLLPUBLIC bool isInitialLayout(const Window *pWindow);
Size getLegacyBestSizeForChildren(const Window &rWindow);
//Get first parent which is not a layout widget
-Window* getNonLayoutParent(Window *pParent);
+VCL_DLLPUBLIC Window* getNonLayoutParent(Window *pParent);
//Get first real parent which is not a layout widget
Window* getNonLayoutRealParent(Window *pParent);
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 2259090..76ba1b7 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -362,8 +362,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
{
SetActualRP( eNewRP );
-if( WINDOW_TABPAGE == GetParent()->GetType() )
-( (SvxTabPage*) GetParent() )->PointChanged( this, eRP );
+Window *pTabPage = getNonLayoutParent(this);
+if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType())
+((SvxTabPage*) pTabPage)->PointChanged(this, eRP);
SetFocusRect();
}
@@ -676,8 +677,9 @@ void SvxRectCtl::SetState( CTL_STATE nState )
eRP = GetRPFromPoint( _aPtNew );
Invalidate();
-if( WINDOW_TABPAGE == GetParent()->GetType() )
-( (SvxTabPage*) GetParent() )->PointChanged( this, eRP );
+Window *pTabPage = getNonLayoutParent(this);
+if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType())
+((SvxTabPage*)pTabPage)->PointChanged(this, eRP);
}
sal_uInt8 SvxRectCtl::GetNumOfChildren( void ) const
@@ -766,14 +768,11 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId&
rResId, sal_uInt16 nNumb
memset(pPixel, 0, nSquares * sizeof(sal_uInt16));
}
-SvxPixelCtl::SvxPixelCtl( Window* pParent, sal_uInt16 nNumber ) :
-Control ( pParent, WB_BORDER ),
-nLines ( nNumber ),
-bPaintable ( sal_True )
+SvxPixelCtl::SvxPixelCtl(Window* pParent, sal_uInt16 nNumber)
+: Control(pParent, WB_BORDER)
+, nLines(nNumber)
+, bPaintable(true)
{
-//aRectSize = GetOutputSize();
-aRectSize = LogicToPixel(Size(72, 72), MAP_APPFONT);
-
SetPixelColor( Color( COL_BLACK ) );
SetBackgroundColor( Color( COL_WHITE ) );
SetLineColor(
Application::GetSettings().GetStyleSettings().GetShadowColor() );
@@ -783,9 +782,20 @@ bPaintable ( sal_True )
memset(pPixel, 0, nSquares * sizeof(sal_uInt16));
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPixelCtl(Window
*pParent, sal_uInt16 nNumber)
+void SvxPixelCtl::Resize()
+{
+Control::Resize();
+aRectSize = GetOutputSize();
+}
+
+Size SvxPixelCtl::GetOptimalSize() const
{
-return new SvxPixelCtl(pParent, 8 ); //nNumber);
+return LogicToPixel(Size(72, 72), MAP_APPFONT);
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPixelCtl(Window
*pParent, VclBuilder::stringmap&)
+{
+return new SvxPixelCtl(pParent, 8);
}
// Destructor dealocating the dynamic array
@@ -808,6 +818,9 @@ void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel )
void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
{
+if (!aRectSize.Width() || !aRectSize.Height())
+return;
+
Point aPt = PixelToLogic( rMEvt.GetPosPixel() );
Point aPtTl, aPtBr;
sal_uInt16 nX, nY;
@@ -824,14 +837,18 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent&
rMEvt )
Invalidate( Rectangle( aPtTl, aPtBr ) );
-if( WINDOW_TABPAGE == GetParent()->GetType() )
-( (SvxTabPage*) GetParent() )->PointChanged( this, RP_MM ); //
RectPoint is a dummy
+Window *pTabPage = getNonLayoutParent(this);
+if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType())
+((SvxTabPage*)pTabPage)->PointChanged(this, RP_MM); // RectPoint is a
dummy
}
// Draws the Control (Rectangle with nine circles)
void SvxPixelCtl::Paint( const Rectangle& )
{
+if (!aRectSize.Width() ||
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/sfx2 include/svx
cui/source/factory/dlgfact.cxx| 18 +++---
cui/source/factory/dlgfact.hxx|3 +--
cui/source/inc/helpid.hrc |1 -
cui/source/options/optlingu.cxx |2 +-
cui/uiconfig/ui/optnewdictionarydialog.ui | 13 -
include/sfx2/sfx.hrc |1 -
include/svx/svxdlg.hxx|3 +--
7 files changed, 14 insertions(+), 27 deletions(-)
New commits:
commit 1766de5a5e0c831127e735b60e46e32b984c524f
Author: Caolán McNamara
Date: Mon Jul 15 15:26:38 2013 +0100
can drop RID_SFXDLG_NEWDICT
Change-Id: I15d1669a870f991ae4c8428838b22c33a2c021f0
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 1bc9399..94a7a16 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1420,22 +1420,10 @@ AbstractFmInputRecordNoDialog *
AbstractDialogFactory_Impl::CreateFmInputRecordN
}
AbstractSvxNewDictionaryDialog *
AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent,
-::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xSpl,
-sal_uInt32 nResId )
+::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xSpl )
{
-SvxNewDictionaryDialog* pDlg=NULL;
-switch ( nResId )
-{
-case RID_SFXDLG_NEWDICT :
-pDlg = new SvxNewDictionaryDialog( pParent, xSpl );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractSvxNewDictionaryDialog_Impl( pDlg );
-return 0;
+SvxNewDictionaryDialog* pDlg = new SvxNewDictionaryDialog( pParent, xSpl );
+return new AbstractSvxNewDictionaryDialog_Impl( pDlg );
}
VclAbstractDialog*
AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 34c4913..4c36e81 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -692,8 +692,7 @@ public:
sal_Int32
nInitialFlags);
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog(
Window* pParent );
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog(
Window* pParent,
-::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xSpl,
-sal_uInt32 nResId ); //add for
SvxNewDictionaryDialog
+::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xSpl );
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window*
pParent,
const String& rName,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index b0d050d..0c30fea 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1651,7 +1651,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *,
pBtn )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
-AbstractSvxNewDictionaryDialog* aDlg =
pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1, RID_SFXDLG_NEWDICT );
+AbstractSvxNewDictionaryDialog* aDlg =
pFact->CreateSvxNewDictionaryDialog( this, xSpellChecker1 );
DBG_ASSERT(aDlg, "Dialogdiet fail!");
uno::Reference< XDictionary > xNewDic;
if ( aDlg->Execute() == RET_OK )
diff --git a/cui/uiconfig/ui/optnewdictionarydialog.ui
b/cui/uiconfig/ui/optnewdictionarydialog.ui
index 643465d..9158de3a 100644
--- a/cui/uiconfig/ui/optnewdictionarydialog.ui
+++ b/cui/uiconfig/ui/optnewdictionarydialog.ui
@@ -23,7 +23,8 @@
gtk-ok
True
True
-True
+True
+True
True
True
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 7d1fc0a..4044de2 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -222,7 +222,6 @@
#define RID_SFXPAGE_SAVE(RID_OPTIONS_START + 0)
#define RID_SFXPAGE_GENERAL (RID_OPTIONS_START + 1)
-#define RID_SFXDLG_NEWDICT (RID_OPTIONS_START + 3)
#define RID_SFXDLG_EDITDICT (RID_OPTIONS_START + 4)
#define RID_SFXQB_DELDICT (RID_OPTIONS_START + 5)
#define RID_SFXPAGE_PATH(RID_OPTIONS_START + 6)
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index fd8ced0..a1b8f2d 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source helpcontent2 svx/source
cui/UIConfig_cui.mk|1
cui/source/inc/helpid.hrc |1
cui/source/options/optchart.cxx| 134 --
cui/source/options/optchart.hrc| 32
cui/source/options/optchart.hxx| 24 ---
cui/source/options/optchart.src| 56 ---
cui/uiconfig/ui/optchartcolorspage.ui | 177 +
cui/uiconfig/ui/querydeletechartcolordialog.ui |2
extras/source/glade/libreoffice-catalog.xml.in |6
helpcontent2 |2
svx/source/dialog/dlgctrl.cxx |8 -
11 files changed, 258 insertions(+), 185 deletions(-)
New commits:
commit d9bfa462ba8dd0a966fe913fad49f300ea48f638
Author: Caolán McNamara
Date: Sat Jul 13 16:02:56 2013 +0100
convert chart color options page to .ui
Change-Id: I9420014d8bee8f71b5ab64aba5dbc7c27f4a25f4
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 4939247..5f51232 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optappearancepage \
cui/uiconfig/ui/optbrowserpage \
cui/uiconfig/ui/optctlpage \
+ cui/uiconfig/ui/optchartcolorspage \
cui/uiconfig/ui/optemailpage \
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index e896118..280b746 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -27,7 +27,6 @@
#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW"
#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT"
-#define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS"
#define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT"
#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS"
#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES"
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 34e5c1a..5f70a12 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -20,56 +20,47 @@
#include
#include
#include "optchart.hxx"
-#include "optchart.hrc"
#include
#include
#include // for SID_SCH_EDITOPTIONS
-//
-// class ChartColorLB
-//
-void ChartColorLB::FillBox( const SvxChartColorTable & rTab )
+namespace
{
-long nCount = rTab.size();
-SetUpdateMode( sal_False );
-
-for( long i = 0; i < nCount; i++ )
+void FillBoxChartColorLB(ColorLB *pLB, const SvxChartColorTable & rTab)
{
-Append( rTab[ i ] );
+pLB->SetUpdateMode(false);
+pLB->Clear();
+long nCount = rTab.size();
+for(long i = 0; i < nCount; ++i)
+{
+pLB->Append(rTab[i]);
+}
+pLB->SetUpdateMode(true);
}
-SetUpdateMode( sal_True );
}
-
-//
-// class SvxDefaultColorOptPage
-//
-SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const
SfxItemSet& rInAttrs ) :
-
-SfxTabPage( pParent, CUI_RES( RID_OPTPAGE_CHART_DEFCOLORS ), rInAttrs ),
-
-aGbChartColors ( this, CUI_RES( FL_CHART_COLOR_LIST ) ),
-aLbChartColors ( this, CUI_RES( LB_CHART_COLOR_LIST ) ),
-aGbColorBox ( this, CUI_RES( FL_COLOR_BOX ) ),
-aValSetColorBox ( this, CUI_RES( CT_COLOR_BOX ) ),
-aPBDefault ( this, CUI_RES( PB_RESET_TO_DEFAULT ) ),
-aPBAdd ( this, CUI_RES( PB_ADD_CHART_COLOR ) ),
-aPBRemove ( this, CUI_RES( PB_REMOVE_CHART_COLOR ) )
+SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const
SfxItemSet& rInAttrs)
+: SfxTabPage(pParent, "OptChartColorsPage","cui/ui/optchartcolorspage.ui",
rInAttrs)
{
-FreeResource();
-
-aPBDefault.SetClickHdl( LINK( this, SvxDefaultColorOptPage,
ResetToDefaults ) );
-aPBAdd.SetClickHdl( LINK( this, SvxDefaultColorOptPage, AddChartColor ) );
-aPBRemove.SetClickHdl( LINK( this, SvxDefaultColorOptPage,
RemoveChartColor ) );
-aLbChartColors.SetSelectHdl( LINK( this, SvxDefaultColorOptPage,
ListClickedHdl ) );
-aValSetColorBox.SetSelectHdl( LINK( this, SvxDefaultColorOptPage,
BoxClickedHdl ) );
-
-aValSetColorBox.SetStyle( aValSetColorBox.GetStyle()
+get(m_pPBRemove, "delete");
+get(m_pPBAdd, "add");
+get(m_pPBDefault, "default");
+get(m_pValSetColorBox, "table");
+get(m_pLbChartColors, "colors");
+m_pLbChartColors->set_height_request(m_pLbChartColors->GetTextHeight()*16);
+
+m_pPBDefault->SetClickHdl( LINK( this, SvxDefaultColorOptPage,
ResetToDefaults ) );
+m_pPBAdd->SetClickHdl( LINK( this, SvxDefaultColorOptPage, AddChartColor )
);
+m_pPBRemove->SetClickHdl( LINK( this, SvxDefaultColorOptPage,
RemoveChartColor ) );
+m_pLbChartColors->
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk|1
cui/source/inc/cuires.hrc |1
cui/source/options/optchart.cxx| 10 +++
cui/source/options/optchart.src|7 -
cui/uiconfig/ui/colorpage.ui |8 ++---
cui/uiconfig/ui/querydeletechartcolordialog.ui | 35 +
6 files changed, 46 insertions(+), 16 deletions(-)
New commits:
commit d2118b08463e60b96244165f4671a7249e06efff
Author: Caolán McNamara
Date: Sat Jul 13 14:01:18 2013 +0100
convert chart color QueryBox to .ui
Change-Id: Idc514afb9b4e5e2404500d3ad81a4e4203600218
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index e0cff23..4939247 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/picknumberingpage \
cui/uiconfig/ui/pickoutlinepage \
cui/uiconfig/ui/positionpage \
+ cui/uiconfig/ui/querydeletechartcolordialog \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 16b6ce5..a79c503 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -158,7 +158,6 @@
#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
#define RID_SVXPAGE_ASIAN_LAYOUT(RID_SVX_START + 246)
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
-#define RID_OPTQB_COLOR_CHART_DELETE(RID_SVX_START + 296)
#define RID_OPTSTR_COLOR_CHART_DELETE (RID_SVX_START + 289)
#define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247)
#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index cf7d025..34e5c1a 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -227,11 +227,11 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor,
PushButton*, pButton )
if( pColorConfig )
{
OSL_ENSURE(pColorConfig->GetColorList().size() > 1, "don't delete the
last chart color");
-QueryBox aQuery(pButton, CUI_RES(RID_OPTQB_COLOR_CHART_DELETE));
-aQuery.SetText(String(CUI_RES(RID_OPTSTR_COLOR_CHART_DELETE)));
-if(RET_YES == aQuery.Execute())
-{
+MessageDialog aQuery(pButton, "QueryDeleteChartColorDialog",
+"cui/ui/querydeletechartcolordialog.ui");
+if (RET_YES == aQuery.Execute())
+{
pColorConfig->GetColorList().remove( nIndex );
aLbChartColors.Clear();
@@ -244,7 +244,7 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor,
PushButton*, pButton )
else if (aLbChartColors.GetEntryCount() > 0)
aLbChartColors.SelectEntryPos( nIndex );
else
-aPBRemove.Enable( sal_False );
+aPBRemove.Enable(true);
}
}
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 3034b13..1653216 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -84,12 +84,7 @@ String RID_SVXSTR_DIAGRAM_ROW
Text [ en-US ] = "Data Series $(ROW)" ;
};
-QueryBox RID_OPTQB_COLOR_CHART_DELETE
-{
-Buttons = WB_YES_NO ;
-DefButton = WB_DEF_NO ;
-Message [ en-US ] = "Do you really want to delete the chart color?" ;
-};
+
String RID_OPTSTR_COLOR_CHART_DELETE
{
Text [ en-US ] = "Chart Color Deletion" ;
diff --git a/cui/uiconfig/ui/querydeletechartcolordialog.ui
b/cui/uiconfig/ui/querydeletechartcolordialog.ui
new file mode 100644
index 000..1492ad0
--- /dev/null
+++ b/cui/uiconfig/ui/querydeletechartcolordialog.ui
@@ -0,0 +1,35 @@
+
+
+
+
+False
+12
+Show changes?
+False
+dialog
+True
+warning
+yes-no
+Do you really want to delete the
chart color?
+This action cannot be
undone.
+
+
+False
+vertical
+24
+
+
+False
+end
+
+
+False
+True
+end
+0
+
+
+
+
+
+
commit 04f6d24a0a072dc8f1298b34bd2c473b5f0f961e
Author: Caolán McNamara
Date: Sat Jul 13 13:42:42 2013 +0100
.ui parser glitch
Change-Id: I0ec484c230ecddf29d09b13f78af724f27657913
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 3481d58..6c58d05 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -205,15 +205,15 @@
end
0
1
+
+ RGB
+ CMYK
+
Color Mode
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig i18npool/source
cui/source/inc/tabstpge.hxx |4 cui/source/tabpages/tabstpge.cxx | 13 +++-- cui/uiconfig/ui/paratabspage.ui |6 ++ i18npool/source/localedata/data/pt_AO.xml |2 +- 4 files changed, 18 insertions(+), 7 deletions(-) New commits: commit 72ca010b217a6df3a0edd47f3bedd60882e5681c Author: Caolán McNamara Date: Wed Jul 3 13:11:42 2013 +0100 sync the FixedFormatskey1 entry of pt-AO with other pt entries because Estandar is Spanish so that's not right anyway and commit 06b6e220b5e9250c688daaea4a7eb2ae64f1863c fixed the same problem for pt-PT Change-Id: Ia3955cbf2af89e03a574a25a5d968a7d2d2d818a diff --git a/i18npool/source/localedata/data/pt_AO.xml b/i18npool/source/localedata/data/pt_AO.xml index fc83a11..37f1eb5 100644 --- a/i18npool/source/localedata/data/pt_AO.xml +++ b/i18npool/source/localedata/data/pt_AO.xml @@ -145,7 +145,7 @@ DD-MM- HH:MM:SS - Estandar + Geral 0 commit a4e9c5f3420eba9d1de8817aa553d50bbf2bc81d Author: Caolán McNamara Date: Wed Jul 3 13:09:15 2013 +0100 restore a11y relations and some other clean up Change-Id: Ic44d45a969bc7e4c809906a59650eab1ee37c424 diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 8ffa903..c19f085 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -94,6 +95,9 @@ private: PushButton* m_pDelAllBtn; PushButton* m_pDelBtn; +VclContainer* m_pTypeFrame; +VclContainer* m_pFillFrame; + // local variables, internal functions SvxTabStop aAktTab; SvxTabStopItem aNewTabs; diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index b620af1..ba44cf2 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -141,6 +141,9 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt get(m_pDelAllBtn,"buttonBTN_DELALL"); get(m_pDelBtn,"buttonBTN_DEL"); +get(m_pTypeFrame, "frameFL_TABTYPE"); +get(m_pFillFrame, "frameFL_FILLCHAR"); + // This page needs ExchangeSupport SetExchangeSupport(); @@ -160,7 +163,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt m_pCenterTab->SetClickHdl( aLink ); m_pDezChar->SetLoseFocusHdl( LINK( this, SvxTabulatorTabPage, GetDezCharHdl_Impl ) ); -//m_pDezChar->SetMaxTextLen(1); m_pDezChar->Disable(); m_pDezCharLabel->Disable(); @@ -171,7 +173,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt m_pFillSolidLine->SetClickHdl( aLink ); m_pFillSpecial->SetClickHdl( aLink ); m_pFillChar->SetLoseFocusHdl( LINK( this, SvxTabulatorTabPage, GetFillCharHdl_Impl ) ); -//m_pFillChar->SetMaxTextLen(1); m_pFillChar->Disable(); m_pTabBox->SetDoubleClickHdl( LINK( this, SvxTabulatorTabPage, SelectHdl_Impl ) ); @@ -336,8 +337,8 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag ) m_pDezCharLabel->Disable(); m_pDezChar->Disable(); } -// if ( ( TABTYPE_ALL & nFlag ) == TABTYPE_ALL ) -// m_pTabTypeLabel->Disable(); + if ( ( TABTYPE_ALL & nFlag ) == TABTYPE_ALL ) + m_pTypeFrame->Disable(); if ( ( TABFILL_NONE & nFlag ) == TABFILL_NONE ) m_pNoFillChar->Disable(); if ( ( TABFILL_POINT & nFlag ) == TABFILL_POINT ) @@ -351,8 +352,8 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag ) m_pFillSpecial->Disable(); m_pFillChar->Disable(); } -// if ( ( TABFILL_ALL & nFlag ) == TABFILL_ALL ) -// m_pFillLabel->Disable(); + if ( ( TABFILL_ALL & nFlag ) == TABFILL_ALL ) + m_pFillFrame->Disable(); } // --- diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui index 709e9df..fe2e2f8 100644 --- a/cui/uiconfig/ui/paratabspage.ui +++ b/cui/uiconfig/ui/paratabspage.ui @@ -416,6 +416,9 @@ 0.09003576278687 True radiobuttonBTN_FILLCHAR_NO + + + 0 @@ -430,6 +433,9 @@ False ⢠1 + + + 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/sfx2 sfx2/source sw/source
cui/source/inc/postdlg.hxx |2 +-
cui/uiconfig/ui/comment.ui |2 +-
include/sfx2/objsh.hxx |3 +++
sfx2/source/doc/objstor.cxx|4
sw/source/core/layout/paintfrm.cxx | 13 +
5 files changed, 22 insertions(+), 2 deletions(-)
New commits:
commit 9ac296af1d3d659097153884e3b78a57b334c4a2
Author: Caolán McNamara
Date: Fri May 31 16:50:00 2013 +0100
Resolves: fdo#65215 wrong type for the multiline comment edit widget
Change-Id: I14b13285daf27191bb8cf95bc7e801281f97dde8
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 592db0d..4ae9b7d 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -89,7 +89,7 @@ public:
private:
FixedText* m_pLastEditFT;
-MultiLineEdit* m_pEditED;
+VclMultiLineEdit* m_pEditED;
VclContainer* m_pInsertAuthor;
PushButton* m_pAuthorBtn;
diff --git a/cui/uiconfig/ui/comment.ui b/cui/uiconfig/ui/comment.ui
index 5959b4a..928bb25 100644
--- a/cui/uiconfig/ui/comment.ui
+++ b/cui/uiconfig/ui/comment.ui
@@ -184,7 +184,7 @@
0
_Text
True
-edit
+edit:border
False
commit 61dfc6fa942e9d9c241231fb5467c860fe95ea06
Author: Jürgen Schmidt
Date: Fri Jun 22 12:30:43 2012 +
Resolves: #i120030# optimize thumbnail creation/painting
(cherry picked from commit 255beb8f56a074ce85eaf1db3cdf168f9c09466e)
Conflicts:
sfx2/inc/sfx2/objsh.hxx
sw/source/core/layout/paintfrm.cxx
Change-Id: I23157f7a6983ba81b1c8ddcc409a4989915be2ed
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4c366a5..4ace180 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -198,6 +198,7 @@ private:
sal_BoolbHasName :1, // sal_True := existing
object,
// sal_False := new object
bIsTmp :1;// temporary Storage
+sal_BoolbIsInGenerateThumbnail; //optimize thumbnail
generate and store procedure to improve odt saving performance, i120030
private:
SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference<
@@ -444,6 +445,8 @@ public:
sal_Bool bIsTemplate,
const ::com::sun::star::uno::Reference<
::com::sun::star::io::XStream >& xStream );
+sal_BoolIsInGenerateAndStoreThumbnail() const {return
bIsInGenerateThumbnail;}//optimize thumbnail generate and store procedure to
improve odt saving performance, i120030
+
// Transfer IFace
voidAbortImport();
sal_BoolIsAbortingImport() const;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index c57c79a..902b538 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3523,6 +3523,8 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail(
sal_Bool bEncrypted,
{
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033)
SfxObjectShell::GenerateAndStoreThumbnail" );
+bIsInGenerateThumbnail = sal_True;//optimize thumbnail generate and store
procedure to improve odt saving performance, i120030
+
sal_Bool bResult = sal_False;
try {
@@ -3547,6 +3549,8 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail(
sal_Bool bEncrypted,
{
}
+bIsInGenerateThumbnail = sal_False;//optimize thumbnail generate and store
procedure to improve odt saving performance, i120030
+
return bResult;
}
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 615d7d8..cb75b9e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3880,6 +3880,19 @@ private:
void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
{
+//optimize thumbnail generation and store procedure to improve odt saving
performance, #i120030#
+ViewShell *pShell = getRootFrm()->GetCurrShell();
+if (pShell && pShell->GetDoc() && pShell->GetDoc()->GetDocShell())
+{
+sal_Bool bInGenerateThumbnail =
pShell->GetDoc()->GetDocShell()->IsInGenerateAndStoreThumbnail();
+if (bInGenerateThumbnail)
+{
+SwRect aVisRect = pShell->VisArea();
+if (!aVisRect.IsOver(Frm()))
+return;
+}
+}
+
//because of the overlapping of frames and drawing objects the flys have to
//paint their borders (and those of the internal ones) directly.
//e.g. #33066#
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-comm
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig svx/source
cui/source/tabpages/paragrph.cxx |3 ---
cui/uiconfig/ui/paragalignpage.ui|5 +
cui/uiconfig/ui/paraindentspacing.ui |5 +
svx/source/dialog/frmdirlbox.cxx |4 +++-
4 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit c3cdc78e885d63aa4993c63b14fc034d1880d066
Author: Caolán McNamara
Date: Fri May 31 12:33:59 2013 +0100
set accessibility name for previews via .ui
Change-Id: I4abf90f43a8278e3c115a809deb1a8096f21c685
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index ff9d71b..b910f7a 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -678,9 +678,6 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window*
pParent, const SfxItemS
Init_Impl();
m_pFLineIndent->SetMin(-);// is set to 0 on default
-
-//aExampleWin.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
-
}
SvxStdParagraphTabPage::~SvxStdParagraphTabPage()
diff --git a/cui/uiconfig/ui/paragalignpage.ui
b/cui/uiconfig/ui/paragalignpage.ui
index caa1f06..178f7c3 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -25,6 +25,11 @@
start
True
True
+
+
+Example
+
+
diff --git a/cui/uiconfig/ui/paraindentspacing.ui
b/cui/uiconfig/ui/paraindentspacing.ui
index df44c1a..5016684 100644
--- a/cui/uiconfig/ui/paraindentspacing.ui
+++ b/cui/uiconfig/ui/paraindentspacing.ui
@@ -475,6 +475,11 @@
start
True
True
+
+
+Example
+
+
commit c799a1e5522971405fa45d3df7ebf259229df63e
Author: Caolán McNamara
Date: Fri May 31 12:29:43 2013 +0100
autosize the frame direction listbox
Change-Id: I440ca0255a6079c28b2314b12511c6c41d6a05f5
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 7de9437..ad1697d 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -56,7 +56,9 @@ FrameDirectionListBox::~FrameDirectionListBox()
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
makeFrameDirectionListBox(Window *pParent, VclBuilder::stringmap &)
{
-return new FrameDirectionListBox(pParent,
WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
+FrameDirectionListBox* pListBox = new FrameDirectionListBox(pParent,
WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
+pListBox->EnableAutoSize(true);
+return pListBox;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk helpcontent2
cui/UIConfig_cui.mk |1
cui/source/inc/autocdlg.hxx | 14 -
cui/source/inc/helpid.hrc|1
cui/source/tabpages/autocdlg.cxx | 68 -
cui/source/tabpages/autocdlg.src | 71 -
cui/uiconfig/ui/autocorrectdialog.ui | 255 +++
helpcontent2 |2
7 files changed, 296 insertions(+), 116 deletions(-)
New commits:
commit 2bbdf5c72254a70c43894eb907f23f78557f709a
Author: Caolán McNamara
Date: Wed Apr 17 16:57:31 2013 +0100
convert autocorrect dialog to .ui format
Just the outmost dialog itself, not the individual pages.
We have to go top down in this case to incrementally convert the pages
because
of the non-standard additional widgets outside the tabcontrol area.
So this dialog is set to non-resizable until its contents are
converted over.
Change-Id: I92014a44b4cab8d345666295b052635d4b57a496
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index d8e94ba..7afa2df 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,cui))
$(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/asiantypography \
+ cui/uiconfig/ui/autocorrectdialog \
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/cellalignment \
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 1190ffe..91062f1 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -38,18 +38,18 @@ namespace editeng { class SortedAutoCompleteStrings; }
class OfaAutoCorrDlg : public SfxTabDialog
{
-FixedText aLanguageFT;
-SvxLanguageBox aLanguageLB;
+VclContainer* m_pLanguageBox;
+SvxLanguageBox* m_pLanguageLB;
+
+sal_uInt16 m_nReplacePageId;
+sal_uInt16 m_nExceptionsPageId;
DECL_LINK(SelectLanguageHdl, ListBox*);
public:
-OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet );
-
-voidEnableLanguage(sal_Bool bEnable)
-{ aLanguageFT.Enable(bEnable);
-aLanguageLB.Enable(bEnable);}
+OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet);
+void EnableLanguage(bool bEnable);
};
#ifdef _OFA_AUTOCDLG_CXX
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 0f4a5a1..5c68192 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -229,7 +229,6 @@
#define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY"
#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
#define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB"
-#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE"
#define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB"
#define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1"
#define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2"
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2f11b4c..75fa160 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -59,11 +59,12 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star;
using namespace ::rtl;
-OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
-SfxTabDialog( pParent, CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet ),
-aLanguageFT ( this, CUI_RES( FT_LANG ) ),
-aLanguageLB ( this, CUI_RES( LB_LANG ) )
+OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet )
+: SfxTabDialog(pParent, "AutoCorrectDialog",
"cui/ui/autocorrectdialog.ui", _pSet)
{
+get(m_pLanguageBox, "langbox");
+get(m_pLanguageLB, "lang");
+
sal_Bool bShowSWOptions = sal_False;
sal_Bool bOpenSmartTagOptions = sal_False;
@@ -78,21 +79,16 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const
SfxItemSet* _pSet ) :
bOpenSmartTagOptions = sal_True;
}
-aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST);
-aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND);
-aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE);
-FreeResource();
-
-AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create,
0);
-AddTabPage(RID_OFAPAGE_AUTOFMT_APPLY, OfaSwAutoFmtOptionsPage::Create, 0);
-AddTabPage(RID_OFAPAGE_AUTOCOMPLETE_OPTIONS,
OfaAutoCompleteTabPage::Create, 0);
-AddTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS,
OfaSmartTagOptionsTabPage::Create, 0);
+AddTabPage("options", OfaAutocorrOptionsPage::Create, 0);
+AddTabPage("apply", OfaSwAutoFmtOptionsPage::Create, 0);
+AddTabPage("wordcompletion", OfaAutoCompleteTabPage::Create, 0);
+AddTabPage("smarttags", OfaSmartTagOptionsTabPage::Create, 0);
if (!bShowSWOptions)
{
-RemoveTabPage(RID_OFAPAGE_AUTOFMT_APPLY);
-RemoveTabPage(RID_OFAPAGE_AUTOCOMPLETE_OPTIONS);
-RemoveTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS);
+
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UI_cui.mk
cui/UI_cui.mk |1
cui/source/inc/helpid.hrc |1
cui/source/inc/paragrph.hxx| 10 +---
cui/source/tabpages/paragrph.cxx | 40 -
cui/source/tabpages/paragrph.hrc |8 ---
cui/source/tabpages/paragrph.src | 37
cui/uiconfig/ui/asiantypography.ui | 85 +
7 files changed, 109 insertions(+), 73 deletions(-)
New commits:
commit 6f1a99392a4c12bd17aa844726c528f773261047
Author: Caolán McNamara
Date: Thu Feb 14 12:42:34 2013 +
TriState boxes created via the builder default to STATE_DONTKNOW
while classic ones default to "false", easiest thing to do here
is to simply only query for their value if enabled
Change-Id: I5b01d344a5310b9bbd8d59e9c53bef1a6bfee1ce
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index e67692a..f041f41 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -273,7 +273,6 @@
#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
-#define HID_SVXPAGE_PARA_ASIAN "CUI_HID_SVXPAGE_PARA_ASIAN"
#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE"
#define HID_AREA_AREA "CUI_HID_AREA_AREA"
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 96753dd..cf8ded0 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2253,12 +2253,12 @@ sal_uInt16* SvxAsianTabPage::GetRanges()
};
return pRanges;
}
-//FIXME: This crash in Calc, but works in Writer/Draw/Impress
-sal_BoolSvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
+
+sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
{
sal_Bool bRet = sal_False;
SfxItemPool* pPool = rSet.GetPool();
-if(m_pScriptSpaceCB->IsChecked() != m_pScriptSpaceCB->GetSavedValue())
+if (m_pScriptSpaceCB->IsEnabled() && m_pScriptSpaceCB->IsChecked() !=
m_pScriptSpaceCB->GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone();
@@ -2267,7 +2267,7 @@ sal_BoolSvxAsianTabPage::FillItemSet( SfxItemSet&
rSet )
delete pNewItem;
bRet = sal_True;
}
-if(m_pHangingPunctCB->IsChecked() != m_pHangingPunctCB->GetSavedValue())
+if (m_pHangingPunctCB->IsEnabled() && m_pHangingPunctCB->IsChecked() !=
m_pHangingPunctCB->GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone();
@@ -2276,7 +2276,7 @@ sal_BoolSvxAsianTabPage::FillItemSet( SfxItemSet&
rSet )
delete pNewItem;
bRet = sal_True;
}
-if(m_pForbiddenRulesCB->IsChecked() !=
m_pForbiddenRulesCB->GetSavedValue())
+if (m_pForbiddenRulesCB->IsEnabled() && m_pForbiddenRulesCB->IsChecked()
!= m_pForbiddenRulesCB->GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone();
diff --git a/cui/uiconfig/ui/asiantypography.ui
b/cui/uiconfig/ui/asiantypography.ui
index eeeb7a4..012ad37 100644
--- a/cui/uiconfig/ui/asiantypography.ui
+++ b/cui/uiconfig/ui/asiantypography.ui
@@ -11,12 +11,14 @@
True
False
+6
12
True
False
vertical
+6
Apply list of
forbidden characters to the beginning and end of lines
commit 4b21195e883472d020e18332976c35ad01393da9
Author: Olivier Hallot
Date: Mon Feb 11 21:41:19 2013 -0200
Widget for asian typography
Change-Id: I70535593c3e06caca48ae8bc8b9476ae09210df8
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index f4af231..5799a87 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UI_UI,cui))
$(eval $(call gb_UI_add_uifiles,cui,\
+ cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/charnamepage \
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index ae9904f..045a29d 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -278,17 +278,15 @@ private:
//--
class SvxAsianTabPage : public SfxTabPage
{
-FixedLine aOptionsFL;
-TriStateBox aForbiddenRulesCB;
-TriStateBox aHangingPunctCB;
-
-TriStateBox aScriptSpaceCB;
+CheckBox* m_pForbiddenRulesCB;
+CheckBox* m_pHangingPunctCB;
+CheckBox* m_pScriptSpaceCB;
SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet );
#ifdef _SVX_PARAGRPH_C
