core.git: Branch 'libreoffice-24-2' - sc/uiconfig
sc/uiconfig/scalc/ui/conditionalentry.ui | 343 ++- 1 file changed, 160 insertions(+), 183 deletions(-) New commits: commit 32f7ef29615b25e91a73fe33632bb3b7ca506d04 Author: Heiko Tietze AuthorDate: Wed Apr 24 11:38:51 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Wed Apr 24 21:48:39 2024 +0200 Resolves tdf#159569 - Conditional Formatting dialog jumps with message string Some defined width solves the issue Change-Id: I1f92815e690828e283c275a58a71dd07613642fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166579 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit 9d29a2a6aad679129218ab4c5020c92bb3ce9cb3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166520 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui index 1ff40d10460f..6e40f6cc6acc 100644 --- a/sc/uiconfig/scalc/ui/conditionalentry.ui +++ b/sc/uiconfig/scalc/ui/conditionalentry.ui @@ -1,216 +1,217 @@ - + True -True +True True -never -never -in +never +never +in True -False +False True - + True -False +False True -6 -6 -12 +6 +6 +12 - + True -False +False True -12 +12 True -False +False -0 -0 +0 +0 -10 +10 True -False +False True end -1 -0 +1 +0 -0 -0 +0 +0 - + True -False +False True -6 -12 -True +6 +12 +True -False -True +False +True Apply Style: -True -style +True +style 0 -0 -2 +0 +2 -False -True +False +True New Style... -1 -2 +1 +2 -False -True +100 +False +True Enter a value: 0 -0 -3 +0 +3 3 -True -True +True +True +True True -True -0 -4 +0 +4 -True -True +True +True +True True -True -1 -4 +1 +4 -True -True +True +True +
core.git: sw/qa sw/source sw/uiconfig
sw/qa/uitest/writer_tests2/formatCharacter.py | 47 -
sw/source/ui/chrdlg/chardlg.cxx | 211 --
sw/source/uibase/inc/chrdlg.hxx | 30 ---
sw/uiconfig/swriter/ui/characterproperties.ui | 30 ---
4 files changed, 3 insertions(+), 315 deletions(-)
New commits:
commit 63315d601296f7c188e920f73b12260d018807d0
Author: Heiko Tietze
AuthorDate: Tue Apr 23 17:20:47 2024 +0200
Commit: Heiko Tietze
CommitDate: Wed Apr 24 16:13:15 2024 +0200
Resolves tdf#132253 - Remove hyperlink tab from character dialog
Change-Id: Idb7fa74dbe196262cea64946452043f7de6fa20c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166553
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/qa/uitest/writer_tests2/formatCharacter.py
b/sw/qa/uitest/writer_tests2/formatCharacter.py
index 265f7b4df92e..724b8813029e 100644
--- a/sw/qa/uitest/writer_tests2/formatCharacter.py
+++ b/sw/qa/uitest/writer_tests2/formatCharacter.py
@@ -65,8 +65,6 @@ class formatCharacter(UITestCase):
xLangFontCTL = xDialog.getChild("cbCTLLanguage")
self.assertEqual(get_state_as_dict(xLangFontCTL)["Text"],
"[None]")
-
-
def test_format_character_tab_font_effects(self):
with self.ui_test.create_doc_in_start_center("writer"):
@@ -115,47 +113,6 @@ class formatCharacter(UITestCase):
self.assertEqual(get_state_as_dict(xEmphasis)["SelectEntryText"], "Dot")
self.assertEqual(get_state_as_dict(xPosition)["SelectEntryText"], "Below text")
-
-
- def test_format_character_tab_hyperlink(self):
-with self.ui_test.create_doc_in_start_center("writer") as document:
-
-with
self.ui_test.execute_dialog_through_command(".uno:FontDialog") as xDialog:
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "4")
-
-xURL = xDialog.getChild("urled")
-xURL.executeAction("TYPE",
mkPropertyValues({"TEXT":"libreoffice.org"}))
-xTexted = xDialog.getChild("texted")
-xTexted.executeAction("TYPE",
mkPropertyValues({"TEXT":"LibreOffice"}))
-xName = xDialog.getChild("nameed")
-xName.executeAction("TYPE",
mkPropertyValues({"TEXT":"hyperlink"}))
-
-xVisited = xDialog.getChild("visitedlb")
-select_by_text(xVisited, "Bullets")
-xUnVisited = xDialog.getChild("unvisitedlb")
-select_by_text(xUnVisited, "Bullets")
-
-
-self.xUITest.executeCommand(".uno:GoLeft")
-self.assertEqual(document.Text.String[0:11], "LibreOffice")
-
-with
self.ui_test.execute_dialog_through_command(".uno:FontDialog",
close_button="cancel") as xDialog:
-xTabs = xDialog.getChild("tabcontrol")
-select_pos(xTabs, "4")
-xURL = xDialog.getChild("urled")
-xTexted = xDialog.getChild("texted")
-xName = xDialog.getChild("nameed")
-xVisited = xDialog.getChild("visitedlb")
-xUnVisited = xDialog.getChild("unvisitedlb")
-
-self.assertEqual(get_state_as_dict(xURL)["Text"],
"http://libreoffice.org/;)
-self.assertEqual(get_state_as_dict(xTexted)["Text"],
"LibreOffice")
-self.assertEqual(get_state_as_dict(xName)["Text"], "hyperlink")
-
self.assertEqual(get_state_as_dict(xVisited)["SelectEntryText"], "Bullets")
-
self.assertEqual(get_state_as_dict(xUnVisited)["SelectEntryText"], "Bullets")
-
-
def test_format_character_tab_asian_layout(self):
with self.ui_test.create_doc_in_start_center("writer"):
@@ -221,8 +178,6 @@ class formatCharacter(UITestCase):
self.assertEqual(get_state_as_dict(xFitToLine)["Selected"],
"true")
self.assertEqual(get_state_as_dict(xNoHyphenation)["Selected"], "true")
-
-
def test_format_character_tab_position_scalewidthsb(self):
with self.ui_test.create_doc_in_start_center("writer"):
@@ -240,6 +195,4 @@ class formatCharacter(UITestCase):
xScalewidth = xDialog.getChild("scalewidthsb")
self.assertEqual(get_state_as_dict(xScalewidth)["Text"],
"101%")
-
-
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 14833d719282..f57a78d735c9 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -17,37 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
-#include
-
-#include
-#include
-#include
#include
-#include
#include
-#include
-#include
#include
#include
#include
#include
-#include
-#include
-#include
#include
-#include
-#include
#include
#include
-#include
-#include
-#include
#include
-#include
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/conditionalentry.ui | 343 ++- 1 file changed, 160 insertions(+), 183 deletions(-) New commits: commit 9d29a2a6aad679129218ab4c5020c92bb3ce9cb3 Author: Heiko Tietze AuthorDate: Wed Apr 24 11:38:51 2024 +0200 Commit: Heiko Tietze CommitDate: Wed Apr 24 14:58:11 2024 +0200 Resolves tdf#159569 - Conditional Formatting dialog jumps with message string Some defined width solves the issue Change-Id: I1f92815e690828e283c275a58a71dd07613642fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166579 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui index 1ff40d10460f..6e40f6cc6acc 100644 --- a/sc/uiconfig/scalc/ui/conditionalentry.ui +++ b/sc/uiconfig/scalc/ui/conditionalentry.ui @@ -1,216 +1,217 @@ - + True -True +True True -never -never -in +never +never +in True -False +False True - + True -False +False True -6 -6 -12 +6 +6 +12 - + True -False +False True -12 +12 True -False +False -0 -0 +0 +0 -10 +10 True -False +False True end -1 -0 +1 +0 -0 -0 +0 +0 - + True -False +False True -6 -12 -True +6 +12 +True -False -True +False +True Apply Style: -True -style +True +style 0 -0 -2 +0 +2 -False -True +False +True New Style... -1 -2 +1 +2 -False -True +100 +False +True Enter a value: 0 -0 -3 +0 +3 3 -True -True +True +True +True True -True -0 -4 +0 +4 -True -True +True +True +True True -True -1 -4 +1 +4 -True -True +True +True +True True -True -2 -4 +2 +4
core.git: sw/uiconfig
sw/uiconfig/swriter/ui/characterproperties.ui | 272 -- 1 file changed, 50 insertions(+), 222 deletions(-) New commits: commit e60ded9773673c356a88fa02867cb3692ee74c87 Author: Heiko Tietze AuthorDate: Tue Apr 23 16:42:56 2024 +0200 Commit: Heiko Tietze CommitDate: Wed Apr 24 11:48:28 2024 +0200 Bump Glade version Change-Id: I53c7c6cab10663b50391a45c18e09dc3e81c87cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166546 Reviewed-by: Heiko Tietze Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui index 1ba9823a1c74..414edb773b86 100644 --- a/sw/uiconfig/swriter/ui/characterproperties.ui +++ b/sw/uiconfig/swriter/ui/characterproperties.ui @@ -1,36 +1,33 @@ - + -False -False -6 +False +6 Character +False True -0 -0 -dialog - - - +0 +0 +dialog -False +False vertical 12 -False -end +False +end _Reset True -True -True +True +True +Unsaved modifications to this tab are reverted. True -Unsaved modifications to this tab are reverted. Revert any changes made on the tab shown here to the settings that were present when this dialog was opened. @@ -45,12 +42,11 @@ -_Standard -False -True -True -True -True +_Standard +True +True +True +True False @@ -62,10 +58,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -78,8 +74,8 @@ _Cancel True -True -True +True +True True @@ -92,8 +88,8 @@ _Help True -True -True +True +True True @@ -107,47 +103,23 @@ False True -end +end 0 True -True +True True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -156,42 +128,18 @@ True -False +False Font -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -203,43 +151,19 @@ True -False +False Font Effects 1 -False +False True -False - - - - -
core.git: svx/uiconfig
svx/uiconfig/ui/themecoloreditdialog.ui |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 8f3a19ce3a2dea548f644a8925bfe0718424ac21 Author: Heiko Tietze AuthorDate: Tue Apr 23 15:45:20 2024 +0200 Commit: Heiko Tietze CommitDate: Tue Apr 23 17:22:12 2024 +0200 Resolves tdf#160050 - Overlapping controls in 'add themes' dialog Change-Id: I196ef4b445dcae5d6fc9891c8f9c0d0b2976d583 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166541 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/svx/uiconfig/ui/themecoloreditdialog.ui b/svx/uiconfig/ui/themecoloreditdialog.ui index 96276093a75a..ac0114ab4be1 100644 --- a/svx/uiconfig/ui/themecoloreditdialog.ui +++ b/svx/uiconfig/ui/themecoloreditdialog.ui @@ -3,13 +3,12 @@ -400 -300 False True True 6 Theme Color Edit +False True dialog
core.git: sw/source
sw/source/core/text/inftxt.cxx| 90 +++---
sw/source/uibase/uiview/view0.cxx |6 --
2 files changed, 47 insertions(+), 49 deletions(-)
New commits:
commit b79e0dd7fc8bc620420ed65edbc105eec3648b34
Author: Heiko Tietze
AuthorDate: Fri Apr 12 15:26:41 2024 +0200
Commit: Heiko Tietze
CommitDate: Sun Apr 21 12:40:23 2024 +0200
Resolves tdf#58434 - Show formatting marks independently from fields
Field Shading / .uno:Marks toggles now only fields, footnotes, tox etc.
and Tab, SoftHyphen, Blank, as well as ControlChar depends now on
Formatting Marks / .uno:ControlCodes. Field Shading also does not
toggle HardBlank and SoftHyphen, and what control character is shown
respect the options under Formatting Aids
Change-Id: I63c826e7fdc09ec95f17aee9735d4f5de9a1b897
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166033
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 18ad3d1144e0..b293f18f824a 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1407,54 +1407,56 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion
,
return;
bool bDraw = false;
-switch( nWhich )
-{
-case PortionType::Footnote:
-case PortionType::QuoVadis:
-case PortionType::Number:
-case PortionType::Field:
-case PortionType::Hidden:
-case PortionType::Tox:
-case PortionType::Ref:
-case PortionType::Meta:
-case PortionType::ContentControl:
-case PortionType::ControlChar:
-if ( !GetOpt().IsPagePreview()
- && !GetOpt().IsReadonly()
- && GetOpt().IsFieldShadings()
- && ( PortionType::Number != nWhich
- || m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel()))
// #i27615#
-{
-bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
-bDraw &= GetOpt().IsHardBlank();
-}
-break;
-case PortionType::Bookmark:
-// no shading
-break;
-case PortionType::InputField:
-// input field shading also in read-only mode
-if ( !GetOpt().IsPagePreview()
- && GetOpt().IsFieldShadings() )
-{
-bDraw = true;
-}
-break;
-case PortionType::Tab:
-if ( GetOpt().IsTab() ) bDraw = true;
-break;
-case PortionType::SoftHyphen:
-if ( GetOpt().IsSoftHyph() )bDraw = true;
-break;
-case PortionType::Blank:
-if ( GetOpt().IsHardBlank())bDraw = true;
-break;
-default:
+if ( !GetOpt().IsPagePreview()
+ && !GetOpt().IsReadonly() )
+{
+switch( nWhich )
{
-OSL_ENSURE( false, "SwTextPaintInfo::DrawViewOpt: don't know how
to draw this" );
+case PortionType::Tab:
+if ( GetOpt().IsViewMetaChars() )
+bDraw = GetOpt().IsTab();
+break;
+case PortionType::SoftHyphen:
+if ( GetOpt().IsViewMetaChars() )
+bDraw = GetOpt().IsSoftHyph();
break;
+case PortionType::Blank:
+if ( GetOpt().IsViewMetaChars() )
+bDraw = GetOpt().IsHardBlank();
+break;
+case PortionType::ControlChar:
+if ( GetOpt().IsViewMetaChars() )
+bDraw = true;
+break;
+case PortionType::Bookmark:
+// no shading
+break;
+case PortionType::Footnote:
+case PortionType::QuoVadis:
+case PortionType::Number:
+case PortionType::Hidden:
+case PortionType::Tox:
+case PortionType::Ref:
+case PortionType::Meta:
+case PortionType::ContentControl:
+case PortionType::Field:
+case PortionType::InputField:
+// input field shading also in read-only mode
+if (GetOpt().IsFieldShadings()
+&& ( PortionType::Number != nWhich
+|| m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel()))
// #i27615#
+{
+bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
+}
+break;
+default:
+{
+OSL_ENSURE( false, "SwTextPaintInfo::DrawViewOpt: don't know
how to draw this" );
+break;
+}
}
}
+
if ( bDraw )
DrawBackground( rPor, pColor );
}
diff --git a/sw/source/uibase/uiview/view0.cxx
b/sw/source/uibase/uiview/view0.cxx
index 70c9882e0d2e..488b32cc5fee 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -128,14 +128,10 @@ std::shared_ptr const &
SwView::GetMailMergeConfigItem()
static bool lcl_IsViewMarks( const SwViewOption& rVOpt )
{
-return rVOpt.IsHardBlank() &&
-rVOpt.IsSoftHyph() &&
-
core.git: Branch 'libreoffice-7-6' - sw/source
sw/source/ui/index/swuiidxmrk.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1bc57f8d02f7b9a2b4e5d16018ac06edce162688 Author: Heiko Tietze AuthorDate: Thu Apr 4 12:09:33 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Fri Apr 5 16:08:15 2024 +0200 Resolves tdf#154209 - Fixes resize issue in Index Entry dialog Change-Id: I83400b56d40f145c0e066c0c8b1783a1bae4cf28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165788 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit ebfa0d061fdbca6a25d3efcff72ab5ed184a51dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165724 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 140b4e48d0a0..3cca2d4011d2 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -440,6 +440,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, SyncSelectionHdl, weld::Button&, void) m_xApplyToAllCB->show(); m_xSearchCaseSensitiveCB->show(); m_xSearchCaseWordOnlyCB->show(); +m_xDialog->resize_to_request(); m_xApplyToAllCB->set_sensitive(!m_aOrgStr.isEmpty() && !(nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FLY_ANY ))); SearchTypeHdl(*m_xApplyToAllCB);
core.git: Branch 'libreoffice-24-2' - sw/source
sw/source/ui/index/swuiidxmrk.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit d3871c6ac05bb9553aed1cc951ba18efcb06082a Author: Heiko Tietze AuthorDate: Thu Apr 4 12:09:33 2024 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Fri Apr 5 08:02:19 2024 +0200 Resolves tdf#154209 - Fixes resize issue in Index Entry dialog Change-Id: I83400b56d40f145c0e066c0c8b1783a1bae4cf28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165788 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit ebfa0d061fdbca6a25d3efcff72ab5ed184a51dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165722 Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 8a6f74b86ee8..03d5733a87ad 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -441,6 +441,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, SyncSelectionHdl, weld::Button&, void) m_xApplyToAllCB->show(); m_xSearchCaseSensitiveCB->show(); m_xSearchCaseWordOnlyCB->show(); +m_xDialog->resize_to_request(); m_xApplyToAllCB->set_sensitive(!m_aOrgStr.isEmpty() && !(nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FLY_ANY ))); SearchTypeHdl(*m_xApplyToAllCB);
core.git: sw/source
sw/source/ui/index/swuiidxmrk.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ebfa0d061fdbca6a25d3efcff72ab5ed184a51dc Author: Heiko Tietze AuthorDate: Thu Apr 4 12:09:33 2024 +0200 Commit: Heiko Tietze CommitDate: Thu Apr 4 15:30:30 2024 +0200 Resolves tdf#154209 - Fixes resize issue in Index Entry dialog Change-Id: I83400b56d40f145c0e066c0c8b1783a1bae4cf28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165788 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 6b6e9f10536f..2ca5d673712b 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -441,6 +441,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, SyncSelectionHdl, weld::Button&, void) m_xApplyToAllCB->show(); m_xSearchCaseSensitiveCB->show(); m_xSearchCaseWordOnlyCB->show(); +m_xDialog->resize_to_request(); m_xApplyToAllCB->set_sensitive(!m_aOrgStr.isEmpty() && !(nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FLY_ANY ))); SearchTypeHdl(*m_xApplyToAllCB);
core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk desktop/source extras/source include/sfx2 include/unotools officecfg/registry Repository.mk sfx2/sdi sfx2/source vcl/Mo
Repository.mk |1 cui/Library_cui.mk |1 cui/UIConfig_cui.mk|1 cui/inc/whatsnew.hrc | 42 ++ cui/source/dialogs/whatsnew.cxx| 172 ++ cui/source/factory/dlgfact.cxx | 13 cui/source/factory/dlgfact.hxx |2 cui/source/inc/whatsnew.hxx| 75 cui/uiconfig/ui/whatsnewdialog.ui | 131 +++ desktop/source/app/app.cxx |2 extras/source/whatsnew/Community.png |binary extras/source/whatsnew/Configurability.png |binary extras/source/whatsnew/LibreOffice.gif |binary extras/source/whatsnew/ODF.png |binary extras/source/whatsnew/whatsnew1.png |binary include/sfx2/sfxdlg.hxx|2 include/sfx2/sfxsids.hrc |5 include/sfx2/strings.hrc |2 include/sfx2/viewfrm.hxx |1 include/unotools/VersionConfig.hxx | 24 - officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs |6 officecfg/registry/schema/org/openoffice/Setup.xcs |8 sfx2/sdi/appslots.sdi |4 sfx2/sdi/sfx.sdi | 16 sfx2/source/appl/appserv.cxx | 10 sfx2/source/dialog/infobar.cxx |2 sfx2/source/view/viewfrm.cxx | 43 +- vcl/Module_vcl.mk |1 vcl/Package_whatsnew.mk| 20 + 29 files changed, 533 insertions(+), 51 deletions(-) New commits: commit dd889b290304b73f96a9a8e6e0f144d3aa2ba7e1 Author: Heiko Tietze AuthorDate: Thu Feb 22 12:56:01 2024 +0100 Commit: Heiko Tietze CommitDate: Wed Mar 27 09:41:44 2024 +0100 Resolves tdf#159573 and tdf#137931 - WhatsNew or Welcome dialog To test the new dialog, change org.openoffice.Setup > Product > ooSetupLastVersion to some lesser value for the WhatsNew dialog or clear the entry for the Welcome version. Change-Id: Iec6de50edba0e5430e82f1db85e61d1e4501771d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163739 Reviewed-by: Michael Weghorn Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/Repository.mk b/Repository.mk index 5b60bd66cfcc..9317a29975df 100644 --- a/Repository.mk +++ b/Repository.mk @@ -925,6 +925,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE) $(eval $(call gb_Helper_register_packages_for_install,ooo,\ tipoftheday_images \ + whatsnew_images \ )) endif diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index e01e33ecb4ec..3ee744e32d0f 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -114,6 +114,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/customize/SvxNotebookbarConfigPage \ cui/source/customize/CustomNotebookbarGenerator \ cui/source/dialogs/about \ +cui/source/dialogs/whatsnew \ $(call gb_Helper_optional,EXTENSIONS, \ cui/source/dialogs/AdditionsDialog) \ cui/source/dialogs/colorpicker \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 10acd83c8c39..79ff7696a93a 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -18,6 +18,7 @@ endif ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE) $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/tipofthedaydialog \ + cui/uiconfig/ui/whatsnewdialog \ )) endif diff --git a/cui/inc/whatsnew.hrc b/cui/inc/whatsnew.hrc new file mode 100644 index ..e155a597bcf2 --- /dev/null +++ b/cui/inc/whatsnew.hrc @@ -0,0 +1,42 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#define NC_(Context, String) TranslateId(Context, u8##String) + +#include +#include +#include +#include + +/* + * std:tuple consists of + * image: + * place new images at extra/source/whatsnew + * do not forget to add the files to vcl/Package_whatsnew.mk + * images are cut-off at 600x400px +*/ + +const std::tuple WELCOME_STRINGARRAY[] =
core.git: include/vcl sfx2/source vcl/source vcl/unx
include/vcl/settings.hxx |9 +
sfx2/source/dialog/infobar.cxx| 12 +++
vcl/source/app/salvtables.cxx |8 +++--
vcl/source/app/settings.cxx | 53 +-
vcl/unx/gtk3/gtkinst.cxx |4 +-
vcl/unx/gtk3/salnativewidgets-gtk.cxx |5 ---
6 files changed, 75 insertions(+), 16 deletions(-)
New commits:
commit d7fd378b533c42f51d1d363f5da30b1fa1281f67
Author: Heiko Tietze
AuthorDate: Fri Mar 22 12:58:07 2024 +0100
Commit: Heiko Tietze
CommitDate: Sat Mar 23 08:02:18 2024 +0100
Harmonization of warning and error colors
* hard-coded colors from infobar moved to settings
* weld::LabelType::Warning and ::Error uses these colors
* gtk3 native configuration removed
Change-Id: Ia80584e9267b8385f7f6b25322f5a85a2570af68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165161
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 0787fe98b6cc..e21091385bc7 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -353,6 +353,15 @@ public:
voidSetWarningColor( const Color& rColor );
const Color&GetWarningColor() const;
+voidSetWarningTextColor( const Color& rColor );
+const Color&GetWarningTextColor() const;
+
+voidSetErrorColor( const Color& rColor );
+const Color&GetErrorColor() const;
+
+voidSetErrorTextColor( const Color& rColor );
+const Color&GetErrorTextColor() const;
+
voidSetHelpColor( const Color& rColor );
const Color&GetHelpColor() const;
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 38a510a2589c..26dfc0af26c0 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -44,6 +44,8 @@ void GetInfoBarColors(InfobarType ibType, BColor&
rBackgroundColor, BColor& rFor
{
rMessageColor = basegfx::BColor(0.0, 0.0, 0.0);
+const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
+
switch (ibType)
{
case InfobarType::INFO: // blue; #004785/0,71,133; #BDE5F8/189,229,248
@@ -55,17 +57,15 @@ void GetInfoBarColors(InfobarType ibType, BColor&
rBackgroundColor, BColor& rFor
rForegroundColor = basegfx::BColor(0.196, 0.333, 0.047);
break;
case InfobarType::WARNING: // orange; #704300/112,67,0;
#FEEFB3/254,239,179
-rBackgroundColor = basegfx::BColor(0.996, 0.937, 0.702);
-rForegroundColor = basegfx::BColor(0.439, 0.263, 0.0);
+rBackgroundColor = rSettings.GetWarningColor().getBColor();
+rForegroundColor = rSettings.GetWarningTextColor().getBColor();
break;
case InfobarType::DANGER: // red; #7A0006/122,0,6; #FFBABA/255,186,186
-rBackgroundColor = basegfx::BColor(1.0, 0.729, 0.729);
-rForegroundColor = basegfx::BColor(0.478, 0.0, 0.024);
+rBackgroundColor = rSettings.GetErrorColor().getBColor();
+rForegroundColor = rSettings.GetErrorTextColor().getBColor();
break;
}
-//remove this?
-const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
if (rSettings.GetHighContrastMode())
{
rBackgroundColor = rSettings.GetLightColor().getBColor();
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4469978be626..3f007783498d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5949,14 +5949,16 @@ void SalInstanceLabel::set_label_type(weld::LabelType
eType)
m_xLabel->SetControlBackground();
break;
case weld::LabelType::Warning:
-m_xLabel->SetControlForeground();
+m_xLabel->SetControlForeground(
+
m_xLabel->GetSettings().GetStyleSettings().GetWarningTextColor());
m_xLabel->SetControlBackground(
m_xLabel->GetSettings().GetStyleSettings().GetWarningColor());
break;
case weld::LabelType::Error:
-m_xLabel->SetControlForeground();
+m_xLabel->SetControlForeground(
+
m_xLabel->GetSettings().GetStyleSettings().GetErrorTextColor());
m_xLabel->SetControlBackground(
-
m_xLabel->GetSettings().GetStyleSettings().GetHighlightColor());
+m_xLabel->GetSettings().GetStyleSettings().GetErrorColor());
break;
case weld::LabelType::Title:
m_xLabel->SetControlForeground(
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8d04d9065ea6..6cf975f50d52 100644
--- a/vcl/source/app/settings.cxx
+++
core.git: sc/source
sc/source/ui/app/rfindlst.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 9c8b240e7cad6ef74e16ad83d45957737389aa90
Author: Heiko Tietze
AuthorDate: Thu Mar 21 11:50:40 2024 +0100
Commit: Heiko Tietze
CommitDate: Fri Mar 22 13:06:37 2024 +0100
Resolves tdf#160282 - Ranges references text colors for dark backgrounds
Change-Id: I3d3bb22302ad5016c962d606e80c2e9942301fbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165095
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index ba17bf006ea1..be521f65dea8 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -20,18 +20,25 @@
#include
#include
#include
+#include
+#include
#define SC_RANGECOLORS 8
const Color aColNames[SC_RANGECOLORS] =
{ COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN,
COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN };
+const Color aDarkColNames[SC_RANGECOLORS] =
+{ COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN,
+Color(0xb4c7dc), Color(0xffa6a6), Color(0xffb66c), Color(0xafd095) };
//light blue/red/orange/green 3
+static bool bIsDark;
ScRangeFindList::ScRangeFindList(OUString aName) :
aDocName(std::move( aName )),
bHidden( false ),
nIndexColor( 0 )
{
+bIsDark =
SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor.IsDark();
}
Color ScRangeFindList::Insert( const ScRangeFindData )
@@ -48,7 +55,8 @@ Color ScRangeFindList::Insert( const ScRangeFindData )
Color ScRangeFindList::GetColorName( const size_t nIndex )
{
-return aColNames[nIndex % SC_RANGECOLORS];
+return bIsDark ? aDarkColNames[nIndex % SC_RANGECOLORS]
+ : aColNames[nIndex % SC_RANGECOLORS];
}
Color ScRangeFindList::FindColor( const ScRange& rRef, const size_t nIndex )
core.git: cui/uiconfig
cui/uiconfig/ui/pickbulletpage.ui| 59 +-- cui/uiconfig/ui/pickgraphicpage.ui | 135 +++ cui/uiconfig/ui/picknumberingpage.ui | 59 +-- cui/uiconfig/ui/pickoutlinepage.ui | 59 +-- 4 files changed, 118 insertions(+), 194 deletions(-) New commits: commit aacce8abe239ad679f5e9f9ce9bf2d27fb046d5d Author: Heiko Tietze AuthorDate: Wed Mar 13 09:40:51 2024 +0100 Commit: Heiko Tietze CommitDate: Fri Mar 15 16:12:42 2024 +0100 Resolves tdf#160167 - Remove pointless frames in bullet & numbering dialog Solves the issue that the "Selection" label is inappropriate Change-Id: I1bdaa6922796fcdceec0aac6902011aa21cd9aa3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164758 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/pickbulletpage.ui b/cui/uiconfig/ui/pickbulletpage.ui index b9749dda540e..589874506853 100644 --- a/cui/uiconfig/ui/pickbulletpage.ui +++ b/cui/uiconfig/ui/pickbulletpage.ui @@ -1,58 +1,39 @@ - + - + True -False +True +6 +6 +6 +6 True True -6 -0 -none +never +never +in - + True -True -True -True -never -never -in -12 -6 +False - + True -False - - -True -True -GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK -True -True - - -Click the bullet style that you want to use. - - +True +GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK +True +True + + +Click the bullet style that you want to use. - - -True -False -Selection - - - - - Displays the different bullet styles that you can apply. diff --git a/cui/uiconfig/ui/pickgraphicpage.ui b/cui/uiconfig/ui/pickgraphicpage.ui index fd7b9922e950..ea7342844a14 100644 --- a/cui/uiconfig/ui/pickgraphicpage.ui +++ b/cui/uiconfig/ui/pickgraphicpage.ui @@ -1,104 +1,85 @@ - + - + + True -False +False +6 +6 +6 +6 True True -6 -0 -none +6 - - + True -False +True True True -6 -12 -6 +never +in - + True -True -True -True -never -in +False - + True -False - - -True -True -GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK -True -True - - -Click the graphics that you want to use as bullets. - - +True +GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK +True +True + + +Click the graphics that you want to use as bullets. - -1 -0 - - - - -False -True -The Gallery theme 'Bullets' is empty (no images). -True - - -0 -0 - - - - -Add and Resize -True -True -False -end - - -1 -2 - - - - - - - - - - + +1 +0 + + + + +False +True +The Gallery theme 'Bullets' is empty (no images). +True + + +0 +0 + - - + + +Add and Resize True -False -Selection - - - +True +False +end + +1 +2 +
core.git: sfx2/source
sfx2/source/dialog/infobar.cxx |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 06d8c1e9d8ba1d04914d1c48c94732cdb5c68846 Author: Heiko Tietze AuthorDate: Wed Mar 6 10:35:53 2024 +0100 Commit: Heiko Tietze CommitDate: Wed Mar 6 11:58:07 2024 +0100 Resolves tdf#159486 - Larger hitbox for close button on infobar Change-Id: I83582c0c1ec7dd5e8f82bdf327e68ce88122ad03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164450 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index ca848813f09e..38a510a2589c 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -103,9 +103,12 @@ void SfxInfoBarWindow::SetCloseButtonImage() aSize = Size(aSize.Width() * 1.5, aSize.Height() * 1.5); ScopedVclPtr xDevice(m_xCloseBtn->create_virtual_device()); -xDevice->SetOutputSizePixel(aSize); +xDevice->SetOutputSizePixel(Size(24, 24)); +xDevice->SetBackground(Color(m_aBackgroundColor)); +xDevice->Erase(); -Point aBtnPos(0, 0); +const int nPos = (24 - aSize.getWidth()) / 2; +Point aBtnPos(nPos, nPos); const ViewInformation2D aNewViewInfos; const std::unique_ptr pProcessor(
core.git: Branch 'libreoffice-7-6' - sfx2/source
sfx2/source/view/viewfrm.cxx | 173 ++-
1 file changed, 92 insertions(+), 81 deletions(-)
New commits:
commit 8f3fb27880d6374f531cb012fe3b53179ecd4313
Author: Heiko Tietze
AuthorDate: Wed Feb 28 10:30:48 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Feb 28 22:49:55 2024 +0100
Resolves tdf#131550 - Suppress Donate/Involve infobar if another is visible
Change-Id: I013f0a1f0aa020f10d6beb21940959508eba4547
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164082
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit 607740654f2264e13469e4da1d020448217d7222)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164115
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 4bfb58a724ec..e6f81d53e873 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1450,88 +1450,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
-#if !ENABLE_WASM_STRIP_PINGUSER
-bool bIsHeadlessOrUITest =
SfxApplication::IsHeadlessOrUITest(); //uitest.uicheck fails when the dialog is
open
-
-//what's new infobar
-if (utl::isProductVersionUpgraded(true) &&
!bIsHeadlessOrUITest)
-{
-VclPtr pInfoBar =
AppendInfoBar("whatsnew", "", SfxResId(STR_WHATSNEW_TEXT), InfobarType::INFO);
-if (pInfoBar)
-{
-weld::Button& rWhatsNewButton = pInfoBar->addButton();
-
rWhatsNewButton.set_label(SfxResId(STR_WHATSNEW_BUTTON));
-rWhatsNewButton.connect_clicked(LINK(this,
SfxViewFrame, WhatsNewHandler));
-}
-}
-
-// show tip-of-the-day dialog if it due, but not if there is
the impress modal template dialog
-// open where SdModule::ExecuteNewDocument will launch it
instead when that dialog is dismissed
-if (SfxApplication::IsTipOfTheDayDue() && !bIsHeadlessOrUITest
&& !IsInModalMode())
-{
-// tdf#127946 pass in argument for dialog parent
-SfxUnoFrameItem aDocFrame(SID_FILLFRAME,
GetFrame().GetFrameInterface());
-GetDispatcher()->ExecuteList(SID_TIPOFTHEDAY,
SfxCallMode::SLOT, {}, { });
-}
-
-// inform about the community involvement
-const auto t0 =
std::chrono::system_clock::now().time_since_epoch();
-const sal_Int64 nLastGetInvolvedShown =
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
-const sal_Int64 nNow =
std::chrono::duration_cast(t0).count();
-const sal_Int64 nPeriodSec(60 * 60 * 24 * 180); // 180 days in
seconds
-bool bUpdateLastTimeGetInvolvedShown = false;
-
-if (nLastGetInvolvedShown == 0)
-bUpdateLastTimeGetInvolvedShown = true;
-else if (nPeriodSec < nNow && nLastGetInvolvedShown < (nNow +
nPeriodSec/2) - nPeriodSec) // 90d alternating with donation
-{
-bUpdateLastTimeGetInvolvedShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("getinvolved", "", SfxResId(STR_GET_INVOLVED_TEXT),
InfobarType::INFO);
-
-if (pInfoBar)
-{
-weld::Button& rGetInvolvedButton =
pInfoBar->addButton();
-
rGetInvolvedButton.set_label(SfxResId(STR_GET_INVOLVED_BUTTON));
-rGetInvolvedButton.connect_clicked(LINK(this,
SfxViewFrame, GetInvolvedHandler));
-}
-}
-
-if (bUpdateLastTimeGetInvolvedShown
-&&
!officecfg::Setup::Product::LastTimeGetInvolvedShown::isReadOnly())
-{
-std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Setup::Product::LastTimeGetInvolvedShown::set(nNow, batch);
-batch->commit();
-}
-
-// inform about donations
-const sal_Int64 nLastDonateShown =
officecfg::Setup::Product::LastTimeDonateShown::get();
-bool bUpdateLastTimeDonateShown = false;
-
-if (nLastDonateShown == 0)
-bUpdateLastTimeDonateShown = true;
-else if (nPeriodSec < nNow && nLastDonateShown < nNow -
nPeriodSec) // 90d alternating with getinvolved
-{
-bUpdateLastTimeDonateShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("donate", "", SfxResId(STR_DONATE_TEXT), InfobarType::INFO);
-if
core.git: Branch 'libreoffice-24-2' - sfx2/source
sfx2/source/view/viewfrm.cxx | 173 ++-
1 file changed, 92 insertions(+), 81 deletions(-)
New commits:
commit 9b0ec6639e7218b93551fc680b0929a73ac1fd90
Author: Heiko Tietze
AuthorDate: Wed Feb 28 10:30:48 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Feb 28 22:27:07 2024 +0100
Resolves tdf#131550 - Suppress Donate/Involve infobar if another is visible
Change-Id: I013f0a1f0aa020f10d6beb21940959508eba4547
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164082
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit 607740654f2264e13469e4da1d020448217d7222)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164114
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index c6b25637ccf3..b14ff206fa96 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1496,88 +1496,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
-#if !ENABLE_WASM_STRIP_PINGUSER
-bool bIsHeadlessOrUITest =
SfxApplication::IsHeadlessOrUITest(); //uitest.uicheck fails when the dialog is
open
-
-//what's new infobar
-if (utl::isProductVersionUpgraded(true) &&
!bIsHeadlessOrUITest)
-{
-VclPtr pInfoBar =
AppendInfoBar("whatsnew", "", SfxResId(STR_WHATSNEW_TEXT), InfobarType::INFO);
-if (pInfoBar)
-{
-weld::Button& rWhatsNewButton = pInfoBar->addButton();
-
rWhatsNewButton.set_label(SfxResId(STR_WHATSNEW_BUTTON));
-rWhatsNewButton.connect_clicked(LINK(this,
SfxViewFrame, WhatsNewHandler));
-}
-}
-
-// show tip-of-the-day dialog if it due, but not if there is
the impress modal template dialog
-// open where SdModule::ExecuteNewDocument will launch it
instead when that dialog is dismissed
-if (SfxApplication::IsTipOfTheDayDue() && !bIsHeadlessOrUITest
&& !IsInModalMode())
-{
-// tdf#127946 pass in argument for dialog parent
-SfxUnoFrameItem aDocFrame(SID_FILLFRAME,
GetFrame().GetFrameInterface());
-GetDispatcher()->ExecuteList(SID_TIPOFTHEDAY,
SfxCallMode::SLOT, {}, { });
-}
-
-// inform about the community involvement
-const auto t0 =
std::chrono::system_clock::now().time_since_epoch();
-const sal_Int64 nLastGetInvolvedShown =
officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
-const sal_Int64 nNow =
std::chrono::duration_cast(t0).count();
-const sal_Int64 nPeriodSec(60 * 60 * 24 * 180); // 180 days in
seconds
-bool bUpdateLastTimeGetInvolvedShown = false;
-
-if (nLastGetInvolvedShown == 0)
-bUpdateLastTimeGetInvolvedShown = true;
-else if (nPeriodSec < nNow && nLastGetInvolvedShown < (nNow +
nPeriodSec/2) - nPeriodSec) // 90d alternating with donation
-{
-bUpdateLastTimeGetInvolvedShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("getinvolved", "", SfxResId(STR_GET_INVOLVED_TEXT),
InfobarType::INFO);
-
-if (pInfoBar)
-{
-weld::Button& rGetInvolvedButton =
pInfoBar->addButton();
-
rGetInvolvedButton.set_label(SfxResId(STR_GET_INVOLVED_BUTTON));
-rGetInvolvedButton.connect_clicked(LINK(this,
SfxViewFrame, GetInvolvedHandler));
-}
-}
-
-if (bUpdateLastTimeGetInvolvedShown
-&&
!officecfg::Setup::Product::LastTimeGetInvolvedShown::isReadOnly())
-{
-std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Setup::Product::LastTimeGetInvolvedShown::set(nNow, batch);
-batch->commit();
-}
-
-// inform about donations
-const sal_Int64 nLastDonateShown =
officecfg::Setup::Product::LastTimeDonateShown::get();
-bool bUpdateLastTimeDonateShown = false;
-
-if (nLastDonateShown == 0)
-bUpdateLastTimeDonateShown = true;
-else if (nPeriodSec < nNow && nLastDonateShown < nNow -
nPeriodSec) // 90d alternating with getinvolved
-{
-bUpdateLastTimeDonateShown = true;
-
-VclPtr pInfoBar =
AppendInfoBar("donate", "", SfxResId(STR_DONATE_TEXT), InfobarType::INFO);
-if
core.git: 2 commits - officecfg/registry static/StaticLibrary_unoembind.mk udkapi/org udkapi/UnoApi_udkapi.mk unotest/InternalUnoApi_embindtest.mk unotest/Library_embindtest.mk unotest/Module_unotest.
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 +++ static/StaticLibrary_unoembind.mk |6 --- udkapi/UnoApi_udkapi.mk| 10 + udkapi/org/libreoffice/embindtest/Struct.idl | 20 ++ udkapi/org/libreoffice/embindtest/Test.idl | 16 udkapi/org/libreoffice/embindtest/XTest.idl|8 unotest/InternalUnoApi_embindtest.mk | 16 unotest/Library_embindtest.mk |4 -- unotest/Module_unotest.mk |1 9 files changed, 52 insertions(+), 35 deletions(-) New commits: commit 6158928209bd0f6bd532df9092f3a81ff615cdcc Author: Heiko Tietze AuthorDate: Tue Feb 27 08:32:06 2024 +0100 Commit: Heiko Tietze CommitDate: Wed Feb 28 07:52:23 2024 +0100 Resolves tdf#159863 - Default shortcut to access foot-/endnote area Change-Id: Ie95e94602a0dfd0c899f70d30d2c78e7063a4818 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164001 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 43b6523c7616..56eb20da6bd3 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -6196,6 +6196,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing .uno:ParaRightToLeft + + +L10N SHORTCUTS - NO TRANSLATE +.uno:JumpToFootnoteOrAnchor + + L10N SHORTCUTS - NO TRANSLATE commit 80e2c4e5b9ef1d299c6caa271c9f177a4d011937 Author: Stephan Bergmann AuthorDate: Tue Feb 27 16:29:18 2024 +0100 Commit: Stephan Bergmann CommitDate: Wed Feb 28 07:52:11 2024 +0100 Fold InternalUnoApi_embindtest into UnoApi_udkapi 80d3f33876a2ad4ce32d3c6183131984e8c6b5da "Library_embindtest should use comprehensive InternalUnoApi_embindtest" was an attempt at making type information about that library available at runtime. Which worked for cases where code directly called one of the types' cppu_detail_getUnoType function. But it would still fail for cases where code indirectly wants to obtain one of the types' information by type name---which is what upcoming code will do that changes the Embind'ing of UNO sequences. So InternalUnoApi_embindtest would need to become a UnoApi_embindtest whose instdir/program/types/embindtest.rdb would be available at runtime. But I'm too dumb to convince gbuild to create that new UnoApi_embindtest. So instead just tack the embindtest UNOIDL entities onto the existing UnoApi_udkapi for the EMSCRIPTEN-ENABLE_DBGUTIL case. (Which requires that the single embindtest.idl is split into individual per-entity files, sigh.) Change-Id: Ie189b17213ac5b2de7a61ac5f97a143fa097337f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164057 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/static/StaticLibrary_unoembind.mk b/static/StaticLibrary_unoembind.mk index 5d4438ef2f85..e2a2bfacd892 100644 --- a/static/StaticLibrary_unoembind.mk +++ b/static/StaticLibrary_unoembind.mk @@ -22,12 +22,6 @@ $(eval $(call gb_StaticLibrary_use_api,unoembind,\ udkapi \ )) -ifneq ($(ENABLE_DBGUTIL),) -$(eval $(call gb_StaticLibrary_use_internal_api,unoembind, \ -embindtest \ -)) -endif - $(call gb_StaticLibrary_get_target,unoembind): $(call gb_CustomTarget_get_target,static/unoembind) # vim: set noet sw=4 ts=4: diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index f18b9f758ddc..5f22026027ee 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -520,6 +520,16 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,com/sun/star/util,\ XVeto \ )) +ifeq ($(OS)-$(ENABLE_DBGUTIL),EMSCRIPTEN-TRUE) +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,org/libreoffice/embindtest, \ +Struct \ +XTest \ +)) +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,org/libreoffice/embindtest, \ +Test \ +)) +endif + $(eval $(call gb_UnoApi_set_reference_rdbfile,udkapi,$(SRCDIR)/udkapi/type_reference/udkapi.idl)) # vim: set noet sw=4 ts=4: diff --git a/udkapi/org/libreoffice/embindtest/Struct.idl b/udkapi/org/libreoffice/embindtest/Struct.idl new file mode 100644 index ..6b9d36e40a1b --- /dev/null +++ b/udkapi/org/libreoffice/embindtest/Struct.idl @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v.
core.git: sw/source
sw/source/uibase/docvw/ShadowOverlayObject.cxx | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
New commits:
commit 215a7afd6042c35a45509cea3eae69254d676429
Author: Heiko Tietze
AuthorDate: Wed Feb 21 16:10:40 2024 +0100
Commit: Heiko Tietze
CommitDate: Wed Feb 21 20:03:19 2024 +0100
Resolves tdf#159535 - Less obtrusive shadow for comments
Change-Id: Ic4b55ebb52aaf03738184dcc0d3b8d57c9ee57a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163699
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index fa905b97567b..ef2ed5dd8b6d 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -73,6 +73,8 @@ public:
drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecomposition(
const drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/)
const
{
+const Color aBgCol =
svtools::ColorConfig().GetColorValue(svtools::WRITERSECTIONBOUNDARIES).nColor;
+const Color aBgColInv = aBgCol.IsDark() ? COL_WHITE : COL_BLACK;
// get logic sizes in object coordinate system
basegfx::B2DRange aRange(maBasePosition);
drawinglayer::primitive2d::Primitive2DReference xRet;
@@ -80,7 +82,7 @@ drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecompo
{
case SS_NORMAL:
{
-aRange.expand(basegfx::B2DTuple(getSecondPosition().getX(),
getSecondPosition().getY() + (2.0 * getDiscreteUnit(;
+aRange.expand(basegfx::B2DTuple(getSecondPosition().getX(),
getSecondPosition().getY() + (1.0 * getDiscreteUnit(;
::drawinglayer::attribute::FillGradientAttribute
aFillGradientAttribute(
css::awt::GradientStyle_LINEAR,
@@ -88,10 +90,7 @@ drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecompo
0.5,
0.5,
M_PI,
-basegfx::BColorStops(
-basegfx::BColor(230.0/255.0,230.0/255.0,230.0/255.0),
-basegfx::BColor(180.0/255.0,180.0/255.0,180.0/255.0)));
-
+basegfx::BColorStops(aBgCol.getBColor(),
aBgColInv.getBColor()));
xRet =
new drawinglayer::primitive2d::FillGradientPrimitive2D(
aRange,
@@ -100,17 +99,14 @@ drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecompo
}
case SS_VIEW:
{
-aRange.expand(basegfx::B2DTuple(getSecondPosition().getX(),
getSecondPosition().getY() + (4.0 * getDiscreteUnit(;
+aRange.expand(basegfx::B2DTuple(getSecondPosition().getX(),
getSecondPosition().getY() + (2.0 * getDiscreteUnit(;
drawinglayer::attribute::FillGradientAttribute
aFillGradientAttribute(
css::awt::GradientStyle_LINEAR,
0.0,
0.5,
0.5,
M_PI,
-basegfx::BColorStops(
-basegfx::BColor(230.0/255.0,230.0/255.0,230.0/255.0),
-basegfx::BColor(180.0/255.0,180.0/255.0,180.0/255.0)));
-
+basegfx::BColorStops(aBgCol.getBColor(),
aBgColInv.getBColor()));
xRet =
new drawinglayer::primitive2d::FillGradientPrimitive2D(
aRange,
@@ -126,10 +122,7 @@ drawinglayer::primitive2d::Primitive2DReference
ShadowPrimitive::create2DDecompo
0.5,
0.5,
M_PI,
-basegfx::BColorStops(
-basegfx::BColor(230.0/255.0,230.0/255.0,230.0/255.0),
-basegfx::BColor(83.0/255.0,83.0/255.0,83.0/255.0)));
-
+basegfx::BColorStops(aBgCol.getBColor(),
aBgColInv.getBColor()));
xRet =
new drawinglayer::primitive2d::FillGradientPrimitive2D(
aRange,
core.git: cui/inc cui/source cui/uiconfig icon-themes/breeze_dark icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg icon-themes/sifr_dark icon-themes/su
cui/inc/bitmaps.hlst|2 cui/source/inc/numpages.hxx |6 cui/source/inc/swpossizetabpage.hxx |7 cui/source/inc/transfrm.hxx |7 cui/source/tabpages/numpages.cxx| 23 cui/source/tabpages/swpossizetabpage.cxx| 26 cui/source/tabpages/transfrm.cxx| 26 cui/uiconfig/ui/bulletandposition.ui| 100 ++- cui/uiconfig/ui/numberingoptionspage.ui | 606 +++- cui/uiconfig/ui/possizetabpage.ui | 110 ++- cui/uiconfig/ui/swpossizepage.ui| 368 ++-- icon-themes/breeze_dark/res/locked.png |binary icon-themes/breeze_dark/res/unlocked.png|binary icon-themes/colibre/res/locked.png |binary icon-themes/colibre/res/unlocked.png|binary icon-themes/colibre_dark/res/locked.png |binary icon-themes/colibre_dark/res/unlocked.png |binary icon-themes/colibre_dark_svg/res/unlocked.svg | 43 + icon-themes/colibre_svg/res/unlocked.svg|4 icon-themes/sifr_dark/res/locked.png|binary icon-themes/sifr_dark/res/unlocked.png |binary icon-themes/sukapura_dark/res/locked.png|binary icon-themes/sukapura_dark/res/unlocked.png |binary include/svx/dlgutil.hxx | 19 sd/inc/bitmaps.hlst |3 sd/source/ui/dlg/BulletAndPositionDlg.cxx | 25 sd/source/ui/inc/BulletAndPositionDlg.hxx |6 svx/inc/bitmaps.hlst|3 svx/source/dialog/dlgutil.cxx | 24 svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 29 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |7 svx/uiconfig/ui/sidebarpossize.ui | 128 +++- sw/inc/bitmaps.hlst |3 sw/source/ui/frmdlg/frmpage.cxx | 20 sw/source/uibase/inc/frmpage.hxx|9 sw/uiconfig/swriter/ui/frmtypepage.ui | 127 +++- 36 files changed, 1201 insertions(+), 530 deletions(-) New commits: commit fe4e750d32cb88a9ce7a7539af6c6883d4194220 Author: Heiko Tietze AuthorDate: Fri Dec 8 12:18:47 2023 +0100 Commit: Heiko Tietze CommitDate: Mon Feb 12 12:56:05 2024 +0100 Resolves tdf#158531 - Connector lines for Keep Ratio setting Icons taken from https://thenounproject.com/icon/lock-89649/ and https://thenounproject.com/icon/unlock-89647/ (licensed PD) Change-Id: I7efd25e83726ced7dee4f876cf4bb4c8f54408df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160460 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst index 6e0a1877588e..aab916827507 100644 --- a/cui/inc/bitmaps.hlst +++ b/cui/inc/bitmaps.hlst @@ -53,6 +53,8 @@ inline constexpr OUString RID_SVXBMP_TOPLOCK = u"svx/res/lo02.png"_ustr; inline constexpr OUString RID_SVXBMP_CELLLOCK = u"svx/res/lo03.png"_ustr; inline constexpr OUString RID_SVXBMP_LOCK = u"res/lock.png"_ustr; +inline constexpr OUString RID_SVXBMP_LOCKED = u"res/locked.png"_ustr; +inline constexpr OUString RID_SVXBMP_UNLOCKED = u"res/unlocked.png"_ustr; inline constexpr OUString RID_SVXBMP_THEME_NORMAL_BIG = u"svx/res/galnorl.png"_ustr; inline constexpr OUString RID_SVXBMP_THEME_READONLY_BIG = u"svx/res/galrdol.png"_ustr; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index ec7b72ac71fb..7c34d49fcc62 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #define MN_GALLERY_ENTRY 100 @@ -218,6 +219,8 @@ class SvxNumOptionsTabPage : public SfxTabPage TypedWhichId nNumItemId; MapUnit eCoreUnit; +SvxRatioConnector m_aRatioTop; +SvxRatioConnector m_aRatioBottom; SvxNumberingPreview m_aPreviewWIN; std::unique_ptr m_xGrid; std::unique_ptr m_xLevelLB; @@ -247,6 +250,9 @@ class SvxNumOptionsTabPage : public SfxTabPage std::unique_ptr m_xHeightFT; std::unique_ptr m_xHeightMF; std::unique_ptr m_xRatioCB; +std::unique_ptr m_xCbxScaleImg; +std::unique_ptr m_xImgRatioTop; +std::unique_ptr m_xImgRatioBottom; std::unique_ptr m_xOrientFT; std::unique_ptr m_xOrientLB; std::unique_ptr m_xAllLevelsFrame; diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index eb73196986bf..2e5a15fbebbb 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -21,6 +21,7 @@ #include #include #include +#include // SvxSwPosSizeTabPage - position and size page for Writer drawing objects struct FrmMap; @@ -55,10 +56,15 @@ class SvxSwPosSizeTabPage : public
core.git: sw/source
sw/source/core/doc/DocumentStylePoolManager.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 1dc0c8c8304ebbce0a2e05e89a3b5458d88f3630
Author: Heiko Tietze
AuthorDate: Tue Feb 6 16:09:32 2024 +0100
Commit: Heiko Tietze
CommitDate: Wed Feb 7 13:45:07 2024 +0100
Resolves tdf#159531 - Indentation and spacing for comments
Change-Id: I3ce9dd5d399ce9ff1427de0c97a1227dab996d9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163059
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 68d4e5c11855..96392c94b1c9 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1014,6 +1014,16 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
case RES_POOLCOLL_COMMENT: // Comment
{
SetAllScriptItem(aSet, SvxFontHeightItem(PT_10, 100,
RES_CHRATR_FONTSIZE));
+
+auto const aIndent(o3tl::convert(0.1, o3tl::Length::cm,
o3tl::Length::twip));
+SvxTextLeftMarginItem const leftMargin(aIndent,
RES_MARGIN_TEXTLEFT);
+SvxRightMarginItem const rightMargin(aIndent,
RES_MARGIN_RIGHT);
+aSet.Put(leftMargin);
+aSet.Put(rightMargin);
+
+auto const aSpacing(o3tl::convert(0.1, o3tl::Length::cm,
o3tl::Length::twip));
+SvxULSpaceItem topSpacing( aSpacing, 0, RES_UL_SPACE );
+aSet.Put(topSpacing);
}
break;
core.git: Branch 'libreoffice-24-2' - sw/source
sw/source/core/text/inftxt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2920c56159320965e81de99b11fb1ca5dd42c8d5
Author: Heiko Tietze
AuthorDate: Wed Jan 31 11:29:14 2024 +0100
Commit: Xisco Fauli
CommitDate: Wed Jan 31 21:00:44 2024 +0100
Resolves tdf#159328 - Fix field shading regression
Introduced by 4d7a98b582dc70bbffc78e6622969e218f108433
Change-Id: Ibcc057e47c62d53dfa9e6410230c4b231df8551c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162799
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit 788ebd183b095ffb7369c4d518acd14bad72ae82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162820
Reviewed-by: Xisco Fauli
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 3d9121ef1ec2..8eced32e8990 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1426,8 +1426,8 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion
,
|| m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel()))
// #i27615#
{
bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
+bDraw &= GetOpt().IsHardBlank();
}
-bDraw &= GetOpt().IsHardBlank();
break;
case PortionType::Bookmark:
// no shading
core.git: sw/source
sw/source/core/text/inftxt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 788ebd183b095ffb7369c4d518acd14bad72ae82
Author: Heiko Tietze
AuthorDate: Wed Jan 31 11:29:14 2024 +0100
Commit: Heiko Tietze
CommitDate: Wed Jan 31 15:25:13 2024 +0100
Resolves tdf#159328 - Fix field shading regression
Introduced by 4d7a98b582dc70bbffc78e6622969e218f108433
Change-Id: Ibcc057e47c62d53dfa9e6410230c4b231df8551c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162799
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 3d9121ef1ec2..8eced32e8990 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1426,8 +1426,8 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion
,
|| m_pFrame->GetTextNodeForParaProps()->HasMarkedLabel()))
// #i27615#
{
bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
+bDraw &= GetOpt().IsHardBlank();
}
-bDraw &= GetOpt().IsHardBlank();
break;
case PortionType::Bookmark:
// no shading
core.git: svtools/source
svtools/source/config/colorcfg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 381ab9a1a38e4ea9238599e62acd430782a80547
Author: Heiko Tietze
AuthorDate: Fri Jan 26 09:05:12 2024 +0100
Commit: Heiko Tietze
CommitDate: Fri Jan 26 11:11:40 2024 +0100
Resolves tdf#159096 - Change color of comment indicators in Calc
COL_LIGHTMAGENT was preceived as too glossy and "Light Purple 3"
should also be closer to the Excel prototype
Change-Id: I451c0ba0628dbd3b1794e46de3ff1fef763a6f46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162593
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index dea9ca97db2f..4a4e94370bef 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -422,7 +422,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
{ COL_GRAY7,COL_GRAY7 }, // CALCPAGEBREAKAUTOMATIC
{ Color(0x2300dc), Color(0x2300DC) }, // CALCHIDDENCOLROW
{ COL_LIGHTRED, COL_LIGHTRED}, // CALCTEXTOVERFLOW
-{ COL_LIGHTMAGENTA, COL_LIGHTMAGENTA}, // CALCCOMMENT
+{ Color(0xbf819e), Color(0xbf819e) }, // CALCCOMMENT
{ COL_LIGHTBLUE,Color(0x355269) }, // CALCDETECTIVE
{ COL_LIGHTRED, Color(0xC9211E) }, // CALCDETECTIVEERROR
{ Color(0xef0fff), Color(0x0D23D5) }, // CALCREFERENCE
core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8
sc/source/ui/view/output.cxx | 26 ++-
2 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit bddae0d0dc4f64757100e00432ca40a6470d2c31
Author: Heiko Tietze
AuthorDate: Tue Jan 16 13:11:06 2024 +0100
Commit: Heiko Tietze
CommitDate: Wed Jan 17 08:50:24 2024 +0100
Resolves tdf#158958 and tdf#159124 - Improvements to Comments indicator
* Option to control the indicator size added
* Border color adopts the grid color
* Indicator moved to the very edge of the cell
* Default dynamic size reduced
Change-Id: Ia298edfa30061910344a1afa42b42840b9cdab77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162175
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d54b092eca66..de97c822c7c1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -105,6 +105,14 @@
true
+
+
+
+If less than 1, the size of comment indicator is calculated
dynamically; otherwise this value will be used.
+Comment indicator size
+
+ 0
+
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 58b6db5107d3..e650c6faf774 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2467,7 +2468,7 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext&
rRenderContext)
nInitPosX += nMirrorW - 1; // always in pixels
tools::Long nLayoutSign = bLayoutRTL ? -1 : 1;
-tools::Long nPosY = nScrY;
+tools::Long nPosY = nScrY - 1;
for (SCSIZE nArrY=1; nArrY+1ColHidden(nX, nTab) && mpDoc->GetNote(nX,
pRowInfo[nArrY].nRowNo, nTab)
&& (bIsMerged || (!pInfo->bHOverlapped &&
!pInfo->bVOverlapped)))
{
-
-const bool bIsDarkBackground =
SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor.IsDark();
-const Color aColor(static_cast(pInfo->maBackground.getItem())->GetColor());
-if ( aColor == COL_AUTO ? bIsDarkBackground :
aColor.IsDark() )
-rRenderContext.SetLineColor(COL_WHITE);
-else
-rRenderContext.SetLineColor(COL_BLACK);
+
rRenderContext.SetLineColor(SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCGRID).nColor);
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
if ( mbUseStyleColor &&
rStyleSettings.GetHighContrastMode() )
@@ -2506,7 +2501,7 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext&
rRenderContext)
else
rRenderContext.SetFillColor(
SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCCOMMENTS).nColor );
-tools::Long nMarkX = nPosX + (
pRowInfo[0].basicCellInfo(nX).nWidth - 2 ) * nLayoutSign;
+tools::Long nMarkX = nPosX + (
pRowInfo[0].basicCellInfo(nX).nWidth - 1) * nLayoutSign;
if ( bIsMerged || pInfo->bMerged )
{
// if merged, add widths of all cells
@@ -2517,11 +2512,14 @@ void ScOutputData::DrawNoteMarks(vcl::RenderContext&
rRenderContext)
++nNextX;
}
}
-// DPI/ZOOM 100/100 => 10, 100/50 => 7, 100/150 => 13
-// DPI/ZOOM 150/100 => 13, 150/50 => 8.5, 150/150 => 17.5
-const double fSize(rRenderContext.GetDPIScaleFactor() *
aZoomX * 6 + 4);
-// Make sure we have an integer size to draw a proper
triangle
-sal_Int16 nSize = static_cast(fSize);
+// DPI/ZOOM 100/100 => 6, 100/50 => 4.5, 100/150 => 7.5
+// DPI/ZOOM 150/100 => 7.5, 150/50 => 6, 150/150 => 9
+sal_Int16 nSize =
officecfg::Office::Calc::Content::Display::NoteIndicator::get();
+if (nSize < 1)
+{
+ const double fSize(rRenderContext.GetDPIScaleFactor() *
aZoomX * 3 + 3);
+ nSize = static_cast(fSize);
+}
Point aPoints[3];
aPoints[0] = Point(nMarkX, nPosY);
aPoints[0].setX( bLayoutRTL ? aPoints[0].X() + nSize :
aPoints[0].X() - nSize );
core.git: Branch 'libreoffice-24-2' - sfx2/source
sfx2/source/dialog/backingwindow.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a19137e28c86b9ff118f3cfdd52554e7c326357c
Author: Heiko Tietze
AuthorDate: Wed Jan 3 15:48:13 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Jan 5 13:38:22 2024 +0100
Resolves tdf#158810 - Hide recent actions while in template mode
Change-Id: I7291cc7a634a0507bb240bf417d346e7a50f3c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161587
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit fc03109024041ea00bb62e90975e9a20a3668101)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161635
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 846fa2ffb70e..9e30572d12d3 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -593,7 +593,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&,
rButton, void )
mxAllRecentThumbnails->GrabFocus();
mxRecentButton->set_active(true);
mxTemplateButton->set_active(false);
-mxActions->set_sensitive(true);
+mxActions->show();
}
else
{
@@ -604,7 +604,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&,
rButton, void )
mxLocalView->GrabFocus();
mxRecentButton->set_active(false);
mxTemplateButton->set_active(true);
-mxActions->set_sensitive(false);
+mxActions->hide();
}
applyFilter();
}
core.git: include/svx svx/source
include/svx/compressgraphicdialog.hxx |1 +
svx/source/dialog/compressgraphicdialog.cxx | 16 +++-
2 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 79018bac2ed73fbfaacf661ae1272086e3ddd342
Author: Heiko Tietze
AuthorDate: Thu Jan 4 14:45:13 2024 +0100
Commit: Heiko Tietze
CommitDate: Fri Jan 5 07:36:33 2024 +0100
Resolves tdf#158780 - Disable resolution controls initially
Change-Id: I80e620085868925643d4b7561cd7aeff2d9c930f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161620
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/svx/compressgraphicdialog.hxx
b/include/svx/compressgraphicdialog.hxx
index 088d0b6fd45e..d46220d17a1f 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -79,6 +79,7 @@ private:
DECL_DLLPRIVATE_LINK( OkayClickHdl, weld::Button&, void );
void Update();
+void UpdateSensitivity(const bool bSensitive);
void UpdateNewWidthMF();
void UpdateNewHeightMF();
void UpdateResolutionLB();
diff --git a/svx/source/dialog/compressgraphicdialog.cxx
b/svx/source/dialog/compressgraphicdialog.cxx
index 35899bec2f5f..df1d3a8c3db6 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -108,6 +108,8 @@ void CompressGraphicsDialog::recallParameter()
m_xQualitySlider->set_value( memp.QualityMF );
m_xInterpolationCombo->set_active( memp.InterpolationCombo );
+
+UpdateSensitivity(m_xReduceResolutionCB->get_active());
}
void CompressGraphicsDialog::Initialize()
@@ -207,6 +209,14 @@ void CompressGraphicsDialog::Update()
m_xFixedText6->set_label("??");
}
+void CompressGraphicsDialog::UpdateSensitivity(const bool bSensitive)
+{
+m_xMFNewWidth->set_sensitive(bSensitive);
+m_xMFNewHeight->set_sensitive(bSensitive);
+m_xResolutionLB->set_sensitive(bSensitive);
+m_xInterpolationCombo->set_sensitive(bSensitive);
+}
+
void CompressGraphicsDialog::UpdateNewWidthMF()
{
int nPixelX = static_cast( GetViewWidthInch() * m_dResolution );
@@ -353,11 +363,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog,
ToggleCompressionRB, weld::Toggleable&,
IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleReduceResolutionRB,
weld::Toggleable&, void )
{
-bool choice = m_xReduceResolutionCB->get_active();
-m_xMFNewWidth->set_sensitive(choice);
-m_xMFNewHeight->set_sensitive(choice);
-m_xResolutionLB->set_sensitive(choice);
-m_xInterpolationCombo->set_sensitive(choice);
+UpdateSensitivity(m_xReduceResolutionCB->get_active());
Update();
}
core.git: svx/source
svx/source/dialog/compressgraphicdialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a5a0bb0c6577c82f5e31f1a81e31381fdf6c0c2e
Author: Heiko Tietze
AuthorDate: Thu Jan 4 12:13:44 2024 +0100
Commit: Heiko Tietze
CommitDate: Thu Jan 4 14:00:21 2024 +0100
Resolves tdf#158780 - Enable "Reduce Resolution" by default
Change-Id: Ib60f8484ebf6b140c52c7d2b6f190eac9dd3ade1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161612
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svx/source/dialog/compressgraphicdialog.cxx
b/svx/source/dialog/compressgraphicdialog.cxx
index 8fcf479d889d..35899bec2f5f 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -45,7 +45,7 @@
namespace
{
struct memParam {
-bool ReduceResolutionCB = false;
+bool ReduceResolutionCB = true;
int MFNewWidth = 1;
int MFNewHeight = 1;
bool LosslessRB = true;
core.git: sfx2/source
sfx2/source/dialog/backingwindow.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fc03109024041ea00bb62e90975e9a20a3668101
Author: Heiko Tietze
AuthorDate: Wed Jan 3 15:48:13 2024 +0100
Commit: Heiko Tietze
CommitDate: Thu Jan 4 11:22:50 2024 +0100
Resolves tdf#158810 - Hide recent actions while in template mode
Change-Id: I7291cc7a634a0507bb240bf417d346e7a50f3c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161587
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 846fa2ffb70e..9e30572d12d3 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -593,7 +593,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&,
rButton, void )
mxAllRecentThumbnails->GrabFocus();
mxRecentButton->set_active(true);
mxTemplateButton->set_active(false);
-mxActions->set_sensitive(true);
+mxActions->show();
}
else
{
@@ -604,7 +604,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&,
rButton, void )
mxLocalView->GrabFocus();
mxRecentButton->set_active(false);
mxTemplateButton->set_active(true);
-mxActions->set_sensitive(false);
+mxActions->hide();
}
applyFilter();
}
[Libreoffice-commits] core.git: svx/source
svx/source/form/labelitemwindow.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 48ba98a51f029cd14b5d982dab36eb581d40fef3
Author: Heiko Tietze
AuthorDate: Wed Nov 29 14:29:57 2023 +0100
Commit: Heiko Tietze
CommitDate: Thu Nov 30 11:41:38 2023 +0100
Resolves tdf#158412 - Don't show chevron in quick find bar
Change-Id: I50f0bb7d8a406b77baccc626ca99b656d170ecf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160093
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svx/source/form/labelitemwindow.cxx
b/svx/source/form/labelitemwindow.cxx
index 1ccbe6c5d156..c9afd1534acc 100644
--- a/svx/source/form/labelitemwindow.cxx
+++ b/svx/source/form/labelitemwindow.cxx
@@ -50,7 +50,8 @@ void LabelItemWindow::set_label(const OUString& rLabel, const
LabelItemWindowTyp
m_xLabel->set_font_color(Color(0x00, 0x47, 0x85));
m_xBox->set_background(Color(0xBD, 0xE5, 0xF8)); // same as
InfobarType::INFO
}
-m_xLabel->set_visible(!rLabel.isEmpty());
+m_xLabel->set_visible(
+true); // always show and not just if !rLabel.isEmpty() to not make
the chevron appear
}
OUString LabelItemWindow::get_label() const { return m_xLabel->get_label(); }
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/linetabpage.ui| 460 ++ cui/uiconfig/ui/possizetabpage.ui | 260 ++--- 2 files changed, 355 insertions(+), 365 deletions(-) New commits: commit fe946f86ad6586fa810cae5c0f246389a285e172 Author: Heiko Tietze AuthorDate: Wed Nov 29 15:25:06 2023 +0100 Commit: Heiko Tietze CommitDate: Thu Nov 30 11:40:59 2023 +0100 Bump Glade version Change-Id: If440010790e170fa1c88b8cbdef5f7eaa3efd686 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160108 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui index a7138e2ebd9b..2a2c1b2e15f5 100644 --- a/cui/uiconfig/ui/linetabpage.ui +++ b/cui/uiconfig/ui/linetabpage.ui @@ -1,36 +1,36 @@ - + 20 -0.05 -1 +0.05 +1 100 -5 -10 +5 +10 5 -0.1 -1 +0.10 +1 5 -0.1 -1 +0.10 +1 5 -0.1 -1 +0.10 +1 20 -0.05 -1 +0.05 +1 @@ -70,41 +70,41 @@ True -False +False True -False +False _No Symbol -True +True True -False +False _Automatic -True +True True -False +False _From file... -True +True True -False +False _Gallery -True +True True -False +False @@ -112,13 +112,13 @@ True -False +False _Symbols -True +True True -False +False @@ -126,45 +126,45 @@ True -False +False True True -6 +6 vertical 12 - + True -False -12 -24 +False +12 +24 True -False -0 -none +False +0 +none True -False -vertical -3 +False 12 6 +vertical +3 True -False +False 6 True -False +False _Style: -True -LB_LINE_STYLE +True +LB_LINE_STYLE 0 @@ -176,10 +176,10 @@ True -False +False liststore5 -0 -1 +0 +1 @@ -188,9 +188,6 @@ - -3 - @@ -209,15 +206,15 @@ True -False +False 6 True -False +False Colo_r: -True -LB_COLOR +True +LB_COLOR 0 @@ -229,11 +226,10 @@ True -True -False +True +False 0 -True - +True @@ -254,15 +250,15 @@ True -False +False 6 True -False
[Libreoffice-commits] core.git: svx/source svx/uiconfig
svx/source/dialog/srchdlg.cxx|1 +
svx/source/form/labelitemwindow.cxx |1 +
svx/uiconfig/ui/findreplacedialog.ui | 11 ++-
svx/uiconfig/ui/labelbox.ui |2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 5a622f1a29d249a512cc24f99d189f748623c678
Author: Heiko Tietze
AuthorDate: Tue Nov 28 11:10:58 2023 +0100
Commit: Heiko Tietze
CommitDate: Tue Nov 28 14:33:18 2023 +0100
Related tdf#156227 - Find/quickfind design
Themed icons look bad when drawn white on light blue;
using the same icon as on the infobar makes more sense
Change-Id: I6b4fd2bac7dce41b8196c702e0f0dc87712e2b8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160017
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b5cf7bcf34fd..b1c87a6db7c8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -344,6 +344,7 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
m_xSearchLabel->set_font_color(Color(0x00, 0x47, 0x85));
this->SetSearchLabel(""); // hide the message but keep the box height
+m_xSearchIcon->set_size_request(24, 24); // vcl/res/infobar.png is 32x32 -
too large here
m_xReplaceTmplLB->make_sorted();
m_xReplaceAttrText->hide();
diff --git a/svx/source/form/labelitemwindow.cxx
b/svx/source/form/labelitemwindow.cxx
index bdff03e060f2..1ccbe6c5d156 100644
--- a/svx/source/form/labelitemwindow.cxx
+++ b/svx/source/form/labelitemwindow.cxx
@@ -19,6 +19,7 @@ LabelItemWindow::LabelItemWindow(vcl::Window* pParent, const
OUString& rLabel)
m_xLabel->set_label(rLabel);
m_xImage->hide();
+m_xImage->set_size_request(24, 24); // vcl/res/infobar.png is 32x32 - too
large here
SetOptimalSize();
diff --git a/svx/uiconfig/ui/findreplacedialog.ui
b/svx/uiconfig/ui/findreplacedialog.ui
index 57a16e666a2f..e915a647f710 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -290,15 +290,16 @@
True
False
+center
6
3
3
3
-res/info.png
+vcl/res/infobox.png
-
-Search icon
-
+
+Search icon
+
@@ -323,7 +324,7 @@
0
- notification
+notification
diff --git a/svx/uiconfig/ui/labelbox.ui b/svx/uiconfig/ui/labelbox.ui
index f77cd5da7f4e..29210661b91c 100644
--- a/svx/uiconfig/ui/labelbox.ui
+++ b/svx/uiconfig/ui/labelbox.ui
@@ -15,7 +15,7 @@
6
3
3
-res/info.png
+vcl/res/infobox.png
False
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/swpossizepage.ui | 424 +++ 1 file changed, 212 insertions(+), 212 deletions(-) New commits: commit cb70626ccb63e09f3a4130fd115a29ac79d823f2 Author: Heiko Tietze AuthorDate: Thu Nov 23 17:21:50 2023 +0100 Commit: Heiko Tietze CommitDate: Fri Nov 24 17:06:31 2023 +0100 Bump Glade version Change-Id: Icea5b88e0e8281803a5deb09619476cccff3b39c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159866 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/swpossizepage.ui b/cui/uiconfig/ui/swpossizepage.ui index 17ab225bf276..399dc211c02d 100644 --- a/cui/uiconfig/ui/swpossizepage.ui +++ b/cui/uiconfig/ui/swpossizepage.ui @@ -1,78 +1,78 @@ - + 0.05 -99.99 -1 -10 +99.98 +1 +10 --99.99 -99.99 -1 -10 +-99.98 +99.98 +1 +10 --99.99 -99.99 -1 -10 +-99.98 +99.98 +1 +10 0.05 -99.99 -1 -10 +99.98 +1 +10 - + True -False +False True -6 -12 +6 +12 - + True -False +False True True -6 -12 +6 +12 True -False +False start True -0 -none +0 +none - + True -False -True -6 +False 12 6 +True +6 - + True -False -12 +False +12 True -True -True +True +True +True adjustment1 2 -True Enter the width that you want for the selected object. @@ -80,44 +80,44 @@ -1 -0 +1 +0 True -False +False _Width: -True -width +True +width 0 -0 -0 +0 +0 -0 -0 +0 +0 - + True -False -12 +False +12 True -True -True +True +True +True adjustment4 2 -True Enter the height that you want for the selected object. @@ -125,38 +125,38 @@ -1 -0 +1 +0 True -False +False H_eight: -True -height +True +height 0 -0 -0 +0 +0 -0 -1 +0 +1
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/thumbnailview.hxx |2 --
include/sfx2/thumbnailviewitem.hxx |2 --
sfx2/source/control/recentdocsview.cxx |4 +---
sfx2/source/control/templatedefaultview.cxx |4 +---
sfx2/source/control/templateviewitem.cxx|2 +-
sfx2/source/control/thumbnailview.cxx |4
sfx2/source/control/thumbnailviewitem.cxx |7 ++-
7 files changed, 5 insertions(+), 20 deletions(-)
New commits:
commit adfb0a34af196befc46527418f6e870d1f8f1889
Author: Heiko Tietze
AuthorDate: Tue Nov 14 11:35:43 2023 +0100
Commit: Heiko Tietze
CommitDate: Tue Nov 14 13:26:53 2023 +0100
Resolves tdf#158084 - Start Center hover color
Selected colors removed since hovering leads to selection
(or execution) and does not need a special color
Transparency for reccent documents and templates in start center
increased to make the difference to selected more clear
Change-Id: Iab52150cd5a93e2f6ff716921b2aa7d093018b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159407
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index a51db9df048b..655aa3ba13e5 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -313,8 +313,6 @@ protected:
Color maTextColor; ///< Text color.
Color maHighlightColor; ///< Color of the highlight (background)
of the hovered item.
Color maHighlightTextColor; ///< Color of the text for the highlighted
item.
-Color maSelectHighlightColor; ///< Color of the highlight (background)
of the selected and hovered item.
-Color maSelectHighlightTextColor; ///< Color of the text of the selected
and hovered item.
double mfHighlightTransparence; ///< Transparence of the highlight.
Link maItemStateHdl;
diff --git a/include/sfx2/thumbnailviewitem.hxx
b/include/sfx2/thumbnailviewitem.hxx
index 9495b08054e3..22020c47728d 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -56,8 +56,6 @@ struct ThumbnailItemAttributes
basegfx::BColor aTextColor;
basegfx::BColor aHighlightColor;
basegfx::BColor aHighlightTextColor;
-basegfx::BColor aSelectHighlightColor;
-basegfx::BColor aSelectHighlightTextColor;
double fHighlightTransparence;
basegfx::B2DVector aFontSize;
drawinglayer::attribute::FontAttribute aFontAttr;
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index 055dc6962423..6df534788a32 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -80,10 +80,8 @@
RecentDocsView::RecentDocsView(std::unique_ptr xWindow, st
const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor = rSettings.GetHighlightTextColor();
-maSelectHighlightColor = rSettings.GetActiveColor();
-maSelectHighlightTextColor = rSettings.GetActiveTextColor();
-mfHighlightTransparence = 0.25;
+mfHighlightTransparence = 0.75;
UpdateColors();
}
diff --git a/sfx2/source/control/templatedefaultview.cxx
b/sfx2/source/control/templatedefaultview.cxx
index 34d40875d23c..909545e423ce 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -37,10 +37,8 @@
TemplateDefaultView::TemplateDefaultView(std::unique_ptr x
const StyleSettings& rSettings =
Application::GetSettings().GetStyleSettings();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor = rSettings.GetHighlightTextColor();
-maSelectHighlightColor = rSettings.GetActiveColor();
-maSelectHighlightTextColor = rSettings.GetActiveTextColor();
-mfHighlightTransparence = 0.25;
+mfHighlightTransparence = 0.75;
UpdateColors();
}
diff --git a/sfx2/source/control/templateviewitem.cxx
b/sfx2/source/control/templateviewitem.cxx
index 28ff1f43133c..d28ad50f74cd 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -61,7 +61,7 @@ void
TemplateViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProces
// Draw background
if( mbSelected && mbHover)
-aFillColor = pAttrs->aSelectHighlightColor;
+aFillColor = pAttrs->aHighlightColor;
else if (mbSelected || mbHover)
{
aFillColor = pAttrs->aHighlightColor;
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 2d4e8bb57611..abb9f9799e34 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -253,8 +253,6 @@ void ThumbnailView::ImplInit()
maTextColor = rSettings.GetWindowTextColor();
maHighlightColor = rSettings.GetHighlightColor();
maHighlightTextColor =
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 14 - sfx2/source/control/recentdocsview.cxx |9 ++-- sfx2/source/control/templatedefaultview.cxx|9 ++-- 3 files changed, 14 insertions(+), 18 deletions(-) New commits: commit 285a3e8d8b77b44da3dcc767877f878fe0e0493e Author: Heiko Tietze AuthorDate: Fri Nov 10 10:12:39 2023 +0100 Commit: Heiko Tietze CommitDate: Mon Nov 13 10:40:30 2023 +0100 Resolves tdf#158084 - Use system colors in start center StartCenterThumbnailsHighlightColor and StartCenterThumbnailsHighlightTextColor removed in favor of StyleSettings.GetHighlightColor and .GetActiveColor Change-Id: I7005b17f6c48525c791f23ea99b7b68e7a67531b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159286 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 76aa4e6c02d9..c551044a350d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3400,20 +3400,6 @@ 15658734 - - - -Specifies the background color of the highlight of a thumbnail in the start center. - - 14540253 - - - - -Specifies the text color of the highlight of a thumbnail in the start center. - - 3355443 - diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index cc2e80de17e9..055dc6962423 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -76,8 +76,13 @@ RecentDocsView::RecentDocsView(std::unique_ptr xWindow, st maFillColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); -maHighlightColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); -maHighlightTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get()); + +const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); +maHighlightColor = rSettings.GetHighlightColor(); +maHighlightTextColor = rSettings.GetHighlightTextColor(); +maSelectHighlightColor = rSettings.GetActiveColor(); +maSelectHighlightTextColor = rSettings.GetActiveTextColor(); + mfHighlightTransparence = 0.25; UpdateColors(); diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 17ad2ba7cbda..34d40875d23c 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -33,8 +33,13 @@ TemplateDefaultView::TemplateDefaultView(std::unique_ptr x // startcenter specific settings maFillColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get()); maTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get()); -maHighlightColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get()); -maHighlightTextColor = Color(ColorTransparency, officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightTextColor::get()); + +const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); +maHighlightColor = rSettings.GetHighlightColor(); +maHighlightTextColor = rSettings.GetHighlightTextColor(); +maSelectHighlightColor = rSettings.GetActiveColor(); +maSelectHighlightTextColor = rSettings.GetActiveTextColor(); + mfHighlightTransparence = 0.25; UpdateColors();
[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig
include/svx/labelitemwindow.hxx | 11
include/svx/srchdlg.hxx |2
svx/source/dialog/srchdlg.cxx| 40 +++--
svx/source/form/labelitemwindow.cxx | 24 +-
svx/uiconfig/ui/findreplacedialog.ui | 80 +--
svx/uiconfig/ui/labelbox.ui | 29 ++--
6 files changed, 135 insertions(+), 51 deletions(-)
New commits:
commit 97d3d4f371f82704dba907975e6cfdaac456fe4d
Author: Heiko Tietze
AuthorDate: Fri Sep 15 14:23:50 2023 +0200
Commit: Heiko Tietze
CommitDate: Sat Oct 28 11:23:12 2023 +0200
Resolves tdf#156227 - More appealing feedback for find/quickfind
ErrorMessageType removed in favor of an infobar-like label
Accessibility notification added for the quickfind bar
Change-Id: Iec2498d04152392b3e181146005bdb0c9db8ec50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156943
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/svx/labelitemwindow.hxx b/include/svx/labelitemwindow.hxx
index 5271482b11ad..d9aeccbb7bfd 100644
--- a/include/svx/labelitemwindow.hxx
+++ b/include/svx/labelitemwindow.hxx
@@ -12,14 +12,23 @@
#include
#include
+enum class LabelItemWindowType
+{
+Text,
+Info,
+};
+
class SVXCORE_DLLPUBLIC LabelItemWindow final : public InterimItemWindow
{
private:
+std::unique_ptr m_xBox;
std::unique_ptr m_xLabel;
+std::unique_ptr m_xImage;
public:
LabelItemWindow(vcl::Window* pParent, const OUString& rLabel);
-void set_label(const OUString& rLabel);
+void set_label(const OUString& rLabel,
+ const LabelItemWindowType eType =
LabelItemWindowType::Text);
OUString get_label() const;
void SetOptimalSize();
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index f069af48c539..7223a51cd324 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -177,6 +177,8 @@ private:
std::unique_ptr m_xSearchTmplLB;
std::unique_ptr m_xSearchAttrText;
std::unique_ptr m_xSearchLabel;
+std::unique_ptr m_xSearchIcon;
+std::unique_ptr m_xSearchBox;
std::unique_ptr m_xReplaceFrame;
std::unique_ptr m_xReplaceLB;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index a17711bc46fb..b5cf7bcf34fd 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -285,6 +285,8 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
, m_xSearchTmplLB(m_xBuilder->weld_combo_box("searchlist"))
, m_xSearchAttrText(m_xBuilder->weld_label("searchdesc"))
, m_xSearchLabel(m_xBuilder->weld_label("searchlabel"))
+, m_xSearchIcon(m_xBuilder->weld_image("searchicon"))
+, m_xSearchBox(m_xBuilder->weld_box("searchbox"))
, m_xReplaceFrame(m_xBuilder->weld_frame("replaceframe"))
, m_xReplaceLB(m_xBuilder->weld_combo_box("replaceterm"))
, m_xReplaceTmplLB(m_xBuilder->weld_combo_box("replacelist"))
@@ -340,6 +342,9 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent,
SfxChildWindow* pChildWi
m_xSearchTmplLB->make_sorted();
m_xSearchAttrText->hide();
+m_xSearchLabel->set_font_color(Color(0x00, 0x47, 0x85));
+this->SetSearchLabel(""); // hide the message but keep the box height
+
m_xReplaceTmplLB->make_sorted();
m_xReplaceAttrText->hide();
@@ -581,14 +586,18 @@ void SvxSearchDialog::SetSearchLabel(const OUString& rStr)
m_xSearchLabel->set_label(rStr);
if (!rStr.isEmpty())
{
-// hide/show to fire SHOWING state change event so search label text
-// is announced by screen reader
-m_xSearchLabel->hide();
m_xSearchLabel->show();
+m_xSearchIcon->show();
+m_xSearchBox->set_background(Color(0xBD, 0xE5, 0xF8)); // same as
InfobarType::INFO
+}
+else
+{
+const Size aSize = m_xSearchBox->get_preferred_size();
+m_xSearchLabel->hide();
+m_xSearchIcon->hide();
+m_xSearchBox->set_size_request(-1, aSize.Height());
+m_xSearchBox->set_background(COL_TRANSPARENT);
}
-
-if (rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND))
-m_xSearchLB->set_entry_message_type(weld::EntryMessageType::Error);
}
void SvxSearchDialog::ApplyTransliterationFlags_Impl( TransliterationFlags
nSettings )
@@ -2360,8 +2369,6 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
static void lcl_SetSearchLabelWindow(const OUString& rStr, SfxViewFrame&
rViewFrame)
{
-bool bNotFound = rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND);
-
css::uno::Reference< css::beans::XPropertySet > xPropSet(
rViewFrame.GetFrame().GetFrameInterface(),
css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
@@ -2380,21 +2387,8 @@ static void lcl_SetSearchLabelWindow(const OUString&
rStr, SfxViewFrame& rViewFr
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/inc sw/qa sw/source
sw/inc/flddat.hxx |2 +-
sw/qa/uibase/shells/shells.cxx|6 --
sw/source/ui/fldui/flddok.cxx |4 ++--
sw/source/uibase/fldui/fldmgr.cxx |6 +++---
4 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit d6347033f95a4c3d4837f954a6560b83ec2a421d
Author: Heiko Tietze
AuthorDate: Tue Oct 17 11:15:58 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue Oct 24 09:18:00 2023 +0200
Revert "Resolves tdf#139141 - Make variable date/time field the default"
This reverts commit e37f06f534ac864f9fe8cd20b07a85c36e697d41.
and ui test from Ia1a2387e137f8a672a24056b13234d4275a77ca4
Reason for revert: tdf#157337; macros rely on fix field values
Change-Id: I7a638330aac9b71432556454c0104479fcd05b4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158041
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
(cherry picked from commit fa569930a0968cdeba4441e19a68e7d78aa25cb4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158282
Tested-by: Jenkins
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 6c452072e926..39c00f68a235 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -30,8 +30,8 @@ namespace tools { class Time; }
enum SwDateSubFormat
{
-DATE_VAR,
DATE_FIX,
+DATE_VAR
};
class SAL_DLLPUBLIC_RTTI SwDateTimeFieldType final : public SwValueFieldType
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index c962f4a5d65e..6543f8f4fcb7 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -1049,7 +1049,9 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormFieldEndnote)
// Then this was empty: the fieldmark was inserted before the note anchor,
not in the note body.
CPPUNIT_ASSERT_EQUAL(OUString("result"), aActual);
}
-
+/*
+// Disabled because tdf#139141 was reverted and the default time field inserts
a fix value again
+// Should be reactivated once a new UNO command is added for variable time
fields
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateSelectedField)
{
// Given an empty doc:
@@ -1077,7 +1079,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateSelectedField)
// Check that the selected field has changed:
CPPUNIT_ASSERT(aTimeFieldAfter != aTimeFieldBefore);
}
-
+*/
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index f669fa7b92b2..a195ed026ec0 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -241,9 +241,9 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::TreeView&,
void)
case SwFieldTypesEnum::Date:
case SwFieldTypesEnum::Time:
m_xSelectionLB->append(sId, aLst[i]);
-if
(static_cast(GetCurField())->IsFixed() && i)
+if
(static_cast(GetCurField())->IsFixed() && !i)
m_xSelectionLB->select_id(sId);
-if
(!static_cast(GetCurField())->IsFixed() && !i)
+if
(!static_cast(GetCurField())->IsFixed() && i)
m_xSelectionLB->select_id(sId);
break;
case SwFieldTypesEnum::ExtendedUser:
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index 143c981a6131..636e2b99058a 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -159,14 +159,14 @@ const TranslateId FMT_AUTHOR_ARY[] =
const TranslateId FLD_DATE_ARY[] =
{
+FLD_DATE_FIX,
FLD_DATE_STD,
-FLD_DATE_FIX
};
const TranslateId FLD_TIME_ARY[] =
{
-FLD_TIME_STD,
-FLD_TIME_FIX
+FLD_TIME_FIX,
+FLD_TIME_STD
};
const TranslateId FMT_NUM_ARY[] =
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/flddat.hxx |2 +-
sw/qa/uibase/shells/shells.cxx|6 --
sw/source/ui/fldui/flddok.cxx |4 ++--
sw/source/uibase/fldui/fldmgr.cxx |6 +++---
4 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit fa569930a0968cdeba4441e19a68e7d78aa25cb4
Author: Heiko Tietze
AuthorDate: Tue Oct 17 11:15:58 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon Oct 23 15:42:38 2023 +0200
Revert "Resolves tdf#139141 - Make variable date/time field the default"
This reverts commit e37f06f534ac864f9fe8cd20b07a85c36e697d41.
and ui test from Ia1a2387e137f8a672a24056b13234d4275a77ca4
Reason for revert: tdf#157337; macros rely on fix field values
Change-Id: I7a638330aac9b71432556454c0104479fcd05b4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158041
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 6c452072e926..39c00f68a235 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -30,8 +30,8 @@ namespace tools { class Time; }
enum SwDateSubFormat
{
-DATE_VAR,
DATE_FIX,
+DATE_VAR
};
class SAL_DLLPUBLIC_RTTI SwDateTimeFieldType final : public SwValueFieldType
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index f8d7f99de023..88f90e909698 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -1049,7 +1049,9 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testInsertTextFormFieldEndnote)
// Then this was empty: the fieldmark was inserted before the note anchor,
not in the note body.
CPPUNIT_ASSERT_EQUAL(OUString("result"), aActual);
}
-
+/*
+// Disabled because tdf#139141 was reverted and the default time field inserts
a fix value again
+// Should be reactivated once a new UNO command is added for variable time
fields
CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testUpdateSelectedField)
{
// Given an empty doc:
@@ -1077,7 +1079,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest,
testUpdateSelectedField)
// Check that the selected field has changed:
CPPUNIT_ASSERT(aTimeFieldAfter != aTimeFieldBefore);
}
-
+*/
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index f669fa7b92b2..a195ed026ec0 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -241,9 +241,9 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, weld::TreeView&,
void)
case SwFieldTypesEnum::Date:
case SwFieldTypesEnum::Time:
m_xSelectionLB->append(sId, aLst[i]);
-if
(static_cast(GetCurField())->IsFixed() && i)
+if
(static_cast(GetCurField())->IsFixed() && !i)
m_xSelectionLB->select_id(sId);
-if
(!static_cast(GetCurField())->IsFixed() && !i)
+if
(!static_cast(GetCurField())->IsFixed() && i)
m_xSelectionLB->select_id(sId);
break;
case SwFieldTypesEnum::ExtendedUser:
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index c61c9c26cba5..3b69fb63739d 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -161,14 +161,14 @@ const TranslateId FMT_AUTHOR_ARY[] =
const TranslateId FLD_DATE_ARY[] =
{
+FLD_DATE_FIX,
FLD_DATE_STD,
-FLD_DATE_FIX
};
const TranslateId FLD_TIME_ARY[] =
{
-FLD_TIME_STD,
-FLD_TIME_FIX
+FLD_TIME_FIX,
+FLD_TIME_STD
};
const TranslateId FMT_NUM_ARY[] =
[Libreoffice-commits] core.git: 2 commits - include/tools sd/qa sd/source
include/tools/color.hxx |7 +--
sd/qa/unit/data/xml/tdf92001_0.xml |2 +-
sd/source/ui/table/tablefunction.cxx |8 +---
3 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 8ff7d75c1929876743b01d9651ea30928673433f
Author: Heiko Tietze
AuthorDate: Mon Oct 16 12:37:00 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon Oct 16 15:35:23 2023 +0200
Revert "Resolves tdf#156685 - "Object without fill" style for tables"
This reverts commit 86eb7ad2b4488dcd29c21ae3fc525056b681e199.
Reason for revert: More generic solution in
I1ca8cfe539a662100f6c581fd633ab1ebd5c6bfb
Change-Id: Ie2769a90f776602e38fc2795e08d591f9ae8d618
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158035
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sd/source/ui/table/tablefunction.cxx
b/sd/source/ui/table/tablefunction.cxx
index b28f89c896e2..67196e864b39 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -44,8 +44,6 @@
#include
#include
#include
-#include
-#include
#include
@@ -149,11 +147,7 @@ static void InsertTableImpl(const DrawViewShell* pShell,
aRect,
nColumns,
nRows);
-//tables must not use default background tango sky blue tdf#156685
-SfxStyleSheet* pStyleSheet = static_cast(
-pShell->GetDoc()->GetStyleSheetPool()->Find(
-SdResId(STR_POOLSHEET_OBJWITHOUTFILL), SfxStyleFamily::Para));
-pObj->NbcSetStyleSheet( pStyleSheet, true );
+pObj->NbcSetStyleSheet( pShell->GetDoc()->GetDefaultStyleSheet(), true );
apply_table_style( pObj.get(), pShell->GetDoc(), sTableStyle );
SdrPageView* pPV = pView->GetSdrPageView();
commit f07d47fff571c4446988715f3c21362b9eed4265
Author: Heiko Tietze
AuthorDate: Mon Oct 16 11:34:56 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon Oct 16 15:35:10 2023 +0200
Related tdf#156182 - Keep legacy contrast for default background
Band aid for follow-up issues, eg. tdf#157706, tdf#157706...
Change-Id: I1ca8cfe539a662100f6c581fd633ab1ebd5c6bfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158024
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index c3bbb5bf0e2b..8ab35445893f 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -311,8 +311,11 @@ public:
*/
bool IsDark() const
{
-// tdf#156182
-return GetLuminance() <= 156;
+// tdf#156182, and band aid for follow-up issues
+if (mValue == 0x729fcf) // COL_DEFAULT_SHAPE_FILLING
+return GetLuminance() <= 62;
+else
+return GetLuminance() <= 156;
}
/** Comparison with luminance thresholds.
diff --git a/sd/qa/unit/data/xml/tdf92001_0.xml
b/sd/qa/unit/data/xml/tdf92001_0.xml
index 234f751a9c23..d67952eb1fe5 100644
--- a/sd/qa/unit/data/xml/tdf92001_0.xml
+++ b/sd/qa/unit/data/xml/tdf92001_0.xml
@@ -1,6 +1,6 @@
-
+
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.cxx | 10 ++
filter/source/pdf/impdialog.hxx |3 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 07a06e40400f3713619cb456d62d4bb952e85436
Author: Heiko Tietze
AuthorDate: Fri Jul 21 11:47:45 2023 +0200
Commit: Heiko Tietze
CommitDate: Thu Oct 5 13:10:15 2023 +0200
Resolves tdf#156337 - Keep warning label enabled on PDF security tab
Change-Id: Ifea77294825b987e4277e146cc34af120e38c8c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154712
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index a036d432e3c3..c7149b0ca534 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -936,7 +936,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage,
TogglePDFVersionOrUniversalAccessibilityHa
// set the security page status (and its controls as well)
ImpPDFTabSecurityPage* pSecPage = mpParent ? mpParent->getSecurityPage() :
nullptr;
if (pSecPage)
-pSecPage->ImplPDFASecurityControl(!bIsPDFA);
+pSecPage->ImplPDFASecurityControl();
mxCbTaggedPDF->set_sensitive(
!bIsPDFA && !bIsPDFUA && !IsReadOnlyProperty("UseTaggedPDF"));
@@ -1315,6 +1315,7 @@
ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(weld::Container* pPage, weld::Dialo
, mxCbEnableCopy(m_xBuilder->weld_check_button("enablecopy"))
, mxCbEnableAccessibility(m_xBuilder->weld_check_button("enablea11y"))
, mxPasswordTitle(m_xBuilder->weld_label("setpasswordstitle"))
+, mxPermissionTitle(m_xBuilder->weld_label("label2"))
{
msStrSetPwd = mxPasswordTitle->get_label();
mxPbSetPwd->connect_clicked(LINK(this, ImpPDFTabSecurityPage,
ClickmaPbSetPwdHdl));
@@ -1411,7 +1412,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const
ImpPDFTabDialog* pParent
ImpPDFTabGeneralPage* pGeneralPage = pParent->getGeneralPage();
if (pGeneralPage)
-ImplPDFASecurityControl(!pGeneralPage->IsPdfaSelected());
+ImplPDFASecurityControl();
}
IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, weld::Button&, void)
@@ -1479,6 +1480,8 @@ void ImpPDFTabSecurityPage::enablePermissionControls()
{
mxCbEnableAccessibility->set_active(true);
}
+mxPermissionTitle->set_sensitive(!bIsPDFASel);
+mxPbSetPwd->set_sensitive(!bIsPDFASel);
mxCbEnableAccessibility->set_sensitive(!bIsPDFUASel);
if (bIsPDFASel)
{
@@ -1532,9 +1535,8 @@ void ImpPDFTabSecurityPage::enablePermissionControls()
// This tab page is under control of the PDF/A-1a checkbox:
// TODO: implement a method to do it.
-void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity )
+void ImpPDFTabSecurityPage::ImplPDFASecurityControl()
{
-m_xContainer->set_sensitive(bEnableSecurity);
// after enable, check the status of control as if the dialog was
initialized
enablePermissionControls();
}
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 7a8985ebc807..8cbfc0af987f 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -355,6 +355,7 @@ class ImpPDFTabSecurityPage : public SfxTabPage
std::unique_ptr mxCbEnableCopy;
std::unique_ptr mxCbEnableAccessibility;
std::unique_ptr mxPasswordTitle;
+std::unique_ptr mxPermissionTitle;
std::shared_ptr< SfxPasswordDialog > mpPasswordDialog;
std::shared_ptr< weld::MessageDialog > mpUnsupportedMsgDialog;
@@ -371,7 +372,7 @@ public:
voidGetFilterConfigItem( ImpPDFTabDialog*
paParent);
voidSetFilterConfigItem( const ImpPDFTabDialog*
paParent );
-voidImplPDFASecurityControl( bool bEnableSecurity
);
+voidImplPDFASecurityControl();
boolhasPassword() const { return
mbHaveOwnerPassword || mbHaveUserPassword; }
};
[Libreoffice-commits] core.git: sd/source
sd/source/ui/table/tablefunction.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 86eb7ad2b4488dcd29c21ae3fc525056b681e199 Author: Heiko Tietze AuthorDate: Wed Oct 4 18:51:21 2023 +0200 Commit: Heiko Tietze CommitDate: Thu Oct 5 09:36:13 2023 +0200 Resolves tdf#156685 - "Object without fill" style for tables The "Default Drawing Style" uses Tango Sky Blue for the background, which is treated as dark since commit Ia5e405fc05613726b5011174c8d00ca204eb31b2. This ends up in unreadable white font color on white backgrounds for tables. The new style "Object without fill" has a clear background. Change-Id: I6b2f701e4a8cce6200fd2a5e86037e9a36b32833 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157568 Tested-by: Heiko Tietze Reviewed-by: Heiko Tietze diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 67196e864b39..b28f89c896e2 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -44,6 +44,8 @@ #include #include #include +#include +#include #include @@ -147,7 +149,11 @@ static void InsertTableImpl(const DrawViewShell* pShell, aRect, nColumns, nRows); -pObj->NbcSetStyleSheet( pShell->GetDoc()->GetDefaultStyleSheet(), true ); +//tables must not use default background tango sky blue tdf#156685 +SfxStyleSheet* pStyleSheet = static_cast( +pShell->GetDoc()->GetStyleSheetPool()->Find( +SdResId(STR_POOLSHEET_OBJWITHOUTFILL), SfxStyleFamily::Para)); +pObj->NbcSetStyleSheet( pStyleSheet, true ); apply_table_style( pObj.get(), pShell->GetDoc(), sTableStyle ); SdrPageView* pPV = pView->GetSdrPageView();
[Libreoffice-commits] core.git: cui/uiconfig sw/source
cui/uiconfig/ui/querysetinsmodedialog.ui |3 +-- sw/source/uibase/wrtsh/select.cxx|2 +- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 5a9c035486a1b2d0796656e33a659718d0b21c09 Author: Heiko Tietze AuthorDate: Fri Sep 29 11:53:37 2023 +0200 Commit: Heiko Tietze CommitDate: Fri Sep 29 13:18:53 2023 +0200 Related tdf#155561 - Query logic inverted "Don't ask again" was working like "Show this dialog" or "Ask for confirmation" before Decided against a renaming since we use the "Do not again" text on other places and it is more common in this type of confirmation dialog than the positive (and checked) form Change-Id: I705376d11bc662b157d38bf7a89fb8db13819e6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157404 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/querysetinsmodedialog.ui b/cui/uiconfig/ui/querysetinsmodedialog.ui index a21659afae5e..76162dc2 100644 --- a/cui/uiconfig/ui/querysetinsmodedialog.ui +++ b/cui/uiconfig/ui/querysetinsmodedialog.ui @@ -23,12 +23,11 @@ end -Don't show again +Do not show again True True False True -True True diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index ebec0dbfed2a..fe369d0f2091 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -697,7 +697,7 @@ void SwWrtShell::SetInsMode( bool bOn ) std::shared_ptr xChanges( comphelper::ConfigurationChanges::create()); - officecfg::Office::Common::Misc::QuerySetInsMode::set(xCheckBox->get_active(), xChanges); + officecfg::Office::Common::Misc::QuerySetInsMode::set(!xCheckBox->get_active(), xChanges); xChanges->commit(); if ( nResult == static_cast(RET_NO) )
[Libreoffice-commits] core.git: cui/uiconfig cui/UIConfig_cui.mk icon-themes/colibre officecfg/registry solenv/sanitizers sw/inc sw/source
cui/UIConfig_cui.mk|1 cui/uiconfig/ui/querysetinsmodedialog.ui | 157 + icon-themes/colibre/res/queryinsmode.png |binary officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 solenv/sanitizers/ui/cui.false |1 sw/inc/bitmaps.hlst|2 sw/source/uibase/wrtsh/select.cxx | 25 ++ 7 files changed, 193 insertions(+) New commits: commit a52bc9b5d6f86b6919931db21d83834d6c14e955 Author: Heiko Tietze AuthorDate: Fri Jun 23 14:57:54 2023 +0200 Commit: Heiko Tietze CommitDate: Wed Sep 27 17:04:57 2023 +0200 Resolves tdf#155561 - Notification for the overwrite mode Dialog shown when it's enabled for the first time Introduces the registry variable QuerySetInsMode Adds an eye-catching image under res/queryinsmode.png Change-Id: I0131177fb54238d48a671bc9ceb88283f796a526 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153505 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index a863e155dd04..b9863422c64a 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -192,6 +192,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/querynosavefiledialog \ cui/uiconfig/ui/querysavelistdialog \ cui/uiconfig/ui/queryupdategalleryfilelistdialog \ + cui/uiconfig/ui/querysetinsmodedialog \ cui/uiconfig/ui/recordnumberdialog \ cui/uiconfig/ui/rotationtabpage \ cui/uiconfig/ui/scriptorganizer \ diff --git a/cui/uiconfig/ui/querysetinsmodedialog.ui b/cui/uiconfig/ui/querysetinsmodedialog.ui new file mode 100644 index ..a21659afae5e --- /dev/null +++ b/cui/uiconfig/ui/querysetinsmodedialog.ui @@ -0,0 +1,157 @@ + + + + + +False +Confirm overwrite mode +False +dialog + + +False +12 +12 +12 +12 +vertical + + +False +12 +True +end + + +Don't show again +True +True +False +True +True +True + + +True +True +0 +True + + + + +No +True +True +True + + +True +True +1 + + + + +Yes +True +True +True + + +True +True +2 + + + + +False +True +end +1 + + + + + +True +False +12 +12 + + +True +False +False +You are switching to the overwrite mode +0 + + + + + + +1 +0 + + + + +True +False +False +The overwrite mode allows to type over text. It is indicated by a block cursor and at the statusbar. Press Insert again to switch back. +True +word-char +40 +0 + + +1 +1 + + + + +True +False +start +Do you want to continue? +True +0 + + +1 +2 + + + + +True +False + + +0 +1 +2 + + + + + + + +False +True +0 + + + + + + btnNo + btnYes + + + diff --git a/icon-themes/colibre/res/queryinsmode.png b/icon-themes/colibre/res/queryinsmode.png new file mode 100644 index ..029c7570a7bf Binary files /dev/null and b/icon-themes/colibre/res/queryinsmode.png differ diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/imagetabpage.ui | 176 1 file changed, 88 insertions(+), 88 deletions(-) New commits: commit 3575abbab1994aa1e0ccd8774a7d7fafb22d79e0 Author: Heiko Tietze AuthorDate: Sat Sep 23 14:24:58 2023 +0300 Commit: Heiko Tietze CommitDate: Tue Sep 26 07:57:02 2023 +0200 Resolves tdf#154019 - Better label in Area dialog more informative Change-Id: Iaa20a88f42e056c6fa005df9854ae0b83d6ce662 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157184 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/imagetabpage.ui b/cui/uiconfig/ui/imagetabpage.ui index f4574f298560..f83ea9a5df74 100644 --- a/cui/uiconfig/ui/imagetabpage.ui +++ b/cui/uiconfig/ui/imagetabpage.ui @@ -1,49 +1,49 @@ - + 100 -1 -10 +1 +10 True -False +False True True -6 +6 6 True -False -0 -none +False +0 +none True -False -vertical -6 +False 12 6 +vertical +6 True -True +True True -never -never -in +never +never +in True -False +False True -True +True GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK True @@ -61,8 +61,8 @@ Add / Import True -True -True +True +True Locate the image that you want to import, and then click Open. The image is added to the end of the list of available images. @@ -80,7 +80,7 @@ True -False +False Image 0 @@ -98,35 +98,35 @@ True -False +False True True -0 -none +0 +none True -False +False start +12 +6 True True vertical 6 -12 -6 True -False +False vertical 3 True -False +False Style: -True -imagestyle +True +imagestyle 0 @@ -138,7 +138,7 @@ True -False +False Custom position/size Tiled @@ -161,13 +161,13 @@ True -False +False vertical 3 True -False +False Size: 0 @@ -180,15 +180,15 @@ True -False +False 6 True -False +False Width: -True -width +True +width False @@ -199,9 +199,9 @@ True -True -True +True True +True False @@ -219,15 +219,15 @@ True -False +False 6 True -False +
[Libreoffice-commits] core.git: sfx2/sdi
sfx2/sdi/sfx.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 90c97ccfd8c0324fffec8852935e71e1f0670d76 Author: Heiko Tietze AuthorDate: Sat Sep 23 14:57:43 2023 +0300 Commit: Heiko Tietze CommitDate: Sun Sep 24 19:58:58 2023 +0200 Resolves tdf#136216 - Hide uno:AdditionsDialog from customization Change-Id: I0948a85cf222a44534473ee465087213734536b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157185 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 669934693c0f..5660596a3b3d 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -5840,9 +5840,9 @@ SfxVoidItem AdditionsDialog SID_ADDITIONS_DIALOG RecordAbsolute = FALSE, RecordPerSet; -AccelConfig = TRUE, -MenuConfig = TRUE, -ToolBoxConfig = TRUE, +AccelConfig = FALSE, +MenuConfig = FALSE, +ToolBoxConfig = FALSE, GroupId = SfxGroupId::Application; ]
[Libreoffice-commits] core.git: cui/uiconfig officecfg/registry
cui/uiconfig/ui/cuiimapdlg.ui|2 +- cui/uiconfig/ui/objecttitledescdialog.ui |4 ++-- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit a5ece3a525466198c91633af3b9e0d6edfe9802f Author: Heiko Tietze AuthorDate: Sat Sep 23 14:14:47 2023 +0300 Commit: Heiko Tietze CommitDate: Sun Sep 24 18:51:32 2023 +0200 Resolves tdf#155044 - Rename "Description" to "Alt Text" Change-Id: Idc6602c6dfc7c6c8703fb8fc643665d7149486a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157183 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/cuiimapdlg.ui b/cui/uiconfig/ui/cuiimapdlg.ui index 5618564cb5c3..870839b8c82a 100644 --- a/cui/uiconfig/ui/cuiimapdlg.ui +++ b/cui/uiconfig/ui/cuiimapdlg.ui @@ -242,7 +242,7 @@ True False True -_Text Alternative: +Alt _Text: Enter a short description of essential features of the image map for persons who do not see the image. True textentry diff --git a/cui/uiconfig/ui/objecttitledescdialog.ui b/cui/uiconfig/ui/objecttitledescdialog.ui index e2cc8f1330ba..bcb121dc7797 100644 --- a/cui/uiconfig/ui/objecttitledescdialog.ui +++ b/cui/uiconfig/ui/objecttitledescdialog.ui @@ -12,7 +12,7 @@ False 6 -Description +Alt Text True 0 0 @@ -90,7 +90,7 @@ True False Give a short description of non-text content for users who do not see this object. -_Text Alternative: +Text: True object_title_entry 0 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index d21f7ebd7a07..b31c153d6dc5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -7252,7 +7252,7 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 - Description... + Alt Text... Add descriptions of non-text content (for accessibility)
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/config/optcomp.cxx | 45 ---
sw/source/uibase/inc/optcomp.hxx|4 -
sw/uiconfig/swriter/ui/optcompatpage.ui | 124
3 files changed, 1 insertion(+), 172 deletions(-)
New commits:
commit 1d4cd39262fb71f72311e33ac2bdb7d925be5d98
Author: Heiko Tietze
AuthorDate: Thu Sep 14 10:48:46 2023 +0200
Commit: Heiko Tietze
CommitDate: Thu Sep 14 12:39:12 2023 +0200
Related tdf#157006 - Remove global compatibility options
Clean-up the UI in favor of the advanced options
Change-Id: I11ffa643fc577e7eee41f42bd3e16fb290202f76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156911
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 7d6ecaf24e4d..8620ac451919 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -50,17 +50,12 @@
SwCompatibilityOptPage::SwCompatibilityOptPage(weld::Container* pPage, weld::Dia
, m_pWrtShell(nullptr)
, m_pImpl(new SwCompatibilityOptPage_Impl)
, m_nSavedOptions(0)
-, m_bSavedMSFormsMenuOption(false)
, m_xMain(m_xBuilder->weld_frame("compatframe"))
-, m_xGlobalOptionsFrame(m_xBuilder->weld_frame("globalcompatframe"))
, m_xFormattingLB(m_xBuilder->weld_combo_box("format"))
-, m_xGlobalOptionsLB(m_xBuilder->weld_combo_box("globaloptions"))
, m_xOptionsLB(m_xBuilder->weld_tree_view("options"))
-, m_xGlobalOptionsCLB(m_xBuilder->weld_tree_view("globaloptioncheckbox"))
, m_xDefaultPB(m_xBuilder->weld_button("default"))
{
m_xOptionsLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
-m_xGlobalOptionsCLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
int nPos = 0;
for (int i = static_cast(SvtCompatibilityEntry::Index::Module) + 1;
@@ -80,21 +75,6 @@
SwCompatibilityOptPage::SwCompatibilityOptPage(weld::Container* pPage, weld::Dia
m_xFormattingLB->clear();
-// Set MSOCompatibleFormsMenu entry attributes
-const bool bReadOnly =
officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::isReadOnly();
-m_xGlobalOptionsCLB->set_sensitive(!bReadOnly);
-
-m_xGlobalOptionsCLB->append();
-const bool bChecked =
officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::get();
-m_xGlobalOptionsCLB->set_toggle(0, bChecked ? TRISTATE_TRUE :
TRISTATE_FALSE);
-m_xGlobalOptionsCLB->set_text(0, m_xGlobalOptionsLB->get_text(0), 0);
-
-m_xGlobalOptionsLB->clear();
-
-// tdf#125799, we let only the doc options grow/shrink but give this one
more than its bare
-// min request height because there's only one row in it and that looks
somewhat abrupt
-m_xGlobalOptionsCLB->set_size_request(-1,
m_xGlobalOptionsCLB->get_preferred_size().Height() * 2);
-
InitControls( rSet );
// set handler
@@ -196,7 +176,6 @@ void SwCompatibilityOptPage::InitControls( const
SfxItemSet& rSet )
else
{
m_xMain->set_sensitive(false);
-m_xGlobalOptionsFrame->set_sensitive(false);
}
const OUString& rText = m_xMain->get_label();
m_xMain->set_label(rText.replaceAll("%DOCNAME", sDocTitle));
@@ -472,27 +451,6 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* )
if ( bModified )
WriteOptions();
-bool bNewMSFormsMenuOption = m_xGlobalOptionsCLB->get_toggle(0);
-if (m_bSavedMSFormsMenuOption != bNewMSFormsMenuOption)
-{
-std::shared_ptr
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::set(bNewMSFormsMenuOption,
batch);
-batch->commit();
-
-m_bSavedMSFormsMenuOption = bNewMSFormsMenuOption;
-bModified = true;
-
-// Show a message about that the option needs a restart to be applied
-{
-SolarMutexGuard aGuard;
-if
(svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
- GetFrameWeld(),
svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU))
-{
-GetDialogController()->response(RET_OK);
-}
-}
-}
-
return bModified;
}
@@ -503,9 +461,6 @@ void SwCompatibilityOptPage::Reset( const SfxItemSet* )
sal_uInt32 nOptions = GetDocumentOptions();
SetCurrentOptions( nOptions );
m_nSavedOptions = nOptions;
-
-m_bSavedMSFormsMenuOption =
officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::get();
-m_xGlobalOptionsCLB->set_toggle(0, m_bSavedMSFormsMenuOption ?
TRISTATE_TRUE : TRISTATE_FALSE);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index c98f17f0a3cd..d4ebbcb6b58e 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.hxx
@@ -40,15 +40,11 @@ private:
std::unique_ptr m_pImpl;
[Libreoffice-commits] core.git: extras/source filter/source include/svx oox/source svx/inc
extras/source/palettes/standard.sod |2 +-
filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl |4 ++--
include/svx/strings.hrc |2 +-
oox/source/drawingml/lineproperties.cxx |2 +-
svx/inc/strings.hxx |2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit df982f67ced630fc417540941392459dee8ab7eb
Author: Heiko Tietze
AuthorDate: Fri Aug 25 09:48:37 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Aug 25 11:12:02 2023 +0200
Resolves tdf#155926 - Rename "Line Style 9"
Sparse dash
Change-Id: Ia676358ea0de4437dd2e5f210b26a4e97f8d8758
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156090
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/extras/source/palettes/standard.sod
b/extras/source/palettes/standard.sod
index 7b68ea06cf9c..e664ff565168 100644
--- a/extras/source/palettes/standard.sod
+++ b/extras/source/palettes/standard.sod
@@ -28,7 +28,7 @@
-
+
diff --git a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
index 95d0d6b9d271..dbd1f5460c57 100644
--- a/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
+++ b/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
@@ -522,7 +522,7 @@
-
+
@@ -6779,7 +6779,7 @@
-
+
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 80066b3d33f3..d0a7390045ae 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -920,7 +920,7 @@
#define RID_SVXSTR_DASH12
NC_("RID_SVXSTR_DASH12", "Fine Dashed")
#define RID_SVXSTR_DASH13
NC_("RID_SVXSTR_DASH13", "Fine Dashed")
#define RID_SVXSTR_DASH14
NC_("RID_SVXSTR_DASH14", "Dashed")
-#define RID_SVXSTR_DASH15
NC_("RID_SVXSTR_DASH15", "Line Style 9")
+#define RID_SVXSTR_DASH15
NC_("RID_SVXSTR_DASH15", "Sparse Dash")
#define RID_SVXSTR_DASH16
NC_("RID_SVXSTR_DASH16", "3 Dashes 3 Dots")
#define RID_SVXSTR_DASH17
NC_("RID_SVXSTR_DASH17", "Ultrafine 2 Dots 3 Dashes")
#define RID_SVXSTR_DASH18
NC_("RID_SVXSTR_DASH18", "2 Dots 1 Dash")
diff --git a/oox/source/drawingml/lineproperties.cxx
b/oox/source/drawingml/lineproperties.cxx
index 5d818a26c613..d52bf07498ee 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -130,7 +130,7 @@ void lclRecoverStandardDashStyles(LineDash& orLineDash,
sal_Int32 nLineWidth)
// Use same ersatz for hairline as in export.
double fWidthHelp = nLineWidth == 0 ? 26.95/100.0 : nLineWidth / 100.0;
// start with (var) cases, because they have no rounding problems
-// "Fine Dashed", "Line Style 9" and "Dashed (var)" need no recover
+// "Fine Dashed", "Sparse Dash" and "Dashed (var)" need no recover
if (nDots == 3 && nDotLen == 197 & == 3 && nDashLen == 100 &&
nDistance == 100)
{ // "3 Dashes 3 Dots (var)"
orLineDash.DashLen = 0;
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 17302aa13ae0..a9bd9eb0dc4a 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -331,7 +331,7 @@ inline constexpr OUStringLiteral RID_SVXSTR_DASH11_DEF
= u
inline constexpr OUStringLiteral RID_SVXSTR_DASH12_DEF =
u"Fine Dashed";
inline constexpr OUStringLiteral RID_SVXSTR_DASH13_DEF =
u"Fine Dashed (var)";
inline constexpr OUStringLiteral RID_SVXSTR_DASH14_DEF =
u"Dashed (var)";
-inline constexpr OUStringLiteral RID_SVXSTR_DASH15_DEF =
u"Line Style 9";
+inline constexpr OUStringLiteral RID_SVXSTR_DASH15_DEF =
u"Sparse Dash";
inline constexpr OUStringLiteral RID_SVXSTR_DASH16_DEF =
u"3 Dashes 3 Dots (var)";
inline constexpr OUStringLiteral RID_SVXSTR_DASH17_DEF =
u"Ultrafine 2 Dots 3 Dashes";
inline constexpr OUStringLiteral RID_SVXSTR_DASH18_DEF =
u"2 Dots 1 Dash";
[Libreoffice-commits] core.git: sfx2/sdi
sfx2/sdi/sfx.sdi |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05f7ab11bec87b706f598ae4e81d1f20cd4f1312 Author: Heiko Tietze AuthorDate: Thu Aug 24 14:35:05 2023 +0200 Commit: Heiko Tietze CommitDate: Fri Aug 25 11:10:05 2023 +0200 Resolves tdf#156404 - No hotkey to apply cloned formatting Block customization for FormatPaintBrush as it allows modifier keys and has a multi-step workflow The patch has no effect yet because of tdf#147411 Change-Id: I4f5e423f483c490a994af4708552442f7716fc2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156052 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 6541b39e47cd..669934693c0f 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4636,7 +4636,7 @@ SfxBoolItem FormatPaintbrush SID_FORMATPAINTBRUSH ( SfxBoolItem PersistentCopy S RecordAbsolute = FALSE, RecordPerSet; - AccelConfig = TRUE, + AccelConfig = FALSE, MenuConfig = TRUE, ToolBoxConfig = TRUE, GroupId = SfxGroupId::Edit;
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabvwsh3.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 27fa859bb85ba7ac5b8cb22db5ae85750c7effba Author: Heiko Tietze AuthorDate: Thu Jul 27 11:08:35 2023 +0200 Commit: Heiko Tietze CommitDate: Fri Aug 18 09:21:23 2023 +0200 Resolves tdf#156357 - Submit Show Formula to document Change-Id: Ic893e573b2409342d61877313a3b60e83bb13690 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154984 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 7395325f775c..255dbed88508 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -721,6 +721,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScViewOptions aSetOpts = rOpts; aSetOpts.SetOption( VOPT_FORMULAS, bFormulaMode ); rViewData.SetOptions( aSetOpts ); +ScDocument& rDoc = rViewData.GetDocument(); +rDoc.SetViewOptions(aSetOpts); rViewData.GetDocShell()->PostPaintGridAll();
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/inftxt.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4d7a98b582dc70bbffc78e6622969e218f108433
Author: Heiko Tietze
AuthorDate: Fri Jul 28 14:38:44 2023 +0200
Commit: Heiko Tietze
CommitDate: Sun Jul 30 10:52:51 2023 +0200
Related tdf#58434 - Treat ZWSP and WJ as hard space
U+200B ZERO WIDTH SPACE and U+2060 WORD JOINER are not highlighted
anymore if Formatting Aids > Non-breaking spaces is off
Change-Id: Id35fb725bbfa14683ceb31d2043848a66328b364
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155019
Tested-by: Heiko Tietze
Reviewed-by: خالد حسني
Reviewed-by: Heiko Tietze
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 715780f65269..7544868bc2ee 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1494,6 +1494,7 @@ void SwTextPaintInfo::DrawViewOpt( const SwLinePortion
,
{
bDraw = PortionType::Footnote != nWhich ||
m_pFrame->IsFootnoteAllowed();
}
+bDraw &= GetOpt().IsHardBlank();
break;
case PortionType::Bookmark:
// no shading
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/medialine.ui | 133 + svx/uiconfig/ui/mediawindow.ui | 119 +++- 2 files changed, 133 insertions(+), 119 deletions(-) New commits: commit 1fb3584d61441d864c14ff3376d2fa485edf400b Author: Heiko Tietze AuthorDate: Fri Jul 28 12:39:22 2023 +0200 Commit: Heiko Tietze CommitDate: Fri Jul 28 16:03:25 2023 +0200 Resolves tdf#156504 - Strings in media player made translatable Change-Id: I2798d0becf7075bd0f484b4e96b44fa29c551415 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155013 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/svx/uiconfig/ui/medialine.ui b/svx/uiconfig/ui/medialine.ui index 2e86fe853065..cfbef49e1e41 100644 --- a/svx/uiconfig/ui/medialine.ui +++ b/svx/uiconfig/ui/medialine.ui @@ -1,40 +1,41 @@ - + 100 -1 -10 +1 +10 100 -1 -10 +1 +10 True -False +False True -False +False True 12 True -True +True center -icons -False +icons +False -True -Open -True -avmedia/res/av02048.png +False +True +Open +True +avmedia/res/av02048.png False @@ -43,10 +44,11 @@ -True -Apply -True -avmedia/res/av02053.png +False +True +Apply +True +avmedia/res/av02053.png False @@ -55,8 +57,8 @@ -False -True +False +True False @@ -66,9 +68,10 @@ True -Play -True -avmedia/res/av02049.png +False +Play +True +avmedia/res/av02049.png False @@ -78,9 +81,10 @@ True -Pause -True -avmedia/res/av02050.png +False +Pause +True +avmedia/res/av02050.png False @@ -90,9 +94,10 @@ True -Stop -True -avmedia/res/av02051.png +False +Stop +True +avmedia/res/av02051.png False @@ -102,7 +107,7 @@ True -False +False False @@ -112,9 +117,10 @@ True -Repeat -True -avmedia/res/av02052.png +False +Repeat +True +avmedia/res/av02052.png False @@ -131,26 +137,26 @@ True -True -icons -False +True +icons +False True -False +False True -False +False -128 +128 True -True +True True adjustment1 2 -False +False False @@ -161,10 +167,10 @@ True -True +True False -True 0.5 +True False @@ -190,15 +196,16 @@ True -True -icons -False +True +icons +False
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/docstat.hxx |1
sw/source/core/doc/docstat.cxx |2
sw/source/ui/dialog/wordcountdialog.cxx |5
sw/source/uibase/inc/wordcountdialog.hxx |1
sw/source/uibase/uiview/view2.cxx|5
sw/uiconfig/swriter/ui/wordcount.ui | 192 +--
6 files changed, 122 insertions(+), 84 deletions(-)
New commits:
commit 90e3af16c12f94f487ff7516048a239db1d2ff7d
Author: Heiko Tietze
AuthorDate: Tue Jul 18 15:02:58 2023 +0200
Commit: Heiko Tietze
CommitDate: Wed Jul 26 10:37:35 2023 +0200
Resolves tdf#95329 - Number of comments in word count dialog
Change-Id: I29ca811065cce83f9c8630f79a2b78c2c3fe0da1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154581
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index fd53d80bfcbf..84476db5c065 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.hxx
@@ -36,6 +36,7 @@ struct SW_DLLPUBLIC SwDocStat
sal_uLong nAsianWord;
sal_uLong nChar;
sal_uLong nCharExcludingSpaces;
+sal_uLong nComments;
boolbModified;
SwDocStat();
diff --git a/sw/source/core/doc/docstat.cxx b/sw/source/core/doc/docstat.cxx
index c34e8d094ba2..959c61833dd6 100644
--- a/sw/source/core/doc/docstat.cxx
+++ b/sw/source/core/doc/docstat.cxx
@@ -30,6 +30,7 @@ SwDocStat::SwDocStat() :
nAsianWord(0),
nChar(0),
nCharExcludingSpaces(0),
+nComments(0),
bModified(true)
{}
@@ -45,6 +46,7 @@ void SwDocStat::Reset()
nAsianWord = 0;
nChar = 0;
nCharExcludingSpaces = 0;
+nComments = 0;
bModified = true;
}
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index a96e1c50b3be..b0b92a6ae1a7 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#define IS_MOBILE_PHONE (comphelper::LibreOfficeKit::isActive() &&
SfxViewShell::Current() && SfxViewShell::Current()->isLOKMobilePhone())
@@ -64,6 +65,7 @@ void SwWordCountFloatDlg::SetValues(const SwDocStat&
rCurrent, const SwDocStat&
setValue(*m_xDocCharacterFT, rDoc.nChar, rLocaleData);
setValue(*m_xDocCharacterExcludingSpacesFT, rDoc.nCharExcludingSpaces,
rLocaleData);
setValue(*m_xDocCjkcharsFT, rDoc.nAsianWord, rLocaleData);
+setValue(*m_xDocComments, rCurrent.nComments, rLocaleData);
if (m_xStandardizedPagesLabelFT->get_visible())
{
@@ -120,6 +122,7 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings*
_pBindings,
, m_xCjkcharsLabelFT2(m_xBuilder->weld_label("cjkcharsft2"))
, m_xStandardizedPagesLabelFT(m_xBuilder->weld_label("standardizedpages"))
,
m_xStandardizedPagesLabelFT2(m_xBuilder->weld_label("standardizedpages2"))
+, m_xDocComments(m_xBuilder->weld_label("docComments"))
{
showCJK(SvtCJKOptions::IsAnyEnabled());
showStandardizedPages(officecfg::Office::Writer::WordCount::ShowStandardizedPageCount::get());
@@ -143,6 +146,8 @@ void SwWordCountFloatDlg::UpdateCounts()
aDocStat = rSh.GetUpdatedDocStat();
rSh.EndAction();
}
+SwPostItMgr* pPostItMgr = rSh.GetPostItMgr();
+aCurrCnt.nComments = pPostItMgr->end() - pPostItMgr->begin();
SetValues(aCurrCnt, aDocStat);
}
}
diff --git a/sw/source/uibase/inc/wordcountdialog.hxx
b/sw/source/uibase/inc/wordcountdialog.hxx
index c5b23f0c5307..ffa0b6478dcc 100644
--- a/sw/source/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/uibase/inc/wordcountdialog.hxx
@@ -43,6 +43,7 @@ class SwWordCountFloatDlg final : public
SfxModelessDialogController
std::unique_ptr m_xCjkcharsLabelFT2;
std::unique_ptr m_xStandardizedPagesLabelFT;
std::unique_ptr m_xStandardizedPagesLabelFT2;
+std::unique_ptr m_xDocComments;
public:
SwWordCountFloatDlg(SfxBindings* pBindings,
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 2903bbf19c03..0fb4f0e22a2b 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1875,9 +1875,12 @@ void SwView::StateStatusLine(SfxItemSet )
OUString aWordCount(SwResId(pResId));
aWordCount = aWordCount.replaceAll("$1", aWordArg);
aWordCount = aWordCount.replaceAll("$2", aCharArg);
-
rSet.Put( SfxStringItem( FN_STAT_WORDCOUNT, aWordCount ) );
+SwPostItMgr* pPostItMgr = rShell.GetPostItMgr();
+if (pPostItMgr)
+selectionStats.nComments = pPostItMgr->end() -
pPostItMgr->begin();
+
SwWordCountWrapper *pWrdCnt =
static_cast(GetViewFrame().GetChildWindow(SwWordCountWrapper::GetChildWindowId()));
if (pWrdCnt)
pWrdCnt->SetCounts(selectionStats, documentStats);
diff --git
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 56ce1aa9239637a10f747c00ba93e96bb2e613ab Author: Heiko Tietze AuthorDate: Mon Jul 24 17:33:55 2023 +0200 Commit: Heiko Tietze CommitDate: Tue Jul 25 14:51:14 2023 +0200 Resolves tdf#58434 - No field shading for soft hyphen and non-breaking spaces Change-Id: I27123b013aa8fc876ddb06e1dd96f4ac50d6ebbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154847 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 0f684bb2eea9..5ac39808f1d0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1144,7 +1144,7 @@ Specifies whether optional hyphens are shown on the screen. Optional hyphens - true + false @@ -1160,7 +1160,7 @@ Specifies whether protected spaces are shown on the screen. Protected Spaces - true + false
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +++
sc/source/ui/view/cellsh4.cxx| 12
2 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit c7de706f5f4b32babdad1cf2ced4e79c802df46a
Author: Heiko Tietze
AuthorDate: Mon Jul 17 16:03:41 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Jul 21 14:51:01 2023 +0200
Resolves tdf#112876 - Make use of scroll lock configurable
Change-Id: I8e2f238e59601fcc1d92fc0593c3d20e75396cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154528
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
(cherry picked from commit 4adc868328e958a4a9cead3731bd3468497c97c8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154696
Reviewed-by: Heiko Tietze
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d282ca681fa0..0cb348ea087e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -690,6 +690,13 @@
true
+
+
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+
+true
+
Specifies the functions last used.
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 13d6993634dd..e44dbe599dba 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
void ScCellShell::ExecuteCursor( SfxRequest& rReq )
@@ -121,10 +122,13 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
// If ScrollLock key is active, cell cursor stays on the current cell while
// scrolling the grid.
bool bScrollLock = false;
-KeyIndicatorState eState = pFrameWin->GetIndicatorState();
-if (eState & KeyIndicatorState::SCROLLLOCK)
-bScrollLock = true;
-
+// tdf#112876 - allow to disable for special keyboards
+if (officecfg::Office::Calc::Input::UseScrollLock::get())
+{
+KeyIndicatorState eState = pFrameWin->GetIndicatorState();
+if (eState & KeyIndicatorState::SCROLLLOCK)
+bScrollLock = true;
+}
//OS: once for all should do, however!
pTabViewShell->ExecuteInputDirect();
switch ( nSlotId )
[Libreoffice-commits] core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |7 +++
sc/source/ui/view/cellsh4.cxx| 12
2 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 4adc868328e958a4a9cead3731bd3468497c97c8
Author: Heiko Tietze
AuthorDate: Mon Jul 17 16:03:41 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue Jul 18 15:05:34 2023 +0200
Resolves tdf#112876 - Make use of scroll lock configurable
Change-Id: I8e2f238e59601fcc1d92fc0593c3d20e75396cc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154528
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d861f56e81d7..eff7ac7aa80a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -690,6 +690,13 @@
true
+
+
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+ Toggles the scroll lock behavior allowing to disable it for
special keyboards
+
+true
+
Specifies the functions last used.
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 13d6993634dd..e44dbe599dba 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
void ScCellShell::ExecuteCursor( SfxRequest& rReq )
@@ -121,10 +122,13 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
// If ScrollLock key is active, cell cursor stays on the current cell while
// scrolling the grid.
bool bScrollLock = false;
-KeyIndicatorState eState = pFrameWin->GetIndicatorState();
-if (eState & KeyIndicatorState::SCROLLLOCK)
-bScrollLock = true;
-
+// tdf#112876 - allow to disable for special keyboards
+if (officecfg::Office::Calc::Input::UseScrollLock::get())
+{
+KeyIndicatorState eState = pFrameWin->GetIndicatorState();
+if (eState & KeyIndicatorState::SCROLLLOCK)
+bScrollLock = true;
+}
//OS: once for all should do, however!
pTabViewShell->ExecuteInputDirect();
switch ( nSlotId )
[Libreoffice-commits] core.git: include/tools sd/qa
include/tools/color.hxx|4 ++--
sd/qa/unit/data/xml/tdf92001_0.xml |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ddb483509113e469b771320fea52f1b089574021
Author: Heiko Tietze
AuthorDate: Wed Jul 12 12:52:39 2023 +0200
Commit: Heiko Tietze
CommitDate: Sat Jul 15 08:33:55 2023 +0200
Resolves tdf#156182 - Automatic text color unreadable with darker cells
Change-Id: Ia5e405fc05613726b5011174c8d00ca204eb31b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154352
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 296d6064c40a..41826ec2335f 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -311,8 +311,8 @@ public:
*/
bool IsDark() const
{
-// 62 is the number that means it also triggers on Ubuntu in dark mode
-return GetLuminance() <= 62;
+// tdf#156182
+return GetLuminance() <= 156;
}
/** Comparison with luminance thresholds.
diff --git a/sd/qa/unit/data/xml/tdf92001_0.xml
b/sd/qa/unit/data/xml/tdf92001_0.xml
index d67952eb1fe5..234f751a9c23 100644
--- a/sd/qa/unit/data/xml/tdf92001_0.xml
+++ b/sd/qa/unit/data/xml/tdf92001_0.xml
@@ -1,6 +1,6 @@
-
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml |1 + 1 file changed, 1 insertion(+) New commits: commit c2b5ef0ea307203131fa2718984dd7b96e61e4d9 Author: Heiko Tietze AuthorDate: Tue Jun 27 13:28:38 2023 +0200 Commit: Heiko Tietze CommitDate: Wed Jun 28 10:11:29 2023 +0200 Related tdf#106556 - Spotlight DF on the main menu Added to the Format menu Change-Id: I9b601aa4b55e9ce5a78fd8306d72baee71fd357f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153661 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 20a0593ac499..bc9b8751b016 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -426,6 +426,7 @@ +
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml |1 + 1 file changed, 1 insertion(+) New commits: commit f1b0aca6bf520626d3c9a1fac67cd2de2c10c78c Author: Heiko Tietze AuthorDate: Tue Jun 27 13:28:38 2023 +0200 Commit: Heiko Tietze CommitDate: Wed Jun 28 10:11:18 2023 +0200 Related tdf#106556 - Spotlight DF on the main menu Added to the Format menu Change-Id: I9b601aa4b55e9ce5a78fd8306d72baee71fd357f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153641 Reviewed-by: Vernon, Stuart Foote Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 20a0593ac499..bc9b8751b016 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -426,6 +426,7 @@ +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - vcl/uiconfig
vcl/uiconfig/ui/printdialog.ui | 148 + 1 file changed, 64 insertions(+), 84 deletions(-) New commits: commit 0e4603d80764772d848684152779824c9ef24b74 Author: Heiko Tietze AuthorDate: Fri Jun 23 11:42:35 2023 +0200 Commit: Heiko Tietze CommitDate: Mon Jun 26 14:44:26 2023 +0200 Resolves tdf#147514 - Number of copies on top of the print dialog Swapped with Odd/Even pages option to keep the dialog small Number of copies is assume to be the more relevant function Simple "More" renamed to give some clue of the options Change-Id: I8d1bd3455d5b8d57f47ac97c1a310fd47a4a5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153495 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit bea05a79c8ed565909e341a24b298d8deab7e042) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153595 diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 9d941db942a2..6f0aa80d05fd 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -1,5 +1,5 @@ - + @@ -609,14 +609,13 @@ - + True False start -Include: +_Number of copies: True -evenoddbox -0 +1 0 @@ -624,19 +623,19 @@ - + True -False -True -0 - - Odd and Even Pages - Odd Pages - Even Pages - +True +start +center +True +1 +True +adjustment2 +1 - -Select the subset of pages to print. + +Enter the number of copies that you want to print. @@ -661,7 +660,8 @@ True False -2 +6 +3 6 @@ -674,7 +674,7 @@ 0 -0 +1 @@ -684,7 +684,7 @@ 1 -0 +1 @@ -699,7 +699,7 @@ 0 -
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - extras/source include/svx svx/inc
extras/source/palettes/standard.sog |4 +++-
include/svx/strings.hrc | 22 +++---
svx/inc/strings.hxx | 22 +++---
3 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit ae1474e5086517c50e28cba890ed147061c04b9b
Author: Heiko Tietze
AuthorDate: Fri Jun 16 09:03:11 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon Jun 26 10:52:41 2023 +0200
MCGR: Some exemplary multi-color gradients
* "Rainbow, Sunrise, Sunset" added
* "Preset, Spotted Grey, Teal To Blue" removed
to keep items inside scrolled window
Change-Id: I3be6c8596accc769df92a8610260ed38a6c29602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153166
Tested-by: Jenkins
Reviewed-by: Regina Henschel
Reviewed-by: Heiko Tietze
(cherry picked from commit b5b3d73e0fb47726fef1342c0944148e673ed1a6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153514
diff --git a/extras/source/palettes/standard.sog
b/extras/source/palettes/standard.sog
index 036faa856de4..32f9d37e9411 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +1,3 @@
-http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;>
+
+
+http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 249d01060a39..eb8ca335f91c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -783,17 +783,17 @@
#define RID_SVXSTR_GRDT71
NC_("RID_SVXSTR_GRDT71", "Pastel Dream")
#define RID_SVXSTR_GRDT72
NC_("RID_SVXSTR_GRDT72", "Blue Touch")
#define RID_SVXSTR_GRDT73
NC_("RID_SVXSTR_GRDT73", "Blank with Gray")
-#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "Spotted Gray")
-#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "London Mist")
-#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Teal to Blue")
-#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Midnight")
-#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Deep Ocean")
-#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Submarine")
-#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Green Grass")
-#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Neon Light")
-#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Sunshine")
-#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Present")
-#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Mahogany")
+#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "London Mist")
+#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "Submarine")
+#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Midnight")
+#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Deep Ocean")
+#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Mahogany")
+#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Green Grass")
+#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Neon Light")
+#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Sunshine")
+#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Rainbow")
+#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Sunrise")
+#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Sunset")
// /gradients
#define RID_SVXSTR_HATCH0
NC_("RID_SVXSTR_HATCH0", "Black 0 Degrees")
#define RID_SVXSTR_HATCH1
NC_("RID_SVXSTR_HATCH1", "Black 90 Degrees")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 1c917bee9318..17302aa13ae0 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -192,17 +192,17 @@ inline constexpr OUStringLiteral RID_SVXSTR_GRDT70_DEF
= u
inline constexpr OUStringLiteral RID_SVXSTR_GRDT71_DEF =
u"Pastel Dream";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT72_DEF =
u"Blue Touch";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT73_DEF =
u"Blank with Gray";
[Libreoffice-commits] core.git: vcl/uiconfig
vcl/uiconfig/ui/printdialog.ui | 148 + 1 file changed, 64 insertions(+), 84 deletions(-) New commits: commit bea05a79c8ed565909e341a24b298d8deab7e042 Author: Heiko Tietze AuthorDate: Fri Jun 23 11:42:35 2023 +0200 Commit: Heiko Tietze CommitDate: Sun Jun 25 09:08:49 2023 +0200 Resolves tdf#147514 - Number of copies on top of the print dialog Swapped with Odd/Even pages option to keep the dialog small Number of copies is assume to be the more relevant function Simple "More" renamed to give some clue of the options Change-Id: I8d1bd3455d5b8d57f47ac97c1a310fd47a4a5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153495 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 9d941db942a2..6f0aa80d05fd 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -1,5 +1,5 @@ - + @@ -609,14 +609,13 @@ - + True False start -Include: +_Number of copies: True -evenoddbox -0 +1 0 @@ -624,19 +623,19 @@ - + True -False -True -0 - - Odd and Even Pages - Odd Pages - Even Pages - +True +start +center +True +1 +True +adjustment2 +1 - -Select the subset of pages to print. + +Enter the number of copies that you want to print. @@ -661,7 +660,8 @@ True False -2 +6 +3 6 @@ -674,7 +674,7 @@ 0 -0 +1 @@ -684,7 +684,7 @@ 1 -0 +1 @@ -699,7 +699,7 @@ 0 -1 +2
[Libreoffice-commits] core.git: extras/source include/svx svx/inc
extras/source/palettes/standard.sog |4 +++-
include/svx/strings.hrc | 22 +++---
svx/inc/strings.hxx | 22 +++---
3 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit d0a9d04d2287da456317c5a59af3ccbe3b98b977
Author: Heiko Tietze
AuthorDate: Fri Jun 16 09:03:11 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Jun 23 11:23:35 2023 +0200
MCGR: Some exemplary multi-color gradients
* "Rainbow, Sunrise, Sunset" added
* "Preset, Spotted Grey, Teal To Blue" removed
to keep items inside scrolled window
Change-Id: I3be6c8596accc769df92a8610260ed38a6c29602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153166
Tested-by: Jenkins
Reviewed-by: Regina Henschel
Reviewed-by: Heiko Tietze
diff --git a/extras/source/palettes/standard.sog
b/extras/source/palettes/standard.sog
index 036faa856de4..32f9d37e9411 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +1,3 @@
-http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;>
+
+
+http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 249d01060a39..eb8ca335f91c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -783,17 +783,17 @@
#define RID_SVXSTR_GRDT71
NC_("RID_SVXSTR_GRDT71", "Pastel Dream")
#define RID_SVXSTR_GRDT72
NC_("RID_SVXSTR_GRDT72", "Blue Touch")
#define RID_SVXSTR_GRDT73
NC_("RID_SVXSTR_GRDT73", "Blank with Gray")
-#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "Spotted Gray")
-#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "London Mist")
-#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Teal to Blue")
-#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Midnight")
-#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Deep Ocean")
-#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Submarine")
-#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Green Grass")
-#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Neon Light")
-#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Sunshine")
-#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Present")
-#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Mahogany")
+#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "London Mist")
+#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "Submarine")
+#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Midnight")
+#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Deep Ocean")
+#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Mahogany")
+#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Green Grass")
+#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Neon Light")
+#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Sunshine")
+#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Rainbow")
+#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Sunrise")
+#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Sunset")
// /gradients
#define RID_SVXSTR_HATCH0
NC_("RID_SVXSTR_HATCH0", "Black 0 Degrees")
#define RID_SVXSTR_HATCH1
NC_("RID_SVXSTR_HATCH1", "Black 90 Degrees")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 1c917bee9318..17302aa13ae0 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -192,17 +192,17 @@ inline constexpr OUStringLiteral RID_SVXSTR_GRDT70_DEF
= u
inline constexpr OUStringLiteral RID_SVXSTR_GRDT71_DEF =
u"Pastel Dream";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT72_DEF =
u"Blue Touch";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT73_DEF =
u"Blank with Gray";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT74_DEF =
u"Spotted Gray";
-inline constexpr OUStringLiteral
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - officecfg/registry sw/inc sw/source
officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 25 +
sw/inc/viewopt.hxx | 10 +
sw/source/ui/config/optpage.cxx|1
sw/source/uibase/config/cfgitems.cxx |6 ++-
sw/source/uibase/config/usrpref.cxx| 21 --
sw/source/uibase/config/viewopt.cxx| 23 +++
sw/source/uibase/frmdlg/frmmgr.cxx |4 +-
sw/source/uibase/inc/cfgitems.hxx |1
sw/source/uibase/inc/optpage.hxx |2 +
9 files changed, 86 insertions(+), 7 deletions(-)
New commits:
commit cbcfada382a5a9aa33d55e996e7865487f5b769e
Author: Heiko Tietze
AuthorDate: Tue Dec 1 12:21:10 2020 +0100
Commit: Gabor Kelemen
CommitDate: Sun Jun 11 23:17:54 2023 +0200
Resolves tdf#99646 - Make default type of anchoring optional
Option introduced at Tools > Options > Writer > Formatting Aids
Change-Id: I8d890f84107647821c39669114b991c301727788
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106970
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152794
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 0c25de006f9e..88ac40f5057d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1079,6 +1079,31 @@
true
+
+
+
+Specifies the anchor of newly inserted images.
+Default Anchor
+
+
+
+
+FLY_TO_PARA
+
+
+
+
+FLY_TO_CHAR
+
+
+
+
+FLY_AS_CHAR
+
+
+
+ 1
+
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 11d2914ed028..3a2148c7911c 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
#include "swdllapi.h"
@@ -169,6 +170,7 @@ class SW_DLLPUBLIC SwViewOption
boolmbHideWhitespaceMode : 1; // Hide header, footer, and
pagebreak.
boolm_bShowPlaceHolderFields : 1; // Only used in printing!
mutable boolm_bIdle;
+sal_Int32 m_nDefaultAnchor; // GetDefaultAnchorType() to convert
int to RndStdIds
// Scale
sal_uInt16 m_nZoom; // In percent.
@@ -649,6 +651,14 @@ public:
static void SetDocBoundaries(bool bSet)
{SetAppearanceFlag(ViewOptFlags::DocBoundaries, bSet);}
static void ApplyColorConfigValues(const svtools::ColorConfig&
rConfig);
+
+// get/set default anchor (0..2); use GetDefaultAnchorType() to convert
into RndStdIds::FLY_*
+sal_Int32 GetDefaultAnchor() const
+{ return m_nDefaultAnchor; }
+void SetDefaultAnchor( const sal_Int32 aFlag )
+{ m_nDefaultAnchor = aFlag; }
+
+RndStdIds GetDefaultAnchorType();
};
inline bool SwViewOption::operator==( const SwViewOption ) const
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 88b6740e8a9a..98359cc2ae05 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1218,6 +1218,7 @@
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
, m_xFillSpaceRB(m_xBuilder->weld_radio_button("fillspace"))
, m_xCursorProtFrame(m_xBuilder->weld_frame("crsrprotframe"))
, m_xCursorInProtCB(m_xBuilder->weld_check_button("cursorinprot"))
+, m_xDefaultAnchorType(m_xBuilder->weld_combo_box("cxDefaultAnchor"))
, m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button("mathbaseline"))
{
const SfxPoolItem* pItem = nullptr;
diff --git a/sw/source/uibase/config/cfgitems.cxx
b/sw/source/uibase/config/cfgitems.cxx
index efbbdf4154b4..a5e8718aa718 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -41,6 +41,7 @@ SwDocDisplayItem::SwDocDisplayItem() :
bCharHiddenText =
bBookmarks =
bManualBreak= true;
+m_xDefaultAnchor = 1; //FLY_TO_CHAR
};
// Item for the Settings dialog, page document view
@@ -55,6 +56,7 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt
) :
bCharHiddenText = rVOpt.IsShowHiddenChar(true);
bBookmarks = rVOpt.IsShowBookmarks(true);
bManualBreak= rVOpt.IsLineBreak(true);
+m_xDefaultAnchor= rVOpt.GetDefaultAnchor();
}
SfxPoolItem* SwDocDisplayItem::Clone( SfxItemPool* ) const
@@ -75,7
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/recentdocsviewitem.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit f8036f2f5238adf227d0ffa646e503f0446bb37b
Author: Heiko Tietze
AuthorDate: Wed May 24 12:05:45 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Jun 2 16:07:39 2023 +0200
Resolves tdf#155200 - Don't scale overlay images in start center
Thumbnails don't change their size so overlay must not too
Change-Id: I83ff2bb60ec619686b583180ebabe194c4a77b23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152193
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index 5c7c6ccfd507..9af2c114988f 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -213,6 +213,7 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView
, const OUStri
aThumbnail = TemplateLocalView::scaleImg(aThumbnail, nThumbnailSize,
nThumbnailSize);
BitmapEx aModule = getModuleOverlay(rURL);
+aModule.Scale(Size(48,48)); //tdf#155200: Thumbnails don't change
their size so overlay must not too
if (!aModule.IsEmpty())
{
const Size aSize(aThumbnail.GetSizePixel());
[Libreoffice-commits] core.git: include/svtools
include/svtools/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 57d5c01ac1bcce56591b4eae96d1e679ef7197d4
Author: Heiko Tietze
AuthorDate: Tue May 30 10:52:30 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue May 30 13:53:15 2023 +0200
Resolves tdf#140091 - Tooltip to add sheets should be more informative
Change-Id: I03ae5d11b80472839e2654ff43eb391b5396f026
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152383
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index c77d3f6cfe7d..645b19b86567 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -187,7 +187,7 @@
#define STR_TABBAR_HINT_MOVELEFT_SHEETS
NC_("STR_TABBAR_HINT_MOVELEFT_SHEETS", "Scroll to previous sheet")
#define STR_TABBAR_HINT_MOVERIGHT_SHEETS
NC_("STR_TABBAR_HINT_MOVERIGHT_SHEETS", "Scroll to next sheet")
#define STR_TABBAR_HINT_MOVETOEND_SHEETS
NC_("STR_TABBAR_HINT_MOVETOEND_SHEETS", "Scroll to last sheet")
-#define STR_TABBAR_HINT_ADDTAB_SHEETS
NC_("STR_TABBAR_HINT_ADDTAB_SHEETS", "Add sheet")
+#define STR_TABBAR_HINT_ADDTAB_SHEETS
NC_("STR_TABBAR_HINT_ADDTAB_SHEETS", "Add new sheet (right click to see all
non-hidden sheets)")
#define STR_SVT_ACC_RULER_HORZ_NAME
NC_("STR_SVT_ACC_RULER_HORZ_NAME", "Horizontal Ruler")
#define STR_SVT_ACC_RULER_VERT_NAME
NC_("STR_SVT_ACC_RULER_VERT_NAME", "Vertical Ruler")
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdpage.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit ca10ae200aac01e6b238567fa637cdc293f70f7a
Author: Heiko Tietze
AuthorDate: Fri May 26 10:17:53 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri May 26 13:05:07 2023 +0200
Suppress variable not used warning
Change-Id: Ie154c9ad2d187adf735590da2e23420572dd5de4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152294
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 55d3e7f5aa6b..175f58b2ad7a 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -139,7 +139,9 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
mbObjOrdNumsDirty = false;
mbRectsDirty = false;
+#ifdef DBG_UTIL
size_t nCloneErrCnt(0);
+#endif
const size_t nCount(rSrcList.GetObjCount());
if(nullptr == getSdrObjectFromSdrObjList() && nullptr ==
getSdrPageFromSdrObjList())
@@ -162,10 +164,12 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
NbcInsertObject(pDO.get(), SAL_MAX_SIZE);
aCloneList.AddPair(pSO, pDO.get());
}
+#ifdef DBG_UTIL
else
{
nCloneErrCnt++;
}
+#endif
}
// Wires up the connections
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/hdrcont.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 306093f8f82a646a2a82ebfc57fbef70af2d30a7
Author: Heiko Tietze
AuthorDate: Fri May 26 11:20:06 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri May 26 13:04:48 2023 +0200
Related tdf#145080 - Less obtrusive col/row header color on macOS
Change-Id: I4821643148afa205d94fe2f6178091c2acfb5bc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152299
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index d6e9b5dbeb3f..c6688ea11562 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -361,7 +361,14 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
{
// background for selection
GetOutDev()->SetLineColor();
-GetOutDev()->SetFillColor( rStyleSettings.GetAccentColor() );
+Color aColor( rStyleSettings.GetAccentColor() );
+// merging the highlightcolor (which is used if accent does not exist) with
the background
+// fails in many cases such as Breeze Dark (highlight is too close to
background) and
+// Breeze Light (font color is white and not readable anymore)
+#ifdef MACOSX
+aColor.Merge( rStyleSettings.GetFaceColor(), 80 );
+#endif
+GetOutDev()->SetFillColor( aColor );
GetOutDev()->DrawRect( aFillRect );
}
}
[Libreoffice-commits] core.git: include/vcl sc/source vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win
include/vcl/settings.hxx |3 +++
sc/source/ui/view/gridwin.cxx |2 +-
sc/source/ui/view/hdrcont.cxx |2 +-
vcl/osx/salframe.cxx |4
vcl/qt5/QtFrame.cxx |2 ++
vcl/source/app/settings.cxx | 17 +
vcl/unx/gtk3/salnativewidgets-gtk.cxx |1 +
vcl/win/window/salframe.cxx |4
8 files changed, 33 insertions(+), 2 deletions(-)
New commits:
commit 258686a58f909ab04c7281c05f15882eb400748e
Author: Heiko Tietze
AuthorDate: Wed May 17 16:48:30 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue May 23 09:44:21 2023 +0200
Resolves tdf#145080 - Use accent color for focused cell
Accent color added but effectively working only on macOS
See inline comments for gtk, qt, and win
Change-Id: I1e4a729331735683921f94b27bb2bb02555c0165
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151887
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 05c7678869d0..7f4849c7b718 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -336,6 +336,9 @@ public:
voidSetDeactiveBorderColor( const Color&
rColor );
const Color&GetDeactiveBorderColor() const;
+voidSetAccentColor( const Color& rColor );
+const Color&GetAccentColor() const;
+
voidSetHighlightColor( const Color& rColor );
const Color&GetHighlightColor() const;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c2ec3311bc9d..d32313ae4308 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6454,7 +6454,7 @@ void ScGridWindow::UpdateCursorOverlay()
if (xOverlayManager.is())
{
-Color aCursorColor =
GetSettings().GetStyleSettings().GetHighlightColor();
+Color aCursorColor =
GetSettings().GetStyleSettings().GetAccentColor();
if (mrViewData.GetActivePart() != eWhich)
// non-active pane uses a different color.
aCursorColor =
SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 305ada306856..d6e9b5dbeb3f 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -361,7 +361,7 @@ void ScHeaderControl::Paint( vcl::RenderContext&
/*rRenderContext*/, const tools
{
// background for selection
GetOutDev()->SetLineColor();
-GetOutDev()->SetFillColor( rStyleSettings.GetHighlightColor()
);
+GetOutDev()->SetFillColor( rStyleSettings.GetAccentColor() );
GetOutDev()->DrawRect( aFillRect );
}
}
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index ea514b786ada..b4a2d07463b8 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1384,6 +1384,10 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
vcl::Font aTooltipFont(getFont([NSFont toolTipsFontOfSize: 0], nDPIY,
aAppFont));
aStyleSettings.SetHelpFont(aTooltipFont);
+Color aAccentColor( getColor( [NSColor controlAccentColor],
+ aStyleSettings.GetAccentColor(), mpNSWindow
) );
+aStyleSettings.SetAccentColor( aAccentColor );
+
Color aHighlightColor( getColor( [NSColor selectedTextBackgroundColor],
aStyleSettings.GetHighlightColor(),
mpNSWindow ) );
aStyleSettings.SetHighlightColor( aHighlightColor );
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index ed5c0538e5cb..08d206261b88 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -1143,6 +1143,8 @@ void QtFrame::UpdateSettings(AllSettings& rSettings)
style.SetWorkspaceColor(aMid);
// Selection
+// https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/305
+style.SetAccentColor(aHigh);
style.SetHighlightColor(aHigh);
style.SetHighlightTextColor(aHighText);
style.SetListBoxWindowHighlightColor(aHigh);
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 313aacfce155..9921b0b774bc 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -112,6 +112,7 @@ struct ImplStyleData
Color maGroupTextColor;
Color maHelpColor;
Color maHelpTextColor;
+Color maAccentColor;
Color maHighlightColor;
Color maHighlightTextColor;
Color maLabelTextColor;
@@ -536,6 +537,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7e3a9c7b82745f8765b5526f400243f0e8eff390
Author: Heiko Tietze
AuthorDate: Tue May 16 13:30:51 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue May 16 17:28:40 2023 +0200
Resolves tdf#154787 - Ambiguous item on macOS quick start menu
Change-Id: I3f414bfc15feff67eac3dddbe5e3cd7b557ea82d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151832
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 83e994bdde77..bd2c0b5d5630 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -136,7 +136,7 @@
#define STR_QUICKSTART_EXIT NC_("STR_QUICKSTART_EXIT",
"Exit Quickstarter")
#define STR_QUICKSTART_TIP NC_("STR_QUICKSTART_TIP",
"%PRODUCTNAME %PRODUCTVERSION Quickstarter")
#define STR_QUICKSTART_FILEOPEN NC_("STR_QUICKSTART_FILEOPEN",
"Open Document...")
-#define STR_QUICKSTART_FROMTEMPLATE
NC_("STR_QUICKSTART_FROMTEMPLATE", "From Template...")
+#define STR_QUICKSTART_FROMTEMPLATE
NC_("STR_QUICKSTART_FROMTEMPLATE", "Template Manager...")
#define STR_QUICKSTART_PRELAUNCH
NC_("STR_QUICKSTART_PRELAUNCH", "Load %PRODUCTNAME During System Start-Up")
#define STR_QUICKSTART_LNKNAME NC_("STR_QUICKSTART_LNKNAME",
"%PRODUCTNAME %PRODUCTVERSION")
#define STR_QUICKSTART_FILE NC_("STR_QUICKSTART_FILE",
"File")
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/options/optgdlg.cxx |1 + cui/uiconfig/ui/optviewpage.ui |4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit 90a8073fa5a6a724de498130476895dfaf4429b5 Author: Heiko Tietze AuthorDate: Mon May 15 13:46:58 2023 +0200 Commit: Heiko Tietze CommitDate: Tue May 16 09:20:49 2023 +0200 Related tdf#155070 - Tooltips moved from container to controls * Save log button disabled if Skia is off to prevent error message Change-Id: Iccd757fb15b347cf9d048115d4b048543814bd99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151764 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 369e48ae265a..249d7b0318b6 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -667,6 +667,7 @@ void OfaViewTabPage::UpdateSkiaStatus() // FIXME: should really add code to show a 'lock' icon here. m_xUseSkia->set_sensitive(!officecfg::Office::Common::VCL::UseSkia::isReadOnly()); m_xForceSkiaRaster->set_sensitive(m_xUseSkia->get_active() && !officecfg::Office::Common::VCL::ForceSkiaRaster::isReadOnly()); +m_xSkiaLog->set_sensitive(bEnabled); // Technically the 'use hardware acceleration' option could be used to mean !forceSkiaRaster, but the implementation // of the option is so tied to the implementation of the canvas module that it's simpler to ignore it. diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index d24f7ef7285a..5a9a7579e85b 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -416,7 +416,6 @@ True False -Requires restart 12 6 3 @@ -426,6 +425,7 @@ True True False +Requires restart start True True @@ -446,6 +446,7 @@ True True False +Requires restart start True True @@ -466,6 +467,7 @@ True True False +Requires restart True True
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/status.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 3e602a74c8de7553ca2340e695ac6a6ec396e1b8
Author: Heiko Tietze
AuthorDate: Mon May 15 15:28:04 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue May 16 08:05:10 2023 +0200
Resolves tdf#155278 - Adjust minimum statusbar height according icons
Change-Id: I7dbcf35f338bfe87702afb45651cd99630efe875
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151768
Reviewed-by: Stéphane Guillou
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 9907dd5479db..b2945bde49f7 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -41,6 +41,8 @@
#define STATUSBAR_PRGS_COUNT100
#define STATUSBAR_PRGS_MIN 5
+#define STATUSBAR_MIN_HEIGHT16 // icons height, tdf#153344
+
class StatusBar::ImplData
{
public:
@@ -1428,7 +1430,7 @@ Size StatusBar::CalcWindowSizePixel() const
i++;
}
-tools::Long nMinHeight = GetTextHeight();
+tools::Long nMinHeight = std::max( static_cast(GetTextHeight()),
STATUSBAR_MIN_HEIGHT);
const tools::Long nBarTextOffset = STATUSBAR_OFFSET_TEXTY*2;
tools::Long nProgressHeight = nMinHeight + nBarTextOffset;
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig include/vcl vcl/skia
cui/inc/bitmaps.hlst|1 +
cui/source/options/optgdlg.cxx | 19 +++
cui/source/options/optgdlg.hxx |2 ++
cui/uiconfig/ui/optviewpage.ui | 14 +-
include/vcl/skia/SkiaHelper.hxx |2 ++
vcl/skia/SkiaHelper.cxx | 12
6 files changed, 49 insertions(+), 1 deletion(-)
New commits:
commit 4356790bdf493c68ab609468603ec57e98dd2dae
Author: Heiko Tietze
AuthorDate: Fri May 12 11:34:02 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon May 15 08:45:11 2023 +0200
Resolves tdf#155070 - Easy access to skia.log
Change-Id: I2aac7a060bbb1d31510da67120728c8a24f0de88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151699
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 5e10e014b446..db0a6ae98d11 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -71,6 +71,7 @@ inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP3 =
u"svx/res/legtyp3.png";
inline constexpr OUStringLiteral RID_SVXBMP_COMPONENT =
u"res/component_16.png";
inline constexpr OUStringLiteral RID_SVXBMP_MACRO = u"svx/res/id018.png";
+inline constexpr OUStringLiteral RID_SVXBMP_COPY = u"cmd/sc_copy.png";
inline constexpr OUStringLiteral RID_SVXBMP_STARS_FULL =
u"cmd/sc_stars-full.png";
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 04de401c4121..369e48ae265a 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -81,11 +81,15 @@
#include
#include
#include
+#include
+
#include "optgdlg.hxx"
#include
#include
#include
#include
+#include
+#include
#if defined(_WIN32)
#include
@@ -537,6 +541,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xForceSkiaRaster(m_xBuilder->weld_check_button("forceskiaraster"))
, m_xSkiaStatusEnabled(m_xBuilder->weld_label("skiaenabled"))
, m_xSkiaStatusDisabled(m_xBuilder->weld_label("skiadisabled"))
+, m_xSkiaLog(m_xBuilder->weld_button("btnSkialog"))
, m_xMouseMiddleLB(m_xBuilder->weld_combo_box("mousemiddle"))
, m_xMoreIcons(m_xBuilder->weld_button("btnMoreIcons"))
, m_xRunGPTests(m_xBuilder->weld_button("btn_rungptest"))
@@ -550,6 +555,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage,
weld::DialogController* p
m_xFontAntiAliasing->connect_toggled( LINK( this, OfaViewTabPage,
OnAntialiasingToggled ) );
m_xUseSkia->connect_toggled(LINK(this, OfaViewTabPage, OnUseSkiaToggled));
+m_xSkiaLog->connect_clicked(LINK(this, OfaViewTabPage, OnCopySkiaLog));
UpdateIconThemes();
@@ -611,12 +617,25 @@ IMPL_LINK_NOARG(OfaViewTabPage, OnUseSkiaToggled,
weld::Toggleable&, void)
UpdateSkiaStatus();
}
+IMPL_LINK_NOARG(OfaViewTabPage, OnCopySkiaLog, weld::Button&, void)
+{
+#if HAVE_FEATURE_SKIA
+css::uno::Reference xClipboard =
+css::datatransfer::clipboard::SystemClipboard::create(
+comphelper::getProcessComponentContext());
+OUString sInfo = SkiaHelper::readLog();
+vcl::unohelper::TextDataObject::CopyStringTo(sInfo, xClipboard);
+m_xSkiaLog->set_from_icon_name(RID_SVXBMP_COPY);
+#endif
+}
+
void OfaViewTabPage::HideSkiaWidgets()
{
m_xUseSkia->hide();
m_xForceSkiaRaster->hide();
m_xSkiaStatusEnabled->hide();
m_xSkiaStatusDisabled->hide();
+m_xSkiaLog->hide();
}
void OfaViewTabPage::UpdateSkiaStatus()
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 9b22c0b9bb9d..c0d2439593ce 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -104,6 +104,7 @@ private:
std::unique_ptr m_xSkiaStatusEnabled;
std::unique_ptr m_xSkiaStatusDisabled;
+std::unique_ptr m_xSkiaLog;
std::unique_ptr m_xMouseMiddleLB;
std::unique_ptr m_xMoreIcons;
@@ -113,6 +114,7 @@ private:
DECL_LINK(OnAntialiasingToggled, weld::Toggleable&, void);
DECL_LINK(OnUseSkiaToggled, weld::Toggleable&, void);
+DECL_LINK(OnCopySkiaLog, weld::Button&, void);
DECL_STATIC_LINK(OfaViewTabPage, OnMoreIconsClick, weld::Button&, void);
DECL_LINK(OnRunGPTestClick, weld::Button&, void);
void UpdateSkiaStatus();
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index a063a4f6d36d..d24f7ef7285a 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -412,7 +412,7 @@
0
none
-
+
True
False
@@ -520,6 +520,18 @@
5
+
+
+Copy skia.log
+True
+True
+True
+
+
+0
+6
+
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - cui/uiconfig
cui/uiconfig/ui/optappearancepage.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 5f930fae314e6eeca0f00dee445ff5f9b9c3ddc7 Author: Heiko Tietze AuthorDate: Thu Apr 27 11:41:19 2023 +0200 Commit: Paris Oplopoios CommitDate: Wed May 10 15:23:15 2023 +0200 Resolves tdf#155038 - Application Color is disabled with GTK3 Change-Id: If820e765f3477f4b5ec8609f2781f8f0ed06cd09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151093 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit d4d0921db42ef2cb0bf691b408da78f36ac4af88) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151612 Tested-by: Paris Oplopoios Reviewed-by: Paris Oplopoios diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui index 63916d36543f..227565907c80 100644 --- a/cui/uiconfig/ui/optappearancepage.ui +++ b/cui/uiconfig/ui/optappearancepage.ui @@ -22,7 +22,6 @@ True -False False 12 6
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui | 685 +++- 1 file changed, 336 insertions(+), 349 deletions(-) New commits: commit ce9ed68fa63af229dceee32d1e512ac31b76e939 Author: Heiko Tietze AuthorDate: Wed May 10 09:47:52 2023 +0200 Commit: Heiko Tietze CommitDate: Wed May 10 10:42:48 2023 +0200 Revert "Resolves tdf#134941 - Fix size issue on start center" This reverts commit 77ed6380dda73a9716f48f73c3ff730380557a09. Reason for revert: Scolled window looks ugly and does not solve the issue; we just cannot support +2x scaling on small screens Change-Id: I2fb9759d55e28169508f33a822241efe955d5699 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151525 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index d8d27b8fe6ad..8120556f3d22 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -103,365 +103,352 @@ 0 none - + True -True -in +False +vertical - + True False +True +vertical +3 + + +_Open File +True +True +True +6 +6 +6 +open_all_image +none +True +0 +True + + +False +True +0 + + + + +Remote File_s +True +True +True +6 +6 +open_all_image2 +none +True +0 +True + + +False +True +1 + + + + +True +False +6 +6 + + +False +True +2 + + + + +_Recent Documents +True +True +True +6 +6 +open_all_image1 +none +True +0 +True + + +False +True +3 + + + + +T_emplates +True +True +True +6 +6 +templates_all_image +none +True +0 +True + + +False +True +4 + + + + +True +False +6 +6 + + +False +True +5 + + + + +True +False +12 +6 +Create: +0 + + +False +True +6 + + + + +_Writer Document +True +True +True +6 +
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 6eb1a3de4d77c887502058e484aba44ba3024528 Author: Heiko Tietze AuthorDate: Wed May 10 09:48:30 2023 +0200 Commit: Heiko Tietze CommitDate: Wed May 10 10:36:44 2023 +0200 Revert "Resolves tdf#155167 - Start center app pane issue under gtk3" This reverts commit b7632b68c5398fce8a22ec09414e0075709fbc32. Reason for revert: Scrolled window looks ugly and does not solve the issue; we just cannot support +2x scaling on small screens Change-Id: I1c908dfc801a3867597feefa2a8852b871f7df3f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151526 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 4b4cdac6d252..d8d27b8fe6ad 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -106,7 +106,6 @@ True True -never in
[Libreoffice-commits] core.git: 2 commits - editeng/source sfx2/uiconfig
editeng/source/items/frmitems.cxx | 18 ++
sfx2/uiconfig/ui/startcenter.ui |1 +
2 files changed, 19 insertions(+)
New commits:
commit b7632b68c5398fce8a22ec09414e0075709fbc32
Author: Heiko Tietze
AuthorDate: Mon May 8 09:20:12 2023 +0200
Commit: Heiko Tietze
CommitDate: Mon May 8 13:33:16 2023 +0200
Resolves tdf#155167 - Start center app pane issue under gtk3
Issue introduced with 77ed6380dda73a9716f48f73c3ff730380557a09
Change-Id: I093808b87bca5f93e28239f22886f543a053e62b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151493
Tested-by: Jenkins
Tested-by: Xisco Fauli
Reviewed-by: Heiko Tietze
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index d8d27b8fe6ad..4b4cdac6d252 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -106,6 +106,7 @@
True
True
+never
in
commit f31bda6971e6f69e2f0c170df4a0dd206aa2f720
Author: Andreas Heinisch
AuthorDate: Sun May 7 18:05:56 2023 +0200
Commit: Michael Stahl
CommitDate: Mon May 8 13:33:11 2023 +0200
tdf#154282 - Prevent crash for LeftParaMargin and RightParaMargin
Prevent crash for LeftParaMargin and RightParaMargin by returning both
values for the hardcoded 0 in SfxDispatchController_Impl::StateChanged.
Change-Id: I7705bd5e22d6cd7fbbe702d7ddbf17e2899b851e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151472
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index de1515380ed5..250b61e33753 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -756,6 +756,15 @@ bool SvxTextLeftMarginItem::QueryValue(uno::Any& rVal,
sal_uInt8 nMemberId) cons
nMemberId &= ~CONVERT_TWIPS;
switch (nMemberId)
{
+// tdf#154282 - return both values for the hardcoded 0 in
SfxDispatchController_Impl::StateChanged
+case 0:
+{
+css::frame::status::LeftRightMarginScale aLRSpace;
+aLRSpace.TextLeft = static_cast(bConvert ?
convertTwipToMm100(GetTextLeft()) : GetTextLeft());
+aLRSpace.ScaleLeft = static_cast(m_nPropLeftMargin);
+rVal <<= aLRSpace;
+break;
+}
case MID_TXT_LMARGIN :
rVal <<= static_cast(bConvert ?
convertTwipToMm100(GetTextLeft()) : GetTextLeft());
break;
@@ -1102,6 +,15 @@ bool SvxRightMarginItem::QueryValue(uno::Any& rVal,
sal_uInt8 nMemberId) const
nMemberId &= ~CONVERT_TWIPS;
switch (nMemberId)
{
+// tdf#154282 - return both values for the hardcoded 0 in
SfxDispatchController_Impl::StateChanged
+case 0:
+{
+css::frame::status::LeftRightMarginScale aLRSpace;
+aLRSpace.Right = static_cast(bConvert ?
convertTwipToMm100(m_nRightMargin) : m_nRightMargin);
+aLRSpace.ScaleRight = static_cast(m_nPropRightMargin);
+rVal <<= aLRSpace;
+break;
+}
case MID_R_MARGIN:
rVal <<= static_cast(bConvert ?
convertTwipToMm100(m_nRightMargin) : m_nRightMargin);
break;
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui | 685 1 file changed, 349 insertions(+), 336 deletions(-) New commits: commit 77ed6380dda73a9716f48f73c3ff730380557a09 Author: Heiko Tietze AuthorDate: Fri May 5 12:41:54 2023 +0200 Commit: Heiko Tietze CommitDate: Sat May 6 06:54:07 2023 +0200 Resolves tdf#134941 - Fix size issue on start center Very tiny screens or huge scaling may result in cut-off content at the app pane. The scrollbar should solve this. Change-Id: I33e6fa3b428c8643f8024bb1287d93dfe4f3b1bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151422 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 8120556f3d22..d8d27b8fe6ad 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -103,352 +103,365 @@ 0 none - + True -False -vertical +True +in - + True False -True -vertical -3 - - -_Open File -True -True -True -6 -6 -6 -open_all_image -none -True -0 -True - - -False -True -0 - - - - -Remote File_s -True -True -True -6 -6 -open_all_image2 -none -True -0 -True - - -False -True -1 - - - - -True -False -6 -6 - - -False -True -2 - - - - -_Recent Documents -True -True -True -6 -6 -open_all_image1 -none -True -0 -True - - -False -True -3 - - - - -T_emplates -True -True -True -6 -6 -templates_all_image -none -True -0 -True - - -False -True -4 - - - - -True -False -6 -6 - - -False -True -5 - - - - -True -False -12 -6 -Create: -0 - - -False -True -6 - - - - -_Writer Document -True -True -True -6 -6 -writer_all_image -none -
[Libreoffice-commits] core.git: formula/uiconfig
formula/uiconfig/ui/formuladialog.ui | 282 ++- formula/uiconfig/ui/parameter.ui | 210 +- 2 files changed, 218 insertions(+), 274 deletions(-) New commits: commit a21e151508918c39189a18d46fcba490100e5890 Author: Heiko Tietze AuthorDate: Tue May 2 11:39:55 2023 +0200 Commit: Heiko Tietze CommitDate: Wed May 3 06:55:33 2023 +0200 Resolves tdf#101876 - Resizing function wizard content GtkPane added Function entries expand now Change-Id: I3f900540fadb530a8c154ec1bdf3771daecb7acb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151258 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui index 65768b390732..dba21cf1179e 100644 --- a/formula/uiconfig/ui/formuladialog.ui +++ b/formula/uiconfig/ui/formuladialog.ui @@ -1,36 +1,33 @@ - + -False -5 -0 -0 -dialog - - - +False +5 +0 +0 +dialog -False +False vertical 6 -False +False True -end +end Array True -True -False +True +False start True -True -True +True +True False @@ -43,8 +40,8 @@ _Help True -True -True +True +True True @@ -58,9 +55,9 @@ _Back True -True -True -True +True +True +True False @@ -72,9 +69,9 @@ _Next True -True -True -True +True +True +True False @@ -86,10 +83,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -102,8 +99,8 @@ _Cancel True -True -True +True +True True @@ -116,61 +113,34 @@ False True -end +end 0 True -False +False True True vertical 6 - + True -False -True -True -6 +True True -True +True True True -True +True True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -179,42 +149,18 @@ True -False +False Functions -False +False True -False - - -
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/index/swuiidxmrk.cxx|2 ++
sw/source/uibase/inc/swuiidxmrk.hxx |1 +
sw/uiconfig/swriter/ui/indexentry.ui |2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit a2756bf71a304f2bb1bf49753dfd37a3402bc463
Author: Heiko Tietze
AuthorDate: Fri Apr 28 13:18:25 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Apr 28 15:13:12 2023 +0200
Resolves tdf#153499 - Hide newly introduced frame label
Frame content is not shown for existing entries
Follow-up to 4ec75d22eb916e3809e9e92f77fd25e33f6b21ee
Change-Id: Ic2b40b19424245ede326a5ef5b53f684ca8a3f94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151166
Reviewed-by: Seth Chaiklin
Reviewed-by: Heiko Tietze
Tested-by: Heiko Tietze
diff --git a/sw/source/ui/index/swuiidxmrk.cxx
b/sw/source/ui/index/swuiidxmrk.cxx
index 7bab5d5728af..22c1bc7409c8 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -168,6 +168,7 @@
SwIndexMarkPane::SwIndexMarkPane(std::shared_ptr xDialog, weld::Bu
, m_xNextSameBT(rBuilder.weld_button("last"))
, m_xPrevBT(rBuilder.weld_button("previous"))
, m_xNextBT(rBuilder.weld_button("next"))
+, m_xForSelectedEntry(rBuilder.weld_label("selectedentrytitle"))
{
m_xSyncED->show();
@@ -345,6 +346,7 @@ void SwIndexMarkPane::InitControls()
//to include all equal entries may only be allowed in the body and
even there
//only when a simple selection exists
const FrameTypeFlags nFrameType =
m_pSh->GetFrameType(nullptr,true);
+m_xForSelectedEntry->show();
m_xApplyToAllCB->show();
m_xSearchCaseSensitiveCB->show();
m_xSearchCaseWordOnlyCB->show();
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx
b/sw/source/uibase/inc/swuiidxmrk.hxx
index 2500548c1582..7f5460a8be45 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -87,6 +87,7 @@ class SwIndexMarkPane
std::unique_ptr m_xNextSameBT;
std::unique_ptr m_xPrevBT;
std::unique_ptr m_xNextBT;
+std::unique_ptr m_xForSelectedEntry;
voidApply();
voidInitControls();
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui
b/sw/uiconfig/swriter/ui/indexentry.ui
index ca3f1f5da8fc..5a70ad727db6 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -582,8 +582,8 @@
-True
False
+True
For Selected Entry
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/colorconfigwin.ui | 55 ++ 1 file changed, 55 insertions(+) New commits: commit ec90dae4993b90e0c3a797ac9b43a076527e1a7d Author: Heiko Tietze AuthorDate: Thu Apr 27 11:18:03 2023 +0200 Commit: Heiko Tietze CommitDate: Thu Apr 27 15:17:25 2023 +0200 Resolves tdf#155039 - Color name not displayed with GTK3 Change-Id: I317a935c1e99c20f09cba8c24085d3a173d64dbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151090 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui index 7b8521b92e30..bc5603ef6651 100644 --- a/cui/uiconfig/ui/colorconfigwin.ui +++ b/cui/uiconfig/ui/colorconfigwin.ui @@ -50,6 +50,7 @@ True 0 True + @@ -85,6 +86,7 @@ end 0 True + @@ -125,6 +127,7 @@ end 0 True + @@ -160,6 +163,7 @@ end 0 True + @@ -203,6 +207,7 @@ end 0 True + @@ -243,6 +248,7 @@ end 0 True + @@ -278,6 +284,7 @@ end 0 True + @@ -321,6 +328,7 @@ end 0 True + @@ -361,6 +369,7 @@ end 0 True + @@ -393,6 +402,7 @@ end 0 True + @@ -428,6 +438,7 @@ end 0 True + @@ -503,6 +514,7 @@ True 0 True + @@ -538,6 +550,7 @@ end 0 True + @@ -581,6 +594,7 @@ end 0 True + @@ -621,6 +635,7 @@ end 0 True + @@ -656,6 +671,7 @@ end 0 True + @@ -696,6 +712,7 @@ end 0 True + @@ -728,6 +745,7 @@ end 0 True + @@ -760,6 +778,7 @@ end 0 True + @@ -792,6 +811,7 @@ end 0 True + @@ -859,6 +879,7 @@ True 0 True + @@ -891,6 +912,7 @@ end 0 True + @@ -923,6 +945,7 @@ end 0 True + @@ -955,6 +978,7 @@ end 0 True + @@ -987,6 +1011,7 @@ end 0 True + @@ -1004,6 +1029,7 @@ end 0 True + @@ -1036,6 +1062,7 @@ end 0 True + @@ -1068,6 +1095,7
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optappearancepage.ui |1 - 1 file changed, 1 deletion(-) New commits: commit d4d0921db42ef2cb0bf691b408da78f36ac4af88 Author: Heiko Tietze AuthorDate: Thu Apr 27 11:41:19 2023 +0200 Commit: Heiko Tietze CommitDate: Thu Apr 27 13:56:50 2023 +0200 Resolves tdf#155038 - Application Color is disabled with GTK3 Change-Id: If820e765f3477f4b5ec8609f2781f8f0ed06cd09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151093 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui index 63916d36543f..227565907c80 100644 --- a/cui/uiconfig/ui/optappearancepage.ui +++ b/cui/uiconfig/ui/optappearancepage.ui @@ -22,7 +22,6 @@ True -False False 12 6
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/dbgui/sortdlg.cxx | 14 ++
sc/source/ui/inc/sortdlg.hxx |1 +
sc/uiconfig/scalc/ui/sortdialog.ui |3 +--
3 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 95ae136380906c6d270fd47b2b9655b2c32f670e
Author: Heiko Tietze
AuthorDate: Wed Apr 26 10:50:04 2023 +0200
Commit: Heiko Tietze
CommitDate: Wed Apr 26 16:15:06 2023 +0200
Resolves tdf#153852 - Make sort dialog resizable
Change-Id: Ie0db5c713bf16443962245900655736aeddce532
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151042
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 22af2230b081..43978d1b8585 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -22,12 +22,26 @@
#include
#include
#include
+#include
ScSortDlg::ScSortDlg(weld::Window* pParent, const SfxItemSet* pArgSet)
: SfxTabDialogController(pParent, "modules/scalc/ui/sortdialog.ui",
"SortDialog", pArgSet)
{
AddTabPage("criteria", ScTabPageSortFields::Create, nullptr);
AddTabPage("options", ScTabPageSortOptions::Create, nullptr);
+
+// restore dialog size
+SvtViewOptions aDlgOpt(EViewType::Dialog, "SortDialog");
+if (aDlgOpt.Exists())
+m_xDialog->set_window_state(aDlgOpt.GetWindowState());
+}
+
+ScSortDlg::~ScSortDlg()
+{
+// tdf#153852 - Make of sort dialog resizable (and remember size)
+SvtViewOptions aDlgOpt(EViewType::Dialog, "SortDialog");
+OUString sWindowState =
m_xDialog->get_window_state(vcl::WindowDataMask::PosSize);
+aDlgOpt.SetWindowState(sWindowState);
}
ScSortWarningDlg::ScSortWarningDlg(weld::Window* pParent,
diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx
index 10d4268d7c51..a18bc66da867 100644
--- a/sc/source/ui/inc/sortdlg.hxx
+++ b/sc/source/ui/inc/sortdlg.hxx
@@ -26,6 +26,7 @@ class ScSortDlg : public SfxTabDialogController
{
public:
ScSortDlg(weld::Window* pParent, const SfxItemSet* pArgSet);
+virtual ~ScSortDlg() override;
};
class ScSortWarningDlg : public weld::GenericDialogController
diff --git a/sc/uiconfig/scalc/ui/sortdialog.ui
b/sc/uiconfig/scalc/ui/sortdialog.ui
index e9ac12779df1..7149b3e63425 100644
--- a/sc/uiconfig/scalc/ui/sortdialog.ui
+++ b/sc/uiconfig/scalc/ui/sortdialog.ui
@@ -1,12 +1,11 @@
-
+
False
6
Sort
-False
True
0
0
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svtools officecfg/registry sc/source svtools/source
cui/source/options/optcolor.cxx|1
cui/uiconfig/ui/colorconfigwin.ui | 71 -
include/svtools/colorcfg.hxx |1
officecfg/registry/data/org/openoffice/Office/UI.xcu |5 +
officecfg/registry/schema/org/openoffice/Office/UI.xcs | 10 ++
sc/source/ui/view/output.cxx | 23 ++---
svtools/source/config/colorcfg.cxx |2
7 files changed, 84 insertions(+), 29 deletions(-)
New commits:
commit 07f87f20c8af71faeda500b6b1d7775743bbf646
Author: Heiko Tietze
AuthorDate: Tue Apr 25 14:52:02 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue Apr 25 18:13:57 2023 +0200
Resolves tdf#154080 - Allow customization of comment indicator color
* New application color added
* Border color depending on cell/sheet background
* Comments color set to light magenta to align with similar tools
Change-Id: I782e8359632c5a319e61f5d5ac3deb4614bd7e79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150970
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 29d5c5b6d8c6..6daa39b37f1f 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -131,6 +131,7 @@ const vEntryInfo[] =
{ Group_Calc,IDS(brkauto) },
{ Group_Calc,IDS_CB(hiddencolrow) },
{ Group_Calc,IDS_CB(textoverflow) },
+{ Group_Calc,IDS(comments) },
{ Group_Calc,IDS(det) },
{ Group_Calc,IDS(deterror) },
{ Group_Calc,IDS(ref) },
diff --git a/cui/uiconfig/ui/colorconfigwin.ui
b/cui/uiconfig/ui/colorconfigwin.ui
index 8b778c236f3c..7b8521b92e30 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -827,7 +827,7 @@
0
none
-
+
True
False
@@ -976,7 +976,7 @@
0
-6
+7
@@ -993,7 +993,7 @@
1
-6
+7
@@ -1010,7 +1010,7 @@
1
-7
+8
@@ -1025,7 +1025,7 @@
0
-7
+8
@@ -1042,7 +1042,7 @@
1
-8
+9
@@ -1057,7 +1057,7 @@
0
-8
+9
@@ -1074,7 +1074,7 @@
1
-9
+10
@@ -1089,7 +1089,7 @@
0
-9
+10
@@ -1106,7 +1106,7 @@
1
-10
+11
@@ -1121,7 +1121,7 @@
0
-10
+11
@@ -1138,7 +1138,7 @@
1
-11
+12
@@ -1153,7 +1153,7 @@
0
-11
+12
@@ -1170,7 +1170,7 @@
1
-12
+13
@@ -1185,7 +1185,7 @@
0
-12
+13
@@ -1202,7 +1202,7 @@
1
-13
+14
@@ -1217,7 +1217,7 @@
0
-13
+14
@@ -1306,6 +1306,43 @@
5
+
+
+True
+True
+False
+end
+0
+True
+
+
+
+
+
+Comments
color
+
+
+
+
+1
+6
+
+
+
+
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/output.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1f7b725b55328f961fc9f124f22e3537e3cfed94 Author: Heiko Tietze AuthorDate: Tue Apr 25 09:04:28 2023 +0200 Commit: Heiko Tietze CommitDate: Tue Apr 25 11:21:12 2023 +0200 Resolves tdf#154991 - Fix crash with hidden columns Hidden columns do not have a background that can be taken into account for the text overflow indicator's frame Change-Id: I325873aede07fd890777624308a3f5a41f0f1795 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150959 Reviewed-by: Xisco Fauli Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index ab5b88062e24..025151e40501 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2709,7 +2709,7 @@ void ScOutputData::DrawClipMarks() tools::Long nMarkPixel = static_cast( SC_CLIPMARK_SIZE * mnPPTX ); Size aMarkSize( nMarkPixel, (nMarkPixel-1)*2 ); -const Color aColor = pInfo->pBackground->GetColor(); +const Color aColor = pInfo->pBackground ? pInfo->pBackground->GetColor() : COL_AUTO; if ( aColor == COL_AUTO ? bIsDarkBackground : aColor.IsDark() ) mpDev->SetDrawMode( nOldDrawMode | DrawModeFlags::WhiteLine ); else
[Libreoffice-commits] core.git: sc/uiconfig solenv/sanitizers
sc/uiconfig/scalc/ui/sidebarnumberformat.ui |6 ++ sc/uiconfig/scalc/ui/solverdlg.ui |1 - sc/uiconfig/scalc/ui/sortcriteriapage.ui| 12 sc/uiconfig/scalc/ui/sortkey.ui |6 ++ sc/uiconfig/scalc/ui/sortoptionspage.ui | 12 solenv/sanitizers/ui/modules/scalc.suppr|3 +++ 6 files changed, 39 insertions(+), 1 deletion(-) New commits: commit 898b77b645cc8b3911bc0722f538ad61f12835c8 Author: Heiko Tietze AuthorDate: Fri Apr 14 17:01:01 2023 +0200 Commit: Heiko Tietze CommitDate: Tue Apr 18 12:38:40 2023 +0200 Solve or suppress accessibility warnings Change-Id: Ice45231375e659ea25907c1af0a48ca77d3cb63b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150421 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui index 3da15aa75a1e..f662e2246f0a 100644 --- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui +++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui @@ -199,6 +199,9 @@ Leading _zeroes: True 0 + + + 0 @@ -218,6 +221,9 @@ Leading Zeroes + + + 1 diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui b/sc/uiconfig/scalc/ui/solverdlg.ui index 458a205ba5d4..f5b1e7ebe036 100644 --- a/sc/uiconfig/scalc/ui/solverdlg.ui +++ b/sc/uiconfig/scalc/ui/solverdlg.ui @@ -140,7 +140,6 @@ False Optimize result to True -max 0 0 diff --git a/sc/uiconfig/scalc/ui/sortcriteriapage.ui b/sc/uiconfig/scalc/ui/sortcriteriapage.ui index 67ebed40ab82..f56e5e1fd8ef 100644 --- a/sc/uiconfig/scalc/ui/sortcriteriapage.ui +++ b/sc/uiconfig/scalc/ui/sortcriteriapage.ui @@ -98,6 +98,9 @@ True True rbTopDown + + + 1 @@ -110,6 +113,9 @@ False Direction: 1 + + + 0 @@ -124,6 +130,9 @@ False True True + + + 1 @@ -136,6 +145,9 @@ False Headers: 1 + + + 0 diff --git a/sc/uiconfig/scalc/ui/sortkey.ui b/sc/uiconfig/scalc/ui/sortkey.ui index 62b7813bc2db..781c846ae82f 100644 --- a/sc/uiconfig/scalc/ui/sortkey.ui +++ b/sc/uiconfig/scalc/ui/sortkey.ui @@ -29,6 +29,9 @@ Select the column that you want to use as the primary sort key. + + + 1 @@ -82,6 +85,9 @@ False Column/Row: 1 + + + 0 diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 89e0be9500cc..f807dbcb082b 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -238,6 +238,9 @@ start Language True + + + 0 @@ -251,6 +254,9 @@ start Options True + + + 1 @@ -272,6 +278,9 @@ Select the language for the sorting rules. + + + 0 @@ -288,6 +297,9 @@ Select a sorting option for the language. + + + 1 diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr index 07e2972554a1..8e0acbdf8290 100644 --- a/solenv/sanitizers/ui/modules/scalc.suppr +++ b/solenv/sanitizers/ui/modules/scalc.suppr @@ -157,3 +157,6 @@ sc/uiconfig/scalc/ui/xmlsourcedialog.ui://GtkLabel[@id='label5'] orphan-label
[Libreoffice-commits] core.git: svtools/source
svtools/source/config/colorcfg.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 846e9a202b450445ede565c4f6a9a70954134438
Author: Heiko Tietze
AuthorDate: Wed Apr 12 15:12:33 2023 +0200
Commit: Caolán McNamara
CommitDate: Mon Apr 17 12:50:46 2023 +0200
Resolves tdf#152184 - App color follow system colors
Change-Id: I47d37a911baab57af832821bb66f8dd4818a8830
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150283
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index 3fa88a3886cf..4847aeb6bd7d 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include "itemholder2.hxx"
@@ -443,10 +444,14 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry
eEntry)
default:
int nAppMod;
switch (MiscSettings::GetAppColorMode()) {
-case 0: nAppMod = clLight; break; // UseDarkMode() ? clDark :
clLight; break;
+default:
+if (MiscSettings::GetUseDarkMode())
+nAppMod = clDark;
+else
+nAppMod = clLight;
+break;
case 1: nAppMod = clLight; break;
case 2: nAppMod = clDark; break;
-default: nAppMod = clLight;
}
aRet = cAutoColors[eEntry][nAppMod];
}
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svtools officecfg/registry sc/inc sc/source sc/uiconfig svtools/source
cui/source/options/optcolor.cxx |1
cui/uiconfig/ui/colorconfigwin.ui| 130 ++-
include/svtools/colorcfg.hxx |1
officecfg/registry/data/org/openoffice/Office/UI.xcu |8
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8
officecfg/registry/schema/org/openoffice/Office/UI.xcs | 16 +
sc/inc/viewopti.hxx |3
sc/source/core/tool/viewopti.cxx | 15 -
sc/source/ui/inc/tpview.hxx |1
sc/source/ui/optdlg/tpview.cxx |6
sc/source/ui/view/gridwin4.cxx |2
sc/source/ui/view/output.cxx | 17 -
sc/source/ui/view/tabview3.cxx |2
sc/uiconfig/scalc/ui/tpviewpage.ui | 23 --
svtools/source/config/colorcfg.cxx |2
15 files changed, 104 insertions(+), 131 deletions(-)
New commits:
commit 11bb9c14da13507adeeea8dce863fb4b96a92870
Author: Heiko Tietze
AuthorDate: Thu Apr 13 12:15:46 2023 +0200
Commit: Heiko Tietze
CommitDate: Fri Apr 14 11:39:06 2023 +0200
[API CHANGE] Related tdf#154080 - Allow customization of comment indicator
color
* Calc > View option replaced by a new application color
* Border not only in highcontrast mode but always shown
* Border color depending on cell/sheet background
The previous option TextOverflow in Calc.xcs was replaced by
CalcTextOverflow in UI.xcs in order to combine color and on/off
with the accepted drawback of incompatibility.
The alternative, keeping the color separate from the toggle, would
separate the options and was rejected therefore.
Change-Id: Ie3e469163485d8eb1cffc7022e1518ad20e8e54e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150340
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 335c517622b5..29d5c5b6d8c6 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -130,6 +130,7 @@ const vEntryInfo[] =
{ Group_Calc,IDS(brkmanual) },
{ Group_Calc,IDS(brkauto) },
{ Group_Calc,IDS_CB(hiddencolrow) },
+{ Group_Calc,IDS_CB(textoverflow) },
{ Group_Calc,IDS(det) },
{ Group_Calc,IDS(deterror) },
{ Group_Calc,IDS(ref) },
diff --git a/cui/uiconfig/ui/colorconfigwin.ui
b/cui/uiconfig/ui/colorconfigwin.ui
index 3094a66d0c59..8b778c236f3c 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -50,7 +50,6 @@
True
0
True
-
@@ -86,7 +85,6 @@
end
0
True
-
@@ -127,7 +125,6 @@
end
0
True
-
@@ -163,7 +160,6 @@
end
0
True
-
@@ -207,7 +203,6 @@
end
0
True
-
@@ -248,7 +243,6 @@
end
0
True
-
@@ -284,7 +278,6 @@
end
0
True
-
@@ -328,7 +321,6 @@
end
0
True
-
@@ -369,7 +361,6 @@
end
0
True
-
@@ -402,7 +393,6 @@
end
0
True
-
@@ -438,7 +428,6 @@
end
0
True
-
@@ -514,7 +503,6 @@
True
0
True
-
@@ -550,7 +538,6 @@
end
0
True
-
@@ -594,7 +581,6 @@
end
0
True
-
@@ -635,7 +621,6 @@
end
0
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig
sc/inc/viewopti.hxx|4 -
sc/source/core/tool/viewopti.cxx |4 +
sc/source/ui/inc/tpview.hxx|2
sc/source/ui/optdlg/tpview.cxx | 34
sc/source/ui/view/viewdata.cxx | 17
sc/uiconfig/scalc/ui/tpviewpage.ui | 75 +
6 files changed, 15 insertions(+), 121 deletions(-)
New commits:
commit 2039fd382af9d110bd68be8629ab757b3617926a
Author: Heiko Tietze
AuthorDate: Wed Mar 29 15:12:58 2023 +0200
Commit: Heiko Tietze
CommitDate: Tue Apr 4 10:53:56 2023 +0200
Resolves tdf#154446 - Remove redundant option for grid line color
Change-Id: I41d39b763e651f90660f2a451ed0a9b473ead206
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149715
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index cd641198753b..b90e1b65f076 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -59,10 +59,6 @@ enum ScVObjType
#define MAX_OPT sal_uInt16(VOPT_CLIPMARKS)+1
#define MAX_TYPEsal_uInt16(VOBJ_TYPE_DRAW)+1
-// SC_STD_GRIDCOLOR is obsolete since tdf#152184 since GridColor == COL_AUTO
-// converts now to either light or dark but still used on options > view >
visual aids
-#define SC_STD_GRIDCOLORCOL_LIGHTGRAY
-
// SvxGrid options with standard operators
class ScGridOptions : public SvxOptionsGrid
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 6079323f13e7..f243289653cd 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -22,6 +22,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -111,7 +113,7 @@ void ScViewOptions::SetDefaults()
aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW;
aModeArr[VOBJ_TYPE_DRAW ] = VOBJ_MODE_SHOW;
-aGridCol = SC_STD_GRIDCOLOR;
+aGridCol = svtools::ColorConfig().GetColorValue( svtools::CALCGRID
).nColor;
aGridOpt.SetDefaults();
}
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 7be90de5aceb..ad485b361580 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -29,8 +29,6 @@ class ScTpContentOptions : public SfxTabPage
std::unique_ptr m_xLocalOptions;
std::unique_ptr m_xGridLB;
-std::unique_ptr m_xColorFT;
-std::unique_ptr m_xColorLB;
std::unique_ptr m_xBreakCB;
std::unique_ptr m_xGuideLineCB;
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 926436864e79..f83ce9f033a5 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -30,15 +30,11 @@
#include
#include
#include
-#include
#include
ScTpContentOptions::ScTpContentOptions(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rArgSet)
: SfxTabPage(pPage, pController, "modules/scalc/ui/tpviewpage.ui",
"TpViewPage", )
, m_xGridLB(m_xBuilder->weld_combo_box("grid"))
-, m_xColorFT(m_xBuilder->weld_label("color_label"))
-, m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("color"),
-[this]{ return GetDialogController()->getDialog(); }))
, m_xBreakCB(m_xBuilder->weld_check_button("break"))
, m_xGuideLineCB(m_xBuilder->weld_check_button("guideline"))
, m_xFormulaCB(m_xBuilder->weld_check_button("formula"))
@@ -88,14 +84,10 @@ ScTpContentOptions::ScTpContentOptions(weld::Container*
pPage, weld::DialogContr
m_xRowColHeaderCB->connect_toggled(aCBHdl);
m_xSummaryCB->connect_toggled(aCBHdl);
m_xThemedCursorRB->connect_toggled(aCBHdl);
-
-m_xColorLB->SetSlotId(SID_ATTR_CHAR_COLOR);
-m_xColorLB->SetAutoDisplayColor(SC_STD_GRIDCOLOR);
}
ScTpContentOptions::~ScTpContentOptions()
{
-m_xColorLB.reset();
}
std::unique_ptr ScTpContentOptions::Create( weld::Container*
pPage, weld::DialogController* pController,
@@ -123,19 +115,11 @@ boolScTpContentOptions::FillItemSet( SfxItemSet*
rCoreSet )
m_xVScrollCB->get_state_changed_from_saved() ||
m_xTblRegCB->get_state_changed_from_saved() ||
m_xOutlineCB->get_state_changed_from_saved() ||
-m_xColorLB->IsValueChangedFromSaved() ||
m_xBreakCB->get_state_changed_from_saved() ||
m_xSummaryCB->get_state_changed_from_saved() ||
m_xThemedCursorRB->get_state_changed_from_saved() ||
m_xGuideLineCB->get_state_changed_from_saved())
{
-NamedColor aNamedColor = m_xColorLB->GetSelectedEntry();
-if (aNamedColor.first == COL_AUTO)
-{
-aNamedColor.first = SC_STD_GRIDCOLOR;
-aNamedColor.second.clear();
-}
-m_xLocalOptions->SetGridColor(aNamedColor.first, aNamedColor.second);
rCoreSet->Put(ScTpViewItem(*m_xLocalOptions));
bRet = true;
}
@@ -211,7 +195,6 @@ voidScTpContentOptions::Reset( const SfxItemSet*
rCoreSet )
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig include/vcl officecfg/registry sc/inc sc/source svtools/source sw/qa sw/source vcl/source
cui/inc/strings.hrc|1
cui/source/options/optcolor.cxx| 36 +
cui/source/options/optcolor.hxx|3
cui/uiconfig/ui/optappearancepage.ui | 220 -
include/vcl/settings.hxx |3
officecfg/registry/data/org/openoffice/Office/UI.xcu | 303 -
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 25 +
sc/inc/viewopti.hxx|2
sc/source/ui/view/gridwin4.cxx |2
svtools/source/config/colorcfg.cxx | 121 ++---
sw/qa/extras/tiledrendering/tiledrendering.cxx | 20
sw/source/uibase/uno/unotxdoc.cxx |2
vcl/source/app/settings.cxx| 12
13 files changed, 261 insertions(+), 489 deletions(-)
New commits:
commit 5675937f7564fa5614f7be5aec0d7f20ba91d02c
Author: Heiko Tietze
AuthorDate: Fri Mar 17 16:10:39 2023 +0100
Commit: Heiko Tietze
CommitDate: Wed Mar 29 10:34:27 2023 +
Resolves tdf#152184 - Application color should follow system color
This patch reverts the previously added "LibreOffice Dark" application
color set and adds it to the automatic colors. Switching between light and dark
changes the Automatic color accordingly instead switching to another color
scheme. The added System Theme option makes Light/Dark follow the actual OS
appearance.
Reverts 6dfc49bb6a72bf6bb79167b12f0d2d0c5a155d06 (Introduce dark color set),
546ad5d17d3e363b75337c336cfb2b2f8acc55e3 (color scheme translatable),
9f0cf00d29298ed55737928ec4dddc50ac850cd8 (Update view options string based
on theme)
Change-Id: Ibf491f2e510fac5f1d27a7166560c4ec281d98d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149059
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 0cd2d2cd4566..498e60e75bc2 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -408,6 +408,5 @@
// Translatable names of color schemes
#define RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC
NC_("RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", "Automatic")
-#define RID_COLOR_SCHEME_LIBREOFFICE_DARK
NC_("RID_COLOR_SCHEME_LIBREOFFICE_DARK", "Dark")
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 4ad5d2b5e93f..15d3dadcf244 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -34,7 +34,8 @@
#include
#include "optcolor.hxx"
#include
-
+#include
+#include
using namespace ::com::sun::star;
using namespace ::svtools;
@@ -165,7 +166,6 @@ const std::map ()
{
static std::map const vColorSchemes = {
{"COLOR_SCHEME_LIBREOFFICE_AUTOMATIC",
CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC)},
-{"COLOR_SCHEME_LIBREOFFICE_DARK",
CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_DARK)}
};
return vColorSchemes;
};
@@ -204,6 +204,7 @@ public:
Link const&,
weld::ScrolledWindow& rScroll);
void Update(EditableColorConfig const*, EditableExtendedColorConfig
const*);
+void UpdateEntries();
void ClickHdl(EditableColorConfig*, const weld::Toggleable&);
void ColorHdl(EditableColorConfig*, EditableExtendedColorConfig*, const
ColorListBox*);
@@ -528,6 +529,16 @@ void ColorConfigWindow_Impl::Update (
}
}
+void ColorConfigWindow_Impl::UpdateEntries()
+{
+for (unsigned i = 0; i != ColorConfigEntryCount; ++i)
+{
+ColorConfigEntry const aEntry = static_cast(i);
+Color aColor = ColorConfig::GetDefaultColor(aEntry);
+vEntries[i]->m_xColorList->SetAutoDisplayColor(aColor);
+}
+}
+
// ClickHdl()
void ColorConfigWindow_Impl::ClickHdl(EditableColorConfig* pConfig, const
weld::Toggleable& rBox)
{
@@ -627,6 +638,7 @@ public:
void SetConfig (EditableColorConfig& rConfig) { pColorConfig = }
void SetExtendedConfig (EditableExtendedColorConfig& rConfig) {
pExtColorConfig = }
void Update();
+void UpdateEntries();
tools::Long GetScrollPosition() const
{
return m_xVScroll->vadjustment_get_value();
@@ -670,6 +682,11 @@ void ColorConfigCtrl_Impl::Update ()
m_xScrollWindow->Update(pColorConfig, pExtColorConfig);
}
+void ColorConfigCtrl_Impl::UpdateEntries()
+{
+m_xScrollWindow->UpdateEntries();
+}
+
IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, weld::Toggleable&, rBox, void)
{
DBG_ASSERT(pColorConfig, "Configuration not set");
@@ -726,6 +743,7 @@
SvxColorOptionsTabPage::SvxColorOptionsTabPage(weld::Container* pPage, weld::Dia
: SfxTabPage(pPage, pController, "cui/ui/optappearancepage.ui",
"OptAppearancePage", )
, bFillItemSetCalled(false)
, m_nSizeAllocEventId(nullptr)
+,
[Libreoffice-commits] core.git: svtools/source
svtools/source/misc/imagemgr.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 1ff8fa39d116c856dd2c0a6809a7f2f100b3439e
Author: Heiko Tietze
AuthorDate: Tue Mar 14 11:53:54 2023 +0100
Commit: Heiko Tietze
CommitDate: Wed Mar 22 13:54:38 2023 +
Related tdf#154182 - Recognize flat open document formats in MRU list
Change-Id: I7e25cf98502db62e80f563af6a80dbf9a7ac8db3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148845
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 7dc6705da29d..4c0d31ef3eb3 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -101,11 +101,15 @@ SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
{ "mod", true, STR_DESCRIPTION_SOURCEFILE,SvImageId::NONE },
{ "odb", false, STR_DESCRIPTION_OO_DATABASE_DOC,
SvImageId::OO_DatabaseDoc },
{ "odg", false, STR_DESCRIPTION_OO_DRAW_DOC,
SvImageId::OO_DrawDoc },
+{ "fodg", false, STR_DESCRIPTION_OO_DRAW_DOC,
SvImageId::OO_DrawDoc },
{ "odf", false, STR_DESCRIPTION_OO_MATH_DOC,
SvImageId::OO_MathDoc },
{ "odm", false, STR_DESCRIPTION_OO_GLOBAL_DOC,
SvImageId::OO_GlobalDoc },
{ "odp", false, STR_DESCRIPTION_OO_IMPRESS_DOC,
SvImageId::OO_ImpressDoc },
+{ "fodp", false, STR_DESCRIPTION_OO_IMPRESS_DOC,
SvImageId::OO_ImpressDoc },
{ "ods", false, STR_DESCRIPTION_OO_CALC_DOC,
SvImageId::OO_CalcDoc },
+{ "fods", false, STR_DESCRIPTION_OO_CALC_DOC,
SvImageId::OO_CalcDoc },
{ "odt", false, STR_DESCRIPTION_OO_WRITER_DOC,
SvImageId::OO_WriterDoc },
+{ "fodt", false, STR_DESCRIPTION_OO_WRITER_DOC,
SvImageId::OO_WriterDoc },
{ "otg", false, STR_DESCRIPTION_OO_DRAW_TEMPLATE,
SvImageId::OO_DrawTemplate },
{ "otp", false, STR_DESCRIPTION_OO_IMPRESS_TEMPLATE,
SvImageId::OO_ImpressTemplate },
{ "ots", false, STR_DESCRIPTION_OO_CALC_TEMPLATE,
SvImageId::OO_CalcTemplate },
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 1 file changed, 8 insertions(+) New commits: commit 2327015285ef31430d8b6a1c18b45d3da1890306 Author: Heiko Tietze AuthorDate: Thu Mar 16 16:26:58 2023 +0100 Commit: Eike Rathke CommitDate: Fri Mar 17 16:27:05 2023 + Related tdf#97551 - Fixes XHierarchicalNameAccess warning Change-Id: I965568bfa57449d1227e7ed0967bc05a29edf85f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148998 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index dce8685a0a05..c4f78c7ecf9d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -105,6 +105,14 @@ true + + + +Indicates whether formulas are marked. +Formula indicator and hint + + false +
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/numparapage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit dc238d75ba2ed49d76c1782043817f57f0a560b3 Author: Heiko Tietze AuthorDate: Thu Mar 9 18:05:33 2023 +0100 Commit: Heiko Tietze CommitDate: Fri Mar 10 09:10:48 2023 + Resolves tdf#153735 - No outline level should not be called Text Body Changed to [None] Change-Id: I841664f432d9235ac5486af7d27ba141ce35cd48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148562 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui index fb6d0d8d0438..0752dc0e9bcd 100644 --- a/sw/uiconfig/swriter/ui/numparapage.ui +++ b/sw/uiconfig/swriter/ui/numparapage.ui @@ -1,5 +1,5 @@ - + @@ -56,7 +56,7 @@ False Assigned Outline Level - Text Body + [None] Level 1 Level 2 Level 3
[Libreoffice-commits] core.git: cui/inc cui/source extras/source icon-themes/colibre vcl/Package_tipoftheday.mk
cui/inc/bitmaps.hlst|6
cui/inc/tipoftheday.hrc | 456 ++--
cui/source/dialogs/tipofthedaydlg.cxx | 23 +
extras/source/tipoftheday/tipoftheday.svg |1
extras/source/tipoftheday/tipoftheday_c.svg |1
extras/source/tipoftheday/tipoftheday_d.svg |1
extras/source/tipoftheday/tipoftheday_i.svg |1
extras/source/tipoftheday/tipoftheday_w.svg |1
vcl/Package_tipoftheday.mk |5
9 files changed, 254 insertions(+), 241 deletions(-)
New commits:
commit 49379a0b3fc7b263a7e5be2ecbb018e9248d01f2
Author: Heiko Tietze
AuthorDate: Thu Mar 9 12:47:05 2023 +0100
Commit: Heiko Tietze
CommitDate: Thu Mar 9 17:07:04 2023 +
Resolves tdf#131177 - Replace Hard-Coded TotD bulb by themeable icon
Change-Id: I25006f64436a72f554450929b1b649478b02cbc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148536
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index e36184208fc5..5e10e014b446 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -74,4 +74,10 @@ inline constexpr OUStringLiteral RID_SVXBMP_MACRO =
u"svx/res/id018.png";
inline constexpr OUStringLiteral RID_SVXBMP_STARS_FULL =
u"cmd/sc_stars-full.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_WRITER =
u"res/tipoftheday_w.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_CALC =
u"res/tipoftheday_c.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_DRAW =
u"res/tipoftheday_d.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_IMPRESS =
u"res/tipoftheday_i.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_SOFFICE =
u"res/tipoftheday.png";
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 9dc6a3d81488..2248f60562fd 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -27,7 +27,7 @@
#include
/*
- * std:tuple consists of
+ * std:tuple consists of
* text:
* escape backslash, ie. use \\ to show \
* Use %MOD1 for Ctrl/Cmd and %MOD2 for Alt/Option depending on OS
(uppercase required)
@@ -43,236 +43,240 @@
* leave the image string empty for the default tipoftheday.png
* place new images at extra/source/tipoftheday and do not forget to add the
files to vcl/Package_tipoftheday.mk
* images are scaled to 150x150px; const ThumbSize() in tipoftheday.cxx
+ * module
+ * use on of the options below; an overlay is drawn on the default image
tipoftheday.png except for the generic soffice (and of course not if an image
is set)
*/
+enum tipModule : sal_uInt8
+{ swriter, scalc, sdraw, simpress, soffice };
-const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
+const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME offers a variety of user
interface options to make you feel at home"), ".uno:ToolbarModeUI",
"toolbarmode.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Need to allow changes to parts of a
read-only document in Writer? Insert frames or sections that can authorize
changes."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/section_edit.html;,
"tipoftheday_w.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to
File ▸ Print ▸ %PRODUCTNAME Impress tab and select Notes under Document ▸
Type."), "", "printnote.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user
profile, or to restore a non-working %PRODUCTNAME, use Help ▸ Restart in Safe
Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Writing a book? %PRODUCTNAME master
document lets you manage large documents as a container for individual
%PRODUCTNAME Writer files."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/globaldoc.html;,
"tipoftheday_w.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create editable Hybrid PDFs with
%PRODUCTNAME."),
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF;,
"hybrid_pdf.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Explore the ten different functions in the
status bar (at the bottom of the document window). Place the cursor over each
field for an explanation. If not visible, use View ▸ Status Bar."), "",
"tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to sum a cell through several sheets?
Refer to the range of sheets e.g. =SUM(Sheet1.A1:Sheet3.A1)."), "",
"sum_sheets.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create fillable form documents
(even PDFs) with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice;,
[Libreoffice-commits] core.git: sc/inc
sc/inc/ViewSettingsSequenceDefines.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f1306e1d0f52716cf44a9052654af4133fa2c6eb Author: Heiko Tietze AuthorDate: Wed Mar 8 12:53:15 2023 +0100 Commit: Heiko Tietze CommitDate: Wed Mar 8 14:18:20 2023 + Fix to SC_VIEWSETTINGS_COUNT Missed in I8f3e368d4fdad362b819b4ce2fd6b0c32b5c1c0f Change-Id: Ibb744c0c853813e379eca8558fa114d403a4f494 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148468 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx index 501a87cc1854..bf8fbfa0729a 100644 --- a/sc/inc/ViewSettingsSequenceDefines.hxx +++ b/sc/inc/ViewSettingsSequenceDefines.hxx @@ -24,7 +24,7 @@ // this are the defines for the position of the settings in the // ViewSettingsSequence -#define SC_VIEWSETTINGS_COUNT 25 +#define SC_VIEWSETTINGS_COUNT 26 #define SC_VIEW_ID 0 #define SC_TABLE_VIEWSETTINGS 1
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/indexentry.ui | 997 --- 1 file changed, 479 insertions(+), 518 deletions(-) New commits: commit 0f9226287fec770c4c9c0fe49b1d7046d995a3e9 Author: Heiko Tietze AuthorDate: Wed Mar 8 12:23:24 2023 +0100 Commit: Heiko Tietze CommitDate: Wed Mar 8 13:24:36 2023 + Related tdf#153499 - Index Entry UI Misleading label "Selection" and associated frame removed Nested grids cleaned-up Change-Id: Ib144d91d6c03a4ae0324c18ad27cde6f25594be7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148467 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui index bfc11ebc7231..5c22a9e41119 100644 --- a/sw/uiconfig/swriter/ui/indexentry.ui +++ b/sw/uiconfig/swriter/ui/indexentry.ui @@ -142,546 +142,507 @@ - + + True False -0 -none +12 +6 +6 +6 - - + True False +6 +Index: +True +typecb +0 + + +0 +0 + + + + +True +False +True + + +Select the index that you want to add the entry to. + + + + +1 +0 + + + + +True +True +True +New User-defined Index +image1 +True + + +2 +0 + + + + +True +False +6 +Entry: +True +entryed +0 + + +0 +1 + + + + +True +True +True +True + + +Displays the text that is selected in the document. If you want, you can enter a different word for the index entry. The selected text in the document is not changed. + + + + +1 +1 + + + + +True +True +Update entry from selection +image6 +True + + +2 +1 + + + + +False +True 12 -6 - - - -True -False -True -6 -6 - - -True -False -6 -Index: -True -typecb -0 - - -0 -0 - - - - -True -False -True - - -Select the index that you want to add the entry to. - - - - -1 -0 - - - - -True -True -True -New User-defined Index -image1 -True - - -2 -0 - - - - -True -False -6 -Entry: -True -entryed -0 - - -0 -1 -
[Libreoffice-commits] core.git: svx/source
svx/source/stbctrls/pszctrl.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 68b6d507342a440b5441882e74587054d530687b Author: Heiko Tietze AuthorDate: Tue Mar 7 14:51:03 2023 +0100 Commit: Heiko Tietze CommitDate: Wed Mar 8 09:59:13 2023 + Vertically center statusbar images Change-Id: Iecdeeda5c10b2322bdf71e84864ed8104581589f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148424 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index cd103e258600..76105b844028 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -449,8 +449,12 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) rRect.Left() + rRect.GetWidth() / 2 + PAINT_OFFSET; // draw position Point aPnt = rRect.TopLeft(); -aPnt.setY( aItemPos.Y() ); aPnt.AdjustX(PAINT_OFFSET ); +// vertically centered +const tools::Long nSizePosY = +(rRect.GetHeight() - pImpl->aPosImage.GetSizePixel().Height()) / 2; +aPnt.AdjustY( nSizePosY ); + pDev->DrawImage( aPnt, pImpl->aPosImage ); aPnt.AdjustX(pImpl->aPosImage.GetSizePixel().Width() ); aPnt.AdjustX(PAINT_OFFSET );
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/statusbar/statusbar.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8dc8443c3b13e8782fdbaf61594056df8126 Author: Heiko Tietze AuthorDate: Tue Mar 7 15:39:32 2023 +0100 Commit: Heiko Tietze CommitDate: Wed Mar 8 06:46:06 2023 + Relates tdf#153344 - Resize statusbar icons to 16px Adjustment of StatusSelectionMode size Also move the ModifiedStatus on top to comply with Writer Change-Id: I0d79161651ea841ab4aa496dd5b2edc3fca43ff1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148427 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/statusbar/statusbar.xml b/sc/uiconfig/scalc/statusbar/statusbar.xml index 6fe161d9379b..fe4994249b62 100644 --- a/sc/uiconfig/scalc/statusbar/statusbar.xml +++ b/sc/uiconfig/scalc/statusbar/statusbar.xml @@ -18,13 +18,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/statusbar; xmlns:xlink="http://www.w3.org/1999/xlink;> + - - +
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg
icon-themes/breeze/svx/res/doc_modified_feedback.png|binary icon-themes/breeze/svx/res/doc_modified_no.png |binary icon-themes/breeze/svx/res/doc_modified_yes.png |binary icon-themes/breeze_dark/svx/res/doc_modified_feedback.png |binary icon-themes/breeze_dark/svx/res/doc_modified_no.png |binary icon-themes/breeze_dark/svx/res/doc_modified_yes.png|binary icon-themes/breeze_dark_svg/svx/res/doc_modified_feedback.svg | 44 -- icon-themes/breeze_dark_svg/svx/res/doc_modified_no.svg | 44 -- icon-themes/breeze_dark_svg/svx/res/doc_modified_yes.svg| 44 -- icon-themes/breeze_svg/svx/res/doc_modified_feedback.svg| 44 -- icon-themes/breeze_svg/svx/res/doc_modified_no.svg | 44 -- icon-themes/breeze_svg/svx/res/doc_modified_yes.svg | 44 -- icon-themes/colibre/svx/res/doc_modified_feedback.png |binary icon-themes/colibre/svx/res/doc_modified_no.png |binary icon-themes/colibre/svx/res/doc_modified_yes.png|binary icon-themes/colibre_dark/svx/res/doc_modified_feedback.png |binary icon-themes/colibre_dark/svx/res/doc_modified_no.png|binary icon-themes/colibre_dark/svx/res/doc_modified_yes.png |binary icon-themes/colibre_dark_svg/svx/res/doc_modified_feedback.svg | 49 -- icon-themes/colibre_dark_svg/svx/res/doc_modified_no.svg| 49 -- icon-themes/colibre_dark_svg/svx/res/doc_modified_yes.svg | 49 -- icon-themes/colibre_svg/svx/res/doc_modified_feedback.svg | 55 -- icon-themes/colibre_svg/svx/res/doc_modified_no.svg | 55 -- icon-themes/colibre_svg/svx/res/doc_modified_yes.svg| 55 -- icon-themes/elementary/svx/res/doc_modified_feedback.png|binary icon-themes/elementary/svx/res/doc_modified_no.png |binary icon-themes/elementary/svx/res/doc_modified_yes.png |binary icon-themes/elementary_svg/svx/res/doc_modified_feedback.svg| 140 --- icon-themes/elementary_svg/svx/res/doc_modified_no.svg | 140 --- icon-themes/elementary_svg/svx/res/doc_modified_yes.svg | 193 -- icon-themes/karasa_jaga/svx/res/doc_modified_feedback.png |binary icon-themes/karasa_jaga/svx/res/doc_modified_no.png |binary icon-themes/karasa_jaga/svx/res/doc_modified_yes.png|binary icon-themes/karasa_jaga_svg/svx/res/doc_modified_feedback.svg | 43 -- icon-themes/karasa_jaga_svg/svx/res/doc_modified_no.svg | 44 -- icon-themes/karasa_jaga_svg/svx/res/doc_modified_yes.svg| 43 -- icon-themes/sifr/svx/res/doc_modified_feedback.png |binary icon-themes/sifr/svx/res/doc_modified_no.png|binary icon-themes/sifr/svx/res/doc_modified_yes.png |binary icon-themes/sifr_dark/svx/res/doc_modified_feedback.png |binary icon-themes/sifr_dark/svx/res/doc_modified_no.png |binary icon-themes/sifr_dark/svx/res/doc_modified_yes.png |binary icon-themes/sifr_dark_svg/svx/res/doc_modified_feedback.svg | 44 -- icon-themes/sifr_dark_svg/svx/res/doc_modified_no.svg | 45 -- icon-themes/sifr_dark_svg/svx/res/doc_modified_yes.svg | 54 -- icon-themes/sifr_svg/svx/res/doc_modified_feedback.svg | 49 -- icon-themes/sifr_svg/svx/res/doc_modified_no.svg| 45 -- icon-themes/sifr_svg/svx/res/doc_modified_yes.svg | 54 -- icon-themes/sukapura/svx/res/doc_modified_feedback.png |binary icon-themes/sukapura/svx/res/doc_modified_no.png|binary icon-themes/sukapura/svx/res/doc_modified_yes.png |binary icon-themes/sukapura_dark/svx/res/doc_modified_feedback.png |binary icon-themes/sukapura_dark/svx/res/doc_modified_no.png |binary icon-themes/sukapura_dark/svx/res/doc_modified_yes.png |binary icon-themes/sukapura_dark_svg/svx/res/doc_modified_feedback.svg |1 icon-themes/sukapura_dark_svg/svx/res/doc_modified_no.svg |1 icon-themes/sukapura_dark_svg/svx/res/doc_modified_yes.svg |1 icon-themes/sukapura_svg/svx/res/doc_modified_feedback.svg |1 icon-themes/sukapura_svg/svx/res/doc_modified_no.svg|1 icon-themes/sukapura_svg/svx/res/doc_modified_yes.svg |1 60 files changed, 30 insertions(+), 1446 deletions(-) New commits: commit e85aa0f9c9ab58b81b333fabbed1604a36b68747 Author: Heiko Tietze AuthorDate: Mon Mar 6 15:12:31 2023 +0100 Commit: Heiko Tietze CommitDate: Tue Mar 7 13:52:31 2023 + Resolves tdf#153344 - Resize Save icon in statusbar to 16px 16px instead 18px to comply with the other icons Change-Id: Ic7e3531c30f1af75b38416a94acc2e7ea16c3ded Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148350 Tested-by: Jenkins Tested-by: Rizal
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/viewlayoutctrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dc025586351206f5369eeed1d9203e659d87ed04
Author: Heiko Tietze
AuthorDate: Mon Mar 6 15:56:33 2023 +0100
Commit: Heiko Tietze
CommitDate: Tue Mar 7 11:51:52 2023 +
Typo in comment
Change-Id: Iadf080cfae051116add064f8ac3e7d13079effb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148351
Tested-by: Heiko Tietze
Reviewed-by: Heiko Tietze
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx
b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index c091fcb01f46..453dcd91a2eb 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -66,7 +66,7 @@ void SwViewLayoutControl::StateChangedAtStatusBarControl(
sal_uInt16 /*nSID*/, S
if ( SfxItemState::DEFAULT != eState || pState->IsVoidItem() )
{
GetStatusBar().SetItemText( GetId(), OUString() );
-mpImpl->mnState = 4; //tdf#148441 switch off is disabled
+mpImpl->mnState = 4; //tdf#148441 switch off, if disabled
}
else
{
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/salvtables.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit d9ba2fbdc81705d387f932700289b2dda8ea81dc Author: Heiko Tietze AuthorDate: Mon Mar 6 14:39:03 2023 +0100 Commit: Heiko Tietze CommitDate: Tue Mar 7 08:28:06 2023 + Resolves tdf#153933 - Minor adjustments to EntryMessageType Red adjusted to follow the standard palette and yellow to have the same saturation Change-Id: Ic40a37c77862471066a8575d4b22cc18dc6edac4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148348 Reviewed-by: Vernon, Stuart Foote Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index a5ac05271b51..9bbd8e5bf05d 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -3458,14 +3458,14 @@ void set_message_type(Edit* pEntry, weld::EntryMessageType eType) // relevant for GTK; see also #i75179# pEntry->SetForceControlBackground(true); pEntry->SetControlForeground(COL_BLACK); -pEntry->SetControlBackground(COL_YELLOW); +pEntry->SetControlBackground(0x38); // "light yellow 1" break; case weld::EntryMessageType::Error: // tdf#114603: enable setting the background to a different color; // relevant for GTK; see also #i75179# pEntry->SetForceControlBackground(true); -pEntry->SetControlForeground(COL_WHITE); -pEntry->SetControlBackground(0xff6563); +pEntry->SetControlForeground(COL_BLACK); // contrast of 5.87 to the red background +pEntry->SetControlBackground(0xff3838); // "light red 1" break; } }
