[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/tpoption.cxx| 59 ++-
sd/source/ui/inc/tpoption.hxx|3 +
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 53 +++-
3 files changed, 92 insertions(+), 23 deletions(-)
New commits:
commit 60969b81dd710f26e50f3428f5544ae368010d79
Author: Balazs Varga
AuthorDate: Fri Nov 24 18:00:44 2023 +0100
Commit: Balazs Varga
CommitDate: Mon Nov 27 08:49:18 2023 +0100
tdf#158241 - UI: Part 43 - Unify lockdown behavior of Options dialog
for Draw - General Page.
Change-Id: Ib17d638580011362cde5c2adea7e7e2d6e7d0eb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159936
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 300b5caedd71..f6f5b4f5aa7e 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -255,6 +256,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage,
weld::DialogController*
: SfxTabPage(pPage, pController,
"modules/simpress/ui/optimpressgeneralpage.ui", "OptSavePage", &rInAttrs)
, nWidth(0)
, nHeight(0)
+, m_bDrawMode(false)
, m_xCbxQuickEdit(m_xBuilder->weld_check_button("qickedit"))
, m_xCbxQuickEditImg(m_xBuilder->weld_widget("lockqickedit"))
, m_xCbxPickThrough(m_xBuilder->weld_check_button("textselected"))
@@ -276,6 +278,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage,
weld::DialogController*
, m_xCbxCompatibilityImg(m_xBuilder->weld_widget("lockcbCompatibility"))
, m_xScaleFrame(m_xBuilder->weld_frame("scaleframe"))
, m_xCbScale(m_xBuilder->weld_combo_box("scaleBox"))
+, m_xCbScaleImg(m_xBuilder->weld_widget("lockscaleBox"))
, m_xNewDocLb(m_xBuilder->weld_label("newdoclbl"))
, m_xFiInfo1(m_xBuilder->weld_label("info1"))
,
m_xMtrFldOriginalWidth(m_xBuilder->weld_metric_spin_button("metricWidthFields",
FieldUnit::MM))
@@ -284,6 +287,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage,
weld::DialogController*
, m_xFiInfo2(m_xBuilder->weld_label("info2"))
,
m_xMtrFldOriginalHeight(m_xBuilder->weld_metric_spin_button("metricHeightFields",
FieldUnit::MM))
, m_xCbxDistort(m_xBuilder->weld_check_button("distortcb"))
+, m_xCbxDistortImg(m_xBuilder->weld_widget("lockdistortcb"))
, m_xMtrFldInfo1(m_xBuilder->weld_metric_spin_button("metricInfo1Fields",
FieldUnit::MM))
, m_xMtrFldInfo2(m_xBuilder->weld_metric_spin_button("metricInfo2Fields",
FieldUnit::MM))
{
@@ -500,42 +504,54 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
{
SdOptionsMiscItem aOptsItem( rAttrs->Get( ATTR_OPTIONS_MISC ) );
-bool bReadOnly =
officecfg::Office::Impress::Misc::NewDoc::AutoPilot::isReadOnly();
+bool bReadOnly = m_bDrawMode ? false :
officecfg::Office::Impress::Misc::NewDoc::AutoPilot::isReadOnly();
m_xCbxStartWithTemplate->set_active(
aOptsItem.GetOptionsMisc().IsStartWithTemplate() );
m_xCbxStartWithTemplate->set_sensitive(!bReadOnly);
m_xCbxStartWithTemplateImg->set_visible(bReadOnly);
-bReadOnly = officecfg::Office::Impress::Misc::ObjectMoveable::isReadOnly();
+bReadOnly = m_bDrawMode ?
officecfg::Office::Draw::Misc::ObjectMoveable::isReadOnly() :
+officecfg::Office::Impress::Misc::ObjectMoveable::isReadOnly();
m_xCbxMarkedHitMovesAlways->set_active(
aOptsItem.GetOptionsMisc().IsMarkedHitMovesAlways() );
m_xCbxMarkedHitMovesAlways->set_sensitive(!bReadOnly);
m_xCbxMarkedHitMovesAlwaysImg->set_visible(bReadOnly);
-bReadOnly =
officecfg::Office::Impress::Misc::TextObject::QuickEditing::isReadOnly();
+bReadOnly = m_bDrawMode ?
officecfg::Office::Draw::Misc::TextObject::QuickEditing::isReadOnly() :
+
officecfg::Office::Impress::Misc::TextObject::QuickEditing::isReadOnly();
m_xCbxQuickEdit->set_active( aOptsItem.GetOptionsMisc().IsQuickEdit() );
m_xCbxQuickEdit->set_sensitive(!bReadOnly);
m_xCbxQuickEditImg->set_visible(bReadOnly);
-bReadOnly =
officecfg::Office::Impress::Misc::TextObject::Selectable::isReadOnly();
+bReadOnly = m_bDrawMode ?
officecfg::Office::Draw::Misc::TextObject::Selectable::isReadOnly() :
+officecfg::Office::Impress::Misc::TextObject::Selectable::isReadOnly();
m_xCbxPickThrough->set_active( aOptsItem.GetOptionsMisc().IsPickThrough()
);
m_xCbxPickThrough->set_sensitive(!bReadOnly);
m_xCbxPickThroughImg->set_visible(bReadOnly);
-bReadOnly =
officecfg::Office::Impress::Misc::BackgroundCache::isReadOnly();
+bReadOnly = m_bDrawMode ?
officecfg::Office::Draw::Misc::BackgroundCache::isReadOnly() :
+officecfg::Office::Impress::Misc::BackgroundCache::isReadOnly();
m_xCbxMasterPageCache->set_active(
aOptsItem.GetOptionsMisc().IsMasterPagePaintCaching() );
m_xCbxMast
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/prntopts.cxx | 63 ++
sd/source/ui/inc/prntopts.hxx | 10 +
sd/uiconfig/simpress/ui/prntopts.ui | 335
3 files changed, 293 insertions(+), 115 deletions(-)
New commits:
commit 6f32acbbf8e2f42dd926b42d7718056db5bbee94
Author: Balazs Varga
AuthorDate: Fri Nov 24 14:15:46 2023 +0100
Commit: Balazs Varga
CommitDate: Fri Nov 24 15:17:12 2023 +0100
tdf#158240 - UI: Part 42 - Unify lockdown behavior of Options dialog
for Impress - Print Page.
Change-Id: I96e90ab09ee4bc80b097799970a5b1c56fc47048
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159927
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 8b17ae6d59ab..6a608932adce 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
/**
* dialog to adjust print options
@@ -36,17 +37,27 @@ SdPrintOptions::SdPrintOptions(weld::Container* pPage,
weld::DialogController* p
, m_xRbtColor(m_xBuilder->weld_radio_button("defaultrb"))
, m_xRbtGrayscale(m_xBuilder->weld_radio_button("grayscalerb"))
, m_xRbtBlackWhite(m_xBuilder->weld_radio_button("blackwhiterb"))
+, m_xRbQualityImg(m_xBuilder->weld_widget("lockquality"))
, m_xCbxPagename(m_xBuilder->weld_check_button("pagenmcb"))
+, m_xCbxPagenameImg(m_xBuilder->weld_widget("lockpagenmcb"))
, m_xCbxDate(m_xBuilder->weld_check_button("datecb"))
+, m_xCbxDateImg(m_xBuilder->weld_widget("lockdatecb"))
, m_xCbxTime(m_xBuilder->weld_check_button("timecb"))
+, m_xCbxTimeImg(m_xBuilder->weld_widget("locktimecb"))
, m_xCbxHiddenPages(m_xBuilder->weld_check_button("hiddenpgcb"))
+, m_xCbxHiddenPagesImg(m_xBuilder->weld_widget("lockhiddenpgcb"))
, m_xRbtDefault(m_xBuilder->weld_radio_button("pagedefaultrb"))
, m_xRbtPagesize(m_xBuilder->weld_radio_button("fittopgrb"))
, m_xRbtPagetile(m_xBuilder->weld_radio_button("tilepgrb"))
, m_xRbtBooklet(m_xBuilder->weld_radio_button("brouchrb"))
+, m_xGridPageOpt(m_xBuilder->weld_widget("pageoptions"))
+, m_xRbtPageOptImg(m_xBuilder->weld_widget("lockpageoptions"))
, m_xCbxFront(m_xBuilder->weld_check_button("frontcb"))
+, m_xCbxFrontImg(m_xBuilder->weld_widget("lockfrontcb"))
, m_xCbxBack(m_xBuilder->weld_check_button("backcb"))
+, m_xCbxBackImg(m_xBuilder->weld_widget("lockbackcb"))
, m_xCbxPaperbin(m_xBuilder->weld_check_button("papertryfrmprntrcb"))
+, m_xCbxPaperbinImg(m_xBuilder->weld_widget("lockpapertryfrmprntrcb"))
{
Link aLink = LINK( this, SdPrintOptions,
ClickBookletHdl );
m_xRbtDefault->connect_toggled( aLink );
@@ -188,6 +199,47 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs )
else
m_xRbtBlackWhite->set_active(true);
}
+
+bool bReadOnly =
officecfg::Office::Impress::Print::Page::PageSize::isReadOnly() ||
+officecfg::Office::Impress::Print::Page::PageTile::isReadOnly() ||
+officecfg::Office::Impress::Print::Page::Booklet::isReadOnly();
+m_xGridPageOpt->set_sensitive(!bReadOnly);
+m_xRbtPageOptImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Print::Page::BookletFront::isReadOnly();
+m_xCbxFront->set_sensitive(!bReadOnly);
+m_xCbxFrontImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Print::Page::BookletBack::isReadOnly();
+m_xCbxBack->set_sensitive(!bReadOnly);
+m_xCbxBackImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Print::Other::FromPrinterSetup::isReadOnly();
+m_xCbxPaperbin->set_sensitive(!bReadOnly);
+m_xCbxPaperbinImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Print::Other::PageName::isReadOnly();
+m_xCbxPagename->set_sensitive(!bReadOnly);
+m_xCbxPagenameImg->set_visible(bReadOnly);
+
+bReadOnly = officecfg::Office::Impress::Print::Other::Date::isReadOnly();
+m_xCbxDate->set_sensitive(!bReadOnly);
+m_xCbxDateImg->set_visible(bReadOnly);
+
+bReadOnly = officecfg::Office::Impress::Print::Other::Time::isReadOnly();
+m_xCbxTime->set_sensitive(!bReadOnly);
+m_xCbxTimeImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Print::Other::HiddenPage::isReadOnly();
+m_xCbxHiddenPages->set_sensitive(!bReadOnly);
+m_xCbxHiddenPagesImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Print::Other::Quality::isReadOnly();
+m_xRbtColor->set_sensitive(!bReadOnly);
+m_xRbtGrayscale->set_sensitive(!bReadOnly);
+m_xRbtBlackWhite->set_sensitive(!bReadOnly);
+m_xRbQualityImg->set_visible(bReadOnly);
+
m_xCbxDraw->save_state();
m_xCbxNotes->save_state();
m_xCbxHandout->save_state();
@@ -229,13 +281,14 @@ IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl,
weld::Toggleable&, voi
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/tpoption.cxx | 20
sd/source/ui/inc/tpoption.hxx |4 +
sd/uiconfig/simpress/ui/sdviewpage.ui | 78 +++---
3 files changed, 87 insertions(+), 15 deletions(-)
New commits:
commit b1a866caccb322ec6e88eac67710310160e72b58
Author: Balazs Varga
AuthorDate: Thu Nov 23 11:39:09 2023 +0100
Commit: Balazs Varga
CommitDate: Fri Nov 24 14:18:23 2023 +0100
tdf#158238 - UI: Part 40 - Unify lockdown behavior of Options dialog
for Impress - View Page.
Change-Id: Icc3c4fc9dd3800ef454cbddb06e569e03c08967a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159856
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index b177c8e94064..fabf76255bd7 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -110,9 +110,13 @@ std::unique_ptr SdTpOptionsSnap::Create(
weld::Container* pPage, wel
SdTpOptionsContents::SdTpOptionsContents(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rInAttrs)
: SfxTabPage(pPage, pController, "modules/simpress/ui/sdviewpage.ui",
"SdViewPage", &rInAttrs)
, m_xCbxRuler(m_xBuilder->weld_check_button("ruler"))
+, m_xCbxRulerImg(m_xBuilder->weld_widget("lockruler"))
, m_xCbxDragStripes(m_xBuilder->weld_check_button("dragstripes"))
+, m_xCbxDragStripesImg(m_xBuilder->weld_widget("lockdragstripes"))
, m_xCbxHandlesBezier(m_xBuilder->weld_check_button("handlesbezier"))
+, m_xCbxHandlesBezierImg(m_xBuilder->weld_widget("lockhandlesbezier"))
, m_xCbxMoveOutline(m_xBuilder->weld_check_button("moveoutline"))
+, m_xCbxMoveOutlineImg(m_xBuilder->weld_widget("lockmoveoutline"))
{
}
@@ -173,6 +177,22 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs )
m_xCbxDragStripes->set_active(
aLayoutItem.GetOptionsLayout().IsDragStripes() );
m_xCbxHandlesBezier->set_active(
aLayoutItem.GetOptionsLayout().IsHandlesBezier() );
+bool bReadOnly =
officecfg::Office::Impress::Layout::Display::Ruler::isReadOnly();
+m_xCbxRuler->set_sensitive(!bReadOnly);
+m_xCbxRulerImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Layout::Display::Contour::isReadOnly();
+m_xCbxMoveOutline->set_sensitive(!bReadOnly);
+m_xCbxMoveOutlineImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Layout::Display::Guide::isReadOnly();
+m_xCbxDragStripes->set_sensitive(!bReadOnly);
+m_xCbxDragStripesImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Layout::Display::Bezier::isReadOnly();
+m_xCbxHandlesBezier->set_sensitive(!bReadOnly);
+m_xCbxHandlesBezierImg->set_visible(bReadOnly);
+
m_xCbxRuler->save_state();
m_xCbxMoveOutline->save_state();
m_xCbxDragStripes->save_state();
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 4184cd7400d5..79735e6a3f81 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -43,9 +43,13 @@ class SdTpOptionsContents final : public SfxTabPage
{
private:
std::unique_ptr m_xCbxRuler;
+std::unique_ptr m_xCbxRulerImg;
std::unique_ptr m_xCbxDragStripes;
+std::unique_ptr m_xCbxDragStripesImg;
std::unique_ptr m_xCbxHandlesBezier;
+std::unique_ptr m_xCbxHandlesBezierImg;
std::unique_ptr m_xCbxMoveOutline;
+std::unique_ptr m_xCbxMoveOutlineImg;
public:
SdTpOptionsContents(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet& rInAttrs);
diff --git a/sd/uiconfig/simpress/ui/sdviewpage.ui
b/sd/uiconfig/simpress/ui/sdviewpage.ui
index 52193b075c1e..608114e88fa9 100644
--- a/sd/uiconfig/simpress/ui/sdviewpage.ui
+++ b/sd/uiconfig/simpress/ui/sdviewpage.ui
@@ -10,13 +10,13 @@
0
none
-
+
+
True
False
12
6
-vertical
-6
+6
_Rulers visible
@@ -32,9 +32,8 @@
-False
-True
-0
+1
+0
@@ -52,9 +51,8 @@
-False
-True
-1
+1
+1
@@ -72,9 +70,8 @@
-False
-True
-2
+1
+2
@@ -92,9 +89,60 @@
-False
-True
-3
+1
+3
+
+
+
+
+False
+True
+center
+center
+res/lock.png
+
+
+0
+0
+
+
+
+
+False
+
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/tpoption.cxx| 55 -
sd/source/ui/inc/tpoption.hxx|9 +
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 140 +--
3 files changed, 193 insertions(+), 11 deletions(-)
New commits:
commit 256ec735299e95f03f87a1356a30147c67388d24
Author: Balazs Varga
AuthorDate: Thu Nov 23 10:45:24 2023 +0100
Commit: Balazs Varga
CommitDate: Fri Nov 24 14:17:47 2023 +0100
tdf#158222 - UI: Part 39 - Unify lockdown behavior of Options dialog
for Impress - General Page.
Change-Id: Idd7240b6c0ccfec8929e2f224a63ec5c0a8ad331
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159854
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index c7ee0843a42b..b177c8e94064 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -197,15 +198,24 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage,
weld::DialogController*
, nWidth(0)
, nHeight(0)
, m_xCbxQuickEdit(m_xBuilder->weld_check_button("qickedit"))
+, m_xCbxQuickEditImg(m_xBuilder->weld_widget("lockqickedit"))
, m_xCbxPickThrough(m_xBuilder->weld_check_button("textselected"))
+, m_xCbxPickThroughImg(m_xBuilder->weld_widget("locktextselected"))
, m_xNewDocumentFrame(m_xBuilder->weld_frame("newdocumentframe"))
, m_xCbxStartWithTemplate(m_xBuilder->weld_check_button("startwithwizard"))
+,
m_xCbxStartWithTemplateImg(m_xBuilder->weld_widget("lockstartwithwizard"))
, m_xCbxMasterPageCache(m_xBuilder->weld_check_button("backgroundback"))
+, m_xCbxMasterPageCacheImg(m_xBuilder->weld_widget("lockbackgroundback"))
, m_xCbxCopy(m_xBuilder->weld_check_button("copywhenmove"))
+, m_xCbxCopyImg(m_xBuilder->weld_widget("lockcopywhenmove"))
, m_xCbxMarkedHitMovesAlways(m_xBuilder->weld_check_button("objalwymov"))
+, m_xCbxMarkedHitMovesAlwaysImg(m_xBuilder->weld_widget("lockobjalwymov"))
, m_xLbMetric(m_xBuilder->weld_combo_box("units"))
+, m_xLbMetricImg(m_xBuilder->weld_widget("lockunits"))
, m_xMtrFldTabstop(m_xBuilder->weld_metric_spin_button("metricFields",
FieldUnit::MM))
+, m_xMtrFldTabstopImg(m_xBuilder->weld_widget("locktabstop"))
, m_xCbxCompatibility(m_xBuilder->weld_check_button("cbCompatibility"))
+, m_xCbxCompatibilityImg(m_xBuilder->weld_widget("lockcbCompatibility"))
, m_xScaleFrame(m_xBuilder->weld_frame("scaleframe"))
, m_xCbScale(m_xBuilder->weld_combo_box("scaleBox"))
, m_xNewDocLb(m_xBuilder->weld_label("newdoclbl"))
@@ -432,13 +442,41 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
{
SdOptionsMiscItem aOptsItem( rAttrs->Get( ATTR_OPTIONS_MISC ) );
+bool bReadOnly =
officecfg::Office::Impress::Misc::NewDoc::AutoPilot::isReadOnly();
m_xCbxStartWithTemplate->set_active(
aOptsItem.GetOptionsMisc().IsStartWithTemplate() );
+m_xCbxStartWithTemplate->set_sensitive(!bReadOnly);
+m_xCbxStartWithTemplateImg->set_visible(bReadOnly);
+
+bReadOnly = officecfg::Office::Impress::Misc::ObjectMoveable::isReadOnly();
m_xCbxMarkedHitMovesAlways->set_active(
aOptsItem.GetOptionsMisc().IsMarkedHitMovesAlways() );
+m_xCbxMarkedHitMovesAlways->set_sensitive(!bReadOnly);
+m_xCbxMarkedHitMovesAlwaysImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Misc::TextObject::QuickEditing::isReadOnly();
m_xCbxQuickEdit->set_active( aOptsItem.GetOptionsMisc().IsQuickEdit() );
+m_xCbxQuickEdit->set_sensitive(!bReadOnly);
+m_xCbxQuickEditImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Misc::TextObject::Selectable::isReadOnly();
m_xCbxPickThrough->set_active( aOptsItem.GetOptionsMisc().IsPickThrough()
);
+m_xCbxPickThrough->set_sensitive(!bReadOnly);
+m_xCbxPickThroughImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Misc::BackgroundCache::isReadOnly();
m_xCbxMasterPageCache->set_active(
aOptsItem.GetOptionsMisc().IsMasterPagePaintCaching() );
+m_xCbxMasterPageCache->set_sensitive(!bReadOnly);
+m_xCbxMasterPageCacheImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Misc::CopyWhileMoving::isReadOnly();
m_xCbxCopy->set_active( aOptsItem.GetOptionsMisc().IsDragWithCopy() );
+m_xCbxCopy->set_sensitive(!bReadOnly);
+m_xCbxCopyImg->set_visible(bReadOnly);
+
+bReadOnly =
officecfg::Office::Impress::Misc::Compatibility::AddBetween::isReadOnly();
m_xCbxCompatibility->set_active(
aOptsItem.GetOptionsMisc().IsSummationOfParagraphs() );
+m_xCbxCompatibility->set_sensitive(!bReadOnly);
+m_xCbxCompatibilityImg->set_visible(bReadOnly);
+
m_xCbxDistort->set_active(
aOptsItem.GetOptionsMisc().IsCrookNoContortion() );
m_xCbxStartWithTemplate->save
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/app/optsitem.cxx| 18 ++
sd/source/ui/dlg/present.cxx |4
sd/source/ui/dlg/tpoption.cxx| 10 ++
sd/source/ui/inc/optsitem.hxx|7 ---
sd/source/ui/inc/present.hxx |2 ++
sd/source/ui/inc/tpoption.hxx|2 --
sd/source/ui/slideshow/slideshowimpl.cxx |4 ++--
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 21 +
sd/uiconfig/simpress/ui/presentationdialog.ui| 13 -
9 files changed, 25 insertions(+), 56 deletions(-)
New commits:
commit e0334e1a77ec080b38952ea64b394c8652af851c
Author: Samuel Mehrbrodt
AuthorDate: Thu Nov 2 13:43:38 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Nov 6 09:43:28 2023 +0100
tdf#157788 Move "Show navigation panel" back to Presentation settings
Instead of hiding it in the general options dialog.
As written in https://bugs.documentfoundation.org/show_bug.cgi?id=157788#c4
"The options in Slide Show Settings should all apply to the workstation";
the options which are saved per user/workstation and not per document,
should not be moved
away from that dialog.
Instead the other options should also be saved per user/workstation.
Change-Id: I720c949f08877abb8ef8f94dbcfa6c85f349631d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158808
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index e02618ca8f18..74e410383c00 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -418,7 +418,6 @@ SdOptionsMisc::SdOptionsMisc( bool bImpress, bool
bUseConfig ) :
bPreviewNewEffects( true ),
bPreviewChangedEffects( false ),
bPreviewTransitions( true ),
-bShowNavigationPanel( false ),
mnDisplay( 0 ),
mnPenColor( 0xff ),
mnPenWidth( 150.0 ),
@@ -460,9 +459,7 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt )
const
IsShowComments() == rOpt.IsShowComments() &&
GetPresentationPenColor() == rOpt.GetPresentationPenColor() &&
GetPresentationPenWidth() == rOpt.GetPresentationPenWidth() &&
-GetDragThresholdPixels() == rOpt.GetDragThresholdPixels() &&
-
-IsShowNavigationPanel() == rOpt.IsShowNavigationPanel()
+GetDragThresholdPixels() == rOpt.GetDragThresholdPixels()
);
}
@@ -503,8 +500,7 @@ void SdOptionsMisc::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"PenColor",
"PenWidth",
"Start/EnableSdremote",
-"TabBarVisible",
-"Start/ShowNavigationPanel"
+"TabBarVisible"
};
rCount = ( IsImpress() ? SAL_N_ELEMENTS(aPropNames) : 16 );
@@ -568,9 +564,6 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[26].hasValue() ) {
SetTabBarVisible( *o3tl::doAccess(pValues[ 26 ]) );
}
-if( pValues[27].hasValue() )
-SetShowNavigationPanel( *o3tl::doAccess(pValues[ 27 ]) );
-
}
return true;
@@ -613,9 +606,6 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 24 ] <<= GetPresentationPenWidth();
pValues[ 25 ] <<= IsEnableSdremote();
pValues[ 26 ] <<= IsTabBarVisible();
-
-pValues[ 27 ] <<= IsShowNavigationPanel();
-
}
return true;
@@ -657,8 +647,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const *
pOpts, ::sd::FrameView c
maOptionsMisc.SetPresentationPenColor(pOpts->GetPresentationPenColor()
);
maOptionsMisc.SetPresentationPenWidth(pOpts->GetPresentationPenWidth()
);
-
-maOptionsMisc.SetShowNavigationPanel( pOpts->IsShowNavigationPanel() );
}
if( pView )
@@ -741,8 +729,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
pOpts->SetPresentationPenWidth( maOptionsMisc.GetPresentationPenWidth() );
pOpts->SetDragThreshold( maOptionsMisc.GetDragThresholdPixels() );
-
-pOpts->SetShowNavigationPanel( maOptionsMisc.IsShowNavigationPanel() );
}
/*
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 6eaedbfae48b..34b0befd2a7f 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -65,6 +65,7 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window*
pWindow, const SfxI
,
m_xCbxAnimationAllowed(m_xBuilder->weld_check_button("animationsallowed"))
, m_xCbxChangePage(m_xBuilder->weld_check_button("changeslidesbyclick"))
, m_xCbxAlwaysOnTop(m_xBuilder->weld_check_button("alwaysontop"))
+,
m_xCbxShowNavigationButton(m_xBuilder->weld_check_button("shownavigationbutton"))
, m_xLbConsole(m_xBuilder->weld_combo_box("console_cb"))
, m_xFtMonitor(m_xBuild
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/app/optsitem.cxx| 30 +++-
sd/source/ui/dlg/present.cxx | 39 +
sd/source/ui/dlg/tpoption.cxx| 15
sd/source/ui/inc/optsitem.hxx|3 -
sd/source/ui/inc/present.hxx |3 +
sd/source/ui/inc/tpoption.hxx|2 -
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 42 +--
sd/uiconfig/simpress/ui/presentationdialog.ui| 34 ++
8 files changed, 84 insertions(+), 84 deletions(-)
New commits:
commit 496f324b8f038d81fe7a14eb424680e9acab1a3c
Author: Samuel Mehrbrodt
AuthorDate: Thu Nov 2 12:35:16 2023 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Nov 6 09:43:04 2023 +0100
tdf#135089 Move Presenter console settings to Slide Show settings
Change-Id: I0aeb180ee132bff359d46d963985196f5a24610f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158798
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 0492be483658..e02618ca8f18 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -409,8 +409,6 @@ SdOptionsMisc::SdOptionsMisc( bool bImpress, bool
bUseConfig ) :
bDoubleClickTextEdit( true ),
bClickChangeRotation( false ),
bEnableSdremote( false ),
-bEnablePresenterScreen( true ),
-bPresenterScreenFullScreen( true ),
bSolidDragging( true ),
bSummationOfParagraphs( false ),
bTabBarVisible( true ),
@@ -446,8 +444,6 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt )
const
IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() &&
IsClickChangeRotation() == rOpt.IsClickChangeRotation() &&
IsEnableSdremote() == rOpt.IsEnableSdremote() &&
-IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen() &&
-IsPresenterScreenFullScreen() ==
rOpt.IsPresenterScreenFullScreen() &&
IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
IsTabBarVisible() == rOpt.IsTabBarVisible() &&
IsSolidDragging() == rOpt.IsSolidDragging() &&
@@ -507,8 +503,6 @@ void SdOptionsMisc::GetPropNameArray( const char**&
ppNames, sal_uLong& rCount )
"PenColor",
"PenWidth",
"Start/EnableSdremote",
-"Start/EnablePresenterScreen",
-"Start/PresenterScreenFullScreen",
"TabBarVisible",
"Start/ShowNavigationPanel"
};
@@ -571,17 +565,11 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[25].hasValue() )
SetEnableSdremote( *o3tl::doAccess(pValues[ 25 ]) );
-if( pValues[26].hasValue() )
-SetEnablePresenterScreen( *o3tl::doAccess(pValues[ 26 ]) );
-
-if (pValues[27].hasValue() )
-SetPresenterScreenFullScreen( *o3tl::doAccess(pValues[ 27 ])
);
-
-if( pValues[28].hasValue() ) {
-SetTabBarVisible( *o3tl::doAccess(pValues[ 28 ]) );
+if( pValues[26].hasValue() ) {
+SetTabBarVisible( *o3tl::doAccess(pValues[ 26 ]) );
}
-if( pValues[29].hasValue() )
-SetShowNavigationPanel( *o3tl::doAccess(pValues[ 29 ]) );
+if( pValues[27].hasValue() )
+SetShowNavigationPanel( *o3tl::doAccess(pValues[ 27 ]) );
}
@@ -624,11 +612,9 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
pValues[ 23 ] <<= GetPresentationPenColor();
pValues[ 24 ] <<= GetPresentationPenWidth();
pValues[ 25 ] <<= IsEnableSdremote();
-pValues[ 26 ] <<= IsEnablePresenterScreen();
-pValues[ 27 ] <<= IsPresenterScreenFullScreen();
-pValues[ 28 ] <<= IsTabBarVisible();
+pValues[ 26 ] <<= IsTabBarVisible();
-pValues[ 29 ] <<= IsShowNavigationPanel();
+pValues[ 27 ] <<= IsShowNavigationPanel();
}
@@ -655,8 +641,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const *
pOpts, ::sd::FrameView c
{
maOptionsMisc.SetStartWithTemplate( pOpts->IsStartWithTemplate() );
maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() );
-maOptionsMisc.SetEnablePresenterScreen(
pOpts->IsEnablePresenterScreen() );
-maOptionsMisc.SetPresenterScreenFullScreen(
pOpts->IsPresenterScreenFullScreen() );
maOptionsMisc.SetSummationOfParagraphs(
pOpts->IsSummationOfParagraphs() );
maOptionsMisc.SetTabBarVisible( pOpts->IsTabBarVisible() );
maOptionsMisc.SetShowUndoDeleteWarning(
pOpts->IsShowUndoDeleteWarning() );
@@ -737,8 +721,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() );
pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() );
pOpts->SetEnableSdremote( maOptionsMisc.IsEnableSdremote() );
-pOpts->
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/navigatr.cxx |9
sd/source/ui/dlg/sdtreelb.cxx | 12 +-
sd/source/ui/inc/sdtreelb.hxx | 13 ++-
sd/uiconfig/simpress/ui/navigatorpanel.ui | 33 ++
4 files changed, 64 insertions(+), 3 deletions(-)
New commits:
commit a8493ee3d7dac611286a75516f24dd6e451f9718
Author: Jim Raykowski
AuthorDate: Sat Apr 22 11:23:48 2023 -0800
Commit: Jim Raykowski
CommitDate: Tue Apr 25 19:50:06 2023 +0200
tdf#154604 SdNavigator: Support listing in front-to-back z order
Enhancement patch to provide the option to list objects in front-to-
back or back-to-front z order
Change-Id: I2194cace08736d948002548887661314834cef89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150893
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index ff0bc85d9b85..be0f5919afa9 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -309,6 +309,9 @@ IMPL_LINK(SdNavigatorWin, DropdownClickToolBoxHdl, const
OUString&, rCommand, vo
bool bAll = mxTlbObjects->GetShowAllShapes();
mxShapeMenu->set_active("named", !bAll);
mxShapeMenu->set_active("all", bAll);
+bool bOrderFrontToBack = mxTlbObjects->GetOrderFrontToBack();
+mxShapeMenu->set_active("fronttoback", bOrderFrontToBack);
+mxShapeMenu->set_active("backtofront", !bOrderFrontToBack);
}
}
@@ -501,13 +504,19 @@ IMPL_LINK(SdNavigatorWin, MenuSelectHdl, const OUString&,
rIdent, void)
IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, const OUString&, rIdent, void )
{
bool bShowAllShapes(mxTlbObjects->GetShowAllShapes());
+bool bOrderFrontToBack(mxTlbObjects->GetOrderFrontToBack());
if (rIdent == "named")
bShowAllShapes = false;
else if (rIdent == "all")
bShowAllShapes = true;
+else if (rIdent == "fronttoback")
+bOrderFrontToBack = true;
+else if (rIdent == "backtofront")
+bOrderFrontToBack = false;
else
OSL_FAIL("SdNavigatorWin::ShapeFilterCallback called for unknown menu
entry");
+mxTlbObjects->SetOrderFrontToBack(bOrderFrontToBack);
mxTlbObjects->SetShowAllShapes(bShowAllShapes, true);
// Remember the selection in the FrameView.
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index efb027c2119c..68e794c21d5d 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -182,6 +182,11 @@ void SdPageObjsTLV::SetShowAllShapes (
}
}
+void SdPageObjsTLV::SetOrderFrontToBack(const bool bOrderFrontToBack)
+{
+m_bOrderFrontToBack = bOrderFrontToBack;
+}
+
bool SdPageObjsTLV::IsEqualToShapeList(std::unique_ptr&
rEntry, const SdrObjList& rList,
std::u16string_view rListName)
{
@@ -416,6 +421,7 @@ bool SdPageObjsTLV::DoDrag()
}
m_xDropTargetHelper->SetDrawView(pViewShell->GetDrawView());
+m_xDropTargetHelper->SetOrderFrontToBack(m_bOrderFrontToBack);
bIsInDrag = true;
std::unique_ptr xEntry = m_xTreeView->make_iterator();
@@ -562,7 +568,7 @@ sal_Int8 SdPageObjsTLVDropTarget::ExecuteDrop( const
ExecuteDropEvent& rEvt )
m_rTreeView.iter_previous_sibling(*xTarget);
m_rTreeView.set_cursor(*xTarget);
-// Remove and insert are required for moving objects in to and out of
groups.
+// Remove and insert are required for moving objects into and out of
groups.
// PutMarked... by itself would suffice if this wasn't allowed.
// Remove the source object from source parent list and insert it in
the target parent list.
@@ -595,7 +601,8 @@ sal_Int8 SdPageObjsTLVDropTarget::ExecuteDrop( const
ExecuteDropEvent& rEvt )
pList->NbcInsertObject(rSourceObject.get());
}
-m_pSdrView->PutMarkedBehindObj(pTargetObject);
+m_bOrderFrontToBack ? m_pSdrView->PutMarkedInFrontOfObj(pTargetObject)
:
+ m_pSdrView->PutMarkedBehindObj(pTargetObject);
}
return DND_ACTION_NONE;
@@ -710,6 +717,7 @@
SdPageObjsTLV::SdPageObjsTLV(std::unique_ptr xTreeView)
, m_pOwnMedium(nullptr)
, m_bLinkableSelected(false)
, m_bShowAllShapes(false)
+, m_bOrderFrontToBack(false)
, m_bShowAllPages(false)
, m_bSelectionHandlerNavigates(false)
, m_bNavigationGrabsFocus(true)
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 07e79c566df9..38255a66e16f 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -56,6 +56,7 @@ class SdPageObjsTLVDropTarget final : public DropTargetHelper
private:
weld::TreeView& m_rTreeView;
SdrView* m_pSdrView;
+bool m_bOrderFrontToBack = false;
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
virtual sal_Int8 ExecuteDrop( const
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/table/tablefunction.cxx|2 +-
sd/uiconfig/sdraw/toolbar/tableobjectbar.xml|1 -
sd/uiconfig/simpress/toolbar/tableobjectbar.xml |1 -
3 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit e0e51cc5441669f6297383d8d50bfde2854be874
Author: Rafael Lima
AuthorDate: Fri Dec 2 10:39:32 2022 +
Commit: Rafael Lima
CommitDate: Wed Dec 7 11:03:06 2022 +
tdf#151185 Make Table Design button toggle-able
Change-Id: I86dfc7a6567b24cc6e9a20203625eeb09c17536c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143574
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sd/source/ui/table/tablefunction.cxx
b/sd/source/ui/table/tablefunction.cxx
index 352ffb37abfe..d3a26e41a872 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -235,7 +235,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
{
// First make sure that the sidebar is visible
GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
-::sfx2::sidebar::Sidebar::ShowPanel(
+::sfx2::sidebar::Sidebar::TogglePanel(
u"SdTableDesignPanel",
GetViewFrame()->GetFrame().GetFrameInterface());
diff --git a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
index 87655aafe2f5..f2f821273c5d 100644
--- a/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
@@ -46,6 +46,5 @@
-
diff --git a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
index 87655aafe2f5..f2f821273c5d 100644
--- a/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
@@ -46,6 +46,5 @@
-
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/navigatr.cxx |2
sd/source/ui/dlg/sdtreelb.cxx | 104 ---
sd/uiconfig/simpress/ui/navigatorpanel.ui | 113 +++---
3 files changed, 139 insertions(+), 80 deletions(-)
New commits:
commit 1b031eb1ba6c529ce67ff8f471afee414d64a098
Author: Jim Raykowski
AuthorDate: Tue Nov 8 23:49:27 2022 -0900
Commit: Jim Raykowski
CommitDate: Mon Nov 21 09:41:41 2022 +0100
tdf#145359 related: SdNavigator dnd
This is an enhancement patch that provides drag and drop capability
within the Navigator page object tree to allow arranging object
navigation order and grouping of objects.
Change-Id: I76996cd909765fb3503cf077566bec267b7705e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142640
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 98883e7b..cdc2db1f5a81 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -808,7 +808,7 @@ void
SdNavigatorControllerItem::StateChangedAtToolBoxControl( sal_uInt16 nSId,
if (nState & NavState::TableUpdate)
{
// InitTlb; is initiated by Slot
-if (maUpdateRequest)
+if (maUpdateRequest &&
!pNavigatorWin->GetObjects().get_treeview().has_focus())
maUpdateRequest();
}
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 8a9002ac6c38..a90a76adbee2 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -379,8 +379,8 @@ namespace
std::unique_ptr
xSourceParent(rTreeView.make_iterator(xSource.get()));
bool bSourceHasParent = rTreeView.iter_parent(*xSourceParent);
-// level 1 objects only
-if (!bSourceHasParent || rTreeView.get_iter_depth(*xSourceParent))
+// disallow root drag
+if (!bSourceHasParent)
return false;
SdrObject* pSourceObject =
weld::fromId(rTreeView.get_id(*xSource));
@@ -495,20 +495,36 @@ sal_Int8 SdPageObjsTLVDropTarget::AcceptDrop(const
AcceptDropEvent& rEvt)
if (!m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, xTarget.get(), true))
return DND_ACTION_NONE;
+// disallow when root is drop target
+if (m_rTreeView.get_iter_depth(*xTarget) == 0)
+return DND_ACTION_NONE;
+
+// disallow if there is no source entry selected
std::unique_ptr xSource(m_rTreeView.make_iterator());
if (!m_rTreeView.get_selected(xSource.get()))
return DND_ACTION_NONE;
-std::unique_ptr
xTargetParent(m_rTreeView.make_iterator(xTarget.get()));
-while (m_rTreeView.get_iter_depth(*xTargetParent))
-m_rTreeView.iter_parent(*xTargetParent);
+// disallow when root is source
+if (m_rTreeView.get_iter_depth(*xSource) == 0)
+return DND_ACTION_NONE;
-std::unique_ptr
xSourceParent(m_rTreeView.make_iterator(xSource.get()));
-while (m_rTreeView.get_iter_depth(*xSourceParent))
-m_rTreeView.iter_parent(*xSourceParent);
+// disallow when the source is the parent or ancestoral parent of the
target
+std::unique_ptr
xTargetParent(m_rTreeView.make_iterator(xTarget.get()));
+while (m_rTreeView.get_iter_depth(*xTargetParent) > 1)
+{
+if (!m_rTreeView.iter_parent(*xTargetParent) ||
+m_rTreeView.iter_compare(*xSource, *xTargetParent) == 0)
+return DND_ACTION_NONE;
+}
-// can only drop within the same page
-if (m_rTreeView.iter_compare(*xTargetParent, *xSourceParent) != 0)
+// disallow drop when source and target are not within the same page
+std::unique_ptr
xSourcePage(m_rTreeView.make_iterator(xSource.get()));
+std::unique_ptr
xTargetPage(m_rTreeView.make_iterator(xTarget.get()));
+while (m_rTreeView.get_iter_depth(*xTargetPage))
+m_rTreeView.iter_parent(*xTargetPage);
+while (m_rTreeView.get_iter_depth(*xSourcePage))
+m_rTreeView.iter_parent(*xSourcePage);
+if (m_rTreeView.iter_compare(*xTargetPage, *xSourcePage) != 0)
return DND_ACTION_NONE;
return DND_ACTION_MOVE;
@@ -529,35 +545,73 @@ sal_Int8 SdPageObjsTLVDropTarget::ExecuteDrop( const
ExecuteDropEvent& rEvt )
return DND_ACTION_NONE;
std::unique_ptr xTarget(m_rTreeView.make_iterator());
-if (!m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, xTarget.get(), true))
+if (!m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, xTarget.get(),
false))
return DND_ACTION_NONE;
-int nTargetPos = m_rTreeView.get_iter_index_in_parent(*xTarget) + 1;
+
+auto nIterCompare = m_rTreeView.iter_compare(*xSource, *xTarget);
+if (nIterCompare == 0)
+{
+// drop position is the same as source position
+return DND_ACTION_NONE;
+}
SdrObject* pTargetObject =
weld::fromId(m_rTreeView.get_id(*xTarget));
SdrObject* pSourceObject =
weld::fromId(m_rTreeView.ge
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_sdraw.mk
sd/UIConfig_sdraw.mk |1
sd/source/ui/dlg/navigatr.cxx| 30 ++-
sd/source/ui/dlg/sdtreelb.cxx| 114 ++-
sd/source/ui/inc/navigatr.hxx|3
sd/source/ui/inc/sdtreelb.hxx| 31 +++
sd/uiconfig/sdraw/ui/navigatorcontextmenu.ui | 17
6 files changed, 194 insertions(+), 2 deletions(-)
New commits:
commit ace75043781b5fe36546ec75574a14617f4feb30
Author: Jim Raykowski
AuthorDate: Mon Oct 24 23:32:30 2022 -0800
Commit: Jim Raykowski
CommitDate: Wed Nov 9 08:23:42 2022 +0100
tdf#139633 SdNavigator: Enhancement to rename pages and objects
This enhancement adds a context popup menu to the Navigator tree that
has menu entry 'Rename...'. Renaming is done by direct editing in the
tree.
Change-Id: I392ea839110b942e1a336748c896d33ee5ece9b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141801
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 136f84fcd315..abc068cff737 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -113,6 +113,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/insertlayer \
sd/uiconfig/sdraw/ui/insertslidesdialog \
sd/uiconfig/sdraw/ui/namedesign \
+ sd/uiconfig/sdraw/ui/navigatorcontextmenu \
sd/uiconfig/sdraw/ui/notebookbar \
sd/uiconfig/sdraw/ui/notebookbar_compact \
sd/uiconfig/sdraw/ui/notebookbar_single \
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 162b3011a23d..98883e7b 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -47,6 +47,8 @@
#include
#include
+#include
+
/**
* SdNavigatorWin - FloatingWindow
*/
@@ -68,6 +70,7 @@ SdNavigatorWin::SdNavigatorWin(weld::Widget* pParent,
SfxBindings* pInBindings,
mxTlbObjects->connect_row_activated(LINK(this, SdNavigatorWin,
ClickObjectHdl));
mxTlbObjects->set_selection_mode(SelectionMode::Multiple);
mxTlbObjects->connect_mouse_release(LINK(this, SdNavigatorWin,
MouseReleaseHdl));
+mxTlbObjects->connect_popup_menu(LINK(this, SdNavigatorWin, CommandHdl));
mxToolbox->connect_clicked(LINK(this, SdNavigatorWin, SelectToolboxHdl));
mxToolbox->connect_menu_toggled(LINK(this, SdNavigatorWin,
DropdownClickToolBoxHdl));
@@ -238,6 +241,27 @@ IMPL_STATIC_LINK_NOARG(SdNavigatorWin, MouseReleaseHdl,
const MouseEvent&, bool)
return true;
}
+IMPL_LINK(SdNavigatorWin, CommandHdl, const CommandEvent&, rCEvt, bool)
+{
+if (rCEvt.GetCommand() != CommandEventId::ContextMenu)
+return false;
+weld::TreeView& rTreeView = GetObjects().get_treeview();
+std::unique_ptr
xBuilder(Application::CreateBuilder(&rTreeView,
+
"modules/sdraw/ui/navigatorcontextmenu.ui"));
+std::unique_ptr xPop = xBuilder->weld_menu("navmenu");
+OString sCommand = xPop->popup_at_rect(&rTreeView,
+
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)));
+if (!sCommand.isEmpty())
+ExecuteContextMenuAction(sCommand);
+return true;
+}
+
+void SdNavigatorWin::ExecuteContextMenuAction(std::string_view
rSelectedPopupEntry)
+{
+if (rSelectedPopupEntry == "rename")
+GetObjects().start_editing();
+}
+
IMPL_LINK(SdNavigatorWin, SelectToolboxHdl, const OString&, rCommand, void)
{
PageJump ePage = PAGE_NONE;
@@ -393,9 +417,13 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl,
weld::TreeView&, bool)
pWindow->GrabFocus();
if (!mxTlbObjects->IsNavigationGrabsFocus())
+{
// This is the case when keyboard navigation inside the
// navigator should continue to work.
+if (mxNavigatorDlg)
+mxNavigatorDlg->GrabFocus();
mxTlbObjects->grab_focus();
+}
}
}
}
@@ -687,7 +715,7 @@ IMPL_LINK(SdNavigatorWin, KeyInputHdl, const KeyEvent&,
rKEvt, bool)
if (KEY_ESCAPE == rKEvt.GetKeyCode().GetCode())
{
// during drag'n'drop we just stop the drag but do not close the
navigator
-if (!SdPageObjsTLV::IsInDrag())
+if (!SdPageObjsTLV::IsInDrag() && !GetObjects().IsEditingActive())
{
::sd::ViewShellBase* pBase =
::sd::ViewShellBase::GetViewShellBase( mpBindings->GetDispatcher()->GetFrame());
if (pBase)
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 226f8fe11eac..0c0e5df03245 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -53,6 +53,8 @@
#include
#include
+#include
+#include
using namespace com::sun::star;
@@ -286,16 +288,44 @@ bool SdPageObjsTLV::IsEqualToDoc( const SdDra
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1
sd/source/ui/inc/DrawViewShell.hxx | 13 +--
sd/source/ui/view/drviews4.cxx | 40
sd/uiconfig/simpress/ui/snapmenu.ui |9
4 files changed, 30 insertions(+), 33 deletions(-)
New commits:
commit 50cec31d5fa77ebc04f35e57718a02d328562417
Author: Caolán McNamara
AuthorDate: Sat Nov 27 21:18:56 2021 +
Commit: Caolán McNamara
CommitDate: Sun Nov 28 11:14:30 2021 +0100
weld Snap Line context menu
Change-Id: Ic4ea546f66eae7acb0427686be8981e2e8231c77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125955
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 4edab7d4d5d9..3476e409a73b 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -161,6 +161,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/slidecontextmenu \
sd/uiconfig/simpress/ui/slidedesigndialog \
sd/uiconfig/simpress/ui/slidetransitionspanel \
+ sd/uiconfig/simpress/ui/snapmenu \
sd/uiconfig/simpress/ui/tabviewbar \
sd/uiconfig/simpress/ui/tabledesignpanel \
sd/uiconfig/simpress/ui/templatedialog \
diff --git a/sd/source/ui/inc/DrawViewShell.hxx
b/sd/source/ui/inc/DrawViewShell.hxx
index 27b46a008fcb..44bb83d44979 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -471,19 +471,18 @@ private:
can not be selected the index of the snap line/point for which the
popup menu is opened has to be passed to the processing slot
handlers. This can be done only by manually showing the popup menu.
+@param pParent
+The parent for the context menu.
+@param rRect
+The location at which to display the context menu.
@param rPageView
The page view is used to access the help lines.
@param nSnapLineIndex
Index of the snap line or snap point for which to show the
context menu.
-@param rMouseLocation
-The mouse location defines the location at which to display the
-context menu.
*/
-void ShowSnapLineContextMenu (
-SdrPageView& rPageView,
-const sal_uInt16 nSnapLineIndex,
-const Point& rMouseLocation);
+void ShowSnapLineContextMenu(weld::Window* pParent, const
::tools::Rectangle& rRect,
+SdrPageView& rPageView, const sal_uInt16 nSnapLineIndex);
using ViewShell::Notify;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 8c0a9282e33a..f4114361ccb0 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -574,7 +574,9 @@ void DrawViewShell::Command(const CommandEvent& rCEvt,
::sd::Window* pWin)
// helper line
if ( mpDrawView->PickHelpLine( aMPos, nHitLog,
*GetActiveWindow()->GetOutDev(), nHelpLine, pPV) )
{
-ShowSnapLineContextMenu(*pPV, nHelpLine, rCEvt.GetMousePosPixel());
+::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(10, 10));
+weld::Window* pParent = weld::GetPopupParent(*pWin, aRect);
+ShowSnapLineContextMenu(pParent, aRect, *pPV, nHelpLine);
return;
}
// is gluepoint under cursor marked?
@@ -928,41 +930,27 @@ void DrawViewShell::UnlockInput()
mnLockCount--;
}
-void DrawViewShell::ShowSnapLineContextMenu (
-SdrPageView& rPageView,
-const sal_uInt16 nSnapLineIndex,
-const Point& rMouseLocation)
+void DrawViewShell::ShowSnapLineContextMenu(weld::Window* pParent, const
::tools::Rectangle& rRect,
+SdrPageView& rPageView, const
sal_uInt16 nSnapLineIndex)
{
const SdrHelpLine& rHelpLine (rPageView.GetHelpLines()[nSnapLineIndex]);
-ScopedVclPtrInstance pMenu;
+std::unique_ptr
xBuilder(Application::CreateBuilder(nullptr,
"modules/simpress/ui/snapmenu.ui"));
+std::unique_ptr xMenu(xBuilder->weld_menu("menu"));
if (rHelpLine.GetKind() == SdrHelpLineKind::Point)
{
-pMenu->InsertItem(
-SID_SET_SNAPITEM,
-SdResId(STR_POPUP_EDIT_SNAPPOINT));
-pMenu->InsertSeparator();
-pMenu->InsertItem(
-SID_DELETE_SNAPITEM,
-SdResId(STR_POPUP_DELETE_SNAPPOINT));
+xMenu->append(OUString::number(SID_SET_SNAPITEM),
SdResId(STR_POPUP_EDIT_SNAPPOINT));
+xMenu->append_separator("separator");
+xMenu->append(OUString::number(SID_DELETE_SNAPITEM),
SdResId(STR_POPUP_DELETE_SNAPPOINT));
}
else
{
-pMenu->InsertItem(
-SID_SET_SNAPITEM,
-SdResId(STR_POPUP_EDIT_SNAPLINE));
-pMenu->InsertSeparator();
-pMenu->InsertItem(
-SID_DELETE_SNAPITEM,
-SdResId(STR_POPUP_DELETE_SNAPLINE));
+xMe
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/animations/CustomAnimationPane.cxx |4 sd/uiconfig/simpress/ui/customanimationspanel.ui | 1124 +++ 2 files changed, 566 insertions(+), 562 deletions(-) New commits: commit 279cc2aa9d8e5e53762352415c05c262fb1d906f Author: Heiko Tietze AuthorDate: Mon Oct 18 12:50:26 2021 +0200 Commit: Heiko Tietze CommitDate: Wed Oct 20 07:12:28 2021 +0200 Related tdf#145037 and tdf#145028 - Animation sidebar usability * Splitter to resize available vs. applied animations * Label on the Add button Change-Id: I0321d35a4c7e796c0732560b34a0bc18fb104e6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123741 Reviewed-by: Heiko Tietze Tested-by: Jenkins diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index a125838a07d5..73d4b581cfbd 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -167,10 +167,10 @@ void CustomAnimationPane::initialize() mxLBAnimation->connect_changed(LINK(this, CustomAnimationPane, AnimationSelectHdl)); mxCustomAnimationList->setController( static_cast ( this ) ); mxCustomAnimationList->set_size_request(mxCustomAnimationList->get_approximate_digit_width() * 15, - mxCustomAnimationList->get_height_rows(8)); + mxCustomAnimationList->get_height_rows(4)); mxLBAnimation->set_size_request(mxLBAnimation->get_approximate_digit_width() * 15, -mxLBAnimation->get_height_rows(8)); +mxLBAnimation->get_height_rows(4)); maStrProperty = mxFTProperty->get_label(); diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index c0d1ab91614f..35cc0d49ecb7 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -1,50 +1,46 @@ - + 10 -0.5 -5 +0.5 +5 10 -0.5 -5 +0.5 +5 True -False -sfx2/res/symphony/sidebar-property-small.png +False +sfx2/res/symphony/sidebar-property-small.png True -False -svtools/res/list_add.png -2 +False +svtools/res/list_add.png True -False -cmd/sc_movedown.png -2 +False +cmd/sc_movedown.png True -False -sd/res/playblue_16.png +False +sd/res/playblue_16.png True -False -extensions/res/buttonminus.png -2 +False +extensions/res/buttonminus.png True -False -cmd/sc_moveup.png -2 +False +cmd/sc_moveup.png @@ -74,615 +70,623 @@ True -False +False True -6 +6 vertical - + True -False +True +True True vertical -12 +True - + True -False +True +never - -True -True -True -in + +True +False - -260 -True -True -True + +True +False True True -liststore1 -False -True -1 - - - - -6 - - - -0 - - + +True +True +True +in - - -1 - + +260 +True +True +True +True +True +liststore1 +False +True +1 + + + + + +6 + + +
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/filter/html/htmlex.hxx|1 +
sd/source/filter/html/pubdlg.cxx| 23 ++-
sd/source/ui/inc/pubdlg.hxx |1 +
sd/uiconfig/simpress/ui/publishingdialog.ui | 24 +++-
4 files changed, 43 insertions(+), 6 deletions(-)
New commits:
commit 1bad47097694de957857c9c891bf79a4873a97c4
Author: Andreas Heinisch
AuthorDate: Wed Mar 24 21:13:38 2021 +0100
Commit: Noel Grandin
CommitDate: Thu Mar 25 15:04:45 2021 +0100
tdf#67614 - Added the FHD image resolution
Added the possibility to chose full hd image resolution when exporting
slides via html.
Change-Id: I38c721c98093fbd21d9761708edf68e26d0c97ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113069
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index cad0c0cd45cf..aeef943cb8f6 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -40,6 +40,7 @@ namespace tools { class Rectangle; }
#define PUB_LOWRES_WIDTH640
#define PUB_MEDRES_WIDTH800
#define PUB_HIGHRES_WIDTH 1024
+#define PUB_FHDRES_WIDTH1920
#define PUB_THUMBNAIL_WIDTH 256
#define PUB_THUMBNAIL_HEIGHT 192
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 2d283e3ae41b..5fe558f1dd22 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -429,6 +429,7 @@ SdPublishingDlg::SdPublishingDlg(weld::Window* pWindow,
DocumentType eDocType)
m_xPage3_Resolution_1->connect_clicked(LINK(this,SdPublishingDlg,
ResolutionHdl ));
m_xPage3_Resolution_2->connect_clicked(LINK(this,SdPublishingDlg,
ResolutionHdl ));
m_xPage3_Resolution_3->connect_clicked(LINK(this,SdPublishingDlg,
ResolutionHdl ));
+m_xPage3_Resolution_4->connect_clicked(LINK(this, SdPublishingDlg,
ResolutionHdl));
m_xPage2_ChgDefault->connect_clicked(LINK(this,SdPublishingDlg,
SlideChgHdl));
m_xPage2_ChgAuto->connect_clicked(LINK(this,SdPublishingDlg, SlideChgHdl));
@@ -564,6 +565,7 @@ void SdPublishingDlg::CreatePages()
m_xPage3_Resolution_1 =
m_xBuilder->weld_radio_button("resolution1Radiobutton");
m_xPage3_Resolution_2 =
m_xBuilder->weld_radio_button("resolution2Radiobutton");
m_xPage3_Resolution_3 =
m_xBuilder->weld_radio_button("resolution3Radiobutton");
+m_xPage3_Resolution_4 =
m_xBuilder->weld_radio_button("resolution4Radiobutton");
m_xPage3_Title3 = m_xBuilder->weld_label("effectsLabel");
m_xPage3_SldSound = m_xBuilder->weld_check_button("sldSoundCheckbutton");
m_xPage3_HiddenSlides =
m_xBuilder->weld_check_button("hiddenSlidesCheckbutton");
@@ -578,6 +580,7 @@ void SdPublishingDlg::CreatePages()
aAssistentFunc.InsertControl(3, m_xPage3_Resolution_1.get());
aAssistentFunc.InsertControl(3, m_xPage3_Resolution_2.get());
aAssistentFunc.InsertControl(3, m_xPage3_Resolution_3.get());
+aAssistentFunc.InsertControl(3, m_xPage3_Resolution_4.get());
aAssistentFunc.InsertControl(3, m_xPage3_Title3.get());
aAssistentFunc.InsertControl(3, m_xPage3_SldSound.get());
aAssistentFunc.InsertControl(3, m_xPage3_HiddenSlides.get());
@@ -725,11 +728,13 @@ void SdPublishingDlg::GetParameterSequence( Sequence<
PropertyValue >& rParams )
// Page 3
aValue.Name = "Width";
-sal_Int32 nTmpWidth = 640;
+sal_Int32 nTmpWidth = PUB_LOWRES_WIDTH;
if( m_xPage3_Resolution_2->get_active() )
-nTmpWidth = 800;
+nTmpWidth = PUB_MEDRES_WIDTH;
else if( m_xPage3_Resolution_3->get_active() )
-nTmpWidth = 1024;
+nTmpWidth = PUB_HIGHRES_WIDTH;
+else if (m_xPage3_Resolution_4->get_active())
+nTmpWidth = PUB_FHDRES_WIDTH;
aValue.Value <<= nTmpWidth;
aProps.push_back( aValue );
@@ -946,6 +951,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, weld::Button&,
rButton, void )
m_xPage3_Resolution_1->set_sensitive(&rButton ==
m_xPage3_Resolution_1.get());
m_xPage3_Resolution_2->set_sensitive(&rButton ==
m_xPage3_Resolution_2.get());
m_xPage3_Resolution_3->set_sensitive(&rButton ==
m_xPage3_Resolution_3.get());
+m_xPage3_Resolution_4->set_sensitive(&rButton ==
m_xPage3_Resolution_4.get());
}
// Clickhandler for the ValueSet with the bitmap-buttons
@@ -1296,6 +1302,7 @@ void SdPublishingDlg::SetDesign( SdPublishingDesign const
* pDesign )
m_xPage3_Resolution_1->set_sensitive(pDesign->m_nResolution ==
PUB_LOWRES_WIDTH);
m_xPage3_Resolution_2->set_sensitive(pDesign->m_nResolution ==
PUB_MEDRES_WIDTH);
m_xPage3_Resolution_3->set_sensitive(pDesign->m_nResolution ==
PUB_HIGHRES_WIDTH);
+m_xPage3_Resolution_4->set_sensitive(pDesign->m_nResolution ==
PUB_FHDRES_WIDTH);
m_xPage3_SldSound->set_sensitive( pDesign->m_bSlideSound );
m_xPage3_HiddenSlides->set_sensitive( pDesign->m_bHiddenSlides );
@@ -1357,8 +1364,14 @@
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/annotations/annotationmanager.cxx |1
sd/source/ui/annotations/annotationtag.cxx | 35 ++---
sd/source/ui/annotations/annotationtag.hxx |3
sd/source/ui/annotations/annotationwindow.cxx | 157 +---
sd/source/ui/annotations/annotationwindow.hxx | 52 +++-
sd/uiconfig/simpress/ui/annotation.ui | 159 -
6 files changed, 180 insertions(+), 227 deletions(-)
New commits:
commit 36348c21c5499f539fd354de6a980fa7a59218bd
Author: Caolán McNamara
AuthorDate: Fri Feb 26 14:38:30 2021 +
Commit: Caolán McNamara
CommitDate: Sat Feb 27 20:13:27 2021 +0100
drop intermediate vcl container for impress annotation floating toplevel
Change-Id: Ia285322d69ea8ac803e1ee5ed8ba195388189058
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111661
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/annotations/annotationmanager.cxx
b/sd/source/ui/annotations/annotationmanager.cxx
index fdd296b92f8a..28f09dd8b237 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
diff --git a/sd/source/ui/annotations/annotationtag.cxx
b/sd/source/ui/annotations/annotationtag.cxx
index 9da90e2e2b57..4e79f8d337f9 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -578,43 +578,34 @@ void AnnotationTag::OpenPopup( bool bEdit )
if( pWindow )
{
RealPoint2D aPosition( mxAnnotation->getPosition() );
-Point aPos( pWindow->OutputToScreenPixel( pWindow->LogicToPixel(
Point( static_cast<::tools::Long>(aPosition.X * 100.0),
static_cast<::tools::Long>(aPosition.Y * 100.0) ) ) ) );
+Point aPos(pWindow->LogicToPixel( Point(
static_cast<::tools::Long>(aPosition.X * 100.0),
static_cast<::tools::Long>(aPosition.Y * 100.0) ) ) );
aPos.AdjustX(4 ); // magic!
aPos.AdjustY(1 );
::tools::Rectangle aRect( aPos, maSize );
-mpAnnotationWindow.reset( VclPtr::Create(
mrView.GetDocSh(), pWindow->GetWindow(GetWindowType::Frame) ) );
-AnnotationContents& rAnnotation =
mpAnnotationWindow->GetContents();
-rAnnotation.InitControls();
-rAnnotation.setAnnotation(mxAnnotation);
-
-sal_uInt16 nArrangeIndex = 0;
-Point aPopupPos( FloatingWindow::CalcFloatingPosition(
mpAnnotationWindow.get(), aRect, FloatWinPopupFlags::Right, nArrangeIndex ) );
-Size aPopupSize( 320, 240 );
-
-mpAnnotationWindow->SetPosSizePixel( aPopupPos, aPopupSize );
-mpAnnotationWindow->DoResize();
-
-mpAnnotationWindow->Show();
-mpAnnotationWindow->GrabFocus();
-mpAnnotationWindow->AddEventListener( LINK(this, AnnotationTag,
WindowEventHandler));
+weld::Window* pParent = weld::GetPopupParent(*pWindow, aRect);
+mpAnnotationWindow.reset(new AnnotationWindow(pParent, aRect,
mrView.GetDocSh(), mxAnnotation));
+mpAnnotationWindow->connect_closed(LINK(this, AnnotationTag,
PopupModeEndHdl));
}
}
if (bEdit && mpAnnotationWindow)
-mpAnnotationWindow->GetContents().StartEdit();
+mpAnnotationWindow->StartEdit();
+}
+
+IMPL_LINK_NOARG(AnnotationTag, PopupModeEndHdl, weld::Popover&, void)
+{
+ClosePopup();
}
void AnnotationTag::ClosePopup()
{
-if( mpAnnotationWindow )
+if (mpAnnotationWindow)
{
-mpAnnotationWindow->RemoveEventListener( LINK(this, AnnotationTag,
WindowEventHandler));
-AnnotationContents& rAnnotation = mpAnnotationWindow->GetContents();
-rAnnotation.SaveToDocument();
-mpAnnotationWindow.disposeAndClear();
+mpAnnotationWindow->SaveToDocument();
+mpAnnotationWindow.reset();
}
}
diff --git a/sd/source/ui/annotations/annotationtag.hxx
b/sd/source/ui/annotations/annotationtag.hxx
index 7a02e304078c..9eea78838eda 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -70,10 +70,11 @@ private:
virtual void deselect() override;
DECL_LINK( WindowEventHandler, VclWindowEvent&, void );
+DECL_LINK(PopupModeEndHdl, weld::Popover&, void);
AnnotationManagerImpl& mrManager;
css::uno::Reference< css::office::XAnnotation > mxAnnotation;
-VclPtrmpAnnotationWindow;
+std::unique_ptr mpAnnotationWindow;
Color maColor;
int mnIndex;
const vcl::Font&mrFont;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx
b/sd/source/ui/annotations/annotationwindow.cxx
index 408eb1a548bd..89ffb94ff106 100644
--- a/sd/source/ui/annotat
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1
sd/source/ui/app/sdpopup.cxx | 145 ---
sd/source/ui/inc/sdpopup.hxx | 15 +--
sd/source/ui/view/drviews4.cxx | 19 ++--
sd/uiconfig/simpress/ui/fieldmenu.ui |9 ++
5 files changed, 112 insertions(+), 77 deletions(-)
New commits:
commit 8e7e9e4f176ea35786cac96935d8692997a3d701
Author: Caolán McNamara
AuthorDate: Tue Feb 23 10:02:54 2021 +
Commit: Caolán McNamara
CommitDate: Tue Feb 23 12:32:33 2021 +0100
weld fieldmenu
Change-Id: I37a1609669631fdafcb4dea59a2a43c1c94e16e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111380
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index a532a2819e2d..78339ddae976 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -120,6 +120,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/dlgfield \
sd/uiconfig/simpress/ui/dockinganimation \
sd/uiconfig/simpress/ui/effectmenu \
+ sd/uiconfig/simpress/ui/fieldmenu \
sd/uiconfig/simpress/ui/fontsizemenu \
sd/uiconfig/simpress/ui/fontstylemenu \
sd/uiconfig/simpress/ui/gluebox \
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index d4b81ea7fde5..9bdb2b93603a 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
@@ -31,11 +32,12 @@
/*
* Popup menu for editing of field command
*/
-SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField, LanguageType
eLanguage ) :
-PopupMenu (),
-pField ( pInField )
+SdFieldPopup::SdFieldPopup(const SvxFieldData* pInField, LanguageType
eLanguage)
+: m_xBuilder(Application::CreateBuilder(nullptr,
"modules/simpress/ui/fieldmenu.ui"))
+, m_xPopup(m_xBuilder->weld_menu("menu"))
+, m_pField(pInField)
{
-Fill( eLanguage );
+Fill(eLanguage);
}
SdFieldPopup::~SdFieldPopup()
@@ -45,106 +47,124 @@ SdFieldPopup::~SdFieldPopup()
void SdFieldPopup::Fill( LanguageType eLanguage )
{
sal_uInt16 nID = 1;
-MenuItemBits nStyle = MenuItemBits::RADIOCHECK | MenuItemBits::AUTOCHECK;
-InsertItem( nID++, SdResId( STR_FIX ), nStyle );
-InsertItem( nID++, SdResId( STR_VAR ), nStyle );
-InsertSeparator();
+m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_FIX));
+m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_VAR));
+m_xPopup->append_separator("separator1");
-if( auto pDateField = dynamic_cast< const SvxDateField *>( pField ) )
+if( auto pDateField = dynamic_cast< const SvxDateField *>( m_pField ) )
{
SvxDateField aDateField( *pDateField );
-if( pDateField->GetType() == SvxDateType::Fix )
-CheckItem( 1 );
+if (pDateField->GetType() == SvxDateType::Fix)
+m_xPopup->set_active("1", true);
else
-CheckItem( 2 );
+m_xPopup->set_active("2", true);
//SvxDateFormat::AppDefault, // is not used
//SvxDateFormat::System, // is not used
-InsertItem( nID++, SdResId( STR_STANDARD_SMALL ), nStyle );
-InsertItem( nID++, SdResId( STR_STANDARD_BIG ), nStyle );
+m_xPopup->append_radio(OUString::number(nID++),
SdResId(STR_STANDARD_SMALL));
+m_xPopup->append_radio(OUString::number(nID++),
SdResId(STR_STANDARD_BIG));
SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter();
aDateField.SetFormat( SvxDateFormat::A );// 13.02.96
-InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter,
eLanguage ), nStyle );
+m_xPopup->append_radio(OUString::number(nID++),
aDateField.GetFormatted(*pNumberFormatter, eLanguage));
aDateField.SetFormat( SvxDateFormat::B );// 13.02.1996
-InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter,
eLanguage ), nStyle );
+m_xPopup->append_radio(OUString::number(nID++),
aDateField.GetFormatted(*pNumberFormatter, eLanguage));
aDateField.SetFormat( SvxDateFormat::C );// 13.Feb 1996
-InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter,
eLanguage ), nStyle );
+m_xPopup->append_radio(OUString::number(nID++),
aDateField.GetFormatted(*pNumberFormatter, eLanguage));
aDateField.SetFormat( SvxDateFormat::D );// 13.Februar 1996
-InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter,
eLanguage ), nStyle );
+m_xPopup->append_radio(OUString::number(nID++),
aDateField.GetFormatted(*pNumberFormatter, eLanguage));
aDateField.SetFormat( SvxDateFormat::E );// Die, 13.Februar 1996
-InsertItem( nID++, aDateField.GetFormatted( *pNumberFormatter,
eLanguage ), nStyle );
+m_xPopup->append_radio(OUString::number(nI
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1
sd/source/ui/app/tmplctrl.cxx | 79 +-
sd/uiconfig/simpress/ui/masterpagemenu.ui |9 +++
3 files changed, 35 insertions(+), 54 deletions(-)
New commits:
commit e0bee1a05bdad73d61fb89e25b1510a12deed1f1
Author: Caolán McNamara
AuthorDate: Mon Feb 22 20:35:35 2021 +
Commit: Caolán McNamara
CommitDate: Tue Feb 23 10:18:07 2021 +0100
replace SdTemplatePopup_Impl
Change-Id: I734124939139e34c776e5e4fe52acde08abf24ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111364
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index d6b96e034661..a532a2819e2d 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/layoutwindow \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/mastermenu \
+ sd/uiconfig/simpress/ui/masterpagemenu \
sd/uiconfig/simpress/ui/masterpagepanel \
sd/uiconfig/simpress/ui/navigatorpanel \
sd/uiconfig/simpress/ui/notebookbar \
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 62d3ba6336a1..a6b89fb1dad4 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -18,8 +18,8 @@
*/
#include
-#include
#include
+#include
#include
#include
#include
@@ -35,38 +35,7 @@
SFX_IMPL_STATUSBAR_CONTROL( SdTemplateControl, SfxStringItem );
-// class SdTemplatePopup_Impl
--
-
-namespace {
-
-class SdTemplatePopup_Impl : public PopupMenu
-{
-public:
-SdTemplatePopup_Impl();
-
-sal_uInt16 GetCurId() const { return nCurId; }
-
-private:
-sal_uInt16 nCurId;
-
-virtual voidSelect() override;
-};
-
-}
-
-SdTemplatePopup_Impl::SdTemplatePopup_Impl() :
-PopupMenu(),
-nCurId(USHRT_MAX)
-{
-}
-
-void SdTemplatePopup_Impl::Select()
-{
-nCurId = GetCurItemId();
-}
-
// class SdTemplateControl --
-
SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId,
sal_uInt16 _nId,
StatusBar& rStb ) :
@@ -110,29 +79,31 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt
)
if( !pDoc )
return;
-ScopedVclPtrInstance aPop;
+std::unique_ptr
xBuilder(Application::CreateBuilder(nullptr,
"modules/simpress/ui/masterpagemenu.ui"));
+std::unique_ptr xPopup(xBuilder->weld_menu("menu"));
+
+const sal_uInt16 nMasterCount =
pDoc->GetMasterSdPageCount(PageKind::Standard);
+
+for (sal_uInt16 nPage = 0; nPage < nMasterCount; ++nPage)
+{
+SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PageKind::Standard);
+if (!pMaster)
+continue;
+xPopup->append(OUString::number(nPage), pMaster->GetName());
+}
+
+::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1, 1));
+weld::Window* pParent = weld::GetPopupParent(GetStatusBar(), aRect);
+OString sResult = xPopup->popup_at_rect(pParent, aRect);
+if (!sResult.isEmpty())
{
-const sal_uInt16 nMasterCount =
pDoc->GetMasterSdPageCount(PageKind::Standard);
-
-sal_uInt16 nCount = 0;
-for( sal_uInt16 nPage = 0; nPage < nMasterCount; ++nPage )
-{
-SdPage* pMaster = pDoc->GetMasterSdPage(nPage, PageKind::Standard);
-if( pMaster )
-aPop->InsertItem( ++nCount, pMaster->GetName() );
-}
-aPop->Execute( &GetStatusBar(), rCEvt.GetMousePosPixel());
-
-sal_uInt16 nCurrId = aPop->GetCurId()-1;
-if( nCurrId < nMasterCount )
-{
-SdPage* pMaster = pDoc->GetMasterSdPage(nCurrId,
PageKind::Standard);
-SfxStringItem aStyle( ATTR_PRESLAYOUT_NAME, pMaster->GetName() );
-pViewFrame->GetDispatcher()->ExecuteList(
-SID_PRESENTATION_LAYOUT, SfxCallMode::SLOT, { &aStyle });
-pViewFrame->GetBindings().Invalidate(SID_PRESENTATION_LAYOUT);
-pViewFrame->GetBindings().Invalidate(SID_STATUS_LAYOUT);
-}
+sal_uInt16 nCurrId = sResult.toUInt32();
+SdPage* pMaster = pDoc->GetMasterSdPage(nCurrId, PageKind::Standard);
+SfxStringItem aStyle( ATTR_PRESLAYOUT_NAME, pMaster->GetName() );
+pViewFrame->GetDispatcher()->ExecuteList(
+SID_PRESENTATION_LAYOUT, SfxCallMode::SLOT, { &aStyle });
+pViewFrame->GetBindings().Invalidate(SID_PRESENTATION_LAYOUT);
+pViewFrame->GetBindings().Invalidate(SID_STATUS_LAYOUT);
}
}
diff --git a/sd/uiconfig/simpress/ui/masterpagemenu.ui
b/sd/uiconfig/simpress/ui/masterpagemenu.ui
new file mode 100644
index ..5bb702561dd2
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/masterpage
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/sidebar/SlideBackground.cxx |2
sd/uiconfig/sdraw/menubar/menubar.xml |4
sd/uiconfig/sdraw/ui/notebookbar.ui| 146 ---
sd/uiconfig/sdraw/ui/notebookbar_compact.ui| 215 -
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 14 -
sd/uiconfig/sdraw/ui/notebookbar_single.ui | 122 -
6 files changed, 2 insertions(+), 501 deletions(-)
New commits:
commit 78ec4f4cbd5b7cc5b7eeb465fe7950fc72ce2847
Author: Justin Luth
AuthorDate: Tue Dec 1 12:09:34 2020 +0300
Commit: Justin Luth
CommitDate: Thu Dec 3 06:11:45 2020 +0100
tdf#116815 Draw UI: remove presentation-only stuff
These items are not saved or imported into Draw,
so remove them from the UI interface.
They are just inherited from Impress.
Specifically:
-Display Master Background
-Display Master Objects
-Master Elements
This patch removes these 3 elements in Draw from:
-sidebar page properties
-main traditional menu
-Tabbed Notebook bar's layout tab,
and the tab's Layout menu,
and when viewing master - context tab
-Compact Notebook bar's layout tab,
and the tab's Layout menu,
and when viewing master - context tab
-Single Notebook bar's master context view
-Compact groupped bar's Page menu
(even though it isn't visible.)
Change-Id: Ibae57bfec18cd44e9a76e6847a4c5215945b64ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107002
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index fb720af1f034..5341acc24f13 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -348,6 +348,8 @@ void SlideBackground::HandleContextChange(
else if ( IsDraw() )
{
mxMasterLabel->set_label(SdResId(STR_MASTERPAGE_LABEL));
+mxDspMasterBackground->hide();
+mxDspMasterObjects->hide();
if (maContext == maDrawOtherContext)
{
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml
b/sd/uiconfig/sdraw/menubar/menubar.xml
index bdcc15444dc8..a2d06a2ec2ec 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -448,10 +448,6 @@
-
-
-
-
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 512ddb512df7..8824cc4637cc 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1354,20 +1354,6 @@
.uno:PresentationLayout
-
-
-True
-False
-.uno:DisplayMasterBackground
-
-
-
-
-True
-False
-.uno:DisplayMasterObjects
-
-
True
@@ -6280,83 +6266,6 @@
8
-
-
-True
-False
-center
-True
-
-
-True
-False
-center
-vertical
-
-
-True
-True
-both-horiz
-False
-
-
-True
-False
-.uno:DisplayMasterBackground
-
-
-False
-True
-
-
-
-
-False
-True
-0
-
-
-
-
-True
-True
-both-horiz
-False
-
-
-True
-False
-.uno:DisplayMasterObjects
-
-
-False
-True
-
-
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1
sd/source/ui/inc/ViewTabBar.hxx | 31 +-
sd/source/ui/view/ViewTabBar.cxx | 156 +-
sd/uiconfig/simpress/ui/tabviewbar.ui | 46 ++
4 files changed, 154 insertions(+), 80 deletions(-)
New commits:
commit e00fd78e6e454491014f03370e14efa5ebc2eefe
Author: Caolán McNamara
AuthorDate: Thu Oct 22 19:41:17 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Oct 29 15:02:34 2020 +0100
weld impress TabBarControl
Change-Id: Ia596830595289005a1c7e811ae4f446dc745f50c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104699
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index f8e10c675609..92d12d7ecc5c 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -156,6 +156,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/slidecontextmenu \
sd/uiconfig/simpress/ui/slidedesigndialog \
sd/uiconfig/simpress/ui/slidetransitionspanel \
+ sd/uiconfig/simpress/ui/tabviewbar \
sd/uiconfig/simpress/ui/tabledesignpanel \
sd/uiconfig/simpress/ui/templatedialog \
))
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index 534eb215dd2b..f48f76d495fd 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -25,8 +25,8 @@
#include
#include
#include
-#include
#include
+#include
#include "MutexOwner.hxx"
#include
@@ -39,10 +39,28 @@ namespace vcl { class Window; }
namespace sd {
class ViewShellBase;
+class ViewTabBar;
}
namespace sd {
+class TabBarControl : public InterimItemWindow
+{
+public:
+TabBarControl(vcl::Window* pParentWindow, const
::rtl::Reference& rpViewTabBar);
+virtual void dispose() override;
+virtual ~TabBarControl() override;
+weld::Notebook& GetNotebook() { return *mxTabControl; }
+int GetAllocatedWidth() const { return mnAllocatedWidth; }
+private:
+std::unique_ptr mxTabControl;
+::rtl::Reference mpViewTabBar;
+int mnAllocatedWidth;
+
+DECL_LINK(ActivatePageHdl, const OString&, void);
+DECL_LINK(NotebookSizeAllocHdl, const Size&, void);
+};
+
typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XToolBar,
css::drawing::framework::XTabBar,
@@ -64,9 +82,9 @@ public:
virtual void SAL_CALL disposing() override;
-const VclPtr< ::TabControl>& GetTabControl() const { return mpTabControl;}
+const VclPtr& GetTabControl() const { return mpTabControl; }
-bool ActivatePage();
+bool ActivatePage(size_t nIndex);
//- drawing::framework::XConfigurationChangeListener --
@@ -125,6 +143,8 @@ public:
*/
int GetHeight() const;
+void UpdateActiveButton();
+
void AddTabBarButton (
const css::drawing::framework::TabBarButton& rButton,
const css::drawing::framework::TabBarButton& rAnchor);
@@ -138,16 +158,15 @@ public:
GetTabBarButtons();
private:
-VclPtr< ::TabControl> mpTabControl;
+VclPtr mpTabControl;
css::uno::Reference mxController;
css::uno::Reference
mxConfigurationController;
typedef ::std::vector
TabBarButtonList;
TabBarButtonList maTabBarButtons;
-VclPtr mpTabPage;
css::uno::Reference mxViewTabBarId;
ViewShellBase* mpViewShellBase;
+int mnNoteBookWidthPadding;
-void UpdateActiveButton();
void AddTabBarButton (
const css::drawing::framework::TabBarButton& rButton,
sal_Int32 nPosition);
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 0a8fc750510b..c045b2295827 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -25,9 +25,8 @@
#include
#include
-#include
-#include
#include
+#include
#include
#include
@@ -54,16 +53,6 @@ bool IsEqual (const TabBarButton& rButton1, const
TabBarButton& rButton2)
|| rButton1.ButtonLabel == rButton2.ButtonLabel);
}
-class TabBarControl : public ::TabControl
-{
-public:
-TabBarControl (vcl::Window* pParentWindow, const
::rtl::Reference& rpViewTabBar);
-virtual void Paint (vcl::RenderContext& rRenderContext, const
::tools::Rectangle& rRect) override;
-virtual void ActivatePage() override;
-private:
-::rtl::Reference mpViewTabBar;
-};
-
} // end of anonymous namespace
ViewTabBar::ViewTabBar (
@@ -73,18 +62,10 @@ ViewTabBar::ViewTabBar (
mpTabControl(VclPtr::Create(GetAnchorWindow(rxViewTabBarId,rxController),
this)),
mxController(rxController),
maTabBarButtons(),
- mpTabPage(nullptr),
mxViewTabBarId(rxViewTabBarId),
- mpViewShellBase(nullptr)
+ mpViewShellBase(nullptr),
+ mnNoteBookWidthPadding(0)
{
-// Set one new tab page for all tab entries. We need it only to
-// determine the height of the
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/sidebar/SlideBackground.cxx | 34 +-
sd/source/ui/sidebar/SlideBackground.hxx |3 +
sd/uiconfig/simpress/ui/sidebarslidebackground.ui | 19
3 files changed, 42 insertions(+), 14 deletions(-)
New commits:
commit cbe86ee37018dc4bf04783ecf70fef2863e61ad7
Author: Pranam Lashkari
AuthorDate: Thu Apr 23 19:29:10 2020 +0530
Commit: Andras Timar
CommitDate: Sat May 2 23:22:06 2020 +0200
Added separate color picker for slide background gradient
Change-Id: I27b60244f011cb482affa5f47cde170daf3fc309
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92889
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 45da884abdae..cb3a5ffdc3f9 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -102,7 +102,8 @@ SlideBackground::SlideBackground(
mxFillStyle(m_xBuilder->weld_combo_box("fillstyle")),
mxFillLB(new ColorListBox(m_xBuilder->weld_menu_button("fillattr"),
GetFrameWeld())),
mxFillAttr(m_xBuilder->weld_combo_box("fillattr1")),
-mxFillGrad(new ColorListBox(m_xBuilder->weld_menu_button("fillattr2"),
GetFrameWeld())),
+mxFillGrad1(new ColorListBox(m_xBuilder->weld_menu_button("fillattr2"),
GetFrameWeld())),
+mxFillGrad2(new ColorListBox(m_xBuilder->weld_menu_button("fillattr3"),
GetFrameWeld())),
mxInsertImage(m_xBuilder->weld_button("button2")),
mxDspMasterBackground(m_xBuilder->weld_check_button("displaymasterbackground")),
mxDspMasterObjects(m_xBuilder->weld_check_button("displaymasterobjects")),
@@ -240,7 +241,8 @@ void SlideBackground::Initialize()
mxFillStyle->connect_changed(LINK(this, SlideBackground,
FillStyleModifyHdl));
mxFillLB->SetSelectHdl(LINK(this, SlideBackground, FillColorHdl));
-mxFillGrad->SetSelectHdl(LINK(this, SlideBackground, FillColorHdl));
+mxFillGrad1->SetSelectHdl(LINK(this, SlideBackground, FillColorHdl));
+mxFillGrad2->SetSelectHdl(LINK(this, SlideBackground, FillColorHdl));
mxFillAttr->connect_changed(LINK(this, SlideBackground,
FillBackgroundHdl));
ViewShell* pMainViewShell = mrBase.GetMainViewShell().get();
@@ -378,13 +380,15 @@ void SlideBackground::Update()
{
mxFillLB->hide();
mxFillAttr->hide();
-mxFillGrad->hide();
+mxFillGrad1->hide();
+mxFillGrad2->hide();
}
break;
case SOLID:
{
mxFillAttr->hide();
-mxFillGrad->hide();
+mxFillGrad1->hide();
+mxFillGrad2->hide();
mxFillLB->show();
const Color aColor = GetColorSetOrDefault();
mxFillLB->SelectEntry(aColor);
@@ -392,15 +396,16 @@ void SlideBackground::Update()
break;
case GRADIENT:
{
-mxFillLB->show();
+mxFillLB->hide();
mxFillAttr->hide();
-mxFillGrad->show();
+mxFillGrad1->show();
+mxFillGrad2->show();
const XGradient xGradient = GetGradientSetOrDefault();
const Color aStartColor = xGradient.GetStartColor();
-mxFillLB->SelectEntry(aStartColor);
+mxFillGrad1->SelectEntry(aStartColor);
const Color aEndColor = xGradient.GetEndColor();
-mxFillGrad->SelectEntry(aEndColor);
+mxFillGrad2->SelectEntry(aEndColor);
}
break;
@@ -410,7 +415,8 @@ void SlideBackground::Update()
mxFillAttr->show();
mxFillAttr->clear();
SvxFillAttrBox::Fill(*mxFillAttr,
pSh->GetItem(SID_HATCH_LIST)->GetHatchList());
-mxFillGrad->hide();
+mxFillGrad1->hide();
+mxFillGrad2->hide();
const OUString aHatchName = GetHatchingSetOrDefault();
mxFillAttr->set_active_text( aHatchName );
@@ -423,7 +429,8 @@ void SlideBackground::Update()
mxFillLB->hide();
mxFillAttr->show();
mxFillAttr->clear();
-mxFillGrad->hide();
+mxFillGrad1->hide();
+mxFillGrad2->hide();
OUString aName;
if(nPos == BITMAP)
{
@@ -684,7 +691,8 @@ void SlideBackground::dispose()
mxMasterSlide.reset();
mxBackgroundLabel.reset();
mxFillAttr.reset();
-mxFillGrad.reset();
+mxFillGrad1.reset();
+mxFillGrad2.reset();
mxFillStyle.reset();
mxFillLB.reset();
mxInsertImage.reset();
@@ -1097,8 +1105,8 @@ IMPL_LINK_NOARG(SlideBackground, FillColorHdl,
ColorListBox&, void)
case drawing::FillStyle_GRADIENT:
{
XGradient aGradient;
-aGradient.SetStartColor(mxFillLB->GetSelectEntryColor());
-aGradient.SetEndColor(mxFillGrad->GetSelectEntryColor());
+aGradient.SetStartColor
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/tpoption.cxx| 12
sd/source/ui/inc/tpoption.hxx|2 +-
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 6d9930f307f08d2c32ee1bcca577cf643955cec9
Author: Julien Nabet
AuthorDate: Thu Mar 5 18:40:42 2020 +0100
Commit: Julien Nabet
CommitDate: Fri Mar 6 07:04:34 2020 +0100
tdf#131137: Fix Checkbox "Do not distort objects in curve" does nothing
See https://bugs.documentfoundation.org/show_bug.cgi?id=131137#c3
and above all
https://bugs.documentfoundation.org/show_bug.cgi?id=131137#c4
Change-Id: Ibd38d13be7ef6956d6c26e6f5f71a6751a56b25e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90054
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 2adcd977111f..9a4e69e77086 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -198,7 +198,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage,
weld::DialogController*
, m_xHeightLb(m_xBuilder->weld_label("heightlbl"))
, m_xFiInfo2(m_xBuilder->weld_label("info2"))
,
m_xMtrFldOriginalHeight(m_xBuilder->weld_metric_spin_button("metricHeightFields",
FieldUnit::MM))
-, m_xCbxDistrot(m_xBuilder->weld_check_button("distrotcb"))
+, m_xCbxDistort(m_xBuilder->weld_check_button("distortcb"))
, m_xMtrFldInfo1(m_xBuilder->weld_metric_spin_button("metricInfo1Fields",
FieldUnit::MM))
, m_xMtrFldInfo2(m_xBuilder->weld_metric_spin_button("metricInfo2Fields",
FieldUnit::MM))
{
@@ -219,7 +219,7 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage,
weld::DialogController*
SetFieldUnit( *m_xMtrFldTabstop , eFUnit );
// Impress is default mode, let' hide the entire scale frame etc.
-m_xCbxDistrot->hide();
+m_xCbxDistort->hide();
m_xScaleFrame->hide();
// fill ListBox with metrics
@@ -342,7 +342,8 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs )
m_xCbxEnableSdremote->get_state_changed_from_saved()||
m_xCbxEnablePresenterScreen->get_state_changed_from_saved() ||
m_xCbxCompatibility->get_state_changed_from_saved() ||
-m_xCbxUsePrinterMetrics->get_state_changed_from_saved() )
+m_xCbxUsePrinterMetrics ||
+m_xCbxDistort->get_state_changed_from_saved())
{
SdOptionsMiscItem aOptsItem;
@@ -359,6 +360,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs )
m_xCbxUsePrinterMetrics->get_active()
? css::document::PrinterIndependentLayout::DISABLED
: css::document::PrinterIndependentLayout::ENABLED);
+aOptsItem.GetOptionsMisc().SetCrookNoContortion(
m_xCbxDistort->get_active() );
rAttrs->Put( aOptsItem );
bModified = true;
@@ -410,6 +412,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
m_xCbxEnablePresenterScreen->set_active(
aOptsItem.GetOptionsMisc().IsEnablePresenterScreen() );
m_xCbxCompatibility->set_active(
aOptsItem.GetOptionsMisc().IsSummationOfParagraphs() );
m_xCbxUsePrinterMetrics->set_active(
aOptsItem.GetOptionsMisc().GetPrinterIndependentLayout()==1 );
+m_xCbxDistort->set_active(
aOptsItem.GetOptionsMisc().IsCrookNoContortion() );
m_xCbxStartWithTemplate->save_state();
m_xCbxMarkedHitMovesAlways->save_state();
m_xCbxQuickEdit->save_state();
@@ -421,6 +424,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
m_xCbxEnablePresenterScreen->save_state();
m_xCbxCompatibility->save_state();
m_xCbxUsePrinterMetrics->save_state();
+m_xCbxDistort->save_state();
// metric
sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
@@ -519,7 +523,7 @@ void SdTpOptionsMisc::SetDrawMode()
m_xMtrFldOriginalWidth->show();
m_xFiInfo2->show();
m_xMtrFldOriginalHeight->show();
-m_xCbxDistrot->show();
+m_xCbxDistort->show();
m_xCbxCompatibility->hide();
}
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 1cc5a88f2ffa..d66a5317e6b1 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -102,7 +102,7 @@ private:
std::unique_ptr m_xHeightLb;
std::unique_ptr m_xFiInfo2;
std::unique_ptr m_xMtrFldOriginalHeight;
-std::unique_ptr m_xCbxDistrot;
+std::unique_ptr m_xCbxDistort;
std::unique_ptr m_xMtrFldInfo1;
std::unique_ptr m_xMtrFldInfo2;
diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 064ff490b914..6c0365bd9f10 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -287,8 +287,8 @@
-
-Do not dis
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk|1
sd/source/ui/dlg/gluectrl.cxx | 71 -
sd/source/ui/inc/gluectrl.hxx | 20 ++
sd/uiconfig/simpress/ui/gluebox.ui | 23 +++
4 files changed, 84 insertions(+), 31 deletions(-)
New commits:
commit 0093d310dc7ecc8206bfcf6ad802a5c389f006e4
Author: Caolán McNamara
AuthorDate: Fri Feb 7 11:01:51 2020 +
Commit: Caolán McNamara
CommitDate: Fri Feb 7 14:11:27 2020 +0100
weld GlueEscDirLB ItemWindow
Change-Id: I472ba595bb2f31bedf1d0e0a890024f9ac3ada39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88176
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 3b12fc536374..ea014ef301b6 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -121,6 +121,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/effectmenu \
sd/uiconfig/simpress/ui/fontsizemenu \
sd/uiconfig/simpress/ui/fontstylemenu \
+ sd/uiconfig/simpress/ui/gluebox \
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
sd/uiconfig/simpress/ui/impressprinteroptions \
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 9f2b9e7f3334..110d945055ee 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -49,26 +49,49 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item
)
/**
* Constructor for glue point escape direction Listbox
*/
-GlueEscDirLB::GlueEscDirLB( vcl::Window* pParent, const Reference< XFrame >&
rFrame ) :
-ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ),
-m_xFrame( rFrame )
+GlueEscDirLB::GlueEscDirLB(vcl::Window* pParent, const Reference&
rFrame)
+: InterimItemWindow(pParent, "modules/simpress/ui/gluebox.ui", "GlueBox")
+, m_xFrame(rFrame)
+, m_xWidget(m_xBuilder->weld_combo_box("gluetype"))
{
-Size aXSize( GetTextWidth( "X" ), GetTextHeight() );
-SetSizePixel( Size( aXSize.Width() * 12, aXSize.Height() * 10 ) );
Fill();
+
+m_xWidget->connect_changed(LINK(this, GlueEscDirLB, SelectHdl));
+m_xWidget->connect_key_press(LINK(this, GlueEscDirLB, KeyInputHdl));
+
+SetSizePixel(m_xWidget->get_preferred_size());
+
Show();
}
+void GlueEscDirLB::dispose()
+{
+m_xWidget.reset();
+InterimItemWindow::dispose();
+}
+
GlueEscDirLB::~GlueEscDirLB()
{
+disposeOnce();
+}
+
+void GlueEscDirLB::set_sensitive(bool bSensitive)
+{
+Enable(bSensitive);
+m_xWidget->set_sensitive(bSensitive);
+}
+
+IMPL_LINK(GlueEscDirLB, KeyInputHdl, const KeyEvent&, rKEvt, bool)
+{
+return ChildKeyInput(rKEvt);
}
/**
* Determines the escape direction and sends the corresponding slot
*/
-void GlueEscDirLB::Select()
+IMPL_LINK(GlueEscDirLB, SelectHdl, weld::ComboBox&, rBox, void)
{
-sal_Int32 nPos = GetSelectedEntryPos();
+sal_Int32 nPos = rBox.get_active();
SfxUInt16Item aItem( SID_GLUE_ESCDIR,
static_cast(aEscDirArray[ nPos ]) );
if ( m_xFrame.is() )
@@ -89,19 +112,19 @@ void GlueEscDirLB::Select()
*/
void GlueEscDirLB::Fill()
{
-InsertEntry( SdResId( STR_GLUE_ESCDIR_SMART ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_LEFT ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_RIGHT ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_TOP ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_BOTTOM ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_SMART ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_LEFT ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_RIGHT ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_TOP ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_BOTTOM ) );
/*
-InsertEntry( SdResId( STR_GLUE_ESCDIR_LO ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_LU ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_RO ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_RU ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_HORZ ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_VERT ) );
-InsertEntry( SdResId( STR_GLUE_ESCDIR_ALL ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_LO ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_LU ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_RO ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_RU ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_HORZ ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_VERT ) );
+m_xWidget->append_text( SdResId( STR_GLUE_ESCDIR_ALL ) );
*/
}
@@ -128,21 +151,21 @@ void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId,
{
if( pState )
{
-pGlueEscDirLB->Enable();
+pGlueEscDirLB->set_sensitive(true);
if ( IsInvalidItem( pState ) )
{
-pGlueEscDirLB->S
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk|1
sd/source/ui/sidebar/LayoutMenu.cxx| 196 ++---
sd/source/ui/sidebar/LayoutMenu.hxx| 17 +-
sd/uiconfig/simpress/ui/layoutpanel.ui | 24
4 files changed, 143 insertions(+), 95 deletions(-)
New commits:
commit 02b0c2ee00ed4aac3f5e4e815fb088b6bb6a0940
Author: Caolán McNamara
AuthorDate: Tue Feb 4 10:14:58 2020 +
Commit: Caolán McNamara
CommitDate: Tue Feb 4 15:06:18 2020 +0100
weld LayoutMenu panel
Change-Id: Id95501de63cb773f9bc568e1bf0d1a2e5e0fdd9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87962
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index fa7796736897..b6fcfc484042 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -128,6 +128,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/interactiondialog \
sd/uiconfig/simpress/ui/interactionpage \
sd/uiconfig/simpress/ui/layoutmenu \
+ sd/uiconfig/simpress/ui/layoutpanel \
sd/uiconfig/simpress/ui/layoutwindow \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/mastermenu \
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index f28bd776d7d6..701c1ce27132 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -127,12 +127,36 @@ static const snewfoil_value_info standard[] =
{"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE}
};
+class LayoutValueSet : public SvtValueSet
+{
+private:
+LayoutMenu& mrMenu;
+public:
+LayoutValueSet(LayoutMenu& rMenu)
+: SvtValueSet(nullptr)
+, mrMenu(rMenu)
+{
+}
+
+virtual bool Command(const CommandEvent& rEvent) override
+{
+if (rEvent.GetCommand() == CommandEventId::ContextMenu)
+{
+mrMenu.ShowContextMenu(rEvent.IsMouseEvent() ?
&rEvent.GetMousePosPixel() : nullptr);
+return true;
+}
+return false;
+}
+};
+
LayoutMenu::LayoutMenu (
vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference& rxSidebar)
-: ValueSet (pParent, WB_ITEMBORDER),
+: PanelLayout( pParent, "LayoutPanel",
"modules/simpress/ui/layoutpanel.ui", nullptr, true ),
mrBase(rViewShellBase),
+ mxLayoutValueSet(new LayoutValueSet(*this)),
+ mxLayoutValueSetWin(new weld::CustomWeld(*m_xBuilder, "valueset",
*mxLayoutValueSet)),
mbIsMainViewChangePending(false),
mxSidebar(rxSidebar),
mbIsDisposed(false)
@@ -141,10 +165,9 @@ LayoutMenu::LayoutMenu (
implConstruct( *mrBase.GetDocument()->GetDocSh() );
SAL_INFO("sd.ui", "created LayoutMenu at " << this);
-SetStyle(GetStyle() | WB_ITEMBORDER | WB_FLATVALUESET | WB_TABSTOP);
+mxLayoutValueSet->SetStyle(mxLayoutValueSet->GetStyle() | WB_ITEMBORDER |
WB_FLATVALUESET | WB_TABSTOP);
-
SetBackground(sfx2::sidebar::Theme::GetWallpaper(sfx2::sidebar::Theme::Paint_PanelBackground));
-
SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground));
+
mxLayoutValueSet->SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground));
#ifdef DEBUG
SetText(OUString("sd:LayoutMenu"));
@@ -158,14 +181,14 @@ void LayoutMenu::implConstruct( DrawDocShell&
rDocumentShell )
// if this fires, then my assumption that the rDocumentShell parameter to
our first ctor is superfluous ...
(void) rDocumentShell;
-SetStyle (
-( GetStyle() & ~(WB_ITEMBORDER) )
+mxLayoutValueSet->SetStyle (
+( mxLayoutValueSet->GetStyle() & ~(WB_ITEMBORDER) )
| WB_TABSTOP
| WB_MENUSTYLEVALUESET
| WB_NO_DIRECTSELECT
);
-SetExtraSpacing(2);
-SetSelectHdl (LINK(this, LayoutMenu, ClickHandler));
+mxLayoutValueSet->SetExtraSpacing(2);
+mxLayoutValueSet->SetSelectHdl (LINK(this, LayoutMenu, ClickHandler));
InvalidateContent();
Link<::sd::tools::EventMultiplexerEvent&,void> aEventListenerLink
(LINK(this,LayoutMenu,EventMultiplexerListener));
@@ -194,7 +217,9 @@ void LayoutMenu::dispose()
{
SAL_INFO("sd.ui", "destroying LayoutMenu at " << this);
Dispose();
-ValueSet::dispose();
+mxLayoutValueSetWin.reset();
+mxLayoutValueSet.reset();
+PanelLayout::dispose();
}
void LayoutMenu::Dispose()
@@ -222,9 +247,9 @@ AutoLayout LayoutMenu::GetSelectedAutoLayout() const
{
AutoLayout aResult = AUTOLAYOUT_NONE;
-if ( ! IsNoSelection() && GetSelectedItemId()!=0)
+if (!mxLayoutValueSet->IsNoSelection() &&
mxLayoutValueSet->GetSelectedItemId()!=0)
{
-AutoLayout* pLayout =
static_cast(GetItemData(GetSelectedItemId()));
+AutoLayout* pLayout =
static_cast(mxLayoutValueSet->GetItemData(mxLayoutValueSet->GetSelectedItemId()));
if (pLayout
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk sfx2/source
sd/UIConfig_simpress.mk |1
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx |6
sd/source/ui/sidebar/MasterPagesSelector.cxx| 156 ++--
sd/source/ui/sidebar/MasterPagesSelector.hxx| 13 +
sd/source/ui/sidebar/PreviewValueSet.cxx| 23 +-
sd/source/ui/sidebar/PreviewValueSet.hxx|8 -
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 10 -
sd/uiconfig/simpress/ui/masterpagepanel.ui | 24 +++
sfx2/source/sidebar/SidebarPanelBase.cxx|7
9 files changed, 145 insertions(+), 103 deletions(-)
New commits:
commit 739e3b25bbaf9305f779e8821fd7aee4fccc6f5d
Author: Caolán McNamara
AuthorDate: Mon Feb 3 16:13:17 2020 +
Commit: Caolán McNamara
CommitDate: Tue Feb 4 11:01:03 2020 +0100
weld MasterPagesSelector
Change-Id: Ie63d7f8f83bae4f9641ab9713c6e46cd2090767b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87906
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index fe0dcce15873..fa7796736897 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -131,6 +131,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/layoutwindow \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/mastermenu \
+ sd/uiconfig/simpress/ui/masterpagepanel \
sd/uiconfig/simpress/ui/navigatorpanel \
sd/uiconfig/simpress/ui/notebookbar \
sd/uiconfig/simpress/ui/notebookbar_compact \
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index c27bb31f976a..70e53010e163 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -184,13 +184,13 @@ void CurrentMasterPagesSelector::UpdateSelection()
}
// Find the items for the master pages in the set.
-sal_uInt16 nItemCount (PreviewValueSet::GetItemCount());
+sal_uInt16 nItemCount (mxPreviewValueSet->GetItemCount());
for (nIndex=1; nIndex<=nItemCount && bLoop; nIndex++)
{
-OUString sName (PreviewValueSet::GetItemText (nIndex));
+OUString sName (mxPreviewValueSet->GetItemText (nIndex));
if (aNames.find(sName) != aNames.end())
{
-PreviewValueSet::SelectItem (nIndex);
+mxPreviewValueSet->SelectItem (nIndex);
}
}
}
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 560f061db87c..43d12ce319c5 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -58,9 +58,11 @@ MasterPagesSelector::MasterPagesSelector (
ViewShellBase& rBase,
const std::shared_ptr& rpContainer,
const css::uno::Reference& rxSidebar)
-: PreviewValueSet(pParent),
+: PanelLayout( pParent, "MasterPagePanel",
"modules/simpress/ui/masterpagepanel.ui", nullptr, true ),
maMutex(),
mpContainer(rpContainer),
+ mxPreviewValueSet(new PreviewValueSet),
+ mxPreviewValueSetWin(new weld::CustomWeld(*m_xBuilder, "valueset",
*mxPreviewValueSet)),
mrDocument(rDocument),
mrBase(rBase),
maCurrentItemList(),
@@ -68,20 +70,19 @@ MasterPagesSelector::MasterPagesSelector (
maLockedMasterPages(),
mxSidebar(rxSidebar)
{
-PreviewValueSet::SetSelectHdl (
+mxPreviewValueSet->SetSelectHdl (
LINK(this, MasterPagesSelector, ClickHandler));
-PreviewValueSet::SetRightMouseClickHandler (
+mxPreviewValueSet->SetRightMouseClickHandler (
LINK(this, MasterPagesSelector, RightClickHandler));
-PreviewValueSet::SetStyle(PreviewValueSet::GetStyle() |
WB_NO_DIRECTSELECT);
+mxPreviewValueSet->SetStyle(mxPreviewValueSet->GetStyle() |
WB_NO_DIRECTSELECT);
if ( GetDPIScaleFactor() > 1 )
mpContainer->SetPreviewSize(MasterPageContainer::LARGE);
-PreviewValueSet::SetPreviewSize(mpContainer->GetPreviewSizePixel());
-PreviewValueSet::Show();
+mxPreviewValueSet->SetPreviewSize(mpContainer->GetPreviewSizePixel());
+mxPreviewValueSet->Show();
-
SetBackground(sfx2::sidebar::Theme::GetWallpaper(sfx2::sidebar::Theme::Paint_PanelBackground));
-
SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground));
+
mxPreviewValueSet->SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground));
Link aChangeListener
(LINK(this,MasterPagesSelector,ContainerChangeListener));
mpContainer->AddChangeListener(aChangeListener);
@@ -100,7 +101,10 @@ void MasterPagesSelector::dispose()
Link aChangeListener
(LINK(this,MasterPagesSelector,ContainerChangeListener));
mpContainer->RemoveChangeListener(aChangeListener);
mpContainer.reset();
-PreviewValueSet::disp
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/tpoption.cxx| 357 ++-
sd/source/ui/inc/tpoption.hxx| 71 ++--
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 82 +++--
3 files changed, 245 insertions(+), 265 deletions(-)
New commits:
commit ca6574af948f473691d331f0f2ccf17907465c9e
Author: Caolán McNamara
AuthorDate: Mon Jul 29 10:46:34 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Jul 29 20:31:37 2019 +0200
weld SdTpOptionsMisc
Change-Id: I43db706b74811a18f573fe20cac041d320f9331c
Reviewed-on: https://gerrit.libreoffice.org/76535
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 0060049a9fad..9e9f8c1d843b 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -171,38 +171,37 @@ VclPtr SdTpOptionsContents::Create(
TabPageParent pParent,
#define TABLE_COUNT 12
#define TOKEN ':'
-SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet&
rInAttrs)
-: SfxTabPage(pParent, "OptSavePage",
"modules/simpress/ui/optimpressgeneralpage.ui", &rInAttrs)
+SdTpOptionsMisc::SdTpOptionsMisc(TabPageParent pParent, const SfxItemSet&
rInAttrs)
+: SfxTabPage(pParent, "modules/simpress/ui/optimpressgeneralpage.ui",
"OptSavePage", &rInAttrs)
, nWidth(0)
, nHeight(0)
+, m_xCbxQuickEdit(m_xBuilder->weld_check_button("qickedit"))
+, m_xCbxPickThrough(m_xBuilder->weld_check_button("textselected"))
+, m_xNewDocumentFrame(m_xBuilder->weld_frame("newdocumentframe"))
+, m_xCbxStartWithTemplate(m_xBuilder->weld_check_button("startwithwizard"))
+, m_xCbxMasterPageCache(m_xBuilder->weld_check_button("backgroundback"))
+, m_xCbxCopy(m_xBuilder->weld_check_button("copywhenmove"))
+, m_xCbxMarkedHitMovesAlways(m_xBuilder->weld_check_button("objalwymov"))
+, m_xPresentationFrame(m_xBuilder->weld_frame("presentationframe"))
+, m_xLbMetric(m_xBuilder->weld_combo_box("units"))
+, m_xMtrFldTabstop(m_xBuilder->weld_metric_spin_button("metricFields",
FieldUnit::MM))
+, m_xCbxEnableSdremote(m_xBuilder->weld_check_button("enremotcont"))
+, m_xCbxEnablePresenterScreen(m_xBuilder->weld_check_button("enprsntcons"))
+, m_xCbxUsePrinterMetrics(m_xBuilder->weld_check_button("printermetrics"))
+, m_xCbxCompatibility(m_xBuilder->weld_check_button("cbCompatibility"))
+, m_xScaleFrame(m_xBuilder->weld_frame("scaleframe"))
+, m_xCbScale(m_xBuilder->weld_combo_box("scaleBox"))
+, m_xNewDocLb(m_xBuilder->weld_label("newdoclbl"))
+, m_xFiInfo1(m_xBuilder->weld_label("info1"))
+,
m_xMtrFldOriginalWidth(m_xBuilder->weld_metric_spin_button("metricWidthFields",
FieldUnit::MM))
+, m_xWidthLb(m_xBuilder->weld_label("widthlbl"))
+, m_xHeightLb(m_xBuilder->weld_label("heightlbl"))
+, m_xFiInfo2(m_xBuilder->weld_label("info2"))
+,
m_xMtrFldOriginalHeight(m_xBuilder->weld_metric_spin_button("metricHeightFields",
FieldUnit::MM))
+, m_xCbxDistrot(m_xBuilder->weld_check_button("distrotcb"))
+, m_xMtrFldInfo1(m_xBuilder->weld_metric_spin_button("metricInfo1Fields",
FieldUnit::MM))
+, m_xMtrFldInfo2(m_xBuilder->weld_metric_spin_button("metricInfo2Fields",
FieldUnit::MM))
{
-get(m_pCbxQuickEdit , "qickedit");
-get(m_pCbxPickThrough , "textselected");
-get(m_pNewDocumentFrame, "newdocumentframe");
-get(m_pCbxStartWithTemplate,"startwithwizard");
-get(m_pCbxMasterPageCache , "backgroundback");
-get(m_pCbxCopy , "copywhenmove");
-get(m_pCbxMarkedHitMovesAlways , "objalwymov");
-get(m_pLbMetric , "units");
-get(m_pCbxEnableSdremote , "enremotcont");
-get(m_pCbxEnablePresenterScreen , "enprsntcons");
-get(m_pCbxUsePrinterMetrics , "printermetrics");
-get(m_pPresentationFrame , "presentationframe");
-get(m_pScaleFrame , "scaleframe");
-get(m_pCbScale , "scaleBox");
-get(m_pMtrFldTabstop , "metricFields");
-get(m_pMtrFldOriginalWidth , "metricWidthFields");
-get(m_pMtrFldOriginalHeight , "metricHeightFields");
-get(m_pMtrFldInfo1 , "metricInfo1Fields");
-get(m_pMtrFldInfo2 , "metricInfo2Fields");
-get(m_pCbxCompatibility ,"cbCompatibility" );
-get(m_pFiInfo1 , "info1");
-get(m_pFiInfo2 , "info2");
-get(m_pNewDocLb , "newdoclbl");
-get(m_pWidthLb , "widthlbl");
-get(m_pHeightLb , "heightlbl");
-get(m_pCbxDistrot , "distrotcb");
-
SetExchangeSupport();
// set metric
@@ -217,36 +216,33 @@ SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent,
const SfxItemSet& rInAttr
else
eFUnit = SfxModule::GetCurrentFieldUnit();
-SetFieldUnit( *m_pMtrFldTabstop , eFUnit );
+SetFieldUnit( *m_xMtrFldTabstop , eFUnit );
// Impress is default mode, let' hide the entire scale frame etc.
-m_pCbxDistrot->Hide();
-m_pScaleFrame->Hide();
+m_xCbxDistrot->hide();
+m_xScaleFrame->hide();
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/prntopts.cxx | 254
sd/source/ui/inc/prntopts.hxx | 47 +++---
sd/uiconfig/simpress/ui/prntopts.ui | 45 --
3 files changed, 142 insertions(+), 204 deletions(-)
New commits:
commit 86b24adfbdebbf95ee8399f7be8d30b4debb1301
Author: Caolán McNamara
AuthorDate: Sun Jul 28 21:28:47 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Jul 29 09:26:46 2019 +0200
weld SdPrintOptions
Change-Id: I09cdf0b327e775bf8b87c353a4d46fa6320c12aa
Reviewed-on: https://gerrit.libreoffice.org/76505
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 2c8131e28104..74d0f46b0c1b 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -26,40 +26,39 @@
/**
* dialog to adjust print options
*/
-SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet&
rInAttrs ) :
-SfxTabPage ( pParent, "prntopts" ,
"modules/simpress/ui/prntopts.ui" , &rInAttrs )
+SdPrintOptions::SdPrintOptions(TabPageParent pParent, const SfxItemSet&
rInAttrs)
+: SfxTabPage(pParent, "modules/simpress/ui/prntopts.ui", "prntopts",
&rInAttrs)
+, m_xFrmContent(m_xBuilder->weld_frame("contentframe"))
+, m_xCbxDraw(m_xBuilder->weld_check_button("drawingcb"))
+, m_xCbxNotes(m_xBuilder->weld_check_button("notecb"))
+, m_xCbxHandout(m_xBuilder->weld_check_button("handoutcb"))
+, m_xCbxOutline(m_xBuilder->weld_check_button("outlinecb"))
+, m_xRbtColor(m_xBuilder->weld_radio_button("defaultrb"))
+, m_xRbtGrayscale(m_xBuilder->weld_radio_button("grayscalerb"))
+, m_xRbtBlackWhite(m_xBuilder->weld_radio_button("blackwhiterb"))
+, m_xCbxPagename(m_xBuilder->weld_check_button("pagenmcb"))
+, m_xCbxDate(m_xBuilder->weld_check_button("datecb"))
+, m_xCbxTime(m_xBuilder->weld_check_button("timecb"))
+, m_xCbxHiddenPages(m_xBuilder->weld_check_button("hiddenpgcb"))
+, m_xRbtDefault(m_xBuilder->weld_radio_button("pagedefaultrb"))
+, m_xRbtPagesize(m_xBuilder->weld_radio_button("fittopgrb"))
+, m_xRbtPagetile(m_xBuilder->weld_radio_button("tilepgrb"))
+, m_xRbtBooklet(m_xBuilder->weld_radio_button("brouchrb"))
+, m_xCbxFront(m_xBuilder->weld_check_button("frontcb"))
+, m_xCbxBack(m_xBuilder->weld_check_button("backcb"))
+, m_xCbxPaperbin(m_xBuilder->weld_check_button("papertryfrmprntrcb"))
{
-get( m_pFrmContent , "contentframe" );
-get( m_pCbxDraw , "drawingcb" );
-get( m_pCbxNotes , "notecb" );
-get( m_pCbxHandout , "handoutcb" );
-get( m_pCbxOutline , "outlinecb");
-get( m_pRbtColor , "defaultrb" );
-get( m_pRbtGrayscale , "grayscalerb" );
-get( m_pRbtBlackWhite , "blackwhiterb" );
-get( m_pCbxPagename , "pagenmcb" );
-get( m_pCbxDate , "datecb" );
-get( m_pCbxTime , "timecb" );
-get( m_pCbxHiddenPages , "hiddenpgcb" );
-get( m_pRbtDefault , "pagedefaultrb" );
-get( m_pRbtPagesize , "fittopgrb" );
-get( m_pRbtPagetile , "tilepgrb" );
-get( m_pRbtBooklet , "brouchrb" );
-get( m_pCbxFront , "frontcb" );
-get( m_pCbxBack , "backcb" );
-get( m_pCbxPaperbin , "papertryfrmprntrcb" );
-
-Link aLink = LINK( this, SdPrintOptions, ClickBookletHdl );
-m_pRbtDefault->SetClickHdl( aLink );
-m_pRbtPagesize->SetClickHdl( aLink );
-m_pRbtPagetile->SetClickHdl( aLink );
-m_pRbtBooklet->SetClickHdl( aLink );
+Link aLink = LINK( this, SdPrintOptions,
ClickBookletHdl );
+m_xRbtDefault->connect_toggled( aLink );
+m_xRbtPagesize->connect_toggled( aLink );
+m_xRbtPagetile->connect_toggled( aLink );
+m_xRbtBooklet->connect_toggled( aLink );
aLink = LINK( this, SdPrintOptions, ClickCheckboxHdl );
-m_pCbxDraw->SetClickHdl( aLink );
-m_pCbxNotes->SetClickHdl( aLink );
-m_pCbxHandout->SetClickHdl( aLink );
-m_pCbxOutline->SetClickHdl( aLink );
+m_xCbxDraw->connect_toggled( aLink );
+m_xCbxNotes->connect_toggled( aLink );
+m_xCbxHandout->connect_toggled( aLink );
+m_xCbxOutline->connect_toggled( aLink );
#ifndef MACOSX
SetDrawMode();
@@ -68,74 +67,49 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const
SfxItemSet& rInAttrs
SdPrintOptions::~SdPrintOptions()
{
-disposeOnce();
-}
-
-void SdPrintOptions::dispose()
-{
-m_pFrmContent.clear();
-m_pCbxDraw.clear();
-m_pCbxNotes.clear();
-m_pCbxHandout.clear();
-m_pCbxOutline.clear();
-m_pRbtColor.clear();
-m_pRbtGrayscale.clear();
-m_pRbtBlackWhite.clear();
-m_pCbxPagename.clear();
-m_pCbxDate.clear();
-m_pCbxTime.clear();
-m_pCbxHiddenPages.clear();
-m_pRbtDefault.clear();
-m_pRbtPagesize.clear();
-m_pRbtPagetile.clear();
-m_pRbtBooklet.clear();
-m_pCbxFront.clear();
-m_pCbxBack.clear();
-m_pCbxPaperbin.clear();
-SfxTabPage::dispose();
}
bool SdPrintO
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/dlgolbul.cxx |6 -
sd/uiconfig/sdraw/ui/bulletsandnumbering.ui | 137
2 files changed, 1 insertion(+), 142 deletions(-)
New commits:
commit e80de5c8fb38f9af58aa7147169a9cd6ec443151
Author: Gülşah Köse
AuthorDate: Thu Apr 11 13:34:47 2019 +0300
Commit: Andras Timar
CommitDate: Fri Apr 26 14:39:10 2019 +0200
Remove tabs: bullets, numberings, images from Impress
Remove that tabs from Bullets and Numbering dialog because they are
already exists on sidebar.
Change-Id: I293efd4bb4ed3f34830e39768dcb42ceeae62640
Reviewed-on: https://gerrit.libreoffice.org/70765
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 0ffad3c6c36c..1d71948dcc4d 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -116,13 +116,9 @@ OutlineBulletDlg::OutlineBulletDlg(weld::Window* pParent,
const SfxItemSet* pAtt
SetInputSet(&m_aInputSet);
-if (!m_bTitle)
-AddTabPage("singlenum", RID_SVXPAGE_PICK_SINGLE_NUM);
-else
+if (m_bTitle)
RemoveTabPage("singlenum");
-AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET);
-AddTabPage("graphics", RID_SVXPAGE_PICK_BMP);
AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS);
AddTabPage("position", RID_SVXPAGE_NUM_POSITION);
}
diff --git a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
index 65b5472c4ea0..a9dd71745e1f 100644
--- a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
+++ b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui
@@ -127,143 +127,6 @@
-
-
-
-True
-False
-Bullets
-
-
-False
-
-
-
-
-True
-False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1
-
-
-
-
-True
-False
-Numbering
-
-
-1
-False
-
-
-
-
-True
-False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2
-
-
-
-
-True
-False
-Image
-
-
-2
-False
-
-
-
-
-True
-False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/sdtreelb.cxx | 186 +++
sd/source/ui/dlg/tpaction.cxx | 349 +
sd/source/ui/inc/sdtreelb.hxx | 76 ++
sd/source/ui/inc/tpaction.hxx | 43 +--
sd/uiconfig/simpress/ui/interactionpage.ui | 162 +++--
5 files changed, 583 insertions(+), 233 deletions(-)
New commits:
commit cb3e2a88aae07d9fdf354bc5569b21d78c46d20e
Author: Caolán McNamara
AuthorDate: Wed Mar 13 08:54:27 2019 +
Commit: Caolán McNamara
CommitDate: Thu Mar 14 09:59:53 2019 +0100
weld SdTPAction
Change-Id: I3c72b19f9c5343451164b5bd35dc79a3753e6a37
Reviewed-on: https://gerrit.libreoffice.org/69179
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 39d648597d97..499dc866cbb8 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1413,6 +1413,7 @@
SdPageObjsTLV::SdPageObjsTLV(std::unique_ptr xTreeView)
, m_pMedium(nullptr)
, m_pOwnMedium(nullptr)
, m_bLinkableSelected(false)
+, m_bShowAllPages(false)
{
m_xTreeView->connect_expanding(LINK(this, SdPageObjsTLV,
RequestingChildrenHdl));
m_xTreeView->connect_changed(LINK(this, SdPageObjsTLV, SelectHdl));
@@ -1610,6 +1611,157 @@ void SdPageObjsTLV::CloseBookmarkDoc()
m_pBookmarkDoc = nullptr;
}
+bool SdPageObjsTLV::PageBelongsToCurrentShow(const SdPage* pPage) const
+{
+// Return as default when there is no custom show or when none
+// is used. The page does then belong to the standard show.
+bool bBelongsToShow = true;
+
+if (m_pDoc->getPresentationSettings().mbCustomShow)
+{
+// Get the current custom show.
+SdCustomShow* pCustomShow = nullptr;
+SdCustomShowList* pShowList =
const_cast(m_pDoc)->GetCustomShowList();
+if (pShowList != nullptr)
+{
+sal_uLong nCurrentShowIndex = pShowList->GetCurPos();
+pCustomShow = (*pShowList)[nCurrentShowIndex].get();
+}
+
+// Check whether the given page is part of that custom show.
+if (pCustomShow != nullptr)
+{
+bBelongsToShow = false;
+size_t nPageCount = pCustomShow->PagesVector().size();
+for (size_t i=0; iPagesVector()[i])
+bBelongsToShow = true;
+}
+}
+
+return bBelongsToShow;
+}
+
+void SdPageObjsTLV::AddShapeList (
+const SdrObjList& rList,
+SdrObject* pShape,
+const OUString& rsName,
+const bool bIsExcluded,
+weld::TreeIter* pParentEntry)
+{
+OUString aIcon(BMP_PAGE);
+if (bIsExcluded)
+aIcon = BMP_PAGE_EXCLUDED;
+else if (pShape != nullptr)
+aIcon = BMP_GROUP;
+
+OUString aUserData("1");
+if (pShape != nullptr)
+aUserData = OUString::number(reinterpret_cast(pShape));
+
+std::unique_ptr xEntry = m_xTreeView->make_iterator();
+InsertEntry(pParentEntry, aUserData, rsName, aIcon, xEntry.get());
+
+SdrObjListIter aIter(
+&rList,
+!rList.HasObjectNavigationOrder() /* use navigation order, if
available */,
+SdrIterMode::Flat);
+
+while( aIter.IsMore() )
+{
+SdrObject* pObj = aIter.Next();
+OSL_ASSERT(pObj!=nullptr);
+
+// Get the shape name.
+OUString aStr (GetObjectName( pObj ) );
+OUString sId(OUString::number(reinterpret_cast(pObj)));
+
+if( !aStr.isEmpty() )
+{
+if( pObj->GetObjInventor() == SdrInventor::Default &&
pObj->GetObjIdentifier() == OBJ_OLE2 )
+{
+InsertEntry(xEntry.get(), sId, aStr, BMP_OLE);
+}
+else if( pObj->GetObjInventor() == SdrInventor::Default &&
pObj->GetObjIdentifier() == OBJ_GRAF )
+{
+InsertEntry(xEntry.get(), sId, aStr, BMP_GRAPHIC);
+}
+else if (pObj->IsGroupObject())
+{
+AddShapeList(
+*pObj->GetSubList(),
+pObj,
+aStr,
+false,
+xEntry.get());
+}
+else
+{
+InsertEntry(xEntry.get(), sId, aStr, BMP_OBJECTS);
+}
+}
+}
+
+if (!m_xTreeView->iter_has_child(*xEntry))
+return;
+
+if (bIsExcluded)
+m_xTreeView->set_image(*xEntry, BMP_PAGEOBJS_EXCLUDED);
+else
+m_xTreeView->set_image(*xEntry, BMP_PAGEOBJS);
+m_xTreeView->expand_row(*xEntry);
+}
+
+/**
+ * Fill TreeLB with pages and objects
+ */
+void SdPageObjsTLV::Fill(const SdDrawDocument* pInDoc, bool bAllPages, const
OUString& rDocName)
+{
+OUString aSelection = m_xTreeView->get_selected_text();
+clear();
+
+m_pDoc = pInDoc;
+m_aDocName = rDocName;
+m_bShowAllPages = bAllPages;
+m_pMedium = nullptr;
+
+// first inser
[Libreoffice-commits] core.git: sd/source sd/uiconfig svx/sdi
sd/source/ui/func/fuconbez.cxx | 86 +++--
sd/source/ui/inc/fuconbez.hxx | 10 +++
sd/uiconfig/sdraw/toolbar/redactionbar.xml |2
svx/sdi/svx.sdi|3 -
4 files changed, 96 insertions(+), 5 deletions(-)
New commits:
commit ed4a2031a8b72d15dbe60ec9dd6fcaed07715be9
Author: Muhammet Kara
AuthorDate: Fri Jan 25 14:24:42 2019 +0300
Commit: Muhammet Kara
CommitDate: Fri Jan 25 22:44:44 2019 +0100
Forge the freeform redaction tool
out of the Freeform Line tool in Draw.
* Replace .uno:LineToolbox with .uno:Freeline_Unfilled in Redaction toolbar
* Add new parameters to .uno:Freeline_Unfilled
- SfxUInt16Item Transparence, SfxStringItem Color,
SfxUInt16Item Width, SfxBoolItem IsSticky
* Handle the params in FuConstructBezierPolygon
* Now the freeform line draw tool on the Redaction toolbar
works with a default width of 5mm, color of COL_GRAY7,
and a transparency of 50%; and it sticks when it is
clicked/selected once until user deliberately deselects it
by clicking on another tool or by clicking outside of the page.
* Known problem: icon is not displayed on the toolbar after adding the
params
Change-Id: I6b09276ca82782dbf214aab8d2ba3b407fb0d81c
Reviewed-on: https://gerrit.libreoffice.org/66916
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index ebc57cb87ebc..1acc46a41f9c 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -31,6 +31,9 @@
#include
#include
+#include
+#include
+#include
#include
#include
@@ -50,7 +53,10 @@ using namespace ::com::sun::star::uno;
namespace sd {
-
+/*//Extra attributes coming from parameters
+sal_uInt16 mnTransparence; // Default: 0
+OUStringmsColor; // Default: ""
+sal_uInt16 mnWidth; // Default: 0*/
FuConstructBezierPolygon::FuConstructBezierPolygon (
ViewShell* pViewSh,
::sd::Window* pWin,
@@ -58,8 +64,29 @@ FuConstructBezierPolygon::FuConstructBezierPolygon (
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuConstruct(pViewSh, pWin, pView, pDoc, rReq),
- nEditMode(SID_BEZIER_MOVE)
+ nEditMode(SID_BEZIER_MOVE),
+ mnTransparence(0),
+ mnWidth(0)
+{
+}
+
+namespace{
+
+/// Checks to see if the request has a parameter of IsSticky:bool=true
+/// It means that the selected command/button will stay selected after use
+bool isSticky(SfxRequest& rReq)
{
+const SfxItemSet *pArgs = rReq.GetArgs ();
+if (pArgs)
+{
+const SfxBoolItem* pIsSticky = rReq.GetArg(FN_PARAM_4);
+if (pIsSticky && pIsSticky->GetValue())
+return true;
+}
+
+return false;
+}
+
}
rtl::Reference FuConstructBezierPolygon::Create( ViewShell* pViewSh,
::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq,
bool bPermanent )
@@ -67,7 +94,7 @@ rtl::Reference FuConstructBezierPolygon::Create(
ViewShell* pViewSh, ::s
FuConstructBezierPolygon* pFunc;
rtl::Reference xFunc( pFunc = new FuConstructBezierPolygon(
pViewSh, pWin, pView, pDoc, rReq ) );
xFunc->DoExecute(rReq);
-pFunc->SetPermanent(bPermanent);
+pFunc->SetPermanent(bPermanent || isSticky(rReq));
return xFunc;
}
@@ -76,11 +103,32 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq
)
FuConstruct::DoExecute( rReq );
const SfxItemSet* pArgs = rReq.GetArgs();
+
if( pArgs )
{
const SfxPoolItem* pPoolItem = nullptr;
if( SfxItemState::SET == pArgs->GetItemState( SID_ADD_MOTION_PATH,
true, &pPoolItem ) )
maTargets = static_cast( pPoolItem
)->GetValue();
+
+if (nSlotId == SID_DRAW_FREELINE_NOFILL)
+{
+const SfxUInt16Item* pTransparence =
rReq.GetArg(FN_PARAM_1);
+const SfxStringItem* pColor =
rReq.GetArg(FN_PARAM_2);
+const SfxUInt16Item* pWidth =
rReq.GetArg(FN_PARAM_3);
+
+if (pTransparence && pTransparence->GetValue() > 0)
+{
+mnTransparence = pTransparence->GetValue();
+}
+if (pColor && !pColor->GetValue().isEmpty())
+{
+msColor = pColor->GetValue();
+}
+if (pWidth && pWidth->GetValue() > 0)
+{
+mnWidth = pWidth->GetValue();
+}
+}
}
}
@@ -126,6 +174,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const
MouseEvent& rMEvt)
{
SfxItemSet aAttr(mpDoc->GetPool());
SetStyleSheet(aAttr, pObj);
+SetAttributes(aAttr);
pObj->SetMergedItemSet(aAttr);
}
}
@@ -285,6 +334,37 @@ void FuConstructBezierPolygon::SelectionHasChanged()
*mpView);
}
+namespace {
+/// Returns the color b
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk
sd/UIConfig_sdraw.mk |1
sd/UIConfig_simpress.mk|1
sd/source/ui/view/drviews4.cxx |3 -
sd/uiconfig/sdraw/popupmenu/outlinetext.xml| 65
sd/uiconfig/sdraw/popupmenu/textbox.xml|1
sd/uiconfig/simpress/popupmenu/outlinetext.xml | 67 -
sd/uiconfig/simpress/popupmenu/textbox.xml |1
7 files changed, 2 insertions(+), 137 deletions(-)
New commits:
commit 22beeb3ee7d199b6b15636c532d3ad9f75da1a2b
Author: Maxim Monastirsky
AuthorDate: Thu Oct 11 19:31:24 2018 +0300
Commit: Maxim Monastirsky
CommitDate: Mon Oct 22 18:26:39 2018 +0200
sd: Use the regular textbox popupmenu for outline text objects
Having a separate menu for just one kind of a text box makes
no sense. It isn't good for developers that must remember to
sync changes between the two, and likewise for users which do
customization, and that have to make the same changes twice.
In fact both menus are identical, except that the outlinetext
menu has also .uno:TextAutoFitToSize. But this commands seems
to work also for other kinds of text boxes, and we actually
have a request in tdf#116898 to have it in the context menu.
So we can just move .uno:TextAutoFitToSize to textbox.xml, and
then remove the separate outlinetext.xml.
Fortunately there is no fear of losing existing user
customization for outlinetext.xml, as it wasn't exposed to the
customization dialog by error (no corresponding entries were
added to ImpressWindowState.xcu/DrawWindowState.xcu).
Change-Id: I3568cb95d862d4ab91bedfa691dcc6659a3bf86f
Reviewed-on: https://gerrit.libreoffice.org/61972
Tested-by: Jenkins
Reviewed-by: andreas_kainz
Reviewed-by: Heiko Tietze
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index edd4e2944ee4..8fd16e5cc8e4 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\
sd/uiconfig/sdraw/popupmenu/multiselect \
sd/uiconfig/sdraw/popupmenu/notebookbar \
sd/uiconfig/sdraw/popupmenu/oleobject \
- sd/uiconfig/sdraw/popupmenu/outlinetext \
sd/uiconfig/sdraw/popupmenu/pagepanemaster \
sd/uiconfig/sdraw/popupmenu/pagepanenoselmaster \
sd/uiconfig/sdraw/popupmenu/pagepanenosel \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 51de808e80f0..7c301e5e8a8d 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -33,7 +33,6 @@ $(eval $(call
gb_UIConfig_add_popupmenufiles,modules/simpress,\
sd/uiconfig/simpress/popupmenu/multiselect \
sd/uiconfig/simpress/popupmenu/notebookbar \
sd/uiconfig/simpress/popupmenu/oleobject \
- sd/uiconfig/simpress/popupmenu/outlinetext \
sd/uiconfig/simpress/popupmenu/outline \
sd/uiconfig/simpress/popupmenu/pagepanemaster \
sd/uiconfig/simpress/popupmenu/pagepanenoselmaster \
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 97d832c1f5ad..11986c86c6c8 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -660,9 +660,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt,
::sd::Window* pWin)
switch ( nId )
{
case OBJ_OUTLINETEXT:
-aPopupId = "outlinetext";
-break;
-
case OBJ_CAPTION:
case OBJ_TITLETEXT:
case OBJ_TEXT:
diff --git a/sd/uiconfig/sdraw/popupmenu/outlinetext.xml
b/sd/uiconfig/sdraw/popupmenu/outlinetext.xml
deleted file mode 100644
index 1bbcb9321824..
--- a/sd/uiconfig/sdraw/popupmenu/outlinetext.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-http://openoffice.org/2001/menu";>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sd/uiconfig/sdraw/popupmenu/textbox.xml
b/sd/uiconfig/sdraw/popupmenu/textbox.xml
index dd6764645fd6..1bbcb9321824 100644
--- a/sd/uiconfig/sdraw/popupmenu/textbox.xml
+++ b/sd/uiconfig/sdraw/popupmenu/textbox.xml
@@ -18,6 +18,7 @@
+
diff --git a/sd/uiconfig/simpress/popupmenu/outlinetext.xml
b/sd/uiconfig/simpress/popupmenu/outlinetext.xml
deleted file mode 100644
index a2bf057b0498..
--- a/sd/uiconfig/simpress/popupmenu/outlinetext.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-http://openoffice.org/2001/menu";>
-
-
-
-
-
-
-
-
-
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/PhotoAlbumDialog.cxx |2 +-
sd/uiconfig/simpress/ui/photoalbum.ui |9 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 49a92a140763ca0273135489a676247d670161a3
Author: Caolán McNamara
Date: Fri May 11 11:46:24 2018 +0100
rename create_btn to ok to get desired button ordering
and help is missing a RET_HELP response id
Change-Id: Ibb816f9a3d03ceef4edde023725bebd29f9160d2
Reviewed-on: https://gerrit.libreoffice.org/54128
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 513dc00781c5..d7af857f86d8 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -44,7 +44,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow,
SdDrawDocument* pAc
pDoc(pActDoc)
{
get(pCancelBtn, "cancel");
-get(pCreateBtn, "create_btn");
+get(pCreateBtn, "ok");
get(pAddBtn, "add_btn");
get(pUpBtn, "up_btn");
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui
b/sd/uiconfig/simpress/ui/photoalbum.ui
index 743cad7108af..2ad9d1df394b 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -1,5 +1,5 @@
-
+
@@ -56,7 +56,7 @@
-
+
Insert Slides
True
True
@@ -428,8 +428,11 @@
- create_btn
+ help
cancel
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/ins_paste.cxx | 21 +--
sd/source/ui/inc/ins_paste.hxx | 13 ---
sd/source/ui/slidesorter/controller/SlsClipboard.cxx |7 +++---
sd/uiconfig/simpress/ui/insertslides.ui | 16 +-
4 files changed, 26 insertions(+), 31 deletions(-)
New commits:
commit 36a688255ff2ebddafa3a8d7011167f437967b6a
Author: Caolán McNamara
Date: Thu May 10 21:30:06 2018 +0100
weld SdInsertPasteDlg
Change-Id: I999e7ff88afd7dd82b368ede83d004e309e7dd3e
Reviewed-on: https://gerrit.libreoffice.org/54102
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx
index 2689f4211bb3..a0b6f305d404 100644
--- a/sd/source/ui/dlg/ins_paste.cxx
+++ b/sd/source/ui/dlg/ins_paste.cxx
@@ -19,30 +19,21 @@
#include
-SdInsertPasteDlg::SdInsertPasteDlg(vcl::Window* pWindow)
-: ModalDialog( pWindow, "InsertSlidesDialog",
-"modules/simpress/ui/insertslides.ui")
+SdInsertPasteDlg::SdInsertPasteDlg(weld::Window* pWindow)
+: GenericDialogController(pWindow, "modules/simpress/ui/insertslides.ui",
"InsertSlidesDialog")
+, m_xRbBefore(m_xBuilder->weld_radio_button("before"))
+, m_xRbAfter(m_xBuilder->weld_radio_button("after"))
{
-get(m_pRbBefore, "before");
-get(m_pRbAfter, "after");
-m_pRbAfter->Check();
+m_xRbAfter->set_active(true);
}
SdInsertPasteDlg::~SdInsertPasteDlg()
{
-disposeOnce();
-}
-
-void SdInsertPasteDlg::dispose()
-{
-m_pRbBefore.clear();
-m_pRbAfter.clear();
-ModalDialog::dispose();
}
bool SdInsertPasteDlg::IsInsertBefore() const
{
-return m_pRbBefore->IsChecked();
+return m_xRbBefore->get_active();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx
index 2ea57eee2e05..70a946271ed8 100644
--- a/sd/source/ui/inc/ins_paste.hxx
+++ b/sd/source/ui/inc/ins_paste.hxx
@@ -22,21 +22,18 @@
#include
-#include
-#include
-#include
+#include
// SdInsertPasteDlg
-class SD_DLLPUBLIC SdInsertPasteDlg : public ModalDialog
+class SD_DLLPUBLIC SdInsertPasteDlg : public weld::GenericDialogController
{
private:
-VclPtr m_pRbBefore;
-VclPtr m_pRbAfter;
+std::unique_ptr m_xRbBefore;
+std::unique_ptr m_xRbAfter;
public:
-SdInsertPasteDlg( vcl::Window* pWindow );
+SdInsertPasteDlg(weld::Window* pWindow);
virtual ~SdInsertPasteDlg() override;
-virtual void dispose() override;
bool IsInsertBefore() const;
};
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index fb12640c8b1e..7ac3ed0e4eda 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -281,11 +281,12 @@ sal_Int32 Clipboard::GetInsertionPosition ()
else if (mrController.GetFocusManager().IsFocusShowing())
{
// Use the focus to determine the insertion position.
-ScopedVclPtrInstance< SdInsertPasteDlg > aDialog(nullptr);
-if (aDialog->Execute() == RET_OK)
+vcl::Window* pWin = mrSlideSorter.GetContentWindow();
+SdInsertPasteDlg aDialog(pWin ? pWin->GetFrameWeld() : nullptr);
+if (aDialog.run() == RET_OK)
{
nInsertPosition =
mrController.GetFocusManager().GetFocusedPageIndex();
-if ( ! aDialog->IsInsertBefore())
+if (!aDialog.IsInsertBefore())
nInsertPosition ++;
}
}
diff --git a/sd/uiconfig/simpress/ui/insertslides.ui
b/sd/uiconfig/simpress/ui/insertslides.ui
index 5a7e92fa430d..1e26155abf03 100644
--- a/sd/uiconfig/simpress/ui/insertslides.ui
+++ b/sd/uiconfig/simpress/ui/insertslides.ui
@@ -1,5 +1,5 @@
-
+
@@ -7,16 +7,19 @@
6
Insert Slides
False
+True
+0
+0
dialog
False
+vertical
12
False
-vertical
-start
+end
gtk-ok
@@ -59,6 +62,7 @@
False
True
2
+True
@@ -98,7 +102,6 @@
0
True
True
-after
False
@@ -132,10 +135,10 @@
True
False
-0.5501192092896
1
Position
center
+0.5501192092896
@@ -155,5 +158,8 @@
cancel
help
+
+
+
___
Libreoffice-commits m
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/filter/html/pubdlg.cxx | 50 +
sd/uiconfig/sdraw/ui/namedesign.ui |9 +-
2 files changed, 26 insertions(+), 33 deletions(-)
New commits:
commit c82438da6827045244a3bde1629c43edb9204146
Author: Caolán McNamara
Date: Thu May 10 17:27:51 2018 +0100
weld SdDesignNameDlg
Change-Id: Ie8f7a62d55aabb520c234c995b01d85bf9f432b6
Reviewed-on: https://gerrit.libreoffice.org/54093
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index ce7d614db124..cf6d21f88559 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -338,18 +338,16 @@ SvStream& WriteSdPublishingDesign(SvStream& rOut, const
SdPublishingDesign& rDes
}
// Dialog for the entry of the name of the design
-class SdDesignNameDlg : public ModalDialog
+class SdDesignNameDlg : public weld::GenericDialogController
{
private:
-VclPtr m_pEdit;
-VclPtr m_pBtnOK;
+std::unique_ptr m_xEdit;
+std::unique_ptr m_xBtnOK;
public:
-SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName );
-virtual ~SdDesignNameDlg() override;
-virtual void dispose() override;
+SdDesignNameDlg(weld::Window* pWindow, const OUString& aName );
OUString GetDesignName();
-DECL_LINK(ModifyHdl, Edit&, void);
+DECL_LINK(ModifyHdl, weld::Entry&, void);
};
// SdPublishingDlg Methods
@@ -1139,11 +1137,11 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl, Button*,
void)
{
bRetry = false;
-ScopedVclPtrInstance< SdDesignNameDlg > aDlg(this, aName );
+SdDesignNameDlg aDlg(GetFrameWeld(), aName);
-if ( aDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
{
-aDesign.m_aDesignName = aDlg->GetDesignName();
+aDesign.m_aDesignName = aDlg.GetDesignName();
std::vector::iterator iter;
for (iter = m_aDesignList.begin(); iter !=
m_aDesignList.end(); ++iter)
@@ -1616,36 +1614,24 @@ bool
SdPublishingDlg::selectPageByUIXMLDescription(const OString& rUIXMLDescript
}
// SdDesignNameDlg Methods
-SdDesignNameDlg::SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName)
-: ModalDialog(pWindow, "NameDesignDialog",
"modules/sdraw/ui/namedesign.ui")
+SdDesignNameDlg::SdDesignNameDlg(weld::Window* pWindow, const OUString& rName)
+: GenericDialogController(pWindow, "modules/sdraw/ui/namedesign.ui",
"NameDesignDialog")
+, m_xEdit(m_xBuilder->weld_entry("entry"))
+, m_xBtnOK(m_xBuilder->weld_button("ok"))
{
-get(m_pEdit, "entry");
-get(m_pBtnOK, "ok");
-m_pEdit->SetModifyHdl(LINK(this, SdDesignNameDlg, ModifyHdl ));
-m_pEdit->SetText(aName);
-m_pBtnOK->Enable(!aName.isEmpty());
-}
-
-SdDesignNameDlg::~SdDesignNameDlg()
-{
-disposeOnce();
-}
-
-void SdDesignNameDlg::dispose()
-{
-m_pEdit.clear();
-m_pBtnOK.clear();
-ModalDialog::dispose();
+m_xEdit->connect_changed(LINK(this, SdDesignNameDlg, ModifyHdl ));
+m_xEdit->set_text(rName);
+m_xBtnOK->set_sensitive(!rName.isEmpty());
}
OUString SdDesignNameDlg::GetDesignName()
{
-return m_pEdit->GetText();
+return m_xEdit->get_text();
}
-IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl, weld::Entry&, void)
{
-m_pBtnOK->Enable(!m_pEdit->GetText().isEmpty());
+m_xBtnOK->set_sensitive(!m_xEdit->get_text().isEmpty());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/uiconfig/sdraw/ui/namedesign.ui
b/sd/uiconfig/sdraw/ui/namedesign.ui
index b5ddb4ee6e18..cdc8b9a037f3 100644
--- a/sd/uiconfig/sdraw/ui/namedesign.ui
+++ b/sd/uiconfig/sdraw/ui/namedesign.ui
@@ -1,11 +1,14 @@
-
+
False
6
Name HTML Design
+True
+0
+0
dialog
@@ -80,6 +83,7 @@
True
True
True
+True
0
@@ -99,5 +103,8 @@
ok
cancel
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/sidebar/PageMarginUtils.hxx | 158 ++
sd/source/ui/sidebar/SlideBackground.cxx | 188 --
sd/source/ui/sidebar/SlideBackground.hxx | 15 -
sd/uiconfig/simpress/ui/sidebarslidebackground.ui | 107 ++--
4 files changed, 299 insertions(+), 169 deletions(-)
New commits:
commit d5a64f114c101339ed479ea926653c703951fae5
Author: pv2k
Date: Thu Aug 31 01:59:05 2017 +0530
tdf#109100 margin spinboxes in draw's sidebar changed to listbox
Change-Id: Ia59f0fb64f10beab70f449d01b8a25113bea475d
Reviewed-on: https://gerrit.libreoffice.org/41741
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sd/source/ui/sidebar/PageMarginUtils.hxx
b/sd/source/ui/sidebar/PageMarginUtils.hxx
new file mode 100644
index ..7061a11f9a6a
--- /dev/null
+++ b/sd/source/ui/sidebar/PageMarginUtils.hxx
@@ -0,0 +1,158 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include
+#define SDPAGE_NO_MARGIN 0
+#define SDPAGE_NARROW_VALUE635
+#define SDPAGE_MODERATE_LR 955
+#define SDPAGE_NORMAL_VALUE1000
+#define SDPAGE_WIDE_VALUE1 1270
+#define SDPAGE_WIDE_VALUE2 2540
+#define SDPAGE_WIDE_VALUE3 1590
+#define SDPAGE_UNIT_THRESHOLD 5
+
+namespace sd { namespace sidebar{
+
+bool IsNone( const long nPageLeftMargin, const long nPageRightMargin,
+ const long nPageTopMargin, const long nPageBottomMargin )
+{
+return( std::abs(nPageLeftMargin - SDPAGE_NO_MARGIN) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageRightMargin - SDPAGE_NO_MARGIN ) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageTopMargin - SDPAGE_NO_MARGIN) <= SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageBottomMargin - SDPAGE_NO_MARGIN) <=
SDPAGE_UNIT_THRESHOLD );
+}
+
+void SetNone( long& nPageLeftMargin, long& nPageRightMargin,
+long& nPageTopMargin, long& nPageBottomMargin )
+{
+nPageLeftMargin = SDPAGE_NO_MARGIN;
+nPageRightMargin = SDPAGE_NO_MARGIN;
+nPageTopMargin = SDPAGE_NO_MARGIN;
+nPageBottomMargin = SDPAGE_NO_MARGIN;
+}
+
+bool IsNarrow( const long nPageLeftMargin, const long nPageRightMargin,
+ const long nPageTopMargin, const long nPageBottomMargin )
+{
+return( std::abs(nPageLeftMargin - SDPAGE_NARROW_VALUE) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageRightMargin - SDPAGE_NARROW_VALUE) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageTopMargin - SDPAGE_NARROW_VALUE) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageBottomMargin - SDPAGE_NARROW_VALUE) <=
SDPAGE_UNIT_THRESHOLD );
+}
+
+void SetNarrow( long& nPageLeftMargin, long& nPageRightMargin,
+long& nPageTopMargin, long& nPageBottomMargin )
+{
+nPageLeftMargin = SDPAGE_NARROW_VALUE;
+nPageRightMargin = SDPAGE_NARROW_VALUE;
+nPageTopMargin = SDPAGE_NARROW_VALUE;
+nPageBottomMargin = SDPAGE_NARROW_VALUE;
+}
+
+bool IsModerate( const long nPageLeftMargin, const long nPageRightMargin,
+ const long nPageTopMargin, const long nPageBottomMargin )
+{
+return( std::abs(nPageLeftMargin - SDPAGE_MODERATE_LR) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageRightMargin - SDPAGE_MODERATE_LR) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageTopMargin - SDPAGE_WIDE_VALUE1) <= SDPAGE_UNIT_THRESHOLD
&&
+std::abs(nPageBottomMargin - SDPAGE_WIDE_VALUE1) <=
SDPAGE_UNIT_THRESHOLD );
+}
+
+void SetModerate( long& nPageLeftMargin, long& nPageRightMargin,
+long& nPageTopMargin, long& nPageBottomMargin )
+{
+nPageLeftMargin = SDPAGE_MODERATE_LR;
+nPageRightMargin = SDPAGE_MODERATE_LR;
+nPageTopMargin = SDPAGE_WIDE_VALUE1;
+nPageBottomMargin = SDPAGE_WIDE_VALUE1;
+}
+
+bool IsNormal075( const long nPageLeftMargin, const long nPageRightMargin,
+ const long nPageTopMargin, const long nPageBottomMargin )
+{
+return( std::abs(nPageLeftMargin - SDPAGE_NORMAL_VALUE) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageRightMargin - SDPAGE_NORMAL_VALUE) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageTopMargin - SDPAGE_NORMAL_VALU
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/tabtempl.cxx |7 +++
sd/source/ui/inc/tabtempl.hxx |1 +
sd/uiconfig/simpress/ui/templatedialog.ui | 14 ++
3 files changed, 22 insertions(+)
New commits:
commit c2c3d86770efc1e39860441d625fcb3b4be7c58e
Author: Caolán McNamara
Date: Fri Aug 11 12:31:13 2017 +0100
add char highlighting (background) tab to graphics styles dialog
Change-Id: I2cf3872116ae59051847d73612a2f4f8385d34d8
Reviewed-on: https://gerrit.libreoffice.org/41030
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index afe136f5c17e..1a060d252055 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -70,6 +70,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent,
, m_nTransparencyId(0)
, m_nFontId(0)
, m_nFontEffectId(0)
+, m_nBackgroundId(0)
, m_nTextId(0)
, m_nDimensionId(0)
, m_nConnectorId(0)
@@ -82,6 +83,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent,
m_nTransparencyId = AddTabPage("transparency", RID_SVXPAGE_TRANSPARENCE);
m_nFontId = AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
m_nFontEffectId = AddTabPage("fonteffect", RID_SVXPAGE_CHAR_EFFECTS);
+m_nBackgroundId = AddTabPage("background", RID_SVXPAGE_BACKGROUND);
AddTabPage("indents", RID_SVXPAGE_STD_PARAGRAPH);
m_nTextId = AddTabPage("text", RID_SVXPAGE_TEXTATTR);
AddTabPage("animation", RID_SVXPAGE_TEXTANIMATION);
@@ -144,6 +146,11 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId,
SfxTabPage &rPage )
{
rPage.PageCreated(aSet);
}
+else if (nId == m_nBackgroundId)
+{
+
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_CHAR_BKGCOLOR)));
+rPage.PageCreated(aSet);
+}
else if (nId == m_nTextId)
{
rPage.PageCreated(aSet);
diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx
index 72cd73456bd7..3bd765e64a69 100644
--- a/sd/source/ui/inc/tabtempl.hxx
+++ b/sd/source/ui/inc/tabtempl.hxx
@@ -49,6 +49,7 @@ private:
sal_uInt16 m_nTransparencyId;
sal_uInt16 m_nFontId;
sal_uInt16 m_nFontEffectId;
+sal_uInt16 m_nBackgroundId;
sal_uInt16 m_nTextId;
sal_uInt16 m_nDimensionId;
sal_uInt16 m_nConnectorId;
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui
b/sd/uiconfig/simpress/ui/templatedialog.ui
index 550c0042ff90..ddb067bff3de 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -204,6 +204,20 @@
+
+True
+False
+Highlighting
+
+
+6
+False
+
+
+
+
+
+
True
False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/copydlg.cxx| 19 +++
sd/uiconfig/sdraw/ui/copydlg.ui |4 ++--
2 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 0b133fdb67cc56fba46ec355283144e611e8bf83
Author: Laurent Balland-Poirier
Date: Sat Apr 22 01:22:11 2017 +0200
tdf#61561 Increase limitation placement and enlargement
Limit placement to +/- page size
Limit enlargement to - object size/+ page size
Change-Id: I180dc8dfd3ce24e917b9e0893bb640aa9995293b
Reviewed-on: https://gerrit.libreoffice.org/36815
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 80209f44ddf1..fc39e1b5 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -124,6 +124,25 @@ void CopyDlg::dispose()
*/
void CopyDlg::Reset()
{
+// Set Min/Max values
+::tools::Rectangle aRect = mpView->GetAllMarkedRect();
+Size aPageSize = mpView->GetSdrPageView()->GetPage()->GetSize();
+SetMetricValue( *m_pMtrFldMoveX, Fraction(100L) / maUIScale,
MapUnit::Map100thMM);
+double fScaleFactor = m_pMtrFldMoveX->GetValue()/100.0;
+
+long nPageWidth = aPageSize.Width() * fScaleFactor;
+long nPageHeight = aPageSize.Height() * fScaleFactor;
+long nRectWidth = aRect.GetWidth() * fScaleFactor;
+long nRectHeight = aRect.GetHeight() * fScaleFactor;
+m_pMtrFldMoveX->SetMin( -nPageWidth );
+m_pMtrFldMoveX->SetMax( nPageWidth );
+m_pMtrFldMoveY->SetMin( -nPageHeight );
+m_pMtrFldMoveY->SetMax( nPageHeight );
+m_pMtrFldWidth->SetMin( -nRectWidth );
+m_pMtrFldWidth->SetMax( nPageWidth );
+m_pMtrFldHeight->SetMin( -nRectHeight );
+m_pMtrFldHeight->SetMax( nPageHeight );
+
const SfxPoolItem* pPoolItem = nullptr;
OUString aStr( GetExtraData() );
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
index 87baa25e17ae..8ba01c9f8aa3 100644
--- a/sd/uiconfig/sdraw/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -16,8 +16,8 @@
10
--120
-120
+-100
+100
0.10001
1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk
sd/UIConfig_sdraw.mk |2 -
sd/UIConfig_simpress.mk |2 -
sd/source/ui/view/DocumentRenderer.cxx |4 +--
sd/uiconfig/sdraw/ui/drawprinteroptions.ui | 24 ++---
sd/uiconfig/simpress/ui/impressprinteroptions.ui | 26 +++
5 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 116931751d252a8284d5c76d883e766186538ed2
Author: Caolán McNamara
Date: Thu Aug 3 17:49:41 2017 +0100
draw vs impress printer option pages
disambiguate contexts for impress vs draw printer options pages
Change-Id: I1bb52c49b95beab3d9acceec73370e0be8da6f59
Reviewed-on: https://gerrit.libreoffice.org/40747
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 089814d6ffb8..1d2d6e9f2a1e 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/dlgsnap \
sd/uiconfig/sdraw/ui/copydlg \
sd/uiconfig/sdraw/ui/drawchardialog \
+ sd/uiconfig/sdraw/ui/drawprinteroptions \
sd/uiconfig/sdraw/ui/drawparadialog \
sd/uiconfig/sdraw/ui/drawpagedialog \
sd/uiconfig/sdraw/ui/drawprtldialog \
@@ -111,7 +112,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/insertslidesdialog \
sd/uiconfig/sdraw/ui/namedesign \
sd/uiconfig/sdraw/ui/paranumberingtab \
- sd/uiconfig/sdraw/ui/printeroptions \
sd/uiconfig/sdraw/ui/queryunlinkimagedialog \
sd/uiconfig/sdraw/ui/tabledesigndialog \
sd/uiconfig/sdraw/ui/vectorize \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index a6ebd013f086..6163004182b4 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -124,6 +124,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/fontstylemenu \
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
+ sd/uiconfig/simpress/ui/impressprinteroptions \
sd/uiconfig/simpress/ui/insertslides \
sd/uiconfig/simpress/ui/interactiondialog \
sd/uiconfig/simpress/ui/interactionpage \
@@ -136,7 +137,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/optimpressgeneralpage \
sd/uiconfig/simpress/ui/photoalbum \
sd/uiconfig/simpress/ui/presentationdialog \
- sd/uiconfig/simpress/ui/printeroptions \
sd/uiconfig/simpress/ui/prntopts \
sd/uiconfig/simpress/ui/publishingdialog \
sd/uiconfig/simpress/ui/remotedialog \
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 363d46dc4b05..021ce8e7b689 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -367,9 +367,9 @@ namespace {
beans::PropertyValue aOptionsUIFile;
aOptionsUIFile.Name = "OptionsUIFile";
if( mbImpress )
-aOptionsUIFile.Value <<=
OUString("modules/simpress/ui/printeroptions.ui");
+aOptionsUIFile.Value <<=
OUString("modules/simpress/ui/impressprinteroptions.ui");
else
-aOptionsUIFile.Value <<=
OUString("modules/sdraw/ui/printeroptions.ui");
+aOptionsUIFile.Value <<=
OUString("modules/sdraw/ui/drawprinteroptions.ui");
maProperties.push_back(aOptionsUIFile);
SvtModuleOptions aOpt;
diff --git a/sd/uiconfig/sdraw/ui/printeroptions.ui
b/sd/uiconfig/sdraw/ui/drawprinteroptions.ui
similarity index 93%
rename from sd/uiconfig/sdraw/ui/printeroptions.ui
rename to sd/uiconfig/sdraw/ui/drawprinteroptions.ui
index 38edf40a5c73..883ba3cbef30 100644
--- a/sd/uiconfig/sdraw/ui/printeroptions.ui
+++ b/sd/uiconfig/sdraw/ui/drawprinteroptions.ui
@@ -29,7 +29,7 @@
6
-Page name
+Page name
False
True
True
@@ -45,7 +45,7 @@
-Date and time
+Date and time
False
True
True
@@ -67,7 +67,7 @@
True
False
-Contents
+Contents
@@ -100,7 +100,7 @@
6
-Original size
+Original size
False
True
True
@@ -118,7 +118,7 @@
-Grayscale
+Grayscale
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/sidebar/SlideBackground.cxx | 58 ++
sd/source/ui/sidebar/SlideBackground.hxx |1
sd/uiconfig/simpress/ui/sidebarslidebackground.ui |4 -
3 files changed, 19 insertions(+), 44 deletions(-)
New commits:
commit 4eae2eeb4c3942648aa5d32678ddb5bbbae9d221
Author: Katarina Behrens
Date: Wed Jun 28 17:29:45 2017 +0200
Slightly different approach to tdf#106679
cowardly avoiding use of DrawViewShell in constructor
Change-Id: Ib40406d439403d0e2de270827bf5c2f06cfb18c2
Reviewed-on: https://gerrit.libreoffice.org/39368
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index c86bb14562d3..3d40c8123648 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -63,6 +63,7 @@
#include "EventMultiplexer.hxx"
#include "glob.hrc"
#include
+#include
using namespace ::com::sun::star;
@@ -112,7 +113,6 @@ SlideBackground::SlideBackground(
maDrawMasterContext(vcl::EnumContext::Application::Draw,
vcl::EnumContext::Context::MasterPage),
maImpressOtherContext(vcl::EnumContext::Application::Impress,
vcl::EnumContext::Context::DrawPage),
maImpressMasterContext(vcl::EnumContext::Application::Impress,
vcl::EnumContext::Context::MasterPage),
-maApplication(vcl::EnumContext::Application::NONE),
mbTitle(false),
mpBindings(pBindings)
{
@@ -142,7 +142,8 @@ SlideBackground::~SlideBackground()
bool SlideBackground::IsImpress()
{
-return ( maApplication == vcl::EnumContext::Application::Impress );
+return ( maContext == maImpressMasterContext ||
+ maContext == maImpressOtherContext );
}
void SlideBackground::Initialize()
@@ -174,25 +175,6 @@ void SlideBackground::Initialize()
aLayoutName =
aLayoutName.copy(0,aLayoutName.indexOf(SD_LT_SEPARATOR));
mpMasterSlide->SelectEntry(aLayoutName);
}
-
-DrawViewShell* pDrawViewShell =
dynamic_cast(pMainViewShell);
-if ( pDrawViewShell != nullptr
- && pDrawViewShell->GetEditMode() == EditMode::MasterPage )
-{
-mpCloseMaster->Show();
-mpEditMaster->Hide();
-mpMasterSlide->Disable();
-mpDspMasterBackground->Disable();
-mpDspMasterObjects->Disable();
-}
-else
-{
-mpCloseMaster->Hide();
-mpEditMaster->Show();
-mpMasterSlide->Enable();
-mpDspMasterBackground->Enable();
-mpDspMasterObjects->Enable();
-}
}
mpFillStyle->SelectEntryPos(static_cast< sal_Int32 >(NONE));
@@ -209,14 +191,24 @@ void SlideBackground::HandleContextChange(
if (maContext == rContext)
return;
maContext = rContext;
-if ( maContext == maImpressOtherContext || maContext ==
maImpressMasterContext )
+
+if ( maContext == maImpressMasterContext )
{
-maApplication = vcl::EnumContext::Application::Impress;
+mpCloseMaster->Show();
+mpEditMaster->Hide();
+mpMasterSlide->Disable();
+mpDspMasterBackground->Disable();
+mpDspMasterObjects->Disable();
}
-else if ( maContext == maDrawOtherContext || maContext ==
maDrawMasterContext )
+else if (maContext == maImpressOtherContext )
{
-maApplication = vcl::EnumContext::Application::Draw;
+mpCloseMaster->Hide();
+mpEditMaster->Show();
+mpMasterSlide->Enable();
+mpDspMasterBackground->Enable();
+mpDspMasterObjects->Enable();
}
+// else Draw or something else, do nothing
}
void SlideBackground::Update()
@@ -371,30 +363,16 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
if ( eMode == EditMode::MasterPage)
{
if( IsImpress() )
-{
SetPanelTitle(SdResId(STR_MASTERSLIDE_NAME));
-mpEditMaster->Hide();
-mpCloseMaster->Show();
-}
else
SetPanelTitle(SdResId(STR_MASTERPAGE_NAME));
-mpMasterSlide->Disable();
-mpDspMasterBackground->Disable();
-mpDspMasterObjects->Disable();
}
else // EditMode::Page
{
if( IsImpress() )
-{
SetPanelTitle(SdResId(STR_SLIDE_NAME));
-mpCloseMaster->Hide();
-mpEditMaster->Show();
-}
else
SetPanelTitle(SdResId(STR_PAGE_NAME));
-mpMasterSlide->Enable();
-mp
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/func/fucopy.cxx|2 +- sd/uiconfig/sdraw/ui/copydlg.ui |1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 8b56a5ceed41a1bb0a82af71c90973f50f54e4b8 Author: Laurent Balland-Poirier Date: Sat Apr 22 15:41:16 2017 +0200 tdf#77816 Duplicate dlg: enable fractionnal angle In Duplicate dialog of Draw: Count angle in 100th of degree Change-Id: If1af9a42e7c35d39edbdc3fa624489d7e38b42e1 Reviewed-on: https://gerrit.libreoffice.org/36816 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index 45490d68f8b3..0edd047c0fed 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -242,7 +242,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) mpView->ResizeAllMarked( aRect.TopLeft(), aWidth, aHeight ); if( mpView->IsRotateAllowed() ) -mpView->RotateAllMarked( aRect.Center(), lAngle * 100 ); +mpView->RotateAllMarked( aRect.Center(), lAngle ); if( mpView->IsMoveAllowed() ) mpView->MoveAllMarked( Size( lSizeX, lSizeY ) ); diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui index ddadc3fdcd77..07c1a506afda 100644 --- a/sd/uiconfig/sdraw/ui/copydlg.ui +++ b/sd/uiconfig/sdraw/ui/copydlg.ui @@ -273,6 +273,7 @@ True â adjustment2 +2 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk|2
sd/source/ui/annotations/annotationmanager.cxx | 96 ++---
sd/source/ui/annotations/annotations.hrc |4
sd/source/ui/annotations/annotations.src | 114 -
sd/uiconfig/simpress/ui/annotationmenu.ui | 107 +++
sd/uiconfig/simpress/ui/annotationtagmenu.ui | 47 ++
6 files changed, 221 insertions(+), 149 deletions(-)
New commits:
commit cf8c82e1abd1961dcb88446acb84e70ca94819cf
Author: Caolán McNamara
Date: Fri Apr 14 14:03:29 2017 +0100
convert annotation menus to .ui
Change-Id: If827a4fb31473bf60d7619f83a5399939cdfc57a
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 1056b0faa987..a6ebd013f086 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -106,6 +106,8 @@ $(eval $(call
gb_UIConfig_add_toolbarfiles,modules/simpress,\
))
$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
+ sd/uiconfig/simpress/ui/annotationmenu \
+ sd/uiconfig/simpress/ui/annotationtagmenu \
sd/uiconfig/simpress/ui/currentmastermenu \
sd/uiconfig/simpress/ui/customanimationspanel \
sd/uiconfig/simpress/ui/customanimationspanelhorizontal \
diff --git a/sd/source/ui/annotations/annotationmanager.cxx
b/sd/source/ui/annotations/annotationmanager.cxx
index 465f83698382..b2680c08bf11 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1089,6 +1089,34 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener,
}
}
+namespace
+{
+sal_uInt16 IdentToSID(const OString& rIdent)
+{
+if (rIdent == "reply")
+return SID_REPLYTO_POSTIT;
+else if (rIdent == "delete")
+return SID_DELETE_POSTIT;
+else if (rIdent == "deleteby")
+return SID_DELETEALLBYAUTHOR_POSTIT;
+else if (rIdent == "deleteall")
+return SID_DELETEALL_POSTIT;
+else if (rIdent == "copy")
+return SID_COPY;
+else if (rIdent == "paste")
+return SID_PASTE;
+else if (rIdent == "bold")
+return SID_ATTR_CHAR_WEIGHT;
+else if (rIdent == "italic")
+return SID_ATTR_CHAR_POSTURE;
+else if (rIdent == "underline")
+return SID_ATTR_CHAR_UNDERLINE;
+else if (rIdent == "strike")
+return SID_ATTR_CHAR_STRIKEOUT;
+return 0;
+}
+}
+
void AnnotationManagerImpl::ExecuteAnnotationContextMenu( const Reference<
XAnnotation >& xAnnotation, vcl::Window* pParent, const ::tools::Rectangle&
rContextRect, bool bButtonMenu /* = false */ )
{
SfxDispatcher* pDispatcher( getDispatcher( mrBase ) );
@@ -1102,32 +1130,38 @@ void
AnnotationManagerImpl::ExecuteAnnotationContextMenu( const Reference< XAnno
if( bReadOnly && !pAnnotationWindow )
return;
-ScopedVclPtrInstance pMenu( SdResId( pAnnotationWindow ?
RID_ANNOTATION_CONTEXTMENU : RID_ANNOTATION_TAG_CONTEXTMENU ) );
+OUString sUIFile;
+if (pAnnotationWindow)
+sUIFile = "modules/simpress/ui/annotationmenu.ui";
+else
+sUIFile = "modules/simpress/ui/annotationtagmenu.ui";
+VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), sUIFile,
"");
+VclPtr pMenu(aBuilder.get_menu("menu"));
SvtUserOptions aUserOptions;
OUString sCurrentAuthor( aUserOptions.GetFullName() );
OUString sAuthor( xAnnotation->getAuthor() );
-OUString aStr( pMenu->GetItemText( SID_DELETEALLBYAUTHOR_POSTIT ) );
+OUString aStr(pMenu->GetItemText(pMenu->GetItemId("deleteby")));
OUString aReplace( sAuthor );
if( aReplace.isEmpty() )
aReplace = SD_RESSTR( STR_ANNOTATION_NOAUTHOR );
aStr = aStr.replaceFirst("%1", aReplace);
-pMenu->SetItemText( SID_DELETEALLBYAUTHOR_POSTIT, aStr );
-pMenu->EnableItem( SID_REPLYTO_POSTIT, (sAuthor != sCurrentAuthor) &&
!bReadOnly );
-pMenu->EnableItem( SID_DELETE_POSTIT, xAnnotation.is() && !bReadOnly );
-pMenu->EnableItem( SID_DELETEALLBYAUTHOR_POSTIT, !bReadOnly );
-pMenu->EnableItem( SID_DELETEALL_POSTIT, !bReadOnly );
+pMenu->SetItemText(pMenu->GetItemId("deleteby"), aStr);
+pMenu->EnableItem(pMenu->GetItemId("reply"), (sAuthor != sCurrentAuthor)
&& !bReadOnly);
+pMenu->EnableItem(pMenu->GetItemId("delete"), xAnnotation.is() &&
!bReadOnly);
+pMenu->EnableItem(pMenu->GetItemId("deleteby"), !bReadOnly);
+pMenu->EnableItem(pMenu->GetItemId("deleteall"), !bReadOnly);
if( pAnnotationWindow )
{
if( pAnnotationWindow->IsProtected() || bReadOnly )
{
-pMenu->EnableItem( SID_ATTR_CHAR_WEIGHT, false );
-pMenu->EnableItem( SID_ATTR_CHAR_POSTURE, false );
-pMenu->EnableItem( SID_ATTR_CHAR_UNDERLINE, false );
-pMenu->EnableItem( SID_ATTR_CHAR_STRIKEOUT, false );
-pMenu->EnableItem( SID_PASTE,
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1
sd/source/ui/animations/CustomAnimation.hrc |6
sd/source/ui/animations/CustomAnimation.src | 22 --
sd/source/ui/animations/CustomAnimationDialog.cxx | 32 +++--
sd/uiconfig/simpress/ui/fontstylemenu.ui | 33 ++
5 files changed, 51 insertions(+), 43 deletions(-)
New commits:
commit cf4ac0f731a42ea2ae97aba4d78ae53b49844888
Author: Caolán McNamara
Date: Thu Apr 13 15:08:56 2017 +0100
convert font style menu to .ui
Change-Id: I3c66c59dcf55276bf340645206422c0cf7396b04
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index a4f981a8c6be..070572c23309 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -119,6 +119,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/dockinganimation \
sd/uiconfig/simpress/ui/effectmenu \
sd/uiconfig/simpress/ui/fontsizemenu \
+ sd/uiconfig/simpress/ui/fontstylemenu \
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
sd/uiconfig/simpress/ui/insertslides \
diff --git a/sd/source/ui/animations/CustomAnimation.hrc
b/sd/source/ui/animations/CustomAnimation.hrc
index d940c17c8e0a..2dfbb26f5d51 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -26,8 +26,6 @@
// attention, we have 200 ids free after RID_CUSTOMANIMATION_START
//
-#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP
RID_CUSTOMANIMATION_START+12
-
#define BMP_CUSTOMANIMATION_ON_CLICK
RID_CUSTOMANIMATION_START+0
#define BMP_CUSTOMANIMATION_AFTER_PREVIOUS
RID_CUSTOMANIMATION_START+1
#define BMP_CUSTOMANIMATION_ENTRANCE_EFFECT
RID_CUSTOMANIMATION_START+2
@@ -71,10 +69,6 @@
#define STR_CUSTOMANIMATION_EXIT
RID_CUSTOMANIMATION_START+41
#define STR_CUSTOMANIMATION_MOTION_PATHS
RID_CUSTOMANIMATION_START+42
-#define CM_BOLD 1
-#define CM_ITALIC 2
-#define CM_UNDERLINED 3
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index ff23e8897f6e..f9d8cfaed76c 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -19,28 +19,6 @@
#include "CustomAnimation.hrc"
-Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = CM_BOLD ;
-Text [ en-US ] = "Bold" ;
-};
-MenuItem
-{
-Identifier = CM_ITALIC ;
-Text [ en-US ] = "Italic" ;
-};
-MenuItem
-{
-Identifier = CM_UNDERLINED ;
-Text [ en-US ] = "Underlined" ;
-};
-};
-};
-
String STR_CUSTOMANIMATION_REPEAT_NONE
{
Text [ en-US ] = "none";
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index fcd86cdcab0e..791ebf251670 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -883,6 +883,7 @@ public:
void update();
private:
+VclBuildermaBuilder;
VclPtr mpControl;
VclPtr mpMenu;
VclPtr mpEdit;
@@ -894,13 +895,14 @@ private:
};
FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType,
vcl::Window* pParent, const Any& rValue, const Link&
rModifyHdl )
-: PropertySubControl( nControlType )
-, maModifyHdl( rModifyHdl )
+: PropertySubControl(nControlType)
+, maBuilder(nullptr, VclBuilderContainer::getUIRootDir(),
"modules/simpress/ui/fontstylemenu.ui", "")
+, maModifyHdl( rModifyHdl )
{
mpEdit.set( VclPtr::Create( pParent,
WB_TABSTOP|WB_IGNORETAB|WB_NOBORDER|WB_READONLY) );
mpEdit->SetText( SD_RESSTR(STR_CUSTOMANIMATION_SAMPLE) );
-mpMenu = VclPtr::Create(SdResId(
RID_CUSTOMANIMATION_FONTSTYLE_POPUP ) );
+mpMenu = maBuilder.get_menu("menu");
mpControl = VclPtr::Create( pParent, mpEdit, mpMenu );
mpControl->SetMenuSelectHdl( LINK( this, FontStylePropertyBox,
implMenuSelectHdl ));
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX );
@@ -911,15 +913,16 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32
nControlType, vcl::Window*
FontStylePropertyBox::~FontStylePropertyBox()
{
+maBuilder.disposeBuilder();
mpControl.disposeAndClear();
}
void FontStylePropertyBox::update()
{
// update menu
-mpMenu->CheckItem( CM_BOLD, mfFontWeight == awt::FontWeight::BOLD );
-mpMenu->CheckItem( CM_ITALIC, meFontSlant == awt::FontSlant_ITALIC);
-mpMenu->
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1
sd/source/ui/animations/CustomAnimation.hrc |8 --
sd/source/ui/animations/CustomAnimation.src | 41 --
sd/source/ui/animations/CustomAnimationDialog.cxx | 39 ++---
sd/uiconfig/simpress/ui/rotatemenu.ui | 63 ++
5 files changed, 83 insertions(+), 69 deletions(-)
New commits:
commit a756bd31dd2da1ef134d80b2dc276cb0be228aba
Author: Caolán McNamara
Date: Thu Apr 13 14:58:33 2017 +0100
convert rotate menu to .ui
Change-Id: I2740862b10bb065a6fdd64a23afb6b1b9571109d
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index feae99758a85..a4f981a8c6be 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/prntopts \
sd/uiconfig/simpress/ui/publishingdialog \
sd/uiconfig/simpress/ui/remotedialog \
+ sd/uiconfig/simpress/ui/rotatemenu \
sd/uiconfig/simpress/ui/scalemenu \
sd/uiconfig/simpress/ui/sdviewpage \
sd/uiconfig/simpress/ui/sidebarslidebackground \
diff --git a/sd/source/ui/animations/CustomAnimation.hrc
b/sd/source/ui/animations/CustomAnimation.hrc
index 062def473af8..d940c17c8e0a 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -26,7 +26,6 @@
// attention, we have 200 ids free after RID_CUSTOMANIMATION_START
//
-#define RID_CUSTOMANIMATION_ROTATION_POPUP
RID_CUSTOMANIMATION_START+9
#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP
RID_CUSTOMANIMATION_START+12
#define BMP_CUSTOMANIMATION_ON_CLICK
RID_CUSTOMANIMATION_START+0
@@ -72,13 +71,6 @@
#define STR_CUSTOMANIMATION_EXIT
RID_CUSTOMANIMATION_START+41
#define STR_CUSTOMANIMATION_MOTION_PATHS
RID_CUSTOMANIMATION_START+42
-#define CM_QUARTER_SPIN 1
-#define CM_HALF_SPIN2
-#define CM_FULL_SPIN3
-#define CM_TWO_SPINS4
-#define CM_CLOCKWISE5
-#define CM_COUNTERCLOCKWISE 6
-
#define CM_BOLD 1
#define CM_ITALIC 2
#define CM_UNDERLINED 3
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index b3eda0013c87..ff23e8897f6e 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -19,47 +19,6 @@
#include "CustomAnimation.hrc"
-Menu RID_CUSTOMANIMATION_ROTATION_POPUP
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = CM_QUARTER_SPIN ;
-Text [ en-US ] = "Quarter spin" ;
-};
-MenuItem
-{
-Identifier = CM_HALF_SPIN ;
-Text [ en-US ] = "Half spin" ;
-};
-MenuItem
-{
-Identifier = CM_FULL_SPIN;
-Text [ en-US ] = "Full spin" ;
-};
-MenuItem
-{
-Identifier = CM_TWO_SPINS;
-Text [ en-US ] = "Two spins" ;
-};
-MenuItem
-{
-Separator = TRUE ;
-};
-MenuItem
-{
-Identifier = CM_CLOCKWISE;
-Text [ en-US ] = "Clockwise" ;
-};
-MenuItem
-{
-Identifier = CM_COUNTERCLOCKWISE;
-Text [ en-US ] = "Counter-clockwise" ;
-};
-};
-};
-
Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP
{
ItemList =
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index e59968b9c660..fcd86cdcab0e 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -602,6 +602,7 @@ public:
void updateMenu();
private:
+VclBuildermaBuilder;
VclPtr mpControl;
VclPtr mpMenu;
VclPtr mpMetric;
@@ -609,8 +610,9 @@ private:
};
RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window*
pParent, const Any& rValue, const Link& rModifyHdl )
-: PropertySubControl( nControlType )
-, maModifyHdl( rModifyHdl )
+: PropertySubControl(nControlType)
+, maBuilder(nullptr, VclBuilderContainer::getUIRootDir(),
"modules/simpress/ui/rotatemenu.ui", "")
+, maModifyHdl(rModifyHdl)
{
mpMetric.set( VclPtr::Create( pParent
,WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) );
mpMetric->SetUnit( FUNIT_CUSTOM );
@@ -618,7 +620,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32
nControlType, vcl::Window* p
mpMetric->SetMin( -1 );
mpMetric->SetMax( 1 );
-mpMenu = VclPtr::Create(SdResId(
RID_CUSTOMANIMATION_ROTATION_POPUP ) );
+mpMenu = maBuilder.get_menu("menu");
mpControl = VclPtr:
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1
sd/source/ui/animations/CustomAnimation.hrc |9 --
sd/source/ui/animations/CustomAnimation.src | 49 ---
sd/source/ui/animations/CustomAnimationDialog.cxx | 43 +++--
sd/uiconfig/simpress/ui/scalemenu.ui | 71 ++
5 files changed, 95 insertions(+), 78 deletions(-)
New commits:
commit a713544b18383c6e5e8d887695e587c2e1b7335a
Author: Caolán McNamara
Date: Thu Apr 13 14:26:48 2017 +0100
convert the scale menu to .ui
(see tdf#48918 for what's needed to enable the grow/shrink entry so
this can be seen)
Change-Id: Ib36907695eb068a22052d08467739e433b240a40
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 60d250604268..feae99758a85 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/prntopts \
sd/uiconfig/simpress/ui/publishingdialog \
sd/uiconfig/simpress/ui/remotedialog \
+ sd/uiconfig/simpress/ui/scalemenu \
sd/uiconfig/simpress/ui/sdviewpage \
sd/uiconfig/simpress/ui/sidebarslidebackground \
sd/uiconfig/simpress/ui/slidedesigndialog \
diff --git a/sd/source/ui/animations/CustomAnimation.hrc
b/sd/source/ui/animations/CustomAnimation.hrc
index 0f0a69bdf8d7..062def473af8 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -27,7 +27,6 @@
//
#define RID_CUSTOMANIMATION_ROTATION_POPUP
RID_CUSTOMANIMATION_START+9
-#define RID_CUSTOMANIMATION_SCALE_POPUP
RID_CUSTOMANIMATION_START+11
#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP
RID_CUSTOMANIMATION_START+12
#define BMP_CUSTOMANIMATION_ON_CLICK
RID_CUSTOMANIMATION_START+0
@@ -80,14 +79,6 @@
#define CM_CLOCKWISE5
#define CM_COUNTERCLOCKWISE 6
-#define CM_SIZE_25 25
-#define CM_SIZE_50 50
-#define CM_SIZE_150 150
-#define CM_SIZE_400 400
-#define CM_HORIZONTAL 1
-#define CM_VERTICAL 2
-#define CM_BOTH 3
-
#define CM_BOLD 1
#define CM_ITALIC 2
#define CM_UNDERLINED 3
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index ae5fe4267a6c..b3eda0013c87 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -19,55 +19,6 @@
#include "CustomAnimation.hrc"
-Menu RID_CUSTOMANIMATION_SCALE_POPUP
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = CM_SIZE_25 ;
-Text [ en-US ] = "Tiny" ;
-};
-MenuItem
-{
-Identifier = CM_SIZE_50 ;
-Text [ en-US ] = "Smaller" ;
-};
-MenuItem
-{
-Identifier = CM_SIZE_150 ;
-Text [ en-US ] = "Larger" ;
-};
-MenuItem
-{
-Identifier = CM_SIZE_400 ;
-Text [ en-US ] = "Extra large" ;
-};
-MenuItem
-{
-Separator = TRUE ;
-};
-MenuItem
-{
-Identifier = CM_HORIZONTAL ;
-Text [ en-US ] = "Horizontal" ;
-
-};
-MenuItem
-{
-Identifier = CM_VERTICAL ;
-Text [ en-US ] = "Vertical" ;
-
-};
-MenuItem
-{
-Identifier = CM_BOTH ;
-Text [ en-US ] = "Both" ;
-
-};
-};
-};
-
Menu RID_CUSTOMANIMATION_ROTATION_POPUP
{
ItemList =
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 6facfeef0f9b..e59968b9c660 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -723,6 +723,7 @@ public:
void updateMenu();
private:
+VclBuilder maBuilder;
VclPtr mpControl;
VclPtr mpMenu;
VclPtr mpMetric;
@@ -730,16 +731,17 @@ private:
int mnDirection;
};
-ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window*
pParent, const Any& rValue, const Link& rModifyHdl )
-: PropertySubControl( nControlType )
-, maModifyHdl( rModifyHdl )
+ScalePropertyBox::ScalePropertyBox(sal_Int32 nControlType, vcl::Window*
pParent, const Any& rValue, const Link& rModifyHdl)
+: PropertySubControl( nControlType )
+, maBuilder(nullptr, VclBuilderContainer::getUIRootDir(),
"modules/simpress/ui/scalemenu.ui", "")
+, maModifyHdl( rModifyHdl )
{
mpMetric.set( VclPtr::Create( pParent
,WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) );
mpMetric->SetUnit( FUNIT_PERC
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1
sd/source/ui/animations/CustomAnimation.hrc |1
sd/source/ui/animations/CustomAnimation.src | 27 --
sd/source/ui/animations/CustomAnimationDialog.cxx | 21 ---
sd/uiconfig/simpress/ui/fontsizemenu.ui | 41 ++
5 files changed, 51 insertions(+), 40 deletions(-)
New commits:
commit 3f2b80579831e400a4a454ce8b2677fb1e08dfb3
Author: Caolán McNamara
Date: Thu Apr 13 13:59:13 2017 +0100
convert font size popup to .ui
Change-Id: I1b1b08c3d2a3e628cce1055e0e5cdbda1549b6cc
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 9561e5c5518f..60d250604268 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -118,6 +118,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/dlgfield \
sd/uiconfig/simpress/ui/dockinganimation \
sd/uiconfig/simpress/ui/effectmenu \
+ sd/uiconfig/simpress/ui/fontsizemenu \
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
sd/uiconfig/simpress/ui/insertslides \
diff --git a/sd/source/ui/animations/CustomAnimation.hrc
b/sd/source/ui/animations/CustomAnimation.hrc
index 9124b4386eb1..0f0a69bdf8d7 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -27,7 +27,6 @@
//
#define RID_CUSTOMANIMATION_ROTATION_POPUP
RID_CUSTOMANIMATION_START+9
-#define RID_CUSTOMANIMATION_FONTSIZE_POPUP
RID_CUSTOMANIMATION_START+10
#define RID_CUSTOMANIMATION_SCALE_POPUP
RID_CUSTOMANIMATION_START+11
#define RID_CUSTOMANIMATION_FONTSTYLE_POPUP
RID_CUSTOMANIMATION_START+12
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index 34eedb138aad..ae5fe4267a6c 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -19,33 +19,6 @@
#include "CustomAnimation.hrc"
-Menu RID_CUSTOMANIMATION_FONTSIZE_POPUP
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = CM_SIZE_25 ;
-Text [ en-US ] = "Tiny" ;
-};
-MenuItem
-{
-Identifier = CM_SIZE_50 ;
-Text [ en-US ] = "Smaller" ;
-};
-MenuItem
-{
-Identifier = CM_SIZE_150 ;
-Text [ en-US ] = "Larger" ;
-};
-MenuItem
-{
-Identifier = CM_SIZE_400 ;
-Text [ en-US ] = "Extra large" ;
-};
-};
-};
-
Menu RID_CUSTOMANIMATION_SCALE_POPUP
{
ItemList =
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 333065e0229d..6facfeef0f9b 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -420,21 +420,24 @@ public:
private:
DECL_LINK( EditModifyHdl, Edit&, void );
+VclBuilder maBuilder;
VclPtr mpControl;
VclPtr mpMenu;
VclPtr mpMetric;
Link maModifyHdl;
};
-CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType,
vcl::Window* pParent, const Any& rValue, const Link&
rModifyHdl )
-: PropertySubControl( nControlType ), maModifyHdl(rModifyHdl)
+CharHeightPropertyBox::CharHeightPropertyBox(sal_Int32 nControlType,
vcl::Window* pParent, const Any& rValue, const Link&
rModifyHdl)
+: PropertySubControl(nControlType)
+, maBuilder(nullptr, VclBuilderContainer::getUIRootDir(),
"modules/simpress/ui/fontsizemenu.ui", "")
+, maModifyHdl(rModifyHdl)
{
mpMetric.set( VclPtr::Create( pParent,
WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER) );
mpMetric->SetUnit( FUNIT_PERCENT );
mpMetric->SetMin( 0 );
mpMetric->SetMax( 1000 );
-mpMenu = VclPtr::Create(SdResId(
RID_CUSTOMANIMATION_FONTSIZE_POPUP ) );
+mpMenu = maBuilder.get_menu("menu");
mpControl = VclPtr::Create( pParent, mpMetric, mpMenu );
mpControl->SetMenuSelectHdl( LINK( this, CharHeightPropertyBox,
implMenuSelectHdl ));
mpControl->SetModifyHdl( LINK( this, CharHeightPropertyBox, EditModifyHdl
) );
@@ -446,6 +449,7 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32
nControlType, vcl::Windo
CharHeightPropertyBox::~CharHeightPropertyBox()
{
+maBuilder.disposeBuilder();
mpControl.disposeAndClear();
}
@@ -456,15 +460,8 @@ IMPL_LINK_NOARG( CharHeightPropertyBox, EditModifyHdl,
Edit&, void )
IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
{
-long nValue = 100;
-switch( pPb->GetCurItemId() )
-{
-case CM_SIZE_25: nValue = 25; break;
-case CM_SIZE_50: nValue = 50; break;
-case CM_SIZE_150: nValue = 150; break;
-case CM_SIZE_400: nValue = 400; break;
-}
-
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/prltempl.cxx |1 +
sd/source/ui/func/futempl.cxx | 22 ++
sd/source/ui/inc/prltempl.hxx |1 +
sd/uiconfig/sdraw/ui/drawprtldialog.ui | 14 ++
4 files changed, 38 insertions(+)
New commits:
commit a04abc59ae24690992a771305a4e89451c77c289
Author: Rohan Kumar
Date: Sat Jan 21 01:31:34 2017 +0530
tdf#96681 Lack of UI to change the text background color of a style
Added Highlighting tab to Edit Style button in impress
Change-Id: I9426f583da4078cd380823bbaa30ce1941ffa3bd
Reviewed-on: https://gerrit.libreoffice.org/23684
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 7c25490..03dfaf4 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -149,6 +149,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(
SfxObjectShell* pDocSh,
mnTab = AddTabPage( "RID_SVXPAGE_TABULATOR",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TABULATOR ), nullptr );
mnAsian = AddTabPage( "RID_SVXPAGE_PARA_ASIAN",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PARA_ASIAN ), nullptr );
mnAlign = AddTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGN_PARAGRAPH ), nullptr );
+mnBackground = AddTabPage( "RID_SVXPAGE_BACKGROUND",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr);
SvtCJKOptions aCJKOptions;
if( !aCJKOptions.IsAsianTypographyEnabled() )
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index bd97800..30893d8 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -36,6 +36,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -103,6 +105,10 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
SfxStyleSheetBase* pStyleSheet = nullptr;
const SfxPoolItem* pItem;
+static const sal_uInt16 aRanges[] = {
+EE_ITEMS_START, EE_ITEMS_END,
+SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR
+};
SfxStyleFamily nFamily = (SfxStyleFamily)USHRT_MAX;
if( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_STYLE_FAMILY,
false, &pItem ))
@@ -299,6 +305,15 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
ScopedVclPtr pPresDlg;
SdAbstractDialogFactory* pFact =
SdAbstractDialogFactory::Create();
bool bOldDocInOtherLanguage = false;
+SfxItemSet aNewAttr(mpViewShell->GetPool(), aRanges);
+
+if( aNewAttr.GetItemState( XATTR_FILLBACKGROUND, true, &pItem
) == SfxItemState::SET)
+{
+Color aBackColor = static_cast(pItem)->GetValue();
+SvxBrushItem aBrushItem(aBackColor, XATTR_FILLBACKGROUND);
+aNewAttr.ClearItem(XATTR_FILLBACKGROUND);
+aNewAttr.Put(aBrushItem);
+}
SfxStyleFamily eFamily = pStyleSheet->GetFamily();
@@ -399,6 +414,13 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
SfxItemSet aTempSet(*pOutSet);
static_cast(pStyleSheet)->AdjustToFontHeight(aTempSet);
+const SvxBrushItem* pBrushItem = static_cast(aTempSet.GetItem(XATTR_FILLBACKGROUND));
+if( pBrushItem )
+{
+ SvxBackgroundColorItem aBackColorItem(
pBrushItem->GetColor(), EE_CHAR_BKGCOLOR);
+ aTempSet.ClearItem(XATTR_FILLBACKGROUND);
+ aTempSet.Put(aBackColorItem);
+}
/* Special treatment: reset the INVALIDS to
NULL-Pointer (otherwise INVALIDs or pointer
point
to DefaultItems in the template; both would
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index e2b8bc6..0694e86 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -61,6 +61,7 @@ private:
sal_uInt16mnTab;
sal_uInt16mnAsian;
sal_uInt16mnAlign;
+sal_uInt16mnBackground;
PresentationObjects ePO;
diff --git a/sd/uiconfig/sdraw/ui/drawprtldialog.ui
b/sd/uiconfig/sdraw/ui/drawprtldialog.ui
index c5c5fa2..561f630 100644
--- a/sd/uiconfig/sdraw/ui/drawprtldialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawprtldialog.ui
@@ -298,6 +298,20 @@
False
+
+
+
+
+
+True
+False
+Highlighting
+
+
+15
+False
+
+
False
___
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/animations/CustomAnimationPane.cxx | 63 ---
sd/source/ui/animations/CustomAnimationPane.hxx |4 +
sd/uiconfig/simpress/ui/customanimationspanel.ui | 36 +
3 files changed, 96 insertions(+), 7 deletions(-)
New commits:
commit 76acb8ab5f302d1dc3a33ac8c13e5e8fd7b6c7a5
Author: Akshay Deep
Date: Tue Jan 17 23:03:02 2017 +0530
tdf#98034 - SIDEBAR: Add delay spinbox to Custom Animation tab
Change-Id: Ie13a5e04207475794fef75c568786f37eb2c406f
Reviewed-on: https://gerrit.libreoffice.org/33230
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Akshay Deep
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 5d2697a..093b0df 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -177,6 +177,9 @@ void CustomAnimationPane::initialize()
get(mpLBCategory, "categorylb");
get(mpFTAnimation, "effectlabel");
get(mpLBAnimation, "effect_list");
+get(mpFTStartDelay, "delay_label");
+get(mpMFStartDelay, "delay_value");
+
mpLBAnimation->SetSelectHdl(LINK(this, CustomAnimationPane,
AnimationSelectHdl));
get(mpCustomAnimationList, "custom_animation_list");
mpCustomAnimationList->setController(
dynamic_cast ( this ) );
@@ -212,6 +215,9 @@ void CustomAnimationPane::initialize()
mpPBPlay->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
mpCBAutoPreview->SetClickHdl( LINK( this, CustomAnimationPane,
implClickHdl ) );
mpLBCategory->SetSelectHdl( LINK(this, CustomAnimationPane,
UpdateAnimationLB) );
+mpMFStartDelay->SetModifyHdl( LINK(this, CustomAnimationPane,
DelayModifiedHdl) );
+mpMFStartDelay->SetLoseFocusHdl(LINK( this, CustomAnimationPane,
DelayLoseFocusHdl));
+
if(!mbHorizontal)
maStrModify = mpFTEffect->GetText();
@@ -267,6 +273,8 @@ void CustomAnimationPane::dispose()
mpPBPropertyMore.clear();
mpFTDuration.clear();
mpCBXDuration.clear();
+mpFTStartDelay.clear();
+mpMFStartDelay.clear();
mpCustomAnimationList.clear();
mpPBMoveUp.clear();
mpPBMoveDown.clear();
@@ -506,6 +514,8 @@ void CustomAnimationPane::updateControls()
mpLBCategory->Disable();
mpFTAnimation->Disable();
mpLBAnimation->Disable();
+mpFTStartDelay->Disable();
+mpMFStartDelay->Disable();
mpLBAnimation->Clear();
mpCustomAnimationList->clear();
return;
@@ -536,6 +546,8 @@ void CustomAnimationPane::updateControls()
mpLBStart->Enable(nSelectionCount > 0);
mpLBProperty->Enable(nSelectionCount > 0);
mpPBPropertyMore->Enable(nSelectionCount > 0);
+mpFTStartDelay->Enable(nSelectionCount > 0);
+mpMFStartDelay->Enable(nSelectionCount > 0);
mpFTProperty->SetText( maStrProperty );
@@ -600,6 +612,8 @@ void CustomAnimationPane::updateControls()
mpFTProperty->Enable( false );
mpLBProperty->Enable( false );
mpPBPropertyMore->Enable( false );
+mpFTStartDelay->Enable( false );
+mpMFStartDelay->Enable( false );
}
sal_uInt32 nCategoryPos = LISTBOX_ENTRY_NOTFOUND;
switch(pEffect->getPresetClass())
@@ -662,12 +676,19 @@ void CustomAnimationPane::updateControls()
}
mpPBPropertyMore->Enable();
+
+mpFTStartDelay->Enable();
+mpMFStartDelay->Enable();
+double fBegin = pEffect->getBegin();
+mpMFStartDelay->SetValue(fBegin*10.0);
}
else
{
mpLBProperty->setSubControl( nullptr );
mpFTProperty->Enable( false );
mpLBProperty->Enable( false );
+mpFTStartDelay->Enable( false );
+mpMFStartDelay->Enable( false );
mpPBPropertyMore->Enable( false );
mpFTDuration->Enable(false);
mpCBXDuration->Enable(false);
@@ -1288,15 +1309,17 @@ void CustomAnimationPane::changeSelection(
STLPropertySet* pResultSet, STLProper
}
}
+double fBegin = 0.0;
+
if( pResultSet->getPropertyState( nHandleBegin ) ==
STLPropertyState::Direct )
-{
-double fBegin = 0.0;
pResultSet->getPropertyValue( nHandleBegin ) >>= fBegin;
-if( pEffect->getBegin() != fBegin )
-{
-pEffect->setBegin( fBegin );
-bChanged = true;
-}
+else
+fBegin = pEffect->getBegin();
+
+if( pEffect->getBegin() != fBegin && pResultSet->getPropertyState(
nHandleBegin ) == STLPropertyState::Direct)
+{
+pEffect->setBegin( fBegin );
+bChanged = true;
}
if( pResultSet->getPropertyState( nHandleDuration ) ==
STLPropertyState::Direct )
@@ -2011,6 +2034,32 @@ IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl,
LinkParamNone*, void)
}
}
+IMPL_LINK_NOARG(CustomAnim
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/animations/CustomAnimation.src | 32 +++---
sd/uiconfig/simpress/ui/customanimationspanel.ui | 51 +--
2 files changed, 63 insertions(+), 20 deletions(-)
New commits:
commit 798d55fcd8efc10fcef6b8ac3fa5abdbc82501ec
Author: Yousuf Philips
Date: Sun Sep 11 20:58:49 2016 +0400
Adjust controls in animation deck and make it a11y accessible
Change-Id: I0a9bbfdc88f3432a80900aeee04c2de71c1c54fb
Reviewed-on: https://gerrit.libreoffice.org/28796
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index daa5c65..632e7b6 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -216,82 +216,82 @@ String STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE
String STR_CUSTOMANIMATION_DIRECTION_PROPERTY
{
-Text [ en-US ] = "Direction";
+Text [ en-US ] = "Direction:";
};
String STR_CUSTOMANIMATION_ZOOM_PROPERTY
{
-Text [ en-US ] = "Zoom";
+Text [ en-US ] = "Zoom:";
};
String STR_CUSTOMANIMATION_SPOKES_PROPERTY
{
-Text [ en-US ] = "Spokes";
+Text [ en-US ] = "Spokes:";
};
String STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY
{
-Text [ en-US ] = "First color";
+Text [ en-US ] = "First color:";
};
String STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY
{
-Text [ en-US ] = "Second color";
+Text [ en-US ] = "Second color:";
};
String STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY
{
-Text [ en-US ] = "Fill color";
+Text [ en-US ] = "Fill color:";
};
String STR_CUSTOMANIMATION_STYLE_PROPERTY
{
-Text [ en-US ] = "Style";
+Text [ en-US ] = "Style:";
};
String STR_CUSTOMANIMATION_FONT_PROPERTY
{
-Text [ en-US ] = "Font";
+Text [ en-US ] = "Font:";
};
String STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY
{
-Text [ en-US ] = "Font color";
+Text [ en-US ] = "Font color:";
};
String STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY
{
-Text [ en-US ] = "Style";
+Text [ en-US ] = "Style:";
};
String STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY
{
-Text [ en-US ] = "Typeface";
+Text [ en-US ] = "Typeface:";
};
String STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY
{
-Text [ en-US ] = "Line color";
+Text [ en-US ] = "Line color:";
};
String STR_CUSTOMANIMATION_SIZE_PROPERTY
{
-Text [ en-US ] = "Font size";
+Text [ en-US ] = "Font size:";
};
String STR_CUSTOMANIMATION_SCALE_PROPERTY
{
-Text [ en-US ] = "Size";
+Text [ en-US ] = "Size:";
};
String STR_CUSTOMANIMATION_AMOUNT_PROPERTY
{
-Text [ en-US ] = "Amount";
+Text [ en-US ] = "Amount:";
};
String STR_CUSTOMANIMATION_COLOR_PROPERTY
{
-Text [ en-US ] = "Color";
+Text [ en-US ] = "Color:";
};
String STR_CUSTOMANIMATION_NO_SOUND
diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui
b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index 513a7d1..8f73654 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -47,11 +47,16 @@
True
False
+6
+6
+6
+3
True
vertical
-2
+3
+260
True
True
True
@@ -70,6 +75,8 @@
True
False
center
+3
+12
True
@@ -141,6 +148,7 @@
True
False
+3
6
6
@@ -149,6 +157,8 @@
False
end
Category:
+True
+categorylb
0
@@ -161,6 +171,8 @@
False
end
Effect:
+True
+effect_list
0
@@ -224,6 +236,7 @@
end
_Start:
True
+start_effect_list
0
@@ -237,6 +250,7 @@
end
_Direction:
True
+placeholder
0
@@ -250,6 +264,7 @@
end
D_uration:
True
+anim_duration:0.00sec
0
@@ -301,6 +316,7 @@
True
True
True
+Options
image1
True
@@ -314,10 +330,7 @@
True
False
True
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 49 +++---
sd/source/ui/dlg/PhotoAlbumDialog.hxx |2 +
sd/uiconfig/simpress/ui/photoalbum.ui | 16 +++
3 files changed, 63 insertions(+), 4 deletions(-)
New commits:
commit 511acc66f543b0200ebe70cf072e5a8db8677809
Author: Abhilash
Date: Fri Jul 29 00:19:27 2016 +0530
tdf#64575 Photo Album: Better Image Layout
Change-Id: I021c5fa921eb80edd996e0224e69e3b3d54b76d3
Reviewed-on: https://gerrit.libreoffice.org/27654
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 9622b8c..c1de735 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -55,6 +55,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow,
SdDrawDocument* pAc
get(pInsTypeCombo, "opt_combo");
get(pASRCheck, "asr_check");
+get(pASRCheckCrop, "asr_check_crop");
get(pCapCheck, "cap_check");
get(pInsertAsLinkCheck, "insert_as_link_check");
@@ -93,6 +94,7 @@ void SdPhotoAlbumDialog::dispose()
pImg.clear();
pInsTypeCombo.clear();
pASRCheck.clear();
+pASRCheckCrop.clear();
pCapCheck.clear();
pInsertAsLinkCheck.clear();
ModalDialog::dispose();
@@ -163,15 +165,14 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl,
Button*, void)
::awt::Point aPicPos;
-if(pASRCheck->IsChecked())
+if(pASRCheck->IsChecked() && !pASRCheckCrop->IsChecked())
{
// Resize the image, with keeping ASR
aPicSize = createASRSize(aPicSize, aPageSize);
}
-else
+else if(pASRCheckCrop->IsChecked())
{
-aPicSize.Width = aPageSize.Width;
-aPicSize.Height = aPageSize.Height;
+aPicSize = createASRSizeCrop(aPicSize, aPageSize);
}
xShape->setSize(aPicSize);
@@ -698,6 +699,46 @@ awt::Size SdPhotoAlbumDialog::createASRSize(const
awt::Size& aPicSize, const awt
return awt::Size(resizeWidth, resizeHeight);
}
+awt::Size SdPhotoAlbumDialog::createASRSizeCrop(const awt::Size& aPicSize,
const awt::Size& aMaxSize)
+{
+double resizeWidth = aPicSize.Width;
+double resizeHeight = aPicSize.Height;
+double imgAspect = resizeWidth / resizeHeight;
+double windowAspectRatio = static_cast(aMaxSize.Width) /
aMaxSize.Height ;
+
+
+//When both sides of an image are bigger than canvas size, image would be
downscaled.
+if( resizeWidth > aMaxSize.Width && resizeHeight > aMaxSize.Height )
+{
+if( imgAspect > windowAspectRatio )
+{
+resizeHeight = aMaxSize.Height;
+resizeWidth = aMaxSize.Height * imgAspect;
+}
+else
+{
+resizeHeight = aMaxSize.Width / imgAspect;
+resizeWidth = aMaxSize.Width;
+}
+
+}
+//In all other cases image is upscaled
+else
+{
+if( imgAspect > windowAspectRatio )
+{
+resizeHeight = aMaxSize.Height;
+resizeWidth = aMaxSize.Height * imgAspect;
+}
+else
+{
+resizeWidth = aMaxSize.Width;
+resizeHeight = aMaxSize.Width / imgAspect;
+}
+}
+return awt::Size(resizeWidth, resizeHeight);
+}
+
void SdPhotoAlbumDialog::createCaption(const awt::Size& aPageSize )
{
Point CapPos;
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index dfdefb0..cf8854a 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -65,6 +65,7 @@ private:
VclPtrpInsTypeCombo;
VclPtr pASRCheck;
+VclPtr pASRCheckCrop;
VclPtr pCapCheck;
VclPtr pInsertAsLinkCheck;
@@ -85,6 +86,7 @@ private:
const Reference< drawing::XDrawPages >& xDrawPages);
static awt::Size createASRSize(const awt::Size& aPicSize, const awt::Size&
aMaxSize);
+static awt::Size createASRSizeCrop(const awt::Size& aPicSize, const
awt::Size& aMaxSize);
void createCaption(const awt::Size& aPageSize);
static Reference< graphic::XGraphic> createXGraphicFromUrl(const OUString&
sUrl,
const Reference< graphic::XGraphicProvider>& xProvider);
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui
b/sd/uiconfig/simpress/ui/photoalbum.ui
index 66948ee..9b2e5ef 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -374,6 +374,22 @@
2
+
+
+Fill
Screen
+True
+True
+False
+0
+Fals
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/dlgpage.cxx | 10 ++
sd/source/ui/inc/dlgpage.hxx |2 +-
sd/uiconfig/sdraw/ui/drawpagedialog.ui | 15 +++
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 5693ee7a41fbe4de337cef3b10294edd670be804
Author: Rishabh Kumar
Date: Fri Aug 5 17:57:49 2016 +0530
[GSoC] Add Transparency tab to background dialog
Change-Id: I33dffe2435c44116842240e4b481947415317b5b
Reviewed-on: https://gerrit.libreoffice.org/27906
Reviewed-by: Yousuf Philips
Tested-by: Yousuf Philips
Reviewed-by: Rishabh Kumar
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index bba44fd..e23b832 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -62,9 +62,13 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, vcl::Window*
pParent, const SfxIte
mnPage = AddTabPage( "RID_SVXPAGE_PAGE", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_PAGE ), nullptr );
mnArea = AddTabPage( "RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_AREA ), nullptr );
+mnTransparence = AddTabPage( "RID_SVXPAGE_TRANSPARENCE",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), nullptr );
if(!bAreaPage) // I have to add the page before I remove it !
+{
RemoveTabPage( "RID_SVXPAGE_AREA" );
+RemoveTabPage( "RID_SVXPAGE_TRANSPARENCE" );
+}
}
void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
@@ -89,6 +93,12 @@ void SdPageDlg::PageCreated(sal_uInt16 nId, SfxTabPage&
rPage)
aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0));
rPage.PageCreated(aSet);
}
+else if (nId == mnTransparence)
+{
+aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,0));
+aSet.Put(SfxUInt16Item(SID_DLG_TYPE,1));
+rPage.PageCreated(aSet);
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index c624ecb..4818c66 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -40,7 +40,7 @@ private:
XPatternListRef mpPatternList;
sal_uInt16mnArea;
sal_uInt16mnPage;
-
+sal_uInt16mnTransparence;
public:
SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet*
pAttr, bool bAreaPage = true );
diff --git a/sd/uiconfig/sdraw/ui/drawpagedialog.ui
b/sd/uiconfig/sdraw/ui/drawpagedialog.ui
index f43e406..087cc4b 100644
--- a/sd/uiconfig/sdraw/ui/drawpagedialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawpagedialog.ui
@@ -99,6 +99,7 @@
Page
+0
False
@@ -116,6 +117,20 @@
False
+
+
+
+
+
+True
+False
+Transparency
+
+
+2
+False
+
+
False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 39 +++---
sd/source/ui/dlg/PhotoAlbumDialog.hxx |1
sd/uiconfig/simpress/ui/photoalbum.ui | 19 ++--
3 files changed, 50 insertions(+), 9 deletions(-)
New commits:
commit 49f93558f073f97e33f3303ebca823a14e238e99
Author: Samuel Mehrbrodt
Date: Thu Jun 30 09:50:35 2016 +0200
tdf#65356 Photo Album: Allow inserting images as link
Change-Id: Ic7d1228b9e0a5ee5a303c5e3f4ce4d5a1b2b2036
Reviewed-on: https://gerrit.libreoffice.org/26793
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 04a7b80..304ff9e 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -56,6 +56,8 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow,
SdDrawDocument* pAc
get(pInsTypeCombo, "opt_combo");
get(pASRCheck, "asr_check");
get(pCapCheck, "cap_check");
+get(pInsertAsLinkCheck, "insert_as_link_check");
+
pCancelBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CancelHdl));
pCreateBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CreateHdl));
@@ -92,6 +94,7 @@ void SdPhotoAlbumDialog::dispose()
pInsTypeCombo.clear();
pASRCheck.clear();
pCapCheck.clear();
+pInsertAsLinkCheck.clear();
ModalDialog::dispose();
}
@@ -119,6 +122,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl,
Button*, void)
// determine if to use Captions (use TitleObject) and choose the
correct AutoLayout
// from the beginning
const bool bCreateCaptions(pCapCheck->IsChecked());
+const bool bInsertAsLink(pInsertAsLinkCheck->IsChecked());
const AutoLayout aAutoLayout(bCreateCaptions ? AUTOLAYOUT_TITLE_ONLY :
AUTOLAYOUT_NONE);
// get the option
@@ -145,7 +149,10 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl,
Button*, void)
uno::UNO_QUERY);
Reference< beans::XPropertySet > xProps( xShape,
uno::UNO_QUERY );
-xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic));
+if (bInsertAsLink)
+xProps->setPropertyValue("GraphicURL", ::uno::Any(sUrl));
+else
+xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic));
::awt::Size aPageSize;
@@ -220,7 +227,10 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl,
Button*, void)
uno::UNO_QUERY);
Reference< beans::XPropertySet > xProps( xShape,
uno::UNO_QUERY );
-xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic));
+if (bInsertAsLink)
+xProps->setPropertyValue("GraphicURL",
::uno::Any(sUrl1));
+else
+xProps->setPropertyValue("Graphic",
::uno::Any(xGraphic));
::awt::Point aPicPos;
@@ -255,7 +265,10 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl,
Button*, void)
uno::UNO_QUERY);
Reference< beans::XPropertySet > xProps( xShape,
uno::UNO_QUERY );
-xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic));
+if (bInsertAsLink)
+xProps->setPropertyValue("GraphicURL",
::uno::Any(sUrl2));
+else
+xProps->setPropertyValue("Graphic",
::uno::Any(xGraphic));
::awt::Point aPicPos;
@@ -335,7 +348,10 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl,
Button*, void)
uno::UNO_QUERY);
Reference< beans::XPropertySet > xProps( xShape,
uno::UNO_QUERY );
-xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic));
+if (bInsertAsLink)
+xProps->setPropertyValue("GraphicURL",
::uno::Any(sUrl1));
+else
+xProps->setPropertyValue("Graphic",
::uno::Any(xGraphic));
::awt::Point aPicPos;
@@ -369,7 +385,10 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl,
Button*, void)
uno::UNO_QUERY);
Reference< beans::XPropertySet > xProps( xShape,
uno::UNO_QUERY );
-xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic));
+if (bInsertAsLink)
+xProps->setPropertyValue("GraphicURL",
::uno::Any(sUrl2));
+else
+xProps->setPropertyValue("Graphic",
::uno::Any(xGraphic));
::awt::Point aPicPos;
@@ -404,7 +423,10 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl,
Button*, void)
uno::UNO_QUERY);
Reference< beans::XPropertySet > xProps( xShape,
uno::UN
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/animations/SlideTransitionPane.cxx | 65 +--
sd/source/ui/animations/SlideTransitionPane.hxx |7 +-
sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 15 ++---
3 files changed, 49 insertions(+), 38 deletions(-)
New commits:
commit d3d546a8e15c96a97dbad986e73665201b02a85c
Author: Akshay Deep
Date: Thu Mar 3 19:33:53 2016 +0530
tdf#98037 - SIDEBAR: Replacing 'Speed' drop downs with comboboxes
Changed speed dropdown in SlideTransitionPanel to Duration combobox.
Used Custom Widget VclComboBoxNumeric with MetricBox class.
Unit set in seconds.
Change-Id: Id295b0ecbd62c60e434d8c65f74d50cdc39c9ecc
Reviewed-on: https://gerrit.libreoffice.org/22865
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx
b/sd/source/ui/animations/SlideTransitionPane.cxx
old mode 100644
new mode 100755
index fb6057c..1778f13
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -408,8 +408,8 @@ SlideTransitionPane::SlideTransitionPane(
{
get(mpFT_VARIANT, "variant_label");
get(mpLB_VARIANT, "variant_list");
-get(mpFT_SPEED, "speed_label");
-get(mpLB_SPEED, "speed_list");
+get(mpFT_duration, "duration_label");
+get(mpCBX_duration, "transition_duration");
get(mpFT_SOUND, "sound_label");
get(mpLB_SOUND, "sound_list");
get(mpCB_LOOP_SOUND, "loop_sound" );
@@ -441,6 +441,11 @@ SlideTransitionPane::SlideTransitionPane(
VALUESET_APPEND, /* show legend */ true );
mpVS_TRANSITION_ICONS->RecalculateItemSizes();
+mpCBX_duration->InsertValue(100, FUNIT_CUSTOM);
+mpCBX_duration->InsertValue(200, FUNIT_CUSTOM);
+mpCBX_duration->InsertValue(300, FUNIT_CUSTOM);
+mpCBX_duration->AdaptDropDownLineCountToMaximum();
+
// set defaults
mpCB_AUTO_PREVIEW->Check(); // automatic preview on
@@ -454,7 +459,8 @@ SlideTransitionPane::SlideTransitionPane(
mpVS_TRANSITION_ICONS->SetSelectHdl( LINK( this, SlideTransitionPane,
TransitionSelected ));
mpLB_VARIANT->SetSelectHdl( LINK( this, SlideTransitionPane,
VariantListBoxSelected ));
-mpLB_SPEED->SetSelectHdl( LINK( this, SlideTransitionPane,
SpeedListBoxSelected ));
+mpCBX_duration->SetModifyHdl(LINK( this, SlideTransitionPane,
DurationModifiedHdl));
+mpCBX_duration->SetLoseFocusHdl(LINK( this, SlideTransitionPane,
DurationLoseFocusHdl));
mpLB_SOUND->SetSelectHdl( LINK( this, SlideTransitionPane,
SoundListBoxSelected ));
mpCB_LOOP_SOUND->SetClickHdl( LINK( this, SlideTransitionPane,
LoopSoundBoxChecked ));
@@ -483,8 +489,8 @@ void SlideTransitionPane::dispose()
mpVS_TRANSITION_ICONS.disposeAndClear();
mpFT_VARIANT.clear();
mpLB_VARIANT.clear();
-mpFT_SPEED.clear();
-mpLB_SPEED.clear();
+mpFT_duration.clear();
+mpCBX_duration.clear();
mpFT_SOUND.clear();
mpLB_SOUND.clear();
mpCB_LOOP_SOUND.clear();
@@ -506,7 +512,7 @@ void SlideTransitionPane::DataChanged (const
DataChangedEvent& rEvent)
void SlideTransitionPane::UpdateLook()
{
SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
-mpFT_SPEED->SetBackground(Wallpaper());
+mpFT_duration->SetBackground(Wallpaper());
mpFT_SOUND->SetBackground(Wallpaper());
}
@@ -593,12 +599,14 @@ void SlideTransitionPane::updateControls()
}
if( aEffect.mbDurationAmbiguous )
-mpLB_SPEED->SetNoSelection();
+{
+mpCBX_duration->SetText("");
+mpCBX_duration->SetNoSelection();
+}
else
-mpLB_SPEED->SelectEntryPos(
-(aEffect.mfDuration > 2.0 )
-? 0 : (aEffect.mfDuration < 2.0)
-? 2 : 1 ); // else FADE_SPEED_FAST
+{
+mpCBX_duration->SetValue( (aEffect.mfDuration)*100.0 );
+}
if( aEffect.mbSoundAmbiguous )
{
@@ -617,7 +625,6 @@ void SlideTransitionPane::updateControls()
tSoundListType::size_type nPos = 0;
if( lcl_findSoundInList( maSoundList, aEffect.maSound, nPos ))
{
-// skip first three entries
mpLB_SOUND->SelectEntryPos( nPos + 3 );
maCurrentSoundFile = aEffect.maSound;
}
@@ -661,7 +668,7 @@ void SlideTransitionPane::updateControlState()
{
mpVS_TRANSITION_ICONS->Enable( mbHasSelection );
mpLB_VARIANT->Enable( mbHasSelection && mpLB_VARIANT->GetEntryCount() > 0
);
-mpLB_SPEED->Enable( mbHasSelection );
+mpCBX_duration->Enable( mbHasSelection );
mpLB_SOUND->Enable( mbHasSelection );
mpCB_LOOP_SOUND->Enable( mbHasSelection &&
(mpLB_SOUND->GetSelectEntryPos() > 2));
mpRB_ADVANCE_ON_MOUSE->Enable( mbHasSelection );
@@ -801,22 +808,17 @@ impl::TransitionEffect
SlideTransitionPane::getTransitionEffectFromControls() co
}
}
aResult.mbEffectAmbiguous = false;
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/animations/CustomAnimation.hrc |5
sd/source/ui/animations/CustomAnimation.src | 25 ---
sd/source/ui/animations/CustomAnimationDialog.cxx | 68 +-
sd/source/ui/animations/CustomAnimationPane.cxx | 135 +++-
sd/source/ui/animations/CustomAnimationPane.hxx | 11 -
sd/uiconfig/simpress/ui/customanimationspanel.ui| 10 +
sd/uiconfig/simpress/ui/customanimationtimingtab.ui |8 -
7 files changed, 103 insertions(+), 159 deletions(-)
New commits:
commit 35aded0e43c74f920dfa6960323506599257264e
Author: Akshay Deep
Date: Sat Mar 12 02:10:53 2016 +0530
tdf#98037 - SIDEBAR: Replacing 'Speed' drop downs with comboboxes (2)
Changed speed dropdowns in CustomAnimationPane and CustomAnimationDialog to
Duration combobox.
Used Custom Widget VclComboBoxNumeric with MetricBox class.
Unit set in seconds.
Change-Id: I86e18da77dcdd72d429a2c02d56aa4b1cf5f6c54
Reviewed-on: https://gerrit.libreoffice.org/23157
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/source/ui/animations/CustomAnimation.hrc
b/sd/source/ui/animations/CustomAnimation.hrc
index 297a9f2..fa0cca2 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -43,11 +43,6 @@
#define IMG_CUSTOMANIMATION_MEDIA_PAUSE
RID_CUSTOMANIMATION_START+8
#define IMG_CUSTOMANIMATION_MEDIA_STOP
RID_CUSTOMANIMATION_START+9
-#define STR_CUSTOMANIMATION_DURATION_VERY_SLOW
RID_CUSTOMANIMATION_START+0
-#define STR_CUSTOMANIMATION_DURATION_SLOW
RID_CUSTOMANIMATION_START+1
-#define STR_CUSTOMANIMATION_DURATION_NORMAL
RID_CUSTOMANIMATION_START+2
-#define STR_CUSTOMANIMATION_DURATION_FAST
RID_CUSTOMANIMATION_START+3
-#define STR_CUSTOMANIMATION_DURATION_VERY_FAST
RID_CUSTOMANIMATION_START+4
#define STR_CUSTOMANIMATION_REPEAT_NONE
RID_CUSTOMANIMATION_START+5
#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK
RID_CUSTOMANIMATION_START+6
#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE
RID_CUSTOMANIMATION_START+7
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index 3d13175..daa5c65 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -199,31 +199,6 @@ Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP
};
};
-String STR_CUSTOMANIMATION_DURATION_VERY_SLOW
-{
-Text [ en-US ] = "Very slow";
-};
-
-String STR_CUSTOMANIMATION_DURATION_SLOW
-{
-Text [ en-US ] = "Slow";
-};
-
-String STR_CUSTOMANIMATION_DURATION_NORMAL
-{
-Text [ en-US ] = "Medium";
-};
-
-String STR_CUSTOMANIMATION_DURATION_FAST
-{
-Text [ en-US ] = "Fast";
-};
-
-String STR_CUSTOMANIMATION_DURATION_VERY_FAST
-{
-Text [ en-US ] = "Very fast";
-};
-
String STR_CUSTOMANIMATION_REPEAT_NONE
{
Text [ en-US ] = "none";
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index b353729..800adde 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1617,6 +1618,7 @@ public:
DECL_LINK_TYPED( implControlHdl, ListBox&, void );
DECL_LINK_TYPED( implClickHdl, Button*, void );
+DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void );
void implHdl(Control*);
private:
@@ -1627,7 +1629,7 @@ private:
VclPtr mpFTStartDelay;
VclPtr mpMFStartDelay;
VclPtr mpFTDuration;
-VclPtr mpCBDuration;
+VclPtr mpCBXDuration;
VclPtr mpFTRepeat;
VclPtr mpCBRepeat;
VclPtr mpCBXRewind;
@@ -1644,7 +1646,7 @@
CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar
get(mpFTStartDelay, "delay_label" );
get(mpMFStartDelay, "delay_value" );
get(mpFTDuration, "duration_label" );
-get(mpCBDuration, "duration_list" );
+get(mpCBXDuration, "anim_duration" );
get(mpFTRepeat, "repeat_label" );
get(mpCBRepeat, "repeat_list" );
get(mpCBXRewind, "rewind" );
@@ -1654,10 +1656,18 @@
CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar
mpLBTrigger->set_width_request(approximate_char_width() * 40);
fillRepeatComboBox( mpCBRepeat );
-fillDurationComboBox( mpCBDuration );
+
+//fillDurationMetricComboBox
+mpCBXDuration->InsertValue(50, FUNIT_CUSTOM);
+mpCBXDuration->InsertValue(100, FUNIT_CUSTOM);
+mpCBXDuration->InsertValue(200, FUNIT_CUSTOM);
+mpCBXDuration->InsertValue(300, FUNIT_CUSTOM);
+mpCBXDuration->InsertValue(500, FUNIT_CUSTOM);
+mpCBXDuration->AdaptDropDownLineCountToMaximum();
mpRBClickSequence->SetClickHdl( LINK( this,
CustomAnimationDurationTabPage, implClickHdl ) );
mpLBTrigger->S
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/animations/CustomAnimationPane.cxx | 54 +++
sd/source/ui/animations/CustomAnimationPane.hxx |4 -
sd/uiconfig/simpress/ui/customanimationspanel.ui |4 -
3 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 662406b44d16c713c3d42585b57caf46689980f0
Author: Rishabh
Date: Wed Feb 10 03:06:26 2016 +0530
tdf#87813: Bugfix for the animations sidebar tab
Fixes the following bugs:
1) When nothing is selected, clicking on a entry in the animation list
doesnt activate category and effect drop down menus.
2) When pressing the add button, it should select Entrance->Appear not
Emphasis->Change Fill Color and no automatic preview should not be executed.
3) When changing the Category, the first entry in the Effect list is
selected, which would confuse users to believe that it is now added to the
object.
Change-Id: Idefe07aae039d6c4b1bc9f18397ede98605b2dd0
Reviewed-on: https://gerrit.libreoffice.org/22248
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 0349e85..e2e34cf 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -491,8 +491,6 @@ void CustomAnimationPane::updateControls()
mpFTSpeed->Enable( mxView.is() );
mpCBSpeed->Enable( mxView.is() );
mpCustomAnimationList->Enable( mxView.is() );
-mpPBMoveUp->Enable( mxView.is() );
-mpPBMoveDown->Enable( mxView.is() );
mpPBPlay->Enable( mxView.is() );
mpCBAutoPreview->Enable( mxView.is() );
@@ -518,7 +516,9 @@ void CustomAnimationPane::updateControls()
mpPBAddEffect->Enable( maViewSelection.hasValue() );
mpPBRemoveEffect->Enable(nSelectionCount);
-if(maViewSelection.hasValue() && (nSelectionCount == 1))
+bool bIsSelected = (nSelectionCount == 1);
+
+if(bIsSelected)
{
mpFTAnimation->Enable();
mpLBAnimation->Enable();
@@ -531,8 +531,8 @@ void CustomAnimationPane::updateControls()
mpLBAnimation->Clear();
}
-mpLBCategory->Enable(maViewSelection.hasValue() && (nSelectionCount == 1));
-mpFTCategory->Enable(maViewSelection.hasValue() && (nSelectionCount == 1));
+mpLBCategory->Enable(bIsSelected);
+mpFTCategory->Enable(bIsSelected);
mpFTStart->Enable(nSelectionCount > 0);
mpLBStart->Enable(nSelectionCount > 0);
@@ -543,7 +543,7 @@ void CustomAnimationPane::updateControls()
mnPropertyType = nPropertyTypeNone;
-if( nSelectionCount == 1 )
+if(bIsSelected)
{
CustomAnimationEffectPtr pEffect = maListSelection.front();
@@ -606,10 +606,10 @@ void CustomAnimationPane::updateControls()
sal_uInt32 nCategoryPos = LISTBOX_ENTRY_NOTFOUND;
switch(pEffect->getPresetClass())
{
-case EffectPresetClass::MOTIONPATH: nCategoryPos = 0; break;
+case EffectPresetClass::ENTRANCE: nCategoryPos = 0; break;
case EffectPresetClass::EMPHASIS: nCategoryPos = 1; break;
-case EffectPresetClass::ENTRANCE: nCategoryPos = 2; break;
-case EffectPresetClass::EXIT: nCategoryPos = 3; break;
+case EffectPresetClass::EXIT: nCategoryPos = 2; break;
+case EffectPresetClass::MOTIONPATH: nCategoryPos = 3; break;
default:
break;
}
@@ -750,8 +750,8 @@ void CustomAnimationPane::updateControls()
}
}
-mpPBMoveUp->Enable(bEnableUp);
-mpPBMoveDown->Enable(bEnableDown);
+mpPBMoveUp->Enable(mxView.is() && bEnableUp);
+mpPBMoveDown->Enable(mxView.is() && bEnableDown);
SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
mpCBAutoPreview->Check( pOptions->IsPreviewChangedEffects() );
@@ -894,7 +894,7 @@ void CustomAnimationPane::onContextMenu( sal_uInt16
nSelectedPopupEntry )
onRemove();
break;
case CM_CREATE:
-if( maViewSelection.hasValue() ) onChange();
+if( maViewSelection.hasValue() ) onAdd();
break;
}
@@ -1771,7 +1771,7 @@ void CustomAnimationPane::animationChange()
}
-void CustomAnimationPane::onChange()
+void CustomAnimationPane::onAdd()
{
bool bHasText = true;
@@ -1829,7 +1829,7 @@ void CustomAnimationPane::onChange()
}
else
{
-OSL_FAIL("sd::CustomAnimationPane::onChange(), unknown view
selection!" );
+OSL_FAIL("sd::CustomAnimationPane::onAdd(), unknown view selection!" );
return;
}
@@ -1838,8 +1838,13 @@ void CustomAnimationPane::onChange()
mpLBCategory->Enable();
mpFTAnimation->Enable();
mpLBAnimation->Enable();
-mpLBCategory->SelectEntryPos(1);
-fillAnimationLB();
+mpLBCategory->SelectEntryPos(0);
+
+sal_uInt32 nFirstEffect = fillAnimationLB();
+if(nFirstEffect == LISTBOX_ENTRY_NOTFOUND)
+return;
+
+mpLBA
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/dlgchar.cxx |6
sd/source/ui/func/fuchar.cxx | 43 +++--
sd/source/ui/inc/dlg_char.hxx |1
sd/uiconfig/sdraw/ui/drawchardialog.ui | 14 ++
4 files changed, 62 insertions(+), 2 deletions(-)
New commits:
commit ecc7308efa973fd1f1985ff9a0a0f01414b73f2b
Author: Katarina Behrens
Date: Fri Oct 30 16:13:27 2015 +0100
tdf#88276: New text background tab in char formatting dialog
Change-Id: I81880456d398e8bffd363626bac17ff9d54e7796
Reviewed-on: https://gerrit.libreoffice.org/19697
Reviewed-by: Oliver Specht
Tested-by: Oliver Specht
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 5e44899..60db745 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -46,6 +46,7 @@ SdCharDlg::SdCharDlg( vcl::Window* pParent, const SfxItemSet*
pAttr,
mnCharName = AddTabPage( "RID_SVXPAGE_CHAR_NAME",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 );
mnCharEffects = AddTabPage( "RID_SVXPAGE_CHAR_EFFECTS",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 );
mnCharPosition = AddTabPage( "RID_SVXPAGE_CHAR_POSITION",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 );
+mnCharBackground = AddTabPage( "RID_SVXPAGE_BACKGROUND",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
}
void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
@@ -62,6 +63,11 @@ void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage
&rPage )
{
rPage.PageCreated(aSet);
}
+else if (nId == mnCharBackground)
+{
+
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)));
+rPage.PageCreated(aSet);
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 5b5227c..705cb16 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -24,6 +24,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -66,10 +68,33 @@ void FuChar::DoExecute( SfxRequest& rReq )
SfxItemSet aEditAttr( mpDoc->GetPool() );
mpView->GetAttributes( aEditAttr );
+static const sal_uInt16 aRanges[] =
+{
+EE_ITEMS_START, EE_ITEMS_END,
+SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR,
+0
+};
+
SfxItemSet aNewAttr( mpViewShell->GetPool(),
-EE_ITEMS_START, EE_ITEMS_END );
+aRanges );
aNewAttr.Put( aEditAttr, false );
+// EE_CHAR_BKGCOLOR is SvxBackgroundColorItem, but char background
tabpage
+// can only work with SvxBrushItems (it requires major undertaking to
have
+// it support anything else). Do the following then:
+const SfxPoolItem* pItem;
+if ( aNewAttr.GetItemState( EE_CHAR_BKGCOLOR, true, &pItem ) ==
SfxItemState::SET )
+{
+// extract Color outta SvxBackColorItem
+Color aBackColor = static_cast(pItem)->GetValue();
+// make new SvxBrushItem with this Color
+SvxBrushItem aBrushItem( aBackColor, SID_ATTR_BRUSH_CHAR );
+
+aNewAttr.ClearItem( EE_CHAR_BKGCOLOR );
+// and stick it into the set
+aNewAttr.Put( aBrushItem );
+}
+
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
std::unique_ptr pDlg(pFact ?
pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0);
sal_uInt16 nResult = RET_CANCEL;
@@ -84,7 +109,20 @@ void FuChar::DoExecute( SfxRequest& rReq )
if( nResult == RET_OK )
{
-rReq.Done( *( pDlg->GetOutputItemSet() ) );
+const SfxItemSet* pOutputSet = pDlg->GetOutputItemSet();
+SfxItemSet pOtherSet( *pOutputSet );
+
+// and now the reverse process
+const SvxBrushItem* pBrushItem= static_cast(pOtherSet.GetItem( SID_ATTR_BRUSH_CHAR ));
+
+if ( pBrushItem )
+{
+SvxBackgroundColorItem aBackColorItem(
pBrushItem->GetColor(), EE_CHAR_BKGCOLOR );
+pOtherSet.ClearItem( SID_ATTR_BRUSH_CHAR );
+pOtherSet.Put( aBackColorItem );
+}
+
+rReq.Done( pOtherSet );
pArgs = rReq.GetArgs();
}
}
@@ -105,6 +143,7 @@ void FuChar::DoExecute( SfxRequest& rReq )
SID_ATTR_CHAR_UNDERLINE,
SID_ATTR_CHAR_FONTHEIGHT,
SID_ATTR_CHAR_COLOR,
+SID_ATTR_CHAR_BACK_COLOR,
SID_ATTR_CHAR_KERNING,
SID_ATTR_CHAR_CASEMAP,
SID_SET_SUPER_SCRIPT,
diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/animations/SlideTransitionPane.cxx |9 -
sd/source/ui/animations/SlideTransitionPane.hxx |2
sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 155 ++-
3 files changed, 69 insertions(+), 97 deletions(-)
New commits:
commit a7b926243b300daf195467111e10a7bd481828a0
Author: Rishabh Kumar
Date: Wed May 27 19:26:43 2015 +0530
tdf#87862: Rearranging the lower half of slide transition tab
Follow up commit for the minor tweaks
Change-Id: I9f274e38c7d0adfc431dc9a11000c3ce9fad3a3e
Reviewed-on: https://gerrit.libreoffice.org/15929
Reviewed-by: Yousuf Philips
Tested-by: Yousuf Philips
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx
b/sd/source/ui/animations/SlideTransitionPane.cxx
index 0c41e09..86f2afd 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -436,7 +436,6 @@ SlideTransitionPane::SlideTransitionPane(
get(mpMF_ADVANCE_AUTO_AFTER, "auto_after_value");
get(mpPB_APPLY_TO_ALL, "apply_to_all");
get(mpPB_PLAY, "play");
-get(mpPB_SLIDE_SHOW, "slide_show");
get(mpCB_AUTO_PREVIEW, "auto_preview");
mpLB_SLIDE_TRANSITIONS->set_width_request(mpLB_SLIDE_TRANSITIONS->approximate_char_width()
* 16);
@@ -460,7 +459,6 @@ SlideTransitionPane::SlideTransitionPane(
// set handlers
mpPB_APPLY_TO_ALL->SetClickHdl( LINK( this, SlideTransitionPane,
ApplyToAllButtonClicked ));
mpPB_PLAY->SetClickHdl( LINK( this, SlideTransitionPane, PlayButtonClicked
));
-mpPB_SLIDE_SHOW->SetClickHdl( LINK( this, SlideTransitionPane,
SlideShowButtonClicked ));
mpLB_SLIDE_TRANSITIONS->SetSelectHdl( LINK( this, SlideTransitionPane,
TransitionSelected ));
@@ -501,7 +499,6 @@ void SlideTransitionPane::dispose()
mpMF_ADVANCE_AUTO_AFTER.clear();
mpPB_APPLY_TO_ALL.clear();
mpPB_PLAY.clear();
-mpPB_SLIDE_SHOW.clear();
mpCB_AUTO_PREVIEW.clear();
PanelLayout::dispose();
}
@@ -1007,12 +1004,6 @@ IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked)
return 0;
}
-IMPL_LINK_NOARG(SlideTransitionPane, SlideShowButtonClicked)
-{
-mrBase.StartPresentation();
-return 0;
-}
-
IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected)
{
applyToSelectedPages();
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx
b/sd/source/ui/animations/SlideTransitionPane.hxx
index 654ce2e..fbfc3cf 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -89,7 +89,6 @@ private:
DECL_LINK( ApplyToAllButtonClicked, void * );
DECL_LINK( PlayButtonClicked, void * );
-DECL_LINK( SlideShowButtonClicked, void * );
DECL_LINK( AutoPreviewClicked, void * );
DECL_LINK( TransitionSelected, void * );
@@ -116,7 +115,6 @@ private:
VclPtr mpMF_ADVANCE_AUTO_AFTER;
VclPtr mpPB_APPLY_TO_ALL;
VclPtr mpPB_PLAY;
-VclPtr mpPB_SLIDE_SHOW;
VclPtr mpCB_AUTO_PREVIEW;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView >
mxView;
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index 13a300c..9e046fe 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -2,6 +2,11 @@
+
+True
+False
+sd/res/playblue_16.png
+
True
False
@@ -26,8 +31,6 @@
True
False
True
-6
-12
True
@@ -40,15 +43,8 @@
-
-
-True
-False
-Apply to Selected
Slides
-
-
-
-
+
+
@@ -67,8 +63,8 @@
True
False
-6
-12
+3
+20
True
@@ -248,113 +244,100 @@
False
True
-3
+2
-
+
True
False
-0
-none
+vertical
-
+
True
False
-6
-12
+center
-
+
+Apply Transition
to All Slides
True
-False
-6
-
-
-Automatic
-True
-True
-False
-
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 38 ++
sd/source/ui/dlg/PhotoAlbumDialog.hxx |4 +--
sd/uiconfig/simpress/ui/photoalbum.ui | 16 ++
3 files changed, 52 insertions(+), 6 deletions(-)
New commits:
commit 070141b854c7731aa44ccf6ce446802ad8653697
Author: Rishabh Kumar
Date: Tue Feb 17 15:40:25 2015 +0530
tdf#64573: Add captions to Photo Album
Creates a rectangular text area with following attributes-
Color-Black
Transparency-20%
Alignment-Bottom
Default Text-Click to add Title
Change-Id: Ifb75c57fd19d41635fd4e397cbfe2b8a65975eb6
Reviewed-on: https://gerrit.libreoffice.org/14517
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index cb4889a..9b7d571 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -9,7 +9,7 @@
#include
#include
-
+#include
#include
#include
#include
@@ -24,10 +24,11 @@
#include
#include
#include
-
+#include
#include
#include
-
+#include
+#include
#include "PhotoAlbumDialog.hxx"
#include "strings.hrc"
#include "sdresid.hxx"
@@ -54,7 +55,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow,
SdDrawDocument* pAc
get(pInsTypeCombo, "opt_combo");
get(pASRCheck, "asr_check");
-
+get(pCapCheck, "cap_check");
pCancelBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CancelHdl));
pCreateBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CreateHdl));
@@ -151,6 +152,8 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
xShape->setPosition(aPicPos);
xSlide->add(xShape);
+if(pCapCheck->IsChecked())
+createCaption( aPageSize );
}
}
else if( nOpt == TWO_IMAGES )
@@ -251,6 +254,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
xShape->setPosition(aPicPos);
xSlide->add(xShape);
+if(pCapCheck->IsChecked())
+createCaption( aPageSize );
+
}
}
}
@@ -431,6 +437,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
xShape->setPosition(aPicPos);
xSlide->add(xShape);
+if(pCapCheck->IsChecked())
+createCaption( aPageSize );
+
}
}
}
@@ -650,6 +659,27 @@ awt::Size SdPhotoAlbumDialog::createASRSize(const
awt::Size& aPicSize, const awt
return awt::Size(resizeWidth, resizeHeight);
}
+void SdPhotoAlbumDialog::createCaption(const awt::Size& aPageSize )
+{
+Point CapPos;
+Size CapSize;
+
+CapSize.Width() = aPageSize.Width;
+CapSize.Height() = aPageSize.Height/6;
+CapPos.X() = 0;
+CapPos.Y() = aPageSize.Height - CapSize.Height();
+SdPage* pSlide = pDoc->GetSdPage( pDoc->GetSdPageCount(PK_STANDARD)-1,
PK_STANDARD );
+Rectangle rRect(CapPos,CapSize);
+SdrObject* pSdrObj = pSlide->CreatePresObj(PRESOBJ_TITLE,false,rRect);
+SdrModel* pSdrModel = pDoc->AllocModel();
+SfxItemSet aSet(pSdrModel->GetItemPool() );
+aSet.Put( XFillStyleItem(drawing::FillStyle_SOLID) );
+aSet.Put( XFillColorItem( "", Color(COL_BLACK) ) );
+aSet.Put( XFillTransparenceItem( 20 ) );
+pSdrObj->SetMergedItemSetAndBroadcast(aSet);
+pSlide->InsertObject(pSdrObj);
+}
+
Reference< graphic::XGraphic> SdPhotoAlbumDialog::createXGraphicFromUrl(const
OUString& sUrl,
Reference< graphic::XGraphicProvider> xProvider
)
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index d97ae81..c7d12e4 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -64,7 +64,7 @@ private:
ListBox*pInsTypeCombo;
CheckBox* pASRCheck;
-
+CheckBox* pCapCheck;
SdDrawDocument* pDoc;
GraphicFilter* mpGraphicFilter;
@@ -83,7 +83,7 @@ private:
Reference< drawing::XDrawPages > xDrawPages);
awt::Size createASRSize(const awt::Size& aPicSize, const awt::Size&
aMaxSize);
-
+void createCaption(const awt::Size& aPageSize);
Reference< graphic::XGraphic> createXGraphicFromUrl(const OUString& sUrl,
Reference< graphic::XGraphicProvider> xProvider);
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui
b/sd/uiconfig/simpress/ui/photoalbum.ui
index d099d36..0678159 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -358,6 +358,22 @@
1
+
+
+Add caption
to each slide
+True
+True
+False
+0
+True
+
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/app/res_bmp.src |2 +-
sd/source/ui/app/strings.src |2 +-
sd/uiconfig/simpress/ui/templatedialog.ui |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cf5a2811bbf5c013da3c6421ecb013137b2cc595
Author: Yousuf Philips
Date: Fri Dec 26 18:42:09 2014 +0400
fdo#87706 correct object/image styles dialog title and tooltip
Change-Id: I36bcd859e5b3da933ed1cd1c54b34b71ca9f52d2
Reviewed-on: https://gerrit.libreoffice.org/13673
Reviewed-by: Adolfo Jayme Barrientos
Reviewed-by: Katarina Behrens
Tested-by: Katarina Behrens
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 2074202..6d8cc04 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -240,7 +240,7 @@ Bitmap BMP_GRAPHIC
};
#define SfxStyleFamiliesRes1\
-Text [ en-US ] = "Drawing Object Styles" ;\
+Text [ en-US ] = "Graphic Styles" ;\
#define SfxStyleFamiliesRes2\
Text [ en-US ] = "Presentation Styles" ;\
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 1327eb6..3e11d18 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1126,7 +1126,7 @@ String STR_TASKPANEL_LAYOUT_MENU_TITLE
};
String STR_GRAPHICS_STYLE_FAMILY
{
-Text [ en-US ] = "Drawing Object Styles";
+Text [ en-US ] = "Graphic Styles";
};
String STR_CELL_STYLE_FAMILY
{
diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui
b/sd/uiconfig/simpress/ui/templatedialog.ui
index 4c89428..2a0e881 100644
--- a/sd/uiconfig/simpress/ui/templatedialog.ui
+++ b/sd/uiconfig/simpress/ui/templatedialog.ui
@@ -5,7 +5,7 @@
False
6
-Image Styles
+Graphic Styles
dialog
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/app/popup2_tmpl.src | 47 ++-
sd/uiconfig/simpress/menubar/menubar.xml |4 ++
2 files changed, 14 insertions(+), 37 deletions(-)
New commits:
commit f11863d43d96c4bcad9ae43ceb25c05d9a94307d
Author: Yousuf Philips
Date: Wed Dec 24 01:48:22 2014 +0400
fdo#86614 reorganize image, shape and line context menus
Change-Id: I87274670fd2c092bd6ea7f7dfb67f9db76865c96
Reviewed-on: https://gerrit.libreoffice.org/13632
Reviewed-by: Yousuf Philips
Tested-by: Yousuf Philips
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index 65ad296..f9a2122 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -153,12 +153,9 @@
{
ItemList =
{
+MN_TRANSFORM
MN_LINE
MN_AREA
-MN_TEXTATTR
-MN_TRANSFORM
-SEPARATOR
-MN_CHAR_PARAGRAPH
SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN
@@ -170,19 +167,12 @@
MN_LEAVE_GROUP
MN_DISMANTLE
-// #i68101#
-SEPARATOR
-MN_OBJECT_TITLE_DESCRIPTION
-MN_NAME_GROUP
-// #i68101#
-
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR
MN_ACTION
#endif
SEPARATOR
MN_STYLEDT
-SEPARATOR
};
};
@@ -343,12 +333,10 @@
{
ItemList =
{
-MN_LINE
MN_TRANSFORM
+MN_LINE
MN_EDIT_POINTS
SEPARATOR
-MN_CHAR_PARAGRAPH
-SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN
MN_DISTRIBUTE
@@ -358,12 +346,6 @@
MN_LEAVE_GROUP
MN_DISMANTLE
-// #i68101#
-SEPARATOR
-MN_OBJECT_TITLE_DESCRIPTION
-MN_NAME_GROUP
-// #i68101#
-
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR
MN_ACTION
@@ -567,15 +549,17 @@
{
ItemList =
{
-MN_TRANSFORM
+MenuItem { ITEM_CHANGE_PICTURE };
+MenuItem { ITEM_SAVE_GRAPHIC };
+MenuItem { ITEM_COMPRESS_GRAPHIC };
+MenuItem { ITEM_EXTERNAL_EDIT };
+SEPARATOR
+MN_CROP
MN_ORIGINAL_SIZE
-MN_LINE
-MN_AREA
-MN_TEXTATTR
SEPARATOR
-MN_CHAR_PARAGRAPH
+MN_TRANSFORM
+MN_LINE
SEPARATOR
-MN_CROP
MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE
@@ -583,23 +567,12 @@
MNSUB_CONVERT
MN_BREAK
-// #i68101#
-SEPARATOR
-MN_OBJECT_TITLE_DESCRIPTION
-MN_NAME_GROUP
-// #i68101#
-
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR
MN_ACTION
#endif
SEPARATOR
MN_STYLEDT
-SEPARATOR
-MenuItem { ITEM_CHANGE_PICTURE };
-MenuItem { ITEM_SAVE_GRAPHIC };
-MenuItem { ITEM_COMPRESS_GRAPHIC };
-MenuItem { ITEM_EXTERNAL_EDIT };
};
};
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index 2a7e878..7b4c9f6 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -260,8 +260,12 @@
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_sdraw.mk
sd/UIConfig_sdraw.mk |1
sd/source/ui/app/strings.src |4 --
sd/source/ui/inc/strings.hrc |2 -
sd/source/ui/view/drviews6.cxx |9 ++
sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui | 35 +
5 files changed, 40 insertions(+), 11 deletions(-)
New commits:
commit 6cbccc8efa49dbf4ff21cabbfb9e74059d67b170
Author: Manal Alhassoun
Date: Thu Dec 26 13:16:51 2013 +0300
convert unlink image querybox to .ui
Change-Id: I46458d497757162be283effb624a7c769aeb5354
Reviewed-on: https://gerrit.libreoffice.org/7200
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 5f8ce22..cb2c84b 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/namedesign \
sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/printeroptions \
+ sd/uiconfig/sdraw/ui/queryunlinkimagedialog \
sd/uiconfig/sdraw/ui/tabledesigndialog \
sd/uiconfig/sdraw/ui/vectorize \
))
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index b7f916c..b8b5237 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -798,10 +798,6 @@ String STR_FILEFORMAT_NAME
{
Text [ en-US ] = "File name without extension" ;
};
-String STR_RELEASE_GRAPHICLINK
-{
-Text [ en-US ] = "This image is linked to a document. Do you want to
unlink the image in order to edit it?" ;
-};
String STR_NEW_CUSTOMSHOW
{
Text [ en-US ] = "New Custom Slide Show" ;
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 819d31d..dcc6042 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -284,8 +284,6 @@
#define STR_FILEFORMAT_PATH (RID_APP_START+509)
#define STR_FILEFORMAT_NAME (RID_APP_START+510)
-#define STR_RELEASE_GRAPHICLINK (RID_APP_START+511)
-
#define STR_NEW_CUSTOMSHOW (RID_APP_START+512)
#define STR_COPY_CUSTOMSHOW (RID_APP_START+513)
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 6aa6238..14f7e6c 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -301,19 +301,18 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq )
if ( pObj && !mpDrawView->IsTextEdit() )
{
SdrGrafObj* pNewObj = (SdrGrafObj*) pObj->Clone();
-sal_BoolbCont = sal_True;
+bool bCont = true;
if( pNewObj->IsLinkedGraphic() )
{
-QueryBox aQBox( (Window*) GetActiveWindow(), WB_YES_NO |
WB_DEF_YES,
-SD_RESSTR( STR_RELEASE_GRAPHICLINK ) );
+MessageDialog aQueryBox( (Window*)
GetActiveWindow(),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui");
-if( RET_YES == aQBox.Execute() )
+if (RET_YES == aQueryBox.Execute())
pNewObj->ReleaseGraphicLink();
else
{
delete pNewObj;
-bCont = sal_False;
+bCont = false;
}
}
diff --git a/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
new file mode 100644
index 000..c372e2b
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
@@ -0,0 +1,35 @@
+
+
+
+
+False
+12
+Release image's link?
+False
+dialog
+True
+question
+yes-no
+This image is linked to a
document.
+ Do you want to unlink
the image in order to edit it?
+
+
+False
+vertical
+24
+
+
+False
+end
+
+
+False
+True
+end
+0
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/present.cxx | 36 ++
sd/source/ui/inc/present.hxx | 11 ++-
sd/uiconfig/simpress/ui/presentationdialog.ui | 12
3 files changed, 47 insertions(+), 12 deletions(-)
New commits:
commit 9b0ba41906f69b2364b11621ba2397f6a15a57e7
Author: Michael Meeks
Date: Fri Jul 19 15:16:08 2013 +0100
fdo#67045 - cleanup slideshow / screen string usage for 4.2.
Change-Id: If71567e2b6c6cfed8860677254d60fce60f63e14
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 6aec289..8264101 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -67,7 +67,9 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window*
pWindow,
get( maFtMonitor, "presdisplay_label" );
get( maLBMonitor, "presdisplay_cb");
-get( msExternalMonitor, "externalmonitor_str" );
+get( msMonitor, "monitor_str" );
+get( msMonitorExternal, "externalmonitor_str" );
+get( msExternal,"external_str" );
get( msMonitor, "monitor_str" );
get( msAllMonitors, "allmonitors_str" );
@@ -149,12 +151,27 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window*
pWindow,
ChangePauseHdl( NULL );
}
-String SdStartPresentationDlg::GetDisplayName( sal_Int32 nDisplay, bool
bExternal )
+String SdStartPresentationDlg::GetDisplayName( sal_Int32 nDisplay,
+ DisplayType eType )
{
-String aName( bExternal ? msExternalMonitor->GetText() :
- msMonitor->GetText() );
+String aName;
+
+switch ( eType )
+{
+case EXTERNAL_IS_NUMBER:
+aName = msExternal->GetText();
+break;
+case MONITOR_IS_EXTERNAL:
+aName = msMonitorExternal->GetText();
+break;
+default:
+case MONITOR_NORMAL:
+aName = msMonitor->GetText();
+break;
+}
const String aNumber( OUString::number( nDisplay ) );
aName.SearchAndReplace( String("%1"), aNumber );
+
return aName;
}
@@ -196,8 +213,8 @@ void SdStartPresentationDlg::InitMonitorSettings()
// Un-conditionally add a version for '0' the default external
display
sal_Int32 nInsertedEntry;
-// FIXME: string-freeze this should really be 'External (display
%)'
-String aName = GetDisplayName( nExternalIndex + 1, true);
+// Initial entry - the auto-detected external monitor
+String aName = GetDisplayName( nExternalIndex + 1,
EXTERNAL_IS_NUMBER);
nInsertedEntry = InsertDisplayEntry( aName, 0 );
if( nDefaultSelectedDisplay == 0)
nSelectedIndex = nInsertedEntry;
@@ -205,10 +222,9 @@ void SdStartPresentationDlg::InitMonitorSettings()
// The user data contains the real setting
for( sal_Int32 nDisplay = 0; nDisplay < mnMonitors; nDisplay++ )
{
-bool bIsExternal = nDisplay == nExternalIndex;
-// FIXME: string-freeze, use true to denote external for now
-bIsExternal = false;
-aName = GetDisplayName( nDisplay + 1, bIsExternal );
+aName = GetDisplayName( nDisplay + 1,
+nDisplay == nExternalIndex ?
+MONITOR_IS_EXTERNAL : MONITOR_NORMAL );
nInsertedEntry = InsertDisplayEntry( aName, nDisplay + 1 );
// Remember the index of the default selection.
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index ef27bfb..c49aab9 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -65,18 +65,25 @@ private:
const SfxItemSet& rOutAttrs;
sal_Int32 mnMonitors;
-FixedText* msExternalMonitor;
FixedText* msMonitor;
FixedText* msAllMonitors;
+FixedText* msMonitorExternal;
+FixedText* msExternal;
DECL_LINK( ChangeRangeHdl, void * );
DECL_LINK( ClickWindowPresentationHdl, void * );
DECL_LINK( ChangePauseHdl, void * );
voidInitMonitorSettings();
+enum DisplayType {
+EXTERNAL_IS_NUMBER,
+MONITOR_NORMAL,
+MONITOR_IS_EXTERNAL,
+};
sal_Int32 InsertDisplayEntry(const rtl::OUString &aName,
sal_Int32nDisplay);
-String GetDisplayName( sal_Int32 nDisplay, bool bExternal );
+String GetDisplayName( sal_Int32 nDisplay,
+DisplayType eType );
public:
SdStartPresentationDlg( Window* pWindow,
const SfxItemSet& rInAttrs,
diff --g
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/tpoption.cxx| 15 -
sd/source/ui/inc/tpoption.hxx|1
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 301 ---
3 files changed, 173 insertions(+), 144 deletions(-)
New commits:
commit d691f4c9ed8de07dd902a98dbe5683de830b023c
Author: Caolán McNamara
Date: Wed Jun 5 14:45:23 2013 +0100
various fixes to impress/draw general opt page
restore original mnemonics
get range of adjustments right
fix height and metric spellings, cosmetic, but it'll bug me
Change-Id: I94a7980d5513f8bfe29bc702bcf902037e1961b6
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index bb88975..b3084b4 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -217,6 +217,7 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const
SfxItemSet& rInAttrs )
{
get(m_pCbxQuickEdit , "qickedit");
get(m_pCbxPickThrough , "textselected");
+get(m_pNewDocumentFrame, "newdocumentframe");
get(m_pCbxStartWithTemplate,"startwithwizard");
get(m_pCbxMasterPageCache , "backgroundback");
get(m_pCbxCopy , "copywhenmove");
@@ -225,15 +226,15 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const
SfxItemSet& rInAttrs )
get(m_pCbxStartWithActualPage , "strtwithPag");
get(m_pCbxEnableSdremote , "enremotcont");
get(m_pCbxEnablePresenterScreen , "enprsntcons");
-get(m_pCbxUsePrinterMetrics , "printermetrc");
+get(m_pCbxUsePrinterMetrics , "printermetrics");
get(m_pPresentationFrame , "presentationframe");
get(m_pScaleFrame , "scaleframe");
get(m_pCbScale , "scaleBox");
-get(m_pMtrFldTabstop , "metericFields");
-get(m_pMtrFldOriginalWidth , "metericWidthFields");
-get(m_pMtrFldOriginalHeight , "metericHighteFields");
-get(m_pMtrFldInfo1 , "metericInfo1Fields");
-get(m_pMtrFldInfo2 , "metericInfo2Fields");
+get(m_pMtrFldTabstop , "metricFields");
+get(m_pMtrFldOriginalWidth , "metricWidthFields");
+get(m_pMtrFldOriginalHeight , "metricHeightFields");
+get(m_pMtrFldInfo1 , "metricInfo1Fields");
+get(m_pMtrFldInfo2 , "metricInfo2Fields");
get(m_pCbxCompatibility ,"cbCompatibility" );
get(m_pFiInfo1 , "info1");
get(m_pFiInfo2 , "info2");
@@ -566,7 +567,7 @@ void SdTpOptionsMisc::SetImpressMode (void)
voidSdTpOptionsMisc::SetDrawMode()
{
m_pScaleFrame->Show();
-m_pCbxStartWithTemplate->Hide();
+m_pNewDocumentFrame->Hide();
m_pCbxStartWithActualPage->Hide();
m_pCbxEnableSdremote->Hide();
m_pCbxEnablePresenterScreen->Hide();
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 244eb44..f914686 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -79,6 +79,7 @@ private:
CheckBox*m_pCbxQuickEdit;
CheckBox*m_pCbxPickThrough;
+VclFrame*m_pNewDocumentFrame;
CheckBox*m_pCbxStartWithTemplate;
CheckBox*m_pCbxMasterPageCache;
diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 7ff7d7e..4f16735 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -6,6 +6,7 @@
False
6
vertical
+12
True
@@ -23,7 +24,9 @@
True
False
-69
+6
+12
+True
Allow quick
editing
@@ -83,7 +86,7 @@
-
+
True
False
0
@@ -99,9 +102,11 @@
True
False
True
+6
+12
-Start with
wizard
+Start with
_wizard
True
True
False
@@ -155,6 +160,7 @@
True
False
True
+6
12
True
@@ -192,39 +198,6 @@
-
-True
-False
-7
-True
-0
-1
-
-
-1
-4
-1
-1
-
-
-
-
-True
-False
-0
-1
-Unit of
_measurement
-True
-units
-
-
-0
-4
-1
-1
-
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 161 +++---
sd/source/ui/dlg/PhotoAlbumDialog.hxx |4
sd/uiconfig/simpress/ui/photoalbum.ui | 33 +-
3 files changed, 45 insertions(+), 153 deletions(-)
New commits:
commit cd1034f87ae0c03d8107e2e1fd8f968c3f7075b3
Author: Samuel Mehrbrodt
Date: Sat May 11 22:39:16 2013 +0200
Related fdo#35546: Remove "1 Image with Title" Layout for Photo Album Dialog
There will be an option for all Slide Layouts to have a title.
Discussed and decided here:
https://wiki.documentfoundation.org/Design/Meetings/2013-05-11
Change-Id: I891511d6cf8183e45b41a9358f4821f7de551836
Reviewed-on: https://gerrit.libreoffice.org/3858
Reviewed-by: Bosdonnat Cedric
Tested-by: Bosdonnat Cedric
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index ba11647..2c49e36 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -95,111 +95,64 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
{
Reference< drawing::XDrawPagesSupplier > xDPS( pDoc->getUnoModel(),
uno::UNO_QUERY );
Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(),
uno::UNO_QUERY );
-Reference< lang::XMultiServiceFactory > xShapeFactory(
pDoc->getUnoModel(), uno::UNO_QUERY );
+Reference< lang::XMultiServiceFactory > xShapeFactory(
pDoc->getUnoModel(), uno::UNO_QUERY );
Reference< XComponentContext >
xContext(::comphelper::getProcessComponentContext());
Reference< graphic::XGraphicProvider>
xProvider(graphic::GraphicProvider::create(xContext));
// get the option
sal_uInt16 nOpt = pInsTypeCombo->GetSelectEntryPos();
-if ( nOpt == FIT_TO_SLIDE )
+if ( nOpt == ONE_IMAGE )
{
OUString sUrl;
-
for( sal_Int16 i = 0; i < pImagesLst->GetEntryCount(); ++i )
{
OUString* pData = (OUString*) pImagesLst->GetEntryData(i);
sUrl = *pData;
-if (sUrl != "Text Box")
-{
-Reference< drawing::XDrawPage > xSlide =
appendNewSlide(AUTOLAYOUT_NONE, xDrawPages);
-Reference< beans::XPropertySet > xSlideProps( xSlide,
uno::UNO_QUERY );
-Reference< graphic::XGraphic > xGraphic =
createXGraphicFromUrl(sUrl, xProvider);
+Reference< drawing::XDrawPage > xSlide =
appendNewSlide(AUTOLAYOUT_NONE, xDrawPages);
+Reference< beans::XPropertySet > xSlideProps( xSlide,
uno::UNO_QUERY );
-Image aImg(xGraphic);
-// Save the original size, multiplied with 100
-::awt::Size aPicSize(aImg.GetSizePixel().Width()*100,
aImg.GetSizePixel().Height()*100);
+Reference< graphic::XGraphic > xGraphic =
createXGraphicFromUrl(sUrl, xProvider);
-Reference< drawing::XShape > xShape(
-
xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"),
-uno::UNO_QUERY);
+Image aImg(xGraphic);
+// Save the original size, multiplied with 100
+::awt::Size aPicSize(aImg.GetSizePixel().Width()*100,
aImg.GetSizePixel().Height()*100);
-Reference< beans::XPropertySet > xProps( xShape,
uno::UNO_QUERY );
-xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic));
+Reference< drawing::XShape > xShape(
+
xShapeFactory->createInstance("com.sun.star.drawing.GraphicObjectShape"),
+uno::UNO_QUERY);
+Reference< beans::XPropertySet > xProps( xShape,
uno::UNO_QUERY );
+xProps->setPropertyValue("Graphic", ::uno::Any(xGraphic));
-::awt::Size aPageSize;
-xSlideProps->getPropertyValue(
-OUString("Width")) >>= aPageSize.Width;
-xSlideProps->getPropertyValue(
-OUString("Height")) >>= aPageSize.Height;
+::awt::Size aPageSize;
-::awt::Point aPicPos;
+xSlideProps->getPropertyValue(
+OUString("Width")) >>= aPageSize.Width;
+xSlideProps->getPropertyValue(
+OUString("Height")) >>= aPageSize.Height;
-if(pASRCheck->IsChecked())
-{
-// Resize the image, with keeping ASR
-aPicSize = createASRSize(aPicSize, aPageSize);
-}
-else
-{
-aPicSize.Width = aPageSize.Width;
-aPicSize.Height = aPageSize.Height;
-}
-xShape->setSize(aPicSize);
-aPicPos.X = (aPag
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/app/strings.src |5
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 24 -
sd/source/ui/dlg/PhotoAlbumDialog.hxx |3
sd/source/ui/inc/strings.hrc |1
sd/uiconfig/simpress/ui/photoalbum.ui | 444 ++
5 files changed, 196 insertions(+), 281 deletions(-)
New commits:
commit 3c480196dd66df48f8ab637a2ac26ffbca328063
Author: Samuel Mehrbrodt
Date: Sat May 11 20:16:30 2013 +0200
Related fdo#35546: Remove the "Text box" function from Photo Album Dialog
This has been discussed and approved in the Design Team IRC Chat on
2013-05-11
Change-Id: I70b861c09af2dfa79c9f773a47791b101888c8f9
Reviewed-on: https://gerrit.libreoffice.org/3857
Reviewed-by: Bosdonnat Cedric
Tested-by: Bosdonnat Cedric
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index eb6b959..8b90e5f 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1273,9 +1273,4 @@ String STR_PHOTO_ALBUM_EMPTY_WARNING
Text [ en-US ] = "Please add Images to the Album." ;
};
-String STR_PHOTO_ALBUM_TEXTBOX
-{
-Text [ en-US ] = "Text Slide";
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 351a9d8..ba11647 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -45,8 +45,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow,
SdDrawDocument* pActDoc)
get(pCancelBtn, "cancel_btn");
get(pCreateBtn, "create_btn");
-get(pFileBtn, "file_btn");
-get(pTextBtn, "textbox_btn");
+get(pAddBtn, "add_btn");
get(pUpBtn, "up_btn");
get(pDownBtn, "down_btn");
get(pRemoveBtn, "rem_btn");
@@ -60,8 +59,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow,
SdDrawDocument* pActDoc)
pCancelBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CancelHdl));
pCreateBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CreateHdl));
-pFileBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, FileHdl));
-pTextBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, TextHdl));
+pAddBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, FileHdl));
pUpBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, UpHdl));
pUpBtn->Disable();
pDownBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, DownHdl));
@@ -72,7 +70,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow,
SdDrawDocument* pActDoc)
mpGraphicFilter = new GraphicFilter;
sDirUrl = "";
-pFileBtn->GrabFocus();
+pAddBtn->GrabFocus();
pImagesLst->Clear();
}
@@ -610,22 +608,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
return 0;
}
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, TextHdl)
-{
-sal_Int16 nPos;
-sal_Int16 nInsertPos = pImagesLst->GetSelectEntryPos();
-if (nInsertPos < 0)
-nPos = pImagesLst->InsertEntry(
OUString(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX)));
-else
-nPos = pImagesLst->InsertEntry(
OUString(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX)), nInsertPos);
-
-OUString sStr(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX));
-pImagesLst->SetEntryData(nPos, (void*)new OUString(sStr));
-
-EnableDisableButtons();
-return 0;
-}
-
IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl)
{
if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index 3e75128..d49ec34 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -54,8 +54,7 @@ private:
CancelButton* pCancelBtn;
PushButton* pCreateBtn;
-PushButton* pFileBtn;
-PushButton* pTextBtn;
+PushButton* pAddBtn;
PushButton* pUpBtn;
PushButton* pDownBtn;
PushButton* pRemoveBtn;
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 19816b9..e59dbeb 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -416,7 +416,6 @@
#define STR_ACC_DIALOG_DESC (RID_APP_START+728)
#define STR_PHOTO_ALBUM_EMPTY_WARNING (RID_APP_START+729)
-#define STR_PHOTO_ALBUM_TEXTBOX (RID_APP_START+730)
/**
* The ids in glob.hrc start at RID_APP_START+750!
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui
b/sd/uiconfig/simpress/ui/photoalbum.ui
index 13760d3..d1e7a6c 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -58,58 +58,156 @@
-
+
True
False
+6
True
-0
-none
-
+
True
False
-12
-6
-True
ve
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 13 +--
sd/uiconfig/simpress/ui/photoalbum.ui | 127 ++
2 files changed, 57 insertions(+), 83 deletions(-)
New commits:
commit 97a055dfa7c85c8795dc9b55fb39a5b3448b29f2
Author: Samuel Mehrbrodt
Date: Thu May 9 14:24:33 2013 +0200
Related fdo#35546: Cosmetic fixes for Photo Album Dialog
* Display spaces in filenames correctly
* Adjust Spacing in Dialog
* Remove the label showing the full path
Change-Id: I5c5d3d54b7e21063628c4cdb4a92f534ec4a3088
Reviewed-on: https://gerrit.libreoffice.org/3834
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index fc4b256..2771166 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -55,9 +55,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow,
SdDrawDocument* pActDoc)
get(pImg, "preview_img");
get(pInsTypeCombo, "opt_combo");
-
get(pASRCheck, "asr_check");
-get(pFilenameLab, "filename_lab");
pCancelBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CancelHdl));
pCreateBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CreateHdl));
@@ -614,10 +612,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
for ( sal_Int32 i = 0; i < aFilesArr.getLength(); i++ )
{
-// Store full path, show filename only
-OUString sFileName =
aFilesArr[i].copy(aFilesArr[i].lastIndexOf("/")).replaceAll("/","");
-sal_Int16 nPos = pImagesLst->InsertEntry( sFileName );
-pImagesLst->SetEntryData(nPos, (void*)new
OUString(aFilesArr[i]));
+// Store full path, show filename only. Use INetURLObject to
display spaces in filename correctly
+INetURLObject aUrl = INetURLObject(aFilesArr[i]);
+sal_Int16 nPos = pImagesLst->InsertEntry(
aUrl.GetLastName(INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8) );
+pImagesLst->SetEntryData(nPos, (OUString*) new
OUString(aUrl.GetMainURL(INetURLObject::DECODE_WITH_CHARSET,
RTL_TEXTENCODING_UTF8)));
}
}
}
@@ -726,7 +724,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl)
{
pImagesLst->RemoveEntry( pImagesLst->GetSelectEntryPos() );
pImg->SetImage(Image());
-pFilenameLab->SetText("");
if(pImagesLst->GetEntryCount() >= 1)
{
@@ -774,7 +771,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl)
GraphicFilter aCurFilter;
Graphic aGraphic;
INetURLObject aURLObj( sImgUrl );
-pFilenameLab->SetText(sImgUrl);
sal_uInt16 nFilter = GRFILTER_FORMAT_DONTKNOW;
@@ -820,7 +816,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl)
else
{
pImg->SetImage(Image());
-pFilenameLab->SetText("");
}
return 0;
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui
b/sd/uiconfig/simpress/ui/photoalbum.ui
index 87304e3..352d4a2 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -74,7 +74,7 @@
True
False
-6
+12
6
True
vertical
@@ -305,93 +305,72 @@
-
-True
-False
-end
-6
-0
-right
-
-
-False
-True
-1
-
-
-
True
False
0
none
-
+
True
False
-6
-12
+12
+6
+12
-
+
True
False
-12
-
-
-True
-False
-Slide
Layout
-True
-opt_combo
-
-
-0
-0
-1
-1
-
-
-
-
-160
-True
-False
-liststore2
-0
-
-
-
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/app/strings.src |4
sd/uiconfig/simpress/ui/photoalbum.ui | 277 +++---
2 files changed, 132 insertions(+), 149 deletions(-)
New commits:
commit aa0bc15b42e8d432def185089ea8fca17f3fd8c8
Author: Samuel Mehrbrodt
Date: Thu May 9 11:29:48 2013 +0200
Related fdo#35546 Improve Layout of "Insert Photo Album" Dialog
No Objections from the Design list:
http://nabble.documentfoundation.org/Streamlining-the-Photo-Album-Creator-td4054397.html
Change-Id: Ib880023b956c6d94d8110829d0c32281854a0705
Reviewed-on: https://gerrit.libreoffice.org/3833
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 928e03e..eb6b959 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1270,12 +1270,12 @@ String STRING_DRAG_AND_DROP_SLIDES
String STR_PHOTO_ALBUM_EMPTY_WARNING
{
- Text [ en-US ] = "Please add images to the album." ;
+ Text [ en-US ] = "Please add Images to the Album." ;
};
String STR_PHOTO_ALBUM_TEXTBOX
{
-Text [ en-US ] = "Text Box";
+Text [ en-US ] = "Text Slide";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui
b/sd/uiconfig/simpress/ui/photoalbum.ui
index e8423ad..87304e3 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -4,11 +4,9 @@
False
6
-Photo Album Creator
-False
+Create Photo Album
center
dialog
-False
False
@@ -20,12 +18,14 @@
end
-Create
+Insert
Slides
+False
True
True
True
True
True
+False
False
@@ -36,9 +36,11 @@
gtk-cancel
+False
True
True
True
+False
True
@@ -65,84 +67,74 @@
True
False
+True
0
none
-
+
True
False
-6
-12
+6
+6
+True
+vertical
-
+
True
False
-6
-True
+6
+start
-
+
+Insert
Images
+False
True
-False
-6
-
-
-200
-150
-True
-False
-gtk-missing-image
-
-
-0
-1
-1
-1
-
-
-
-
-True
-False
-Preview:
-True
-preview_img
-
-
-0
-0
-1
-1
-
-
+True
+True
+False
-2
-0
-1
-1
+False
+True
+0
+
+Insert
Text Slide
+False
+True
+True
+True
+False
+
+
+False
+
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/custsdlg.cxx| 117 +-
sd/source/ui/inc/custsdlg.hxx| 19 -
sd/uiconfig/simpress/ui/definecustomslideshow.ui | 260 +++
3 files changed, 328 insertions(+), 68 deletions(-)
New commits:
commit 7886bbd044a5148deafa61bde731e371166299f6
Author: Katarina Behrens
Date: Thu May 2 23:50:58 2013 +0200
Converted define custom slide show dialog to .ui
Change-Id: I6bb6bcb96993d05cc225da63c56cbb7fbad83ec2
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index dd0c95d..fabac08 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -280,34 +280,37 @@ sal_Bool SdCustomShowDlg::IsCustomShow() const
SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ) :
-ModalDialog ( pWindow, SdResId( DLG_DEFINE_CUSTOMSHOW ) ),
-
-aFtName ( this, SdResId( FT_NAME ) ),
-aEdtName( this, SdResId( EDT_NAME ) ),
-aFtPages( this, SdResId( FT_PAGES ) ),
-aLbPages( this, SdResId( LB_PAGES ) ),
-aBtnAdd ( this, SdResId( BTN_ADD ) ),
-aBtnRemove ( this, SdResId( BTN_REMOVE ) ),
-aFtCustomPages ( this, SdResId( FT_CUSTOM_PAGES ) ),
-aLbCustomPages ( this, SdResId( LB_CUSTOM_PAGES ) ),
-aBtnOK ( this, SdResId( BTN_OK ) ),
-aBtnCancel ( this, SdResId( BTN_CANCEL ) ),
-aBtnHelp( this, SdResId( BTN_HELP ) ),
-
+ModalDialog ( pWindow, "DefineCustomSlideShow",
"modules/simpress/ui/definecustomslideshow.ui" ),
rDoc( rDrawDoc ),
rpCustomShow( rpCS ),
bModified ( sal_False )
{
-FreeResource();
+get( m_pEdtName, "customname" );
+get( m_pLbPages, "pages" );
+get( m_pBtnAdd, "add" );
+get( m_pBtnRemove, "remove" );
+get( m_pLbCustomPages, "custompages" );
+get( m_pBtnOK, "ok" );
+get( m_pBtnCancel, "cancel" );
+get( m_pBtnHelp, "help" );
Link aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl );
-aBtnAdd.SetClickHdl( aLink );
-aBtnRemove.SetClickHdl( aLink );
-aEdtName.SetModifyHdl( aLink );
-aLbPages.SetSelectHdl( aLink ); // because of status
-aLbCustomPages.SetSelectHdl( aLink ); // because of status
+m_pBtnAdd->SetClickHdl( aLink );
+m_pBtnRemove->SetClickHdl( aLink );
+m_pEdtName->SetModifyHdl( aLink );
+m_pLbPages->SetSelectHdl( aLink ); // because of status
+m_pLbCustomPages->SetSelectHdl( aLink ); // because of status
-aBtnOK.SetClickHdl( LINK( this, SdDefineCustomShowDlg, OKHdl ) );
+m_pBtnOK->SetClickHdl( LINK( this, SdDefineCustomShowDlg, OKHdl ) );
+
+// Hack: m_pLbPages used to be MultiLB. We don't have VCL builder
equivalent
+// of it yet. So enable selecting multiple items here
+m_pLbPages->EnableMultiSelection( sal_True );
+
+// shape 'em a bit
+m_pLbPages->set_width_request(m_pLbPages->approximate_char_width() * 16);
+m_pLbCustomPages->set_width_request(m_pLbPages->approximate_char_width() *
16);
+m_pLbPages->SetDropDownLineCount(10);
SdPage* pPage;
// fill Listbox with page names of Docs
@@ -317,35 +320,35 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window*
pWindow,
{
pPage = rDoc.GetSdPage( (sal_uInt16) nPage, PK_STANDARD );
OUString aStr( pPage->GetName() );
-aLbPages.InsertEntry( aStr );
+m_pLbPages->InsertEntry( aStr );
}
//aLbPages.SelectEntryPos( 0 );
if( rpCustomShow )
{
aOldName = rpCustomShow->GetName();
-aEdtName.SetText( aOldName );
+m_pEdtName->SetText( aOldName );
// fill ListBox with CustomShow pages
for( SdCustomShow::PageVec::iterator it =
rpCustomShow->PagesVector().begin();
it != rpCustomShow->PagesVector().end(); ++it )
{
-SvTreeListEntry* pEntry = aLbCustomPages.InsertEntry(
(*it)->GetName() );
+SvTreeListEntry* pEntry = m_pLbCustomPages->InsertEntry(
(*it)->GetName() );
pEntry->SetUserData( (SdPage*) (*it) );
}
}
else
{
rpCustomShow = new SdCustomShow( &rDoc );
-aEdtName.SetText( OUString( SdResId( STR_NEW_CUSTOMSHOW ) ) );
-aEdtName.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
-rpCustomShow->SetName( aEdtName.GetText() );
+m_pEdtName->SetText( OUString( SdResId( STR_NEW_CUSTOMSHOW ) ) );
+m_pEdtName->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
+rpCustomShow->SetName( m_pEdtName->GetText() );
}
-aLbCustomPages.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE );
-aLbCustomPages.SetHighlightRange();
+m_pLbCustomPages->SetDragDropMode( SV_DRAGDROP_CTRL_MOVE );
+m_pLbCustomPages->SetHighlightRange();
-aBtnOK.Enable( sal_False );
+m_pBtnOK->Enable( sal_False );
CheckState();
[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/dlg/custsdlg.cxx |3 +
sd/source/ui/dlg/custsdlg.src | 84
sd/source/ui/inc/custsdlg.hrc |4 -
sd/uiconfig/simpress/ui/customslideshows.ui | 36 +++-
4 files changed, 13 insertions(+), 114 deletions(-)
New commits:
commit 4667a55fd47db456d36ad151656b4041a6ded034
Author: Caolán McNamara
Date: Sat Apr 27 09:00:02 2013 +0100
remove now unused src Dialog resources
Change-Id: I2aadd2a7e643f2598da9ed474e47ece02208297f
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 8019f43..dd0c95d 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -55,6 +55,9 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow,
get( m_pLbCustomShows, "customshowlist");
get( m_pCbxUseCustomShow, "usecustomshows" );
+
m_pLbCustomShows->set_width_request(m_pLbCustomShows->approximate_char_width()
* 32);
+m_pLbCustomShows->SetDropDownLineCount(8);
+
Link aLink( LINK( this, SdCustomShowDlg, ClickButtonHdl ) );
m_pBtnNew->SetClickHdl( aLink );
m_pBtnEdit->SetClickHdl( aLink );
diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src
index 79029ba..4fa50f2 100644
--- a/sd/source/ui/dlg/custsdlg.src
+++ b/sd/source/ui/dlg/custsdlg.src
@@ -20,89 +20,7 @@
#include "custsdlg.hrc"
#include "app.hrc"
#include "helpids.h"
-#define DIFF 20
-#define DIFF_Y 17
-ModalDialog DLG_CUSTOMSHOW
-{
-HelpID = CMD_SID_CUSTOMSHOW_DLG ;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 175 + DIFF , 114 + DIFF_Y ) ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-PushButton BTN_NEW
-{
-HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_NEW";
-Pos = MAP_APPFONT ( 120 + DIFF , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "~New..." ;
-};
-PushButton BTN_EDIT
-{
-HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_EDIT";
-Pos = MAP_APPFONT ( 120 + DIFF , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "~Edit..." ;
-};
-PushButton BTN_REMOVE
-{
-HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_REMOVE";
-Pos = MAP_APPFONT ( 120 + DIFF , 40 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "~Delete" ;
-};
-PushButton BTN_COPY
-{
-HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_COPY";
-Pos = MAP_APPFONT ( 120 + DIFF , 57 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "Cop~y" ;
-};
-HelpButton BTN_HELP
-{
-Pos = MAP_APPFONT ( 120 + DIFF , 74 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-PushButton BTN_STARTSHOW
-{
-HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_STARTSHOW";
-Pos = MAP_APPFONT ( 120 + DIFF , 94 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "~Start" ;
-};
-OKButton BTN_OK
-{
-Pos = MAP_APPFONT ( 120 + DIFF , 94 + DIFF_Y ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-DefButton = TRUE ;
-Text [ en-US ] = "~Close" ;
-};
-ListBox LB_CUSTOMSHOWS
-{
-HelpID = "sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS";
-Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 6 ) ;
-Size = MAP_APPFONT ( 102 + DIFF , 86 + DIFF_Y ) ;
-TabStop = TRUE ;
-QuickHelpText [ en-US ] = "Custom Screen Show" ;
-};
-CheckBox CBX_USE_CUSTOMSHOW
-{
-HelpID = "sd:CheckBox:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW";
-Pos = MAP_APPFONT ( 6 , 96 + DIFF_Y ) ;
-Size = MAP_APPFONT ( 112 + DIFF , 12 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = "~Use Custom Slide Show" ;
-};
-Text [ en-US ] = "Custom Slide Shows" ;
-};
+
ModalDialog DLG_DEFINE_CUSTOMSHOW
{
HelpID = HID_DLG_DEFINE_CUSTOMSHOW ;
diff --git a/sd/source/ui/inc/custsdlg.hrc b/sd/source/ui/inc/custsdlg.hrc
index cc04e35..8e9a2ce 100644
--- a/sd/source/ui/inc/custsdlg.hrc
+++ b/sd/source/ui/inc/custsdlg.hrc
@@ -18,16 +18,13 @@
*/
#include
-#define DLG_CUSTOMSHOW 843
#define DLG_DEFINE_CUSTOMSHOW 890
#define BTN_OK 1
#define BTN_NEW 1
#define BTN_EDIT 2
#define BTN_REMOVE 3
#define BTN_COPY 4
-#define BTN_STARTSHOW 5
#define BTN_HELP 1
-#define LB_CUSTOMSHOWS 1
#define LB_PAGES 1
#define LB_CUSTOM_PAGES 2
#define FT_NAME 1
@@ -36,6 +33,5 @@
#define FT_CUSTOM_PAGES 3
#define BTN_CANCEL 2
#define BTN_ADD 1
-#define CBX_USE_CUSTOMSHOW 1
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/uiconfig/simpress/ui/customslideshows.ui
b/sd/uiconfig/simpress/ui/customslideshows.ui
index 1621058..fbd1a84 100644
--- a/sd/uiconfig/simpress/ui/customslideshows.ui
+++ b/sd/uiconfig/simpress/ui
