core.git: cui/inc officecfg/registry
cui/inc/tipoftheday.hrc|2 +-
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 --
2 files changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 2769feccbf026dd318c4afa08ba3692f287d7c5d
Author: kubak
AuthorDate: Sun May 5 19:40:36 2024 +0200
Commit: Heiko Tietze
CommitDate: Tue Jun 18 17:32:00 2024 +0200
tdf#131688 - RemoveDirectCharFormats ++X usage tip
Change-Id: I89c2c7d6af663904223834664aeb635cb99068bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167164
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index a87d1ec51387..4a88d774b7df 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -117,7 +117,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
{ NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined
template or current document per Tools ▸ Options ▸ %PRODUCTNAME Writer ▸ Basic
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", "", swriter},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01040300.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to find words containing more than 10
characters? Edit ▸ Find and Replace ▸ Search ▸ [a-z]{10,} ▸ Other Options ▸
check Regular expressions."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Open a CSV file as a new sheet in the
current spreadsheet via Sheet ▸ Sheet from file."), "", "", scalc},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can continue writing with the default
formatting attributes after manually applying bold, italic or underline by
pressing %MOD1+Shift+X."), "", "", swriter},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can continue writing with the default
formatting attributes after manually applying bold, italic or underline by
pressing %MOD1+M."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use %MOD1+%MOD2+Shift+V to paste the
contents of the clipboard as unformatted text."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Customize footnote appearance with Tools ▸
Footnote/Endnote Settings…"), ".uno:FootnoteDialog", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "With Slide Show ▸ Custom Slide Show,
reorder and pick slides to fit a slideshow to the needs of your viewers."), "",
"", simpress},
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index c5f32a4af1d8..d90357018cb0 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -6844,12 +6844,6 @@ Ctrl+Shift+u aka U_SHIFT_MOD1 under GTK/IBUS is for
unicode key input
.uno:PasteSpecial
-
-
-L10N SHORTCUTS - NO
TRANSLATE
-.uno:RemoveDirectCharFormats
-
-
L10N SHORTCUTS - NO
TRANSLATE
core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source include/sfx2 include/unotools officecfg/registry Repository.mk sfx2/sdi sfx2/source vcl/Module_vcl.mk vcl
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 | 14
cui/source/factory/dlgfact.hxx |2
cui/source/inc/whatsnew.hxx| 79 ---
cui/uiconfig/ui/whatsnewdialog.ui | 131 --
dev/null |binary
include/sfx2/sfxdlg.hxx|2
include/sfx2/sfxsids.hrc |3
include/sfx2/strings.hrc |2
include/sfx2/viewfrm.hxx |1
include/unotools/VersionConfig.hxx |5
officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs |6
officecfg/registry/schema/org/openoffice/Setup.xcs |2
sfx2/sdi/appslots.sdi |4
sfx2/sdi/sfx.sdi | 16
sfx2/source/appl/appserv.cxx |9
sfx2/source/dialog/infobar.cxx |2
sfx2/source/view/viewfrm.cxx | 212
+-
vcl/Module_vcl.mk |1
vcl/Package_whatsnew.mk| 20
24 files changed, 124 insertions(+), 604 deletions(-)
New commits:
commit 1bd9747a126a3e82b6093c2b4af3b3a74774a3e9
Author: Heiko Tietze
AuthorDate: Wed May 22 13:18:27 2024 +0200
Commit: Heiko Tietze
CommitDate: Wed May 22 21:19:46 2024 +0200
tdf#161209 - Reverts WhatsNew/Welcome dialog
dd889b290304b73f96a9a8e6e0f144d3aa2ba7e1
Change-Id: Idf0594c546e4d9ca263272ed1534b27948e8e930
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167956
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/Repository.mk b/Repository.mk
index b86eb1bc5646..4a505655d209 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -925,7 +925,6 @@ $(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 3ee744e32d0f..e01e33ecb4ec 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -114,7 +114,6 @@ $(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 79ff7696a93a..10acd83c8c39 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -18,7 +18,6 @@ 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
deleted file mode 100644
index e155a597bcf2..
--- a/cui/inc/whatsnew.hrc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- 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[] =
-{
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME is a powerful and free office
suite, used by millions of people around the world."), "LibreOffice.gif"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME uses the reliable and trustworthy
standard open document format."), "ODF.png"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME blends into every operation
system and provides full customization."), "Configurability.png"},
- { NC_("RID_CUI_WHATSNEW", "%PRODUCTNAME is open source: Your project,
your data, your freedom."),
core.git: cui/inc cui/source
cui/inc/dlgname.hxx |2 cui/source/customize/CommandCategoryListBox.cxx | 10 cui/source/customize/CustomNotebookbarGenerator.cxx | 23 + cui/source/customize/SvxConfigPageHelper.cxx| 24 +- cui/source/customize/SvxMenuConfigPage.cxx | 50 ++-- cui/source/customize/SvxNotebookbarConfigPage.cxx | 20 - cui/source/customize/SvxToolbarConfigPage.cxx | 62 ++--- cui/source/customize/acccfg.cxx | 39 +-- cui/source/customize/cfg.cxx| 120 +- cui/source/customize/cfgutil.cxx| 44 +-- cui/source/customize/eventdlg.cxx | 14 - cui/source/customize/macropg.cxx| 30 +- cui/source/dialogs/AdditionsDialog.cxx | 71 +++-- cui/source/dialogs/DiagramDialog.cxx| 18 - cui/source/dialogs/FontFeaturesDialog.cxx | 21 - cui/source/dialogs/GraphicTestsDialog.cxx | 16 - cui/source/dialogs/ImageViewerDialog.cxx|4 cui/source/dialogs/QrCodeGenDialog.cxx | 40 +-- cui/source/dialogs/SignSignatureLineDialog.cxx | 42 +-- cui/source/dialogs/SignatureLineDialog.cxx | 56 ++-- cui/source/dialogs/SpellDialog.cxx | 62 ++--- cui/source/dialogs/about.cxx| 38 +-- cui/source/dialogs/colorpicker.cxx | 54 ++-- cui/source/dialogs/cuifmsearch.cxx | 54 ++-- cui/source/dialogs/cuigaldlg.cxx| 84 +++ cui/source/dialogs/cuigrfflt.cxx| 32 +- cui/source/dialogs/cuihyperdlg.cxx | 26 +- cui/source/dialogs/cuiimapwnd.cxx | 14 - cui/source/dialogs/cuitbxform.cxx |5 cui/source/dialogs/dlgname.cxx | 59 ++-- cui/source/dialogs/hangulhanjadlg.cxx | 100 cui/source/dialogs/hldocntp.cxx | 16 - cui/source/dialogs/hldoctp.cxx | 16 - cui/source/dialogs/hlinettp.cxx |6 cui/source/dialogs/hlmailtp.cxx | 10 cui/source/dialogs/hlmarkwn.cxx | 18 - cui/source/dialogs/hltpbase.cxx | 14 - cui/source/dialogs/hyphen.cxx | 18 - cui/source/dialogs/insdlg.cxx | 92 +++ cui/source/dialogs/insrc.cxx|8 cui/source/dialogs/linkdlg.cxx | 24 +- cui/source/dialogs/multipat.cxx | 16 - cui/source/dialogs/newtabledlg.cxx |6 cui/source/dialogs/passwdomdlg.cxx | 44 +-- cui/source/dialogs/pastedlg.cxx |8 cui/source/dialogs/postdlg.cxx | 18 - cui/source/dialogs/screenshotannotationdlg.cxx | 28 +- cui/source/dialogs/scriptdlg.cxx| 50 ++-- cui/source/dialogs/sdrcelldlg.cxx | 34 +- cui/source/dialogs/showcols.cxx |6 cui/source/dialogs/splitcelldlg.cxx | 10 cui/source/dialogs/srchxtra.cxx | 40 +-- cui/source/dialogs/thesdlg.cxx | 16 - cui/source/dialogs/tipofthedaydlg.cxx | 15 - cui/source/dialogs/toolbarmodedlg.cxx | 33 +- cui/source/dialogs/whatsnew.cxx | 12 - cui/source/dialogs/widgettestdlg.cxx| 12 - cui/source/dialogs/zoom.cxx | 28 +- cui/source/factory/cuiexp.cxx |4 cui/source/factory/dlgfact.cxx |4 cui/source/factory/dlgfact.hxx |2 cui/source/inc/FontFeaturesDialog.hxx | 10 cui/source/options/certpath.cxx | 14 - cui/source/options/connpooloptions.cxx | 32 +- cui/source/options/dbregister.cxx | 12 - cui/source/options/doclinkdialog.cxx| 20 - cui/source/options/fontsubs.cxx | 36 +-- cui/source/options/optaboutconfig.cxx | 32 +- cui/source/options/optaccessibility.cxx | 36 +-- cui/source/options/optasian.cxx | 38 +-- cui/source/options/optbasic.cxx | 20 - cui/source/options/optchart.cxx | 24 +- cui/source/options/optcolor.cxx | 70 ++--- cui/source/options/optctl.cxx | 20 - cui/source/options/optdeepl.cxx | 10 cui/source/options/optdict.cxx | 36 +-- cui/source/options/optfltr.cxx | 60 ++--- cui/source/options/optgdlg.cxx | 238 ++-- cui/source/options/optgenrl.cxx | 108
core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 132ed1b713f7379589bd6906036b157301f27209
Author: Adolfo Jayme Barrientos
AuthorDate: Mon Apr 22 14:33:43 2024 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Apr 22 23:42:33 2024 +0200
tdf#94535 Update a Tip of the Day with new command name
Change-Id: Idba9a4d050617e14db62cdf9bc4c62f0916cc032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166472
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 559211da3986..a87d1ec51387 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -149,7 +149,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to open hyperlinks without pressing
the %MOD1 key? Uncheck “%MOD1+click required to open hyperlinks” in Tools ▸
Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ Security Options."),
"cui/ui/securityoptionsdialog/ctrlclick", "", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "You would like to view the calculation of
individual elements of a formula, select the respective elements and press
F9."), "", "", scalc},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can protect cells with Format ▸ Cells ▸
Protection. To prevent insert, delete, rename, move/copy of sheets use Tools ▸
Protect Sheet."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/cell_protect.html;,
"", scalc}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Write along a curve? Draw the curve, double
click, type the text, Format ▸ Text Box and Shape ▸ Fontwork. Select one of the
alignment options: Rotate, Upright, Slant Horizontal or Slant Vertical."), "",
"", swriter},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can make text follow the shape of a
curve. Draw the curve, double-click it, type the text, and choose Format ▸ Text
Box and Shape ▸ Text along Path. Select one of the alignment options: Rotate,
Upright, Slant Horizontal or Slant Vertical."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to display only the highest values in
a spreadsheet? Select menu Data ▸ AutoFilter, click the drop-down arrow, and
choose “Top10”."), "", "", scalc},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table
of contents go to Insert ▸ Table of Contents and Index (or right-click and Edit
Index to edit a previously inserted index). In the Entries tab delete the page
number (#) from Structure line."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "With the Navigator you can select & move
up/down headings and the text below the heading, in the Navigator and in the
document."), "", "", swriter},
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: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6acc37e936c2023af612b812524fa5b4a56d6895
Author: Bogdan Buzea
AuthorDate: Sun Mar 24 15:41:00 2024 +0100
Commit: Ilmari Lauhakangas
CommitDate: Mon Mar 25 08:20:39 2024 +0100
tdf#154331 Improve tip of the day
Change-Id: Ibebbc9b254d1bc8c45e20efc634d77ec0b708569
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165235
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas
Reviewed-by: Ilmari Lauhakangas
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index ed4b7b72eb3d..559211da3986 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -101,7 +101,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
{ NC_("RID_CUI_TIPOFTHEDAY", "Hold down %MOD1 and turn the mouse wheel to
change the zoom factor."), "", "", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has great extensions to
increase your productivity—check them out."),
"https://extensions.libreoffice.org;, "", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to count words for just one particular
paragraph style? Use Edit ▸ Find and Replace, click Paragraph Styles, select
the style in Find, and click Find All. Read the result in the status bar."),
"", "", swriter},
- { NC_("RID_CUI_TIPOFTHEDAY", "Generate fully customized PDF documents
with the exact format, image compression, comments, access rights, password,
etc., via File ▸ Export as PDF."), "", "", soffice},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Generate fully customized PDF documents
with the exact format, image compression, comments, access rights, password,
etc., you specify via File ▸ Export as PDF."), "", "", soffice},
#if ENABLE_LIBRELOGO
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer includes LibreLogo: simple Logo-like
programming environment with turtle vector graphics, DTP and graphic design."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/librelogo/LibreLogo.html;,
"", swriter}, //local help missing
#endif
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: cui/inc cui/Library_cui.mk cui/source include/cui include/svx sd/inc sd/Library_sdui.mk sd/source solenv/clang-format svx/Library_svx.mk svx/source sw/Library_swui.mk sw/source
cui/Library_cui.mk|1 -
cui/inc/dlgname.hxx |8 +++-
cui/inc/strings.hrc |3 ---
cui/source/factory/dlgfact.cxx|2 +-
cui/source/factory/dlgfact.hxx|2 +-
cui/source/factory/init.cxx |2 +-
cui/source/tabpages/autocdlg.cxx |2 +-
cui/source/tabpages/chardlg.cxx |2 +-
cui/source/tabpages/numpages.cxx |2 +-
include/cui/cuidllapi.h | 23 ---
include/svx/cuicharmap.hxx| 15 ++-
include/svx/strings.hrc |4
sd/Library_sdui.mk|1 -
sd/inc/pch/precompiled_sdui.hxx |1 -
sd/source/ui/dlg/BulletAndPositionDlg.cxx |2 +-
solenv/clang-format/excludelist |2 +-
svx/Library_svx.mk|1 +
svx/source/dialog/cuicharmap.cxx | 20 ++--
sw/Library_swui.mk|1 -
sw/source/ui/misc/contentcontroldlg.cxx |2 +-
20 files changed, 33 insertions(+), 63 deletions(-)
New commits:
commit 52ba1fea038a93c77e62d3a173a070b6a249518c
Author: Caolán McNamara
AuthorDate: Wed Jan 31 09:46:57 2024 +
Commit: Caolán McNamara
CommitDate: Wed Jan 31 20:52:19 2024 +0100
move CharMap out of cui
remove CUI_DLLPUBLIC from stuff which is not exported
then drop the cui/include dir which is then empty and
the places we link to cui where we now don't need to
and restore cui back to a lib containing stuff that
doesn't need to be explictly linked to in keeping
with original #i106421# idea
Change-Id: I21894e6f8529dd3306df345fb52dbf5009015f3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162798
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index e122d2b734c4..105defe54e80 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
$(call gb_Helper_optional,EXTENSIONS, \
cui/source/dialogs/AdditionsDialog) \
cui/source/dialogs/colorpicker \
-cui/source/dialogs/cuicharmap \
cui/source/dialogs/cuifmsearch \
cui/source/dialogs/cuigaldlg \
cui/source/dialogs/cuigrfflt \
diff --git a/cui/inc/dlgname.hxx b/cui/inc/dlgname.hxx
index 9835661c4e7d..deb55df1c962 100644
--- a/cui/inc/dlgname.hxx
+++ b/cui/inc/dlgname.hxx
@@ -18,14 +18,12 @@
*/
#pragma once
-#include
-
#include
#include
#include
/// Dialog for editing a name
-class CUI_DLLPUBLIC SvxNameDialog final : public weld::GenericDialogController
+class SvxNameDialog final : public weld::GenericDialogController
{
private:
std::unique_ptr m_xEdtName;
@@ -66,7 +64,7 @@ public:
};
/// Dialog for editing a number
-class CUI_DLLPUBLIC SvxNumberDialog final : public
weld::GenericDialogController
+class SvxNumberDialog final : public weld::GenericDialogController
{
private:
std::unique_ptr m_xEdtNumber;
@@ -79,7 +77,7 @@ public:
sal_Int64 GetNumber() const { return m_xEdtNumber->get_value(); }
};
-class CUI_DLLPUBLIC SvxDecimalNumberDialog final : public
weld::GenericDialogController
+class SvxDecimalNumberDialog final : public weld::GenericDialogController
{
private:
std::unique_ptr m_xEdtNumber;
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index f5252694459c..953f67b25342 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -80,9 +80,6 @@
// tdf#119293 Labels depending on row/col
#define RID_CUISTR_INSERTROW_BEFORE
NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above selection")
#define RID_CUISTR_INSERTROW_AFTER
NC_("RID_SVXSTR_INSERTROW_AFTER", "Below selection")
-#define RID_CUISTR_REMOVE_FAVORITES
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
-#define RID_CUISTR_MISSING_CHAR
NC_("RID_SVXSTR_MISSING_CHAR", "Missing character")
-#define RID_CUISTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
// PPI is pixel per inch, %1 is a number
#define RID_CUISTR_PPI NC_("RID_SVXSTR_PPI", "(%1
PPI)")
#define RID_CUISTR_COL NC_("RID_SVXSTR_COL",
"Insert Columns")
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index e0ad91cd52b1..6cb6f3147657 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -32,7 +32,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 3c8601140164..fc83403cb24d 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -26,7 +26,7 @@
#include
#include
-#include
+#include
#include
#include
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/personas.hrc | 30 ++
cui/source/options/personalization.cxx |9 +++--
2 files changed, 37 insertions(+), 2 deletions(-)
New commits:
commit a6dc2a42263816461600307b5f8271a5c5d8d031
Author: Julien Nabet
AuthorDate: Sat Dec 2 11:36:06 2023 +0100
Commit: Julien Nabet
CommitDate: Mon Dec 4 17:20:07 2023 +0100
tdf#157402: translate personas
Change-Id: I6b2bc6f8fa76ddb669a71d0858a43c62bf51d58d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160240
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/cui/inc/personas.hrc b/cui/inc/personas.hrc
new file mode 100644
index ..6b101717dcaa
--- /dev/null
+++ b/cui/inc/personas.hrc
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+#include
+
+#include
+
+#define NC_(Context, String) TranslateId(Context, u8##String)
+
+// it must be synchronized with
extras/source/gallery/personas/personas_list.txt
+std::pair RID_PERSONAS_COLOR[] =
+{
+{ NC_("RID_CUI_PERSONAS_COLOR", "White") , 0 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Gray") , 1 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Dark") , 2 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Pink") , 3 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Sand") , 4 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Green") , 5 },
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 6311fd491141..657344d60c75 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -11,6 +11,8 @@
#include "personalization.hxx"
+#include
+
#include
#include
#include
@@ -21,6 +23,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
using namespace ::com::sun::star::uno;
@@ -144,6 +147,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
bool foundOne = false;
OStringBuffer aLine;
+int nLineNumberFilePersona = 0;
while (aStream.IsOpen() && !aStream.eof() && nIndex < MAX_DEFAULT_PERSONAS)
{
OUString aPersonaSetting, aPreviewFile, aName;
@@ -151,8 +155,8 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
aStream.ReadLine(aLine);
aPersonaSetting = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8);
-aName = aPersonaSetting.getToken(1, ';', nParseIndex);
-aPreviewFile = aPersonaSetting.getToken(0, ';', nParseIndex);
+aName = CuiResId(RID_PERSONAS_COLOR[nLineNumberFilePersona].first);
+aPreviewFile = aPersonaSetting.getToken(2, ';', nParseIndex);
if (aPreviewFile.isEmpty())
break;
@@ -175,6 +179,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
m_vDefaultPersonaImages[nIndex]->set_tooltip_text(aName);
m_vDefaultPersonaImages[nIndex++]->show();
foundOne = true;
+++nLineNumberFilePersona;
}
m_xDefaultPersona->set_sensitive(foundOne);
[Libreoffice-commits] core.git: cui/inc
cui/inc/dlgname.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 143f223e5e58cf218b23697600c7a49ba4a45bc8
Author: Stephan Bergmann
AuthorDate: Mon Nov 27 21:42:37 2023 +0100
Commit: Stephan Bergmann
CommitDate: Tue Nov 28 12:31:17 2023 +0100
-Werror,-Wunused-private-field
Change-Id: Ide7172c567f595fb7e44f19c8d96ab8d6b751491
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160007
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/cui/inc/dlgname.hxx b/cui/inc/dlgname.hxx
index 3876585e1947..9835661c4e7d 100644
--- a/cui/inc/dlgname.hxx
+++ b/cui/inc/dlgname.hxx
@@ -160,7 +160,6 @@ class SvxListDialog : public weld::GenericDialogController
{
private:
ListMode m_aMode;
-Link m_aEditHdl;
std::unique_ptr m_xList;
std::unique_ptr m_xAddBtn;
std::unique_ptr m_xRemoveBtn;
[Libreoffice-commits] core.git: cui/inc cui/source include/cui
cui/inc/dlgname.hxx |2 +- cui/source/customize/SvxMenuConfigPage.cxx|2 +- cui/source/customize/SvxToolbarConfigPage.cxx |2 +- cui/source/dialogs/dlgname.cxx|2 +- cui/source/factory/dlgfact.cxx|1 - cui/source/factory/dlgfact.hxx|2 +- cui/source/options/optaboutconfig.cxx |1 - cui/source/options/optaboutconfig.hxx |2 +- 8 files changed, 6 insertions(+), 8 deletions(-) New commits: commit 8c3e4dba01fa3bac6ddf16ebe75f3e169e458068 Author: Julien Nabet AuthorDate: Mon Nov 27 15:04:55 2023 +0100 Commit: Julien Nabet CommitDate: Mon Nov 27 20:20:55 2023 +0100 Move a cui header inside the module + fix building issues about "cuidllapi.h" + remove #include in some cxx since their corresponding hxx already contains the include Change-Id: I2396104fbcbca2e1aca29cdb2324ae0f4daf63cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159996 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/cui/dlgname.hxx b/cui/inc/dlgname.hxx similarity index 99% rename from include/cui/dlgname.hxx rename to cui/inc/dlgname.hxx index e06c56c0f010..3876585e1947 100644 --- a/include/cui/dlgname.hxx +++ b/cui/inc/dlgname.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include "cuidllapi.h" +#include #include #include diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 3ec1f2a531e1..4ee5ce9be0ca 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index be34445cf19f..035059ea8e83 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -38,7 +38,7 @@ #include #include -#include +#include #include SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage, diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 8164bf1c2b40..09b6158fde00 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 42a2b19fbaee..fbdea49672ef 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 137a5a033294..b6120dcfb2ef 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index f191a59bd2ee..885ea189a8c5 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 17aea23a997e..7bfce2ab85aa 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -11,7 +11,7 @@ #include -#include +#include #include #include
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig editeng/source filter/source filter/uiconfig include/jvmfwk include/svl officecfg/registry readlicense_oo/docs reportbuilder/Package_tem
cui/inc/tipoftheday.hrc|8 +++---
cui/inc/treeopt.hrc|4 +--
cui/source/inc/treeopt.hxx |2 -
cui/source/tabpages/numfmt.cxx |2 -
cui/uiconfig/ui/numberingformatpage.ui |2 -
cui/uiconfig/ui/opthtmlpage.ui |2 -
editeng/source/editeng/editview.cxx|8 +++---
filter/source/msfilter/svdfppt.cxx |2 -
filter/uiconfig/ui/pdfviewpage.ui |2 -
include/jvmfwk/framework.hxx |2 -
include/svl/zforlist.hxx |2 -
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs |2 -
officecfg/registry/schema/org/openoffice/Setup.xcs |6 ++--
readlicense_oo/docs/readme.xrm |2 -
reportbuilder/Package_templates.mk |2 -
sc/source/filter/excel/xestyle.cxx |2 -
scaddins/source/analysis/analysishelper.hxx|4 +--
sd/source/ui/docshell/docshel3.cxx |2 -
setup_native/source/mac/macinstall.ulf |2 -
svtools/uiconfig/ui/restartdialog.ui |2 -
svx/inc/svxerr.hrc |2 -
sw/qa/uitest/findReplace/tdf118208.py | 13
+-
sw/source/core/access/AccessibilityIssue.cxx |2 -
sw/source/filter/ww8/wrtw8sty.cxx |2 -
sw/source/uibase/shells/langhelper.cxx |2 -
sw/source/uibase/shells/textsh1.cxx|2 -
sw/uiconfig/swriter/ui/textgridpage.ui |2 -
27 files changed, 43 insertions(+), 42 deletions(-)
New commits:
commit 0264999bb3746a9c68938edd1a6fc05a8e40b406
Author: t-aswath
AuthorDate: Sat Nov 11 14:19:08 2023 +0530
Commit: Eike Rathke
CommitDate: Sat Nov 18 16:01:33 2023 +0100
tdf#157716 - Rename "Language settings" to "Languages and Locales"
Change-Id: Idd31b18c87998b03d884e7aa17197c459241abf9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159315
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 7f1dca4441d9..ed4b7b72eb3d 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -135,7 +135,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
{ NC_("RID_CUI_TIPOFTHEDAY", "In %PRODUCTNAME Impress, use Insert ▸ Media
▸ Photo Album to create a slideshow from a series of pictures with the “Photo
Album” feature."), "", "", simpress},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can show formulas instead of results
with View ▸ Show Formula (or Tools ▸ Options ▸ %PRODUCTNAME Calc ▸ View ▸
Display ▸ Formulas)."), "", "", scalc},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME is developed by a friendly
community, made up of hundreds of contributors around the world. Join us with
your skills beyond coding."),
"https://www.libreoffice.org/community/get-involved/;, "", soffice},
- { NC_("RID_CUI_TIPOFTHEDAY", "Left-handed? Enable Tools ▸ Options ▸
Language Settings ▸ Languages ▸ Asian and check Tools ▸ Options ▸ %PRODUCTNAME
Writer ▸ View ▸ Ruler ▸ Right-aligned, which displays the scrollbar to the
left."), "", "", swriter},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Left-handed? Enable Tools ▸ Options ▸
Languages and Locales ▸ General ▸ Asian and check Tools ▸ Options ▸
%PRODUCTNAME Writer ▸ View ▸ Ruler ▸ Right-aligned, which displays the
scrollbar to the left."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want headings to always begin a page? Edit
the paragraph style applied to the headings. Check “Insert” on the “Text Flow”
tab, with Type “Page” and Position “Before”."),
"cui/ui/textflowpage/checkInsert", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Date/time value is just a number of days
since a chosen day zero; in the number, integer part represents date, and
fractional part is time (elapsed part of a day), with 0.5 representing noon."),
"", "", scalc},
{ NC_("RID_CUI_TIPOFTHEDAY", "Shift+%MOD1+Del deletes from cursor to the
end of the current sentence."), "", "", swriter},
@@ -185,7 +185,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
{ NC_("RID_CUI_TIPOFTHEDAY", "Your donations support our worldwide
community."), "https://www.libreoffice.org/donate/;, "", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "You want to add x months to a date? Use
=EDATE(date;months)."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/func_edate.html;,
"", scalc}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "To select a
[Libreoffice-commits] core.git: cui/inc
cui/inc/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 63a5c6350f8930774c651a9cf41521606ecb6a94
Author: Stéphane Guillou
AuthorDate: Tue Sep 26 22:27:03 2023 +0200
Commit: László Németh
CommitDate: Tue Oct 3 13:38:22 2023 +0200
tdf#157170: clarify angle quotes autocorrect rule
Change-Id: Idb514e0e0487a65e3057328a13d34659d706ab90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157300
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 29126053d968..66a9957b7698 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -327,7 +327,7 @@
#define RID_CUISTR_NON_BREAK_SPACE
NC_("RID_SVXSTR_NON_BREAK_SPACE", "Add non-breaking space before specific
punctuation marks in French text")
#define RID_CUISTR_ORDINAL NC_("RID_SVXSTR_ORDINAL",
"Format ordinal numbers suffixes (1st -> 1^st)")
#define RID_CUISTR_OLD_HUNGARIAN
NC_("RID_SVXSTR_OLD_HUNGARIAN", "Transliterate to Old Hungarian if the text
direction is from right to left")
-#define RID_CUISTR_ANGLE_QUOTES
NC_("RID_SVXSTR_ANGLE_QUOTES", "Replace << and >> with angle quotes")
+#define RID_CUISTR_ANGLE_QUOTES
NC_("RID_SVXSTR_ANGLE_QUOTES", "Replace two inequality signs (<< or >>) with
angle quotes")
#define RID_CUISTR_DEL_EMPTY_PARA
NC_("RID_SVXSTR_DEL_EMPTY_PARA", "Remove blank paragraphs")
#define RID_CUISTR_USER_STYLE
NC_("RID_SVXSTR_USER_STYLE", "Replace Custom Styles")
#define RID_CUISTR_BULLET NC_("RID_SVXSTR_BULLET",
"Replace bullets with: %1")
[Libreoffice-commits] core.git: cui/inc cui/source editeng/source include/editeng officecfg/registry sw/inc sw/qa sw/source
cui/inc/strings.hrc|1
cui/source/inc/autocdlg.hxx|1
cui/source/tabpages/autocdlg.cxx |8 ++
editeng/source/misc/acorrcfg.cxx |3
editeng/source/misc/swafopt.cxx|1
include/editeng/swafopt.hxx|1
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 ++
sw/inc/editsh.hxx |2
sw/qa/core/doc/doc.cxx | 51 +
sw/qa/uitest/writer_tests/tdf156165.py |4 -
sw/source/core/edit/autofmt.cxx| 46 ---
sw/source/uibase/docvw/edtwin.cxx | 15 +++
sw/source/uibase/shells/textsh1.cxx|4 -
13 files changed, 129 insertions(+), 16 deletions(-)
New commits:
commit c4fc18308074634e9578ad12d94d937f259aa22a
Author: Darshan-upadhyay1110
AuthorDate: Fri Sep 1 16:08:58 2023 +0530
Commit: Szymon Kłos
CommitDate: Thu Sep 7 09:18:50 2023 +0200
Autocorrect: Add option for autoformat bulleted lists after space
Enable option in Autocoorect => bulleted lists after pressing space
Example: press * or - and space will change into bullets
Change-Id: I9741ad4c3eb4123074f06b762b58fe7ffdb44613
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156616
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index ffcf10e73556..29126053d968 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -334,6 +334,7 @@
// To translators: %1 will be replaced with a percentage, e.g. "10%"
#define RID_CUISTR_RIGHT_MARGIN
NC_("RID_SVXSTR_RIGHT_MARGIN", "Combine single line paragraphs if length
greater than %1")
#define RID_CUISTR_NUM NC_("RID_SVXSTR_NUM",
"Bulleted and numbered lists. Bullet symbol: %1")
+#define RID_SVXSTR_NUM_FORMAT_AFTER_SPACE
NC_("RID_SVXSTR_NUM_FORMAT_AFTER_SPACE", "Bulleted and numbered lists immediate
after pressing space")
#define RID_CUISTR_BORDER NC_("RID_SVXSTR_BORDER",
"Apply border")
#define RID_CUISTR_CREATE_TABLE
NC_("RID_SVXSTR_CREATE_TABLE", "Create table")
#define RID_CUISTR_REPLACE_TEMPLATES
NC_("RID_SVXSTR_REPLACE_TEMPLATES", "Apply Styles")
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 2357677ef65f..2677b8535ebe 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -97,6 +97,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
OUStringsDash;
OUStringsRightMargin;
OUStringsNum;
+OUStringsBulletsAfterSpace;
OUStringsBorder;
OUStringsTable;
OUStringsReplaceTemplates;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a23fc2015ebf..282e8b5405a1 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -344,6 +344,7 @@ enum OfaAutoFmtOptions
IGNORE_DBLSPACE,
CORRECT_CAPS_LOCK,
APPLY_NUMBERING,
+APPLY_NUMBERING_AFTER_SPACE,
INSERT_BORDER,
CREATE_TABLE,
REPLACE_STYLES,
@@ -372,6 +373,7 @@
OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage(weld::Container* pPage, weld::D
, sDash(CuiResId(RID_CUISTR_DASH))
, sRightMargin(CuiResId(RID_CUISTR_RIGHT_MARGIN))
, sNum(CuiResId(RID_CUISTR_NUM))
+, sBulletsAfterSpace(CuiResId(RID_SVXSTR_NUM_FORMAT_AFTER_SPACE))
, sBorder(CuiResId(RID_CUISTR_BORDER))
, sTable(CuiResId(RID_CUISTR_CREATE_TABLE))
, sReplaceTemplates(CuiResId(RID_CUISTR_REPLACE_TEMPLATES))
@@ -498,6 +500,10 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
bModified |= pOpt->bSetNumRule != bCheck;
pOpt->bSetNumRule = bCheck;
+bCheck = m_xCheckLB->get_toggle(APPLY_NUMBERING_AFTER_SPACE, CBCOL_SECOND)
== TRISTATE_TRUE;
+bModified |= pOpt->bSetNumRuleAfterSpace != bCheck;
+pOpt->bSetNumRuleAfterSpace = bCheck;
+
bCheck = m_xCheckLB->get_toggle(INSERT_BORDER, CBCOL_SECOND) ==
TRISTATE_TRUE;
bModified |= pOpt->bSetBorder != bCheck;
pOpt->bSetBorder = bCheck;
@@ -578,6 +584,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
CreateEntry(sNoDblSpaces, CBCOL_SECOND);
CreateEntry(sCorrectCapsLock, CBCOL_SECOND);
CreateEntry(sNum.replaceFirst("%1", sBulletChar), CBCOL_SECOND);
+CreateEntry(sBulletsAfterSpace, CBCOL_SECOND);
CreateEntry(sBorder,CBCOL_SECOND);
CreateEntry(sTable, CBCOL_SECOND);
CreateEntry(sReplaceTemplates, CBCOL_SECOND);
@@ -607,6 +614,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
m_xCheckLB->set_toggle(IGNORE_DBLSPACE, bool(nFlags
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |1 +
1 file changed, 1 insertion(+)
New commits:
commit 473da3a79758b061409ca6f0d8a41a0a91541842
Author: Seth Chaiklin
AuthorDate: Tue Jul 18 03:20:24 2023 +0200
Commit: Seth Chaiklin
CommitDate: Wed Jul 19 10:25:48 2023 +0200
tdf#127294 add tip about "Search Commands"
also provided uri
Change-Id: I7e757b41dfb8532b4b39f4d8a9bbf9b296c69b50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154539
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 462be2acd570..a1c45dae45b6 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -277,6 +277,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
{ NC_("RID_CUI_TIPOFTHEDAY", "Press Shift+F1 to see any available
extended tooltips in dialog boxes, when \"Extended tips\" is not enabled in
Tools ▸ Options ▸ %PRODUCTNAME ▸ General."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/05/0120.html;,
"", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "Never use certain arrow styles? Remove them
by using the Delete button on the Format ▸ Text Box and Shape ▸ Line ▸ Arrow
Styles tab."), "cui/ui/lineendstabpage/BTN_MODIFY", "", sdraw},
{ NC_("RID_CUI_TIPOFTHEDAY", "Don’t like the position of some icons on
your toolbar? Change it with Tools ▸ Customize ▸ Toolbars tab ▸ Target."),
"CUI_HID_SVX_CONFIG_TOOLBAR", "", soffice},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Can’t find a command in the menus? Try
Shift+ESC."), ".uno:CommandPopup", "", soffice},
};
#define STR_HELP_LINK NC_("STR_HELP_LINK", "%PRODUCTNAME
Help")
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc|1 +
cui/source/options/optlanguagetool.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit 7c6c58197a84cf22789ca3dc97e863390c31a2f9
Author: Mike Kaganski
AuthorDate: Wed Jun 14 17:01:32 2023 +0300
Commit: Mike Kaganski
CommitDate: Wed Jun 14 20:59:03 2023 +0200
Related: tdf#150494 add placeholder text to the REST protocol field
Change-Id: I8aab941d9dd03e54a3a39ccb643a5a628d6c5be7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153061
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 98c6cc50b2d3..84a2c9f859a1 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -407,6 +407,7 @@
#define RID_CUISTR_OPT_READONLY
NC_("RID_CUISTR_OPT_READONLY", "This property is locked for editing.")
#define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free
version")
+#define RID_LANGUAGETOOL_REST_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_REST_LEAVE_EMPTY", "Leave this field empty to use
LanguageTool protocol")
// Translatable names of color schemes
#define RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC
NC_("RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", "Automatic")
diff --git a/cui/source/options/optlanguagetool.cxx
b/cui/source/options/optlanguagetool.cxx
index 485e8ecb1be6..e1f4806f47f3 100644
--- a/cui/source/options/optlanguagetool.cxx
+++ b/cui/source/options/optlanguagetool.cxx
@@ -45,6 +45,7 @@
OptLanguageToolTabPage::OptLanguageToolTabPage(weld::Container* pPage,
m_xBaseURLED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
m_xUsernameED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
m_xApiKeyED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
+
m_xRestProtocol->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_REST_LEAVE_EMPTY));
}
OptLanguageToolTabPage::~OptLanguageToolTabPage() {}
[Libreoffice-commits] core.git: cui/inc officecfg/registry
cui/inc/tipoftheday.hrc |4 ++--
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0b1a8cc4a59fadd83bdcf13ba88bb8f68d02e106
Author: Seth Chaiklin
AuthorDate: Tue Jun 6 11:09:59 2023 +0200
Commit: Seth Chaiklin
CommitDate: Fri Jun 9 15:00:10 2023 +0200
tdf#125876 "Footnotes and Endnotes" -> "Footnote/Endnote Settings"
also update command name in "tip of day" and add links to the
dialog for the relevant tips.
Change-Id: I6dbebf3cbe405f5bd1d6d01d992cb096a5e61348
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152651
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 5816a7de3676..462be2acd570 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -119,7 +119,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
{ NC_("RID_CUI_TIPOFTHEDAY", "Open a CSV file as a new sheet in the
current spreadsheet via Sheet ▸ Sheet from file."), "", "", scalc},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can continue writing with the default
formatting attributes after manually applying bold, italic or underline by
pressing %MOD1+Shift+X."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use %MOD1+%MOD2+Shift+V to paste the
contents of the clipboard as unformatted text."), "", "", swriter},
- { NC_("RID_CUI_TIPOFTHEDAY", "Customize footnote appearance with Tools ▸
Footnotes and Endnotes…"), "", "", swriter},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Customize footnote appearance with Tools ▸
Footnote/Endnote Settings…"), ".uno:FootnoteDialog", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "With Slide Show ▸ Custom Slide Show,
reorder and pick slides to fit a slideshow to the needs of your viewers."), "",
"", simpress},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to change spell checking for some part
of the text? Click in the language zone of the status bar or better, apply a
style."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer can insert a blank page between two
odd (even) pages that follow. Check “Print automatically inserted blank pages”
in the print dialog’s %PRODUCTNAME Writer tab."), "", "", swriter},
@@ -156,7 +156,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to get a math object into Writer
quickly? Type your formula, select it, and use Insert ▸ OLE Object ▸ Formula to
convert the text."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME it is very easy to
install a new dictionary: they are supplied as extensions."),
"https://extensions.libreoffice.org/?q=[]=50;, "", soffice},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a portable version which
gives you mobility. Even without administrator rights on your computer you can
install %PRODUCTNAME Portable to your hard drive too."),
"https://www.libreoffice.org/download/portable-versions/;, "", soffice},
- { NC_("RID_CUI_TIPOFTHEDAY", "Writer lets you number your footnotes per
page, chapter, document: Tools ▸ Footnotes and Endnotes ▸ Footnotes tab ▸
Counting."), "", "", swriter},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Writer lets you number your footnotes per
page, chapter, document: Tools ▸ Footnote/Endnote Settings ▸ Footnotes tab ▸
Counting."), ".uno:FootnoteDialog", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Your Writer document does not reopen with
the text cursor at the same editing position it was when you saved it? Add
First or Last name in Tools ▸ Options ▸ %PRODUCTNAME ▸ User Data ▸ First/last
name."), "", "", swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to do citation? You can use
third-party citation managers such as Zotero."),
"https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;, "",
swriter},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to insert a value in the same place on
several sheets? Select the sheets: hold down %MOD1 key and click their tabs
before entering."), "", "", scalc},
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index b5f215d7d9e5..7458ed89d8e2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1489,7 +1489,7 @@
- ~Footnotes and Endnotes...
+ ~Footnote/Endnote Settings...
1
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig
cui/inc/strings.hrc |1
cui/source/options/optaboutconfig.cxx | 53 ++
cui/source/options/optaboutconfig.hxx |3 +
cui/uiconfig/ui/aboutconfigdialog.ui | 21 +
4 files changed, 72 insertions(+), 6 deletions(-)
New commits:
commit efa965969c6d3dfe5745a535605a6b9a482a03bd
Author: Samuel Mehrbrodt
AuthorDate: Thu May 11 10:17:18 2023 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon May 15 13:31:35 2023 +0200
tdf#104005 Don't allow changing finalized properties
Change-Id: Ic9e42ba6aed2fadd0f28dfc6be0a639cdd16bb34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151660
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 442ac515ef8c..98c6cc50b2d3 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -404,6 +404,7 @@
#define RID_CUISTR_CLICK_RESULT
NC_("RID_CUISTR_CLICK_RESULT", "(Click on any test to view its resultant bitmap
image)")
#define RID_CUISTR_ZIPFAIL NC_("RID_CUISTR_ZIPFAIL",
"Creation of ZIP file failed.")
#define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED",
"The results have been successfully saved in the file
'GraphicTestResults.zip'!")
+#define RID_CUISTR_OPT_READONLY
NC_("RID_CUISTR_OPT_READONLY", "This property is locked for editing.")
#define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free
version")
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 0914310f2800..4578bc027581 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -16,8 +16,10 @@
#include
#include
#include
+#include
#include
#include
+#include
#include
#include
#include
@@ -35,6 +37,9 @@
#include
#include
+#include
+#include
+
#include
#include
#include
@@ -63,18 +68,21 @@ struct Prop_Impl
struct UserData
{
bool bIsPropertyPath;
+bool bIsReadOnly;
OUString sPropertyPath;
int aLineage;
Reference aXNameAccess;
-explicit UserData( OUString aPropertyPath )
+explicit UserData( OUString aPropertyPath, bool isReadOnly )
: bIsPropertyPath( true )
+, bIsReadOnly( isReadOnly )
, sPropertyPath(std::move(aPropertyPath))
, aLineage(0)
{}
explicit UserData( Reference const & rXNameAccess, int rIndex
)
: bIsPropertyPath( false )
+, bIsReadOnly( false )
, aLineage(rIndex)
, aXNameAccess( rXNameAccess )
{}
@@ -171,6 +179,19 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage(weld::Window*
pParent)
o3tl::narrowing(fWidth * 8)
};
m_xPrefBox->set_column_fixed_widths(aWidths);
+
+m_xPrefBox->connect_query_tooltip(LINK(this, CuiAboutConfigTabPage,
QueryTooltip));
+}
+
+IMPL_LINK(CuiAboutConfigTabPage, QueryTooltip, const weld::TreeIter&, rIter,
OUString)
+{
+UserData *pUserData = weld::fromId(m_xPrefBox->get_id(rIter));
+if (pUserData && pUserData->bIsReadOnly)
+{
+return CuiResId(RID_CUISTR_OPT_READONLY);
+}
+
+return OUString();
}
IMPL_LINK(CuiAboutConfigTabPage, HeaderBarClick, int, nColumn, void)
@@ -210,9 +231,9 @@ CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const
OUString& rProp, const OUString& rStatus,
const OUString& rType, const OUString&
rValue, const weld::TreeIter* pParentEntry,
-bool bInsertToPrefBox)
+bool bInsertToPrefBox, bool
bIsReadOnly)
{
-m_vectorUserData.push_back(std::make_unique(rPropertyPath));
+m_vectorUserData.push_back(std::make_unique(rPropertyPath,
bIsReadOnly));
if (bInsertToPrefBox)
{
OUString sId(weld::toId(m_vectorUserData.back().get()));
@@ -220,6 +241,7 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString&
rPropertyPath, const OUS
m_xPrefBox->set_text(*m_xScratchIter, rStatus, 1);
m_xPrefBox->set_text(*m_xScratchIter, rType, 2);
m_xPrefBox->set_text(*m_xScratchIter, rValue, 3);
+m_xPrefBox->set_sensitive(*m_xScratchIter, !bIsReadOnly, -1);
}
else
{
@@ -304,6 +326,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference<
XNameAccess >& xNameAcces
m_xPrefBox->set_text(*m_xScratchIter, "", 1);
m_xPrefBox->set_text(*m_xScratchIter, "", 2);
m_xPrefBox->set_text(*m_xScratchIter, "", 3);
+m_xPrefBox->set_sensitive(*m_xScratchIter, true);
}
}
else
@@ -318,6 +341,22 @@ void CuiAboutConfigTabPage::FillItems(const Reference<
XNameAccess >& xNameAcces
}
);
+
[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: cui/inc cui/source editeng/source include/editeng include/svl officecfg/registry svl/qa svl/source sw/inc sw/source
cui/inc/strings.hrc|1
cui/source/inc/autocdlg.hxx|2
cui/source/tabpages/autocdlg.cxx | 15 +++
editeng/source/misc/acorrcfg.cxx | 18 +++
editeng/source/misc/svxacorr.cxx | 18 +++
editeng/source/misc/swafopt.cxx|1
include/editeng/svxacorr.hxx |6 +
include/editeng/swafopt.hxx|1
include/svl/urihelper.hxx |5 +
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 10 ++
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 +
svl/qa/unit/test_URIHelper.cxx | 54 +++
svl/source/misc/urihelper.cxx | 59 +
sw/inc/comcore.hxx |3
sw/inc/utlui.hrc |3
sw/source/core/edit/autofmt.cxx|9 +
sw/source/uibase/docvw/edtwin.cxx |5 -
sw/source/uibase/shells/textsh.cxx |3
sw/source/uibase/wrtsh/wrtsh1.cxx |3
19 files changed, 210 insertions(+), 14 deletions(-)
New commits:
commit a772976f047882918d5386a3ef9226c4aa2aa118
Author: Baole Fang
AuthorDate: Tue Apr 25 00:33:01 2023 -0400
Commit: Stephan Bergmann
CommitDate: Thu Apr 27 15:27:33 2023 +0200
tdf#145925: Add DOI recognition
Detect DOI string in the form of "doi:10.*" and add hyperlink to it.
It works the same way as url recognition.
Change-Id: I3c4e78a110fd81ad7e727d5e9acee7e51127466a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150954
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Stephan Bergmann
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 498e60e75bc2..442ac515ef8c 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -332,6 +332,7 @@
#define RID_CUISTR_BOLD_UNDER
NC_("RID_SVXSTR_BOLD_UNDER", "Automatic *bold*, /italic/, -strikeout- and
_underline_")
#define RID_CUISTR_NO_DBL_SPACES
NC_("RID_SVXSTR_NO_DBL_SPACES", "Ignore double spaces")
#define RID_CUISTR_DETECT_URL
NC_("RID_SVXSTR_DETECT_URL", "URL Recognition")
+#define RID_CUISTR_DETECT_DOI
NC_("RID_SVXSTR_DETECT_DOI", "DOI citation recognition")
#define RID_CUISTR_DASH NC_("RID_SVXSTR_DASH",
"Replace dashes")
#define RID_CUISTR_CORRECT_ACCIDENTAL_CAPS_LOCK
NC_("RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK", "Correct accidental use of cAPS
LOCK key")
#define RID_CUISTR_NON_BREAK_SPACE
NC_("RID_SVXSTR_NON_BREAK_SPACE", "Add non-breaking space before specific
punctuation marks in French text")
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 7b4842314779..2357677ef65f 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -57,6 +57,7 @@ private:
OUString m_sStartCap;
OUString m_sBoldUnderline;
OUString m_sURL;
+OUString m_sDOI;
OUString m_sNoDblSpaces;
OUString m_sDash;
OUString m_sAccidentalCaps;
@@ -92,6 +93,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
OUStringsNoDblSpaces;
OUStringsCorrectCapsLock;
OUStringsDetectURL;
+OUStringsDetectDOI;
OUStringsDash;
OUStringsRightMargin;
OUStringsNum;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index aea3f7d9727e..38a261ad5737 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -189,6 +189,7 @@
OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(weld::Container* pPage, weld::Dia
, m_sStartCap(CuiResId(RID_CUISTR_CPTL_STT_SENT))
, m_sBoldUnderline(CuiResId(RID_CUISTR_BOLD_UNDER))
, m_sURL(CuiResId(RID_CUISTR_DETECT_URL))
+, m_sDOI(CuiResId(RID_CUISTR_DETECT_DOI))
, m_sNoDblSpaces(CuiResId(RID_CUISTR_NO_DBL_SPACES))
, m_sDash(CuiResId(RID_CUISTR_DASH))
, m_sAccidentalCaps(CuiResId(RID_CUISTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
@@ -223,6 +224,7 @@ bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* )
pAutoCorrect->SetAutoCorrFlag(ACFlags::CapitalStartSentence,
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgWeightUnderl,
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
pAutoCorrect->SetAutoCorrFlag(ACFlags::SetINetAttr,
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
+pAutoCorrect->SetAutoCorrFlag(ACFlags::SetDOIAttr,
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgToEnEmDash,
[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: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f69235a6f6578f3280a28560f6297c8ee6b797b8
Author: Andrea Gelmini
AuthorDate: Fri Mar 10 15:48:43 2023 +0100
Commit: Julien Nabet
CommitDate: Sat Mar 11 05:36:29 2023 +
Fix typo
Change-Id: Iaee1ae3085caa5a416f2129e218658c4ad8e531b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148647
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 2248f60562fd..5816a7de3676 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -44,7 +44,7 @@
* 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)
+ * use one 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 };
[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: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f48d238ce8d5e22642324c456c83b424b3dcb446
Author: Adolfo Jayme Barrientos
AuthorDate: Mon Feb 20 05:47:56 2023 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Mar 6 23:47:10 2023 +
The quotation marks aren’t needed here
Change-Id: Id89b5e161d1d02da66138b16bc8ea34417c554c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148365
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 96ecb57913d5..9dc6a3d81488 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -121,7 +121,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer can insert a blank page between two
odd (even) pages that follow. Check “Print automatically inserted blank pages”
in the print dialog’s %PRODUCTNAME Writer tab."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You do not want to print all columns? Hide
or group the ones you do not need."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To modify an AutoPlay presentation, open it
and after it starts, right click and select Edit in the context menu."), "",
"tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Need to position precisely? “%MOD2+arrow”
keys move objects (shapes, pictures, formulas) by one pixel."), "",
"tipoftheday_d.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Need to position precisely? %MOD2+arrow
keys move objects (shapes, pictures, formulas) by one pixel."), "",
"tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Embedded help is available by pressing F1,
if you have installed it. Otherwise check online at:"),
"https://help.libreoffice.org;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Right-click in the status bar in
%PRODUCTNAME Calc and select “Selection count” to display the number of
selected cells."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to have two or more columns for just a
part of a %PRODUCTNAME Writer page? Insert ▸ Section, set with Columns tab, and
place text in that section."), "", "tipoftheday_w.png"},
[Libreoffice-commits] core.git: cui/inc cui/source officecfg/registry
cui/inc/strings.hrc |4 ++
cui/source/options/optcolor.cxx | 35 ---
officecfg/registry/data/org/openoffice/Office/UI.xcu |6 +--
3 files changed, 38 insertions(+), 7 deletions(-)
New commits:
commit 546ad5d17d3e363b75337c336cfb2b2f8acc55e3
Author: Rafael Lima
AuthorDate: Thu Jan 19 13:12:42 2023 +
Commit: Heiko Tietze
CommitDate: Tue Feb 21 16:30:38 2023 +
tdf#143660 Make color scheme names translatable
The color scheme names defined in UI.xcu are currently not translatable.
This patch makes them translatable by mapping the names in the UI.xcu file
to a translated string.
Change-Id: I10ab3bbcc9b028955c3c179558f8040b3b1d6c9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145732
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 8228eea8f1fa..0cd2d2cd4566 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -406,4 +406,8 @@
#define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free
version")
+// 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 3c66f4ba49d5..2cb20a2650fa 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -160,6 +160,33 @@ const vEntryInfo[] =
#undef IDS
};
+// Maps the names of default color schemes to the corresponding TranslateId
+std::map const vColorSchemes = {
+{"COLOR_SCHEME_LIBREOFFICE_AUTOMATIC",
CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC)},
+{"COLOR_SCHEME_LIBREOFFICE_DARK",
CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_DARK)}
+};
+
+// If the color scheme name has a translated string, then return the
translation
+// Or else simply return the input string
+// For non-translatable color schemes, the ID and the name are the same
+OUString lcl_SchemeIdToTranslatedName(const OUString& sSchemeId)
+{
+auto it = vColorSchemes.find(sSchemeId);
+if (it != vColorSchemes.end())
+return it->second;
+return sSchemeId;
+}
+
+// Given a translated color scheme name, return the scheme ID used in the
UI.xcu file
+// For non-translatable color schemes, the ID and the name are the same
+OUString lcl_TranslatedNameToSchemeId(const OUString& sName)
+{
+for (auto it = vColorSchemes.begin(); it != vColorSchemes.end(); ++it)
+if (it->second == sName)
+return it->first;
+return sName;
+}
+
// ColorConfigWindow_Impl
class ColorConfigWindow_Impl
@@ -787,8 +814,8 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet* )
m_xColorSchemeLB->clear();
const uno::Sequence< OUString > aSchemes = pColorConfig->GetSchemeNames();
for(const OUString& s : aSchemes)
-m_xColorSchemeLB->append_text(s);
-m_xColorSchemeLB->set_active_text(pColorConfig->GetCurrentSchemeName());
+m_xColorSchemeLB->append_text(lcl_SchemeIdToTranslatedName(s));
+
m_xColorSchemeLB->set_active_text(lcl_SchemeIdToTranslatedName(pColorConfig->GetCurrentSchemeName()));
m_xColorSchemeLB->save_value();
m_xDeleteSchemePB->set_sensitive( aSchemes.getLength() > 1 );
UpdateColorConfig();
@@ -809,8 +836,8 @@ void SvxColorOptionsTabPage::UpdateColorConfig()
IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, weld::ComboBox&,
rBox, void)
{
-pColorConfig->LoadScheme(rBox.get_active_text());
-pExtColorConfig->LoadScheme(rBox.get_active_text());
+
pColorConfig->LoadScheme(lcl_TranslatedNameToSchemeId(rBox.get_active_text()));
+
pExtColorConfig->LoadScheme(lcl_TranslatedNameToSchemeId(rBox.get_active_text()));
UpdateColorConfig();
}
diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu
b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index 18aa40bbfa8b..b7d704d43f81 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -134,10 +134,10 @@
- ${PRODUCTNAME}
+ COLOR_SCHEME_LIBREOFFICE_AUTOMATIC
-
+
@@ -440,7 +440,7 @@
-
+
1842204
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 454f141406e379d60e57c3e9fdd06641b49c00c1
Author: Seth Chaiklin
AuthorDate: Sun Feb 19 01:00:54 2023 +
Commit: Seth Chaiklin
CommitDate: Sun Feb 19 09:41:36 2023 +
grammatical/typographical corrections to one tip of the day
Change-Id: If2de87c859ca4cd59cfb92fd64648be400df187f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147252
Reviewed-by: Seth Chaiklin
Tested-by: Jenkins
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f610a671053f..96ecb57913d5 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -121,7 +121,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer can insert a blank page between two
odd (even) pages that follow. Check “Print automatically inserted blank pages”
in the print dialog’s %PRODUCTNAME Writer tab."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You do not want to print all columns? Hide
or group the ones you do not need."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To modify an AutoPlay presentation, open it
and after it starts, right click and select Edit in the context menu."), "",
"tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Need to precisely position? %MOD2+arrow
Keys move objects (shapes, pictures, formulas) by one pixel."), "",
"tipoftheday_d.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Need to position precisely? “%MOD2+arrow”
keys move objects (shapes, pictures, formulas) by one pixel."), "",
"tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Embedded help is available by pressing F1,
if you have installed it. Otherwise check online at:"),
"https://help.libreoffice.org;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Right-click in the status bar in
%PRODUCTNAME Calc and select “Selection count” to display the number of
selected cells."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to have two or more columns for just a
part of a %PRODUCTNAME Writer page? Insert ▸ Section, set with Columns tab, and
place text in that section."), "", "tipoftheday_w.png"},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d2a6687bf6a7c49e851bf686cdd6afd0db7ac0a2
Author: Seth Chaiklin
AuthorDate: Thu Feb 16 15:53:03 2023 +
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Feb 17 20:34:30 2023 +
tdf#153549 change tip-of-day about chapter numbering
- rewritten in form of a question
- generalized to refer to headings, because not limited to chapters
- added additional detail about relevant location in dialog, but
did not attempt detailed explanation, because
- added link to relevant help page
- added missing period.
Change-Id: Ie16c116b8e51e6b24de2c4060fee9617c6ef1e7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147121
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 37078706aa68..f610a671053f 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -210,7 +210,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Got many images in your Writer document?
Speed up the display by disabling View ▸ Images and charts."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet ▸ Fill Cells ▸ Random Number to
generate a random series based on various distributions."),
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog",
"tipoftheday_c.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/02140700.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Rename your slides in Impress to help you
define “Go to page” interactions and to have a summary more explicit than
Slide1, Slide2…"), "", "tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Chapter numbering dialog lets you set text
to be displayed before the chapter number. For example, type “Chapter ” to
display “Chapter 1”"), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to display text before a heading
number? Open the Numbering tab of the “Heading Numbering” dialog and enter the
desired text in “Before”. For example, type “Chapter ” to display “Chapter
1”."), "modules/swriter/ui/outlinenumberingpage/prefix", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Transpose a Writer table? Copy and paste in
Calc, transpose with copy/paste special then copy/paste special ▸ Formatted
text in Writer."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To get the “Vertical Text” tool in the
Drawing toolbar, check Tools ▸ Options ▸ Language Settings ▸ Languages ▸
Default languages for Documents ▸ Asian (and make the button visible with
right-click and then Visible Buttons ▸ Vertical Text)."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "To quickly zoom in on range selection,
right click on the zoom part of the status bar and choose Optimal."), "",
"tipoftheday_c.png"},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b63bffc2bb5a68d1f21e4035dde9a60429c9173c
Author: Seth Chaiklin
AuthorDate: Mon Feb 13 10:55:54 2023 +
Commit: Seth Chaiklin
CommitDate: Thu Feb 16 15:30:54 2023 +
tdf#152506 "titles" -> "headings" in tips of the day
- one tip is generalised from "Heading 1" to all headings.
- another tip has its formatting improved and a tab name corrected.
- for both tips, link added to relevant help page.
Change-Id: I394773d2b7af5434f708fe188f86d7f8a2b16e49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146914
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index e6bd357d2ae4..37078706aa68 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -132,7 +132,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "You can show formulas instead of results
with View ▸ Show Formula (or Tools ▸ Options ▸ %PRODUCTNAME Calc ▸ View ▸
Display ▸ Formulas)."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME is developed by a friendly
community, made up of hundreds of contributors around the world. Join us with
your skills beyond coding."),
"https://www.libreoffice.org/community/get-involved/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Left-handed? Enable Tools ▸ Options ▸
Language Settings ▸ Languages ▸ Asian and check Tools ▸ Options ▸ %PRODUCTNAME
Writer ▸ View ▸ Ruler ▸ Right-aligned, which displays the scrollbar to the
left."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want your chapter titles to always begin a
page? Edit Heading1 (paragraph style) ▸ Text Flow ▸ Breaks and check Insert ▸
Page ▸ Before."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want headings to always begin a page? Edit
the paragraph style applied to the headings. Check “Insert” on the “Text Flow”
tab, with Type “Page” and Position “Before”."),
"cui/ui/textflowpage/checkInsert", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Date/time value is just a number of days
since a chosen day zero; in the number, integer part represents date, and
fractional part is time (elapsed part of a day), with 0.5 representing noon."),
"", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Shift+%MOD1+Del deletes from cursor to the
end of the current sentence."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use column or row labels in formulas. For
example, if you have two columns, “Time” and “KM”, use =Time/KM to get minutes
per kilometer."), "", "tipoftheday_c.png"},
@@ -255,7 +255,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To change the number of a page in Writer,
go to the properties of the first paragraph and at the Text Flow tab check
Break ▸ Insert and enter the number."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Run %PRODUCTNAME in any browser via
rollApp."), "https://www.rollapp.com/app/lowriter;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Strange error code in Calc, Err: followed
by a number? This page gives the explanation:"),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/05/0214.html;,
"tipoftheday_c.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Include a paragraph that is not a title in
the table of contents by changing Outline & Numbering in the paragraph settings
to an outline level."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Include a paragraph that is not a heading
in the “Table of Contents” by giving a numerical outline level to the paragraph
in the “Outline & List” tab in the paragraph settings."),
"modules/swriter/ui/numparapage/comboLB_OUTLINE_LEVEL", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Apart from table of contents, %PRODUCTNAME
can create Alphabetical, Illustrations, Tables, Objects, Bibliography,
User-Defined indexes."), "modules/swriter/ui/tocdialog/TocDialog",
"tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/indices_toc.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Unable to modify or delete a custom cell
style? Check all sheets, none should be protected."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You need to fill a series? Select the cell
range and Sheet ▸ Fill Cells ▸ Fill Series and choose between Linear, Growth,
Date and AutoFill."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/calc_series.html;,
"tipoftheday_c.png"}, //local help missing
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig
cui/inc/widgettestdlg.hxx|4
cui/source/dialogs/widgettestdlg.cxx | 26
cui/uiconfig/ui/widgettestdialog.ui | 200 +++
3 files changed, 210 insertions(+), 20 deletions(-)
New commits:
commit 24c9373409dda957ad6e1f1b4e3ec6c7135ecf1a
Author: Szymon Kłos
AuthorDate: Thu Dec 15 13:59:15 2022 +0100
Commit: Szymon Kłos
CommitDate: Thu Jan 19 13:03:59 2023 +
jsdialog: add TreeView to TestWidgetDialog
Change-Id: I5c4f70d98dd8ea03c137cd368a2c097cd866609d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144222
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Rashesh Padia
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145067
Tested-by: Jenkins
diff --git a/cui/inc/widgettestdlg.hxx b/cui/inc/widgettestdlg.hxx
index dabc2ee14e75..02ab7f317894 100644
--- a/cui/inc/widgettestdlg.hxx
+++ b/cui/inc/widgettestdlg.hxx
@@ -18,10 +18,14 @@ class WidgetTestDialog final : public
weld::GenericDialogController
private:
std::unique_ptr m_xOKButton;
std::unique_ptr m_xCancelButton;
+std::unique_ptr m_xTreeView;
+std::unique_ptr m_xTreeView2;
DECL_LINK(OkHdl, weld::Button&, void);
DECL_LINK(CancelHdl, weld::Button&, void);
+void FillTreeView();
+
public:
WidgetTestDialog(weld::Window* pParent);
~WidgetTestDialog();
diff --git a/cui/source/dialogs/widgettestdlg.cxx
b/cui/source/dialogs/widgettestdlg.cxx
index 5475151a9af2..51ecef3105d0 100644
--- a/cui/source/dialogs/widgettestdlg.cxx
+++ b/cui/source/dialogs/widgettestdlg.cxx
@@ -8,15 +8,20 @@
*/
#include
+#include
WidgetTestDialog::WidgetTestDialog(weld::Window* pParent)
: GenericDialogController(pParent, "cui/ui/widgettestdialog.ui",
"WidgetTestDialog")
{
m_xOKButton = m_xBuilder->weld_button("ok_btn");
m_xCancelButton = m_xBuilder->weld_button("cancel_btn");
+m_xTreeView = m_xBuilder->weld_tree_view("contenttree");
+m_xTreeView2 = m_xBuilder->weld_tree_view("contenttree2");
m_xOKButton->connect_clicked(LINK(this, WidgetTestDialog, OkHdl));
m_xCancelButton->connect_clicked(LINK(this, WidgetTestDialog, CancelHdl));
+
+FillTreeView();
}
WidgetTestDialog::~WidgetTestDialog() {}
@@ -28,4 +33,25 @@ IMPL_LINK_NOARG(WidgetTestDialog, CancelHdl, weld::Button&,
void)
m_xDialog->response(RET_CANCEL);
}
+void WidgetTestDialog::FillTreeView()
+{
+OUString aImage1(RID_SVXBMP_CELL_LR);
+OUString aImage2(RID_SVXBMP_SHADOW_BOT_LEFT);
+
+for (size_t nCount = 0; nCount < 4; nCount++)
+{
+OUString sText = OUString::Concat("Test ") +
OUString::Concat(OUString::number(nCount));
+std::unique_ptr xEntry = m_xTreeView->make_iterator();
+m_xTreeView->insert(nullptr, -1, , , nullptr, nullptr,
false, xEntry.get());
+m_xTreeView->set_image(*xEntry, (nCount % 2 == 0) ? aImage1 : aImage2);
+
+m_xTreeView2->append();
+m_xTreeView2->set_image(nCount, (nCount % 2 == 0) ? aImage1 : aImage2);
+m_xTreeView2->set_text(nCount, "First Column", 0);
+m_xTreeView2->set_text(
+nCount, OUString::Concat("Row ") +
OUString::Concat(OUString::number(nCount)), 1);
+m_xTreeView2->set_id(nCount, OUString::number(nCount));
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/widgettestdialog.ui
b/cui/uiconfig/ui/widgettestdialog.ui
index 787deda37171..4f4b3cfc23b9 100644
--- a/cui/uiconfig/ui/widgettestdialog.ui
+++ b/cui/uiconfig/ui/widgettestdialog.ui
@@ -8,11 +8,8 @@
dialog
-True
-False
-vertical
-5
-
+ vertical
+
False
end
@@ -46,9 +43,16 @@
False
False
-0
+1
+
+
+
+True
+False
+5
+5
@@ -286,18 +290,8 @@
False
True
-0
-
-
-
-
-True
-False
-
-
-False
-True
-1
+0
+0
@@ -455,11 +449,151 @@
False
True
-2
+0
+1
+
+
+
+
+True
+False
+True
+True
+vertical
+
+
+True
+True
+True
+True
+in
+
+
+-1
+True
+True
+True
+True
+True
+True
+liststore2
+False
+
[Libreoffice-commits] core.git: cui/inc cui/source include/linguistic include/unotools lingucomponent/source linguistic/source linguistic/workben offapi/com offapi/type_reference officecfg/registry un
cui/inc/strings.hrc|2
cui/source/inc/optlingu.hxx|2
cui/source/options/optlingu.cxx| 26 +-
include/linguistic/lngprophelp.hxx |8 +
include/unotools/lingucfg.hxx |8 +
include/unotools/linguprops.hxx|8 -
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 25 -
lingucomponent/source/spellcheck/spell/sspellimp.hxx |2
linguistic/source/iprcache.cxx |6 -
linguistic/source/lngopt.cxx |8 +
linguistic/source/lngopt.hxx |8 +
linguistic/source/lngprophelp.cxx | 42
++
linguistic/workben/sprophelp.cxx | 35
offapi/com/sun/star/linguistic2/XLinguProperties.idl | 14 +++
offapi/type_reference/offapi.idl |2
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 16 +++
unotools/source/config/lingucfg.cxx| 19
17 files changed, 211 insertions(+), 20 deletions(-)
New commits:
commit 57d79744c77eef96b4c2bd3b16e0a04317ffcf9e
Author: László Németh
AuthorDate: Fri Dec 30 10:26:07 2022 +0100
Commit: László Németh
CommitDate: Fri Dec 30 11:03:39 2022 +
tdf#136306 offapi linguistic: add options to disable rule-based compounding
Add two new spell checking options to disable rule-based closed
and hyphenated compound word recognition with Hunspell dictionaries:
com::sun::star::linguistic2::XLinguProperties::IsSpellClosedCompound
com::sun::star::linguistic2::XLinguProperties::IsSpellHyphenatedCompound
For professional proofreaders, it can be more important to avoid
of the mistakes of the rule-based compound word recognition, than
to speed up proofreading. Disabling the following two new options
will report all rule-based closed compound words (default in
Dutch, German, Hungarian etc. dictionaries) and rule-based
hyphenated compound words (all languages with BREAK usage in
their Hunspell dictionaries):
- "Accept possible closed compound words"
- "Accept possible hyphenated compound words"
For example, disabling the second one, dictionary word "scot-free"
will be still correct word in English spell checking, but not
the previously accepted compound "arbitrary-word-with-hyphen".
Note: the second option works with the update to Hunspell 1.7.2.
Change-Id: Id879610927d5e8269fda5ad207c1c2fe1f57a0b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144875
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1d4fe526dabd..0d311518ad53 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -293,6 +293,8 @@
#define RID_CUISTR_CAPITAL_WORDS
NC_("RID_SVXSTR_CAPITAL_WORDS", "Check uppercase words")
#define RID_CUISTR_WORDS_WITH_DIGITS
NC_("RID_SVXSTR_WORDS_WITH_DIGITS", "Check words with numbers ")
#define RID_CUISTR_SPELL_SPECIAL
NC_("RID_SVXSTR_SPELL_SPECIAL", "Check special regions")
+#define RID_CUISTR_SPELL_CLOSED_COMPOUND
NC_("RID_SVXSTR_SPELL_CLOSED_COMPOUND", "Accept possible closed compound words")
+#define RID_CUISTR_SPELL_HYPHENATED_COMPOUND
NC_("RID_SVXSTR_SPELL_HYPHENATED_COMPOUND", "Accept possible hyphenated
compound words")
#define RID_CUISTR_SPELL_AUTO
NC_("RID_SVXSTR_SPELL_AUTO", "Check spelling as you type")
#define RID_CUISTR_GRAMMAR_AUTO
NC_("RID_SVXSTR_GRAMMAR_AUTO", "Check grammar as you type")
#define RID_CUISTR_NUM_MIN_WORDLEN
NC_("RID_SVXSTR_NUM_MIN_WORDLEN", "Minimal number of characters for
hyphenation: ")
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 365acfbbb0fb..29adee861417 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -84,6 +84,8 @@ private:
OUStringsWordsWithDigits;
OUStringsSpellSpecial;
OUStringsSpellAuto;
+OUStringsSpellClosedCompound;
+OUStringsSpellHyphenatedCompound;
OUStringsGrammarAuto;
OUStringsNumMinWordlen;
OUStringsNumPreBreak;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6db7634159b1..b80343657f22 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -193,7 +193,9 @@ enum EID_OPTIONS
EID_NUM_PRE_BREAK,
EID_NUM_POST_BREAK,
EID_HYPH_AUTO,
-EID_HYPH_SPECIAL
+EID_HYPH_SPECIAL,
+EID_SPELL_CLOSED_COMPOUND,
+
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc|1 -
cui/source/customize/cfg.cxx |1 -
cui/source/customize/cfgutil.cxx |2 --
cui/source/dialogs/AdditionsDialog.cxx |4
cui/source/dialogs/DiagramDialog.cxx |1 -
cui/source/dialogs/hlmailtp.cxx|1 -
cui/source/inc/AdditionsDialog.hxx |4
cui/source/inc/DiagramDialog.hxx |1 -
cui/source/inc/SpellDialog.hxx |1 -
cui/source/inc/cfg.hxx |1 -
cui/source/inc/hlmailtp.hxx|1 -
cui/source/inc/page.hxx|1 -
cui/source/inc/paragrph.hxx|1 -
cui/source/options/optcolor.cxx|1 -
cui/source/options/optcolor.hxx|1 -
cui/source/options/optgdlg.cxx |1 -
cui/source/options/optgdlg.hxx |1 -
cui/source/tabpages/page.cxx |1 -
cui/source/tabpages/paragrph.cxx |1 -
19 files changed, 26 deletions(-)
New commits:
commit a7674cc127c9987622cb69d7a23468df3f10ff21
Author: Noel Grandin
AuthorDate: Mon Nov 21 11:24:52 2022 +0200
Commit: Noel Grandin
CommitDate: Tue Nov 22 11:06:29 2022 +0100
loplugin:unusedfields
Change-Id: I4487f1b3bb051e1eb48226eb52a6706b22493fec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143088
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index b4b232b9ac5d..1d4fe526dabd 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -110,7 +110,6 @@
#define RID_CUISTR_EDITHINT NC_("RID_SVXSTR_EDITHINT",
"[Enter text here]")
#define RID_CUISTR_HANGUL NC_("RID_SVXSTR_HANGUL",
"Hangul")
#define RID_CUISTR_HANJANC_("RID_SVXSTR_HANJA",
"Hanja")
-#define RID_CUISTR_BASICMACROS
NC_("RID_SVXSTR_BASICMACROS", "BASIC Macros")
#define RID_CUISTR_GROUP_STYLES
NC_("RID_SVXSTR_GROUP_STYLES", "Styles")
#define RID_CUISTR_GROUP_SIDEBARDECKS
NC_("RID_SVXSTR_GROUP_SIDEBARDECKS", "Sidebar Decks")
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 9baf31e61065..030307879738 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2680,7 +2680,6 @@ void ToolbarSaveInData::LoadToolbar(
SvxNewToolbarDialog::SvxNewToolbarDialog(weld::Window* pWindow, const
OUString& rName)
: GenericDialogController(pWindow, "cui/ui/newtoolbardialog.ui",
"NewToolbarDialog")
, m_xEdtName(m_xBuilder->weld_entry("edit"))
-, m_xBtnOK(m_xBuilder->weld_button("ok"))
, m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
{
m_xEdtName->set_text(rName);
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 0314f1810c47..9f2c3bfd9ec6 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -347,7 +347,6 @@ struct SvxConfigGroupBoxResource_Impl
{
OUString m_sMyMacros;
OUString m_sProdMacros;
-OUString m_sMacros;
OUString m_sDlgMacros;
OUString m_aStrGroupStyles;
OUString m_aStrGroupSidebarDecks;
@@ -358,7 +357,6 @@ struct SvxConfigGroupBoxResource_Impl
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
m_sMyMacros(CuiResId(RID_CUISTR_MYMACROS)),
m_sProdMacros(CuiResId(RID_CUISTR_PRODMACROS)),
-m_sMacros(CuiResId(RID_CUISTR_BASICMACROS)),
m_sDlgMacros(CuiResId(RID_CUISTR_PRODMACROS)),
m_aStrGroupStyles(CuiResId(RID_CUISTR_GROUP_STYLES)),
m_aStrGroupSidebarDecks(CuiResId(RID_CUISTR_GROUP_SIDEBARDECKS))
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index 76b215a0b777..dfa7f12858b5 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -604,19 +604,15 @@ AdditionsItem::AdditionsItem(weld::Widget* pParent,
AdditionsDialog* pParentDial
, m_xLinkButtonWebsite(m_xBuilder->weld_link_button("btnWebsite"))
, m_xLabelName(m_xBuilder->weld_label("lbName"))
, m_xLabelAuthor(m_xBuilder->weld_label("labelAuthor"))
-, m_xLabelDesc(m_xBuilder->weld_label("labelDesc")) // no change (print
description)
, m_xLabelDescription(m_xBuilder->weld_label("labelDescription"))
, m_xLabelLicense(m_xBuilder->weld_label("lbLicenseText"))
, m_xLabelVersion(m_xBuilder->weld_label("lbVersionText"))
-, m_xLabelComments(m_xBuilder->weld_label("labelComments")) // no change
, m_xLinkButtonComments(m_xBuilder->weld_link_button("linkButtonComments"))
, m_xImageVoting1(m_xBuilder->weld_image("imageVoting1"))
, m_xImageVoting2(m_xBuilder->weld_image("imageVoting2"))
, m_xImageVoting3(m_xBuilder->weld_image("imageVoting3"))
, m_xImageVoting4(m_xBuilder->weld_image("imageVoting4"))
, m_xImageVoting5(m_xBuilder->weld_image("imageVoting5"))
-, m_xLabelNoVoting(m_xBuilder->weld_label("votingLabel"))
-,
[Libreoffice-commits] core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/sfx2 sfx2/sdi sfx2/source vcl/jsdialog
cui/Library_cui.mk |1
cui/UIConfig_cui.mk |1
cui/inc/widgettestdlg.hxx| 28 +
cui/source/dialogs/widgettestdlg.cxx | 31 ++
cui/source/factory/dlgfact.cxx |9
cui/source/factory/dlgfact.hxx |6
cui/uiconfig/ui/widgettestdialog.ui | 496 +++
include/sfx2/sfxdlg.hxx |2
include/sfx2/sfxsids.hrc |1
sfx2/sdi/appslots.sdi|4
sfx2/sdi/sfx.sdi | 17 +
sfx2/source/appl/appserv.cxx | 11
vcl/jsdialog/enabled.cxx |3
13 files changed, 609 insertions(+), 1 deletion(-)
New commits:
commit ba5e0013e74f072300e808e4d8d679b6f42bff92
Author: rash419
AuthorDate: Wed Apr 13 16:20:36 2022 +0530
Commit: Szymon Kłos
CommitDate: Sun Nov 20 10:40:16 2022 +0100
jsdialogs: added WidgetTestDialog to test different vcl widgets in online
side
Signed-off-by: rash419
Change-Id: I27cbb72b4ccd486b58934503b1d3d5d7ff47cbfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132865
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142970
Tested-by: Jenkins
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 5918be60972c..e967e4491419 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -241,6 +241,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/tabpages/tptrans \
cui/source/tabpages/transfrm \
cui/source/util/FontFeatures \
+cui/source/dialogs/widgettestdlg \
))
# vim: set noet sw=4 ts=4:
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 89c8869ade36..4c0f9a7f2a75 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -228,6 +228,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/wordcompletionpage \
cui/uiconfig/ui/spinbox \
cui/uiconfig/ui/zoomdialog \
+ cui/uiconfig/ui/widgettestdialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/cui/inc/widgettestdlg.hxx b/cui/inc/widgettestdlg.hxx
new file mode 100644
index ..dabc2ee14e75
--- /dev/null
+++ b/cui/inc/widgettestdlg.hxx
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#pragma once
+
+#include
+#include
+#include
+
+class WidgetTestDialog final : public weld::GenericDialogController
+{
+private:
+std::unique_ptr m_xOKButton;
+std::unique_ptr m_xCancelButton;
+
+DECL_LINK(OkHdl, weld::Button&, void);
+DECL_LINK(CancelHdl, weld::Button&, void);
+
+public:
+WidgetTestDialog(weld::Window* pParent);
+~WidgetTestDialog();
+};
diff --git a/cui/source/dialogs/widgettestdlg.cxx
b/cui/source/dialogs/widgettestdlg.cxx
new file mode 100644
index ..5475151a9af2
--- /dev/null
+++ b/cui/source/dialogs/widgettestdlg.cxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#include
+
+WidgetTestDialog::WidgetTestDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "cui/ui/widgettestdialog.ui",
"WidgetTestDialog")
+{
+m_xOKButton = m_xBuilder->weld_button("ok_btn");
+m_xCancelButton = m_xBuilder->weld_button("cancel_btn");
+
+m_xOKButton->connect_clicked(LINK(this, WidgetTestDialog, OkHdl));
+m_xCancelButton->connect_clicked(LINK(this, WidgetTestDialog, CancelHdl));
+}
+
+WidgetTestDialog::~WidgetTestDialog() {}
+
+IMPL_LINK_NOARG(WidgetTestDialog, OkHdl, weld::Button&, void) {
m_xDialog->response(RET_OK); }
+
+IMPL_LINK_NOARG(WidgetTestDialog, CancelHdl, weld::Button&, void)
+{
+m_xDialog->response(RET_CANCEL);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 930452d64d09..0cd8d39688ad 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -143,6 +144,7 @@
IMPL_ABSTDLG_CLASS_ASYNC(CuiAbstractControllerAsync,weld::DialogController)
IMPL_ABSTDLG_CLASS_ASYNC(CuiAbstractTabController,SfxTabDialogController)
IMPL_ABSTDLG_CLASS(CuiAbstractController)
IMPL_ABSTDLG_CLASS(CuiAbstractSingleTabController)
+IMPL_ABSTDLG_CLASS_ASYNC(CuiAbstractWidgetTestControllerAsync,weld::GenericDialogController)
short
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc|2 ++
cui/source/options/optlanguagetool.cxx | 25 +++--
cui/source/options/optlanguagetool.hxx |3 +++
3 files changed, 28 insertions(+), 2 deletions(-)
New commits:
commit 2c8a760a18501acaa6e4ff2a2dee76b0bad275f1
Author: Rafael Lima
AuthorDate: Thu Nov 3 14:52:13 2022 +0200
Commit: Rafael Lima
CommitDate: Wed Nov 9 16:06:12 2022 +0100
tdf#150494 LanguageTool: Add placeholder text with default value info
With this patch, the Language Tool dialog works as follows:
- The first time the tool is enabled, a default URL is entered as text
- If the URL is left empty, a placeholder text is shown saying that leaving
this entry empty will cause the default URL to be used
- If another URL is defined by the user, than this is the one used
Change-Id: Id31fca0e44091aff3c77a9be8b639a20437b1b7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142197
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index cea0b183e33a..b4b232b9ac5d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -403,4 +403,6 @@
#define RID_CUISTR_ZIPFAIL NC_("RID_CUISTR_ZIPFAIL",
"Creation of ZIP file failed.")
#define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED",
"The results have been successfully saved in the file
'GraphicTestResults.zip'!")
+#define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free
version")
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optlanguagetool.cxx
b/cui/source/options/optlanguagetool.cxx
index 38807bc337d3..309ff2a09b52 100644
--- a/cui/source/options/optlanguagetool.cxx
+++ b/cui/source/options/optlanguagetool.cxx
@@ -20,6 +20,8 @@
#include "optlanguagetool.hxx"
#include
#include
+#include
+#include
OptLanguageToolTabPage::OptLanguageToolTabPage(weld::Container* pPage,
weld::DialogController*
pController,
@@ -34,6 +36,11 @@
OptLanguageToolTabPage::OptLanguageToolTabPage(weld::Container* pPage,
m_xActivateBox->connect_toggled(LINK(this, OptLanguageToolTabPage,
CheckHdl));
SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
EnableControls(rLanguageOpts.getEnabled());
+
+// tdf#150494 Set default values as placeholder text
+m_xBaseURLED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
+
m_xUsernameED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
+m_xApiKeyED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
}
OptLanguageToolTabPage::~OptLanguageToolTabPage() {}
@@ -54,7 +61,14 @@ IMPL_LINK_NOARG(OptLanguageToolTabPage, CheckHdl,
weld::Toggleable&, void)
void OptLanguageToolTabPage::Reset(const SfxItemSet*)
{
SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
-m_xBaseURLED->set_text(rLanguageOpts.getBaseURL());
+
+// tdf#150494 If no URL has been set, use the default URL
+OUString aBaseURL = rLanguageOpts.getBaseURL();
+if (aBaseURL.isEmpty())
+m_xBaseURLED->set_text(LANGUAGETOOL_DEFAULT_URL);
+else
+m_xBaseURLED->set_text(rLanguageOpts.getBaseURL());
+
m_xUsernameED->set_text(rLanguageOpts.getUsername());
m_xApiKeyED->set_text(rLanguageOpts.getApiKey());
}
@@ -62,7 +76,14 @@ void OptLanguageToolTabPage::Reset(const SfxItemSet*)
bool OptLanguageToolTabPage::FillItemSet(SfxItemSet*)
{
SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
-rLanguageOpts.setBaseURL(m_xBaseURLED->get_text());
+
+// tdf#150494 If no URL has been set, then save the default URL
+OUString aBaseURL = m_xBaseURLED->get_text();
+if (aBaseURL.isEmpty())
+rLanguageOpts.setBaseURL(LANGUAGETOOL_DEFAULT_URL);
+else
+rLanguageOpts.setBaseURL(aBaseURL);
+
rLanguageOpts.setUsername(m_xUsernameED->get_text());
rLanguageOpts.setApiKey(m_xApiKeyED->get_text());
return false;
diff --git a/cui/source/options/optlanguagetool.hxx
b/cui/source/options/optlanguagetool.hxx
index 46a60ecbe103..8ee83ed4e367 100644
--- a/cui/source/options/optlanguagetool.hxx
+++ b/cui/source/options/optlanguagetool.hxx
@@ -18,6 +18,9 @@
*/
#pragma once
#include
+#include
+
+inline constexpr OUStringLiteral LANGUAGETOOL_DEFAULT_URL =
u"https://api.languagetool.org/v2;;
class OptLanguageToolTabPage : public SfxTabPage
{
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c4ee1f180aed4bc09cf8dab2a1101feb0d95fa6
Author: Bogdan B
AuthorDate: Sun Nov 6 21:39:25 2022 +0200
Commit: Ilmari Lauhakangas
CommitDate: Tue Nov 8 10:36:22 2022 +0100
tdf#131688 Improve one tip of the day
Change-Id: I5f8796bd1cae65a2259a9695321f94cd24188eec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142301
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index d26a83d64f1a..e6bd357d2ae4 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -113,7 +113,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined
template or current document per Tools ▸ Options ▸ %PRODUCTNAME Writer ▸ Basic
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage",
"tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01040300.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to find words containing more than 10
characters? Edit ▸ Find and Replace ▸ Search ▸ [a-z]{10,} ▸ Other Options ▸
check Regular expressions."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Open a CSV file as a new sheet in the
current spreadsheet via Sheet ▸ Sheet from file."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Typing in bold, italics, or underlined in
Writer you can continue with the default attributes using just the shortcut
%MOD1+Shift+X (remove direct character formats)."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can continue writing with the default
formatting attributes after manually applying bold, italic or underline by
pressing %MOD1+Shift+X."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use %MOD1+%MOD2+Shift+V to paste the
contents of the clipboard as unformatted text."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Customize footnote appearance with Tools ▸
Footnotes and Endnotes…"), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With Slide Show ▸ Custom Slide Show,
reorder and pick slides to fit a slideshow to the needs of your viewers."), "",
"tipoftheday_i.png"},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c3d2c5056aeaa57ed0254e3ea1faa86ed0cb58c9
Author: Adolfo Jayme Barrientos
AuthorDate: Sun Nov 6 18:49:33 2022 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Nov 7 05:26:28 2022 +0100
No point in abbreviating like that in the middle of the sentence
Change-Id: Id2144df2d5a714acc0a1022dccd802ec0a89a559
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142364
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 27f13fcfdc4e..d26a83d64f1a 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -154,7 +154,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a portable version which
gives you mobility. Even without administrator rights on your computer you can
install %PRODUCTNAME Portable to your hard drive too."),
"https://www.libreoffice.org/download/portable-versions/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer lets you number your footnotes per
page, chapter, document: Tools ▸ Footnotes and Endnotes ▸ Footnotes tab ▸
Counting."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Your Writer document does not reopen with
the text cursor at the same editing position it was when you saved it? Add
First or Last name in Tools ▸ Options ▸ %PRODUCTNAME ▸ User Data ▸ First/last
name."), "", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Need to do citation? You can use 3rd-party
citation managers such as Zotero."),
"https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Need to do citation? You can use
third-party citation managers such as Zotero."),
"https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to insert a value in the same place on
several sheets? Select the sheets: hold down %MOD1 key and click their tabs
before entering."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to hide some text in a document?
Select the text. Insert ▸ Section, and select “Hide”."),
"modules/swriter/ui/editsectiondialog/hide", "tipoftheday_w.png"}, // online
help is different
https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/hidden_text.html#hd_id3148675
{ NC_("RID_CUI_TIPOFTHEDAY", "You can customize the middle mouse button
by going to Tools ▸ Options ▸ %PRODUCTNAME ▸ View ▸ Mouse ▸ Middle button."),
"", ""},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5beddf4c66c63cac050b4f32d2756c733c842d6f
Author: Bogdan B
AuthorDate: Wed Nov 2 21:50:56 2022 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Nov 3 07:49:04 2022 +0100
tdf#148777 Improvement to Tip of the day 106
Change-Id: Iea1304d314f6070999f5e3a778e4ea10d92c0688
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142153
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 5baafec6578d..27f13fcfdc4e 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -154,7 +154,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a portable version which
gives you mobility. Even without administrator rights on your computer you can
install %PRODUCTNAME Portable to your hard drive too."),
"https://www.libreoffice.org/download/portable-versions/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer lets you number your footnotes per
page, chapter, document: Tools ▸ Footnotes and Endnotes ▸ Footnotes tab ▸
Counting."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Your Writer document does not reopen with
the text cursor at the same editing position it was when you saved it? Add
First or Last name in Tools ▸ Options ▸ %PRODUCTNAME ▸ User Data ▸ First/last
name."), "", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Citation management? Use a 3rd party
extension."),
"https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Need to do citation? You can use 3rd-party
citation managers such as Zotero."),
"https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to insert a value in the same place on
several sheets? Select the sheets: hold down %MOD1 key and click their tabs
before entering."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to hide some text in a document?
Select the text. Insert ▸ Section, and select “Hide”."),
"modules/swriter/ui/editsectiondialog/hide", "tipoftheday_w.png"}, // online
help is different
https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/hidden_text.html#hd_id3148675
{ NC_("RID_CUI_TIPOFTHEDAY", "You can customize the middle mouse button
by going to Tools ▸ Options ▸ %PRODUCTNAME ▸ View ▸ Mouse ▸ Middle button."),
"", ""},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 781cf132167d81ff694c7cf82bac30de19711974
Author: Rafael Lima
AuthorDate: Sat Oct 15 00:06:31 2022 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Oct 15 12:48:06 2022 +0200
tdf#151526 Improve TOTD about text in curves
Change-Id: Ib035608c0ee0cea413c5f8dc71b2e10fdc29e763
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141394
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 94160925617f..5baafec6578d 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -145,7 +145,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to open hyperlinks without pressing
the %MOD1 key? Uncheck “%MOD1+click required to open hyperlinks” in Tools ▸
Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ Security Options."),
"cui/ui/securityoptionsdialog/ctrlclick", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "You would like to view the calculation of
individual elements of a formula, select the respective elements and press
F9."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can protect cells with Format ▸ Cells ▸
Protection. To prevent insert, delete, rename, move/copy of sheets use Tools ▸
Protect Sheet."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/cell_protect.html;,
"tipoftheday_c.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Write along a curve? Draw the line, double
click, type the text, Format ▸ Text Box and Shape ▸ Fontwork."), "",
"tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Write along a curve? Draw the curve, double
click, type the text, Format ▸ Text Box and Shape ▸ Fontwork. Select one of the
alignment options: Rotate, Upright, Slant Horizontal or Slant Vertical."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to display only the highest values in
a spreadsheet? Select menu Data ▸ AutoFilter, click the drop-down arrow, and
choose “Top10”."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table
of contents go to Insert ▸ Table of Contents and Index (or right-click and Edit
Index to edit a previously inserted index). In the Entries tab delete the page
number (#) from Structure line."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With the Navigator you can select & move
up/down headings and the text below the heading, in the Navigator and in the
document."), "", "tipoftheday_w.png"},
[Libreoffice-commits] core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk desktop/source include/linguistic include/sfx2 include/svtools include/svx include/vcl linguistic
cui/Library_cui.mk |1 cui/UIConfig_cui.mk |1 cui/inc/treeopt.hrc |3 cui/source/options/optdeepl.cxx | 53 ++ cui/source/options/optdeepl.hxx | 37 + cui/source/options/treeopt.cxx |2 cui/uiconfig/ui/deepltabpage.ui | 124 + desktop/source/lib/init.cxx | 24 + include/linguistic/translate.hxx|9 include/sfx2/pageids.hxx|1 include/sfx2/sfxsids.hrc|1 include/svtools/deeplcfg.hxx| 50 ++ include/svx/svxids.hrc |2 include/vcl/htmltransferable.hxx| 51 ++ linguistic/Library_lng.mk |2 linguistic/source/translate.cxx | 71 +++ officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 22 + svtools/Library_svt.mk |1 svtools/source/config/deeplcfg.cxx | 124 + svx/sdi/svx.sdi | 17 sw/Library_sw.mk|1 sw/Library_swui.mk |2 sw/UIConfig_swriter.mk |1 sw/inc/strings.hrc |1 sw/inc/swabstdlg.hxx| 13 sw/sdi/_textsh.sdi |6 sw/source/ui/dialog/swdlgfact.cxx | 12 sw/source/ui/dialog/swdlgfact.hxx | 14 sw/source/ui/misc/translatelangselect.cxx | 153 +++ sw/source/uibase/inc/translatehelper.hxx| 42 ++ sw/source/uibase/inc/translatelangselect.hxx| 69 +++ sw/source/uibase/shells/textsh1.cxx | 29 + sw/source/uibase/shells/translatehelper.cxx | 208 ++ sw/uiconfig/sglobal/menubar/menubar.xml |2 sw/uiconfig/swriter/menubar/menubar.xml |2 sw/uiconfig/swriter/ui/translationdialog.ui | 104 + vcl/Library_vcl.mk |1 vcl/jsdialog/enabled.cxx|1 vcl/source/app/htmltransferable.cxx | 78 +++ 40 files changed, 1341 insertions(+), 2 deletions(-) New commits: commit e20d2de7836da52dbf9e528d1043b1e188097bfd Author: Mert Tumer AuthorDate: Tue Jul 5 12:03:27 2022 +0300 Commit: Miklos Vajna CommitDate: Wed Oct 12 16:52:03 2022 +0200 new uno command uno:Translate with deepl api New Uno command added for translation right now it is only using deepl translation api There's a section in the options > language settings for setting up the api url and auth key uno:Translate is a menu button under Format tab which will bring up Language Selection dialog for translation. DeepL can accept html as the input for translation, this new feature leverages that by exporting paragraphs/selections to html and paste them back without losing the formatting (in theory) This works good in general but we may lose formatting in very complex styled sentences. Translation works in two ways; 1) Whole document when there is no selection, it assumes that we want to translate whole document. Each paragraphs is sent one by one so that the output timeout can be minimum for each paragraph. 2) Selection Change-Id: Ia2d3ab2f6757faf565b939e1d670a7dedac33390 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140624 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index cb26653b395d..5918be60972c 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -188,6 +188,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optgenrl \ cui/source/options/opthtml \ cui/source/options/optlanguagetool \ +cui/source/options/optdeepl \ cui/source/options/optinet2 \ cui/source/options/optjava \ cui/source/options/optjsearch \ diff
[Libreoffice-commits] core.git: cui/inc include/unotools officecfg/registry sc/source sc/uiconfig sd/source sd/uiconfig sw/source sw/uiconfig test/source unotools/source
cui/inc/tipoftheday.hrc |1
include/unotools/compatibility.hxx|1
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8
officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |6
sc/source/core/tool/inputopt.cxx | 11 -
sc/source/ui/inc/tpview.hxx |1
sc/source/ui/optdlg/tpview.cxx| 11 -
sc/uiconfig/scalc/ui/scgeneralpage.ui | 27 --
sd/source/ui/dlg/tpoption.cxx |9
sd/source/ui/inc/tpoption.hxx |1
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 25 --
sw/source/core/doc/DocumentSettingManager.cxx |2
sw/source/ui/config/optcomp.cxx | 10
sw/uiconfig/swriter/ui/optcompatpage.ui | 105
--
test/source/sheet/globalsheetsettings.cxx |1
unotools/source/config/compatibility.cxx |2
16 files changed, 63 insertions(+), 158 deletions(-)
New commits:
commit 27f98935f9207465186da96c85467f3c005662a6
Author: Heiko Tietze
AuthorDate: Tue Sep 13 14:38:51 2022 +0200
Commit: Heiko Tietze
CommitDate: Thu Oct 6 18:55:20 2022 +0200
[API CHANGE] Resolves tdf#131136 - Remove option "Use printer metrics"
Option is out-dated and access via UI confusing
* UI access removed from Tools > Options > General (Impress, Calc)
resp. > Compatibility (Writer)
* Unit tests updated
* Tip-Of-The-Day cleaned-up
* remove UsePrtMetrics value
Change-Id: Ib645f6e1f648455e0536a437be14c2c6a7b25a49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139863
Tested-by: Jenkins
Reviewed-by: Michael Stahl
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 171ae5290a96..94160925617f 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -221,7 +221,6 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Use font embedding for greater
interoperability with other office suites at File ▸ Properties ▸ Font."), "",
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "To convert a formula into static values you
do not need to copy/paste; use Data ▸ Calculate ▸ Formula to Value."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can reformat all comments in a document
by clicking the down arrow in a comment and choose “Format all Comments”."),
"", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want the same layout for the screen display
and printing? Check Tools ▸ Options ▸ %PRODUCTNAME Calc ▸ General ▸ Use printer
metrics for text formatting."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer helps you to make backups: with File
▸ Save a Copy you create a new document continuing to work on the original."),
"", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "When you have created a Style based on
another, you can enter a percentage value or a point value (e.g. 110% or −2pt
or +5pt)."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To copy a comment without losing the
content of the target cell you should use Paste Special and uncheck everything
except “Comments” in dialog. Use Operations “Add” to not override existing
content."), "", "tipoftheday_c.png"},
diff --git a/include/unotools/compatibility.hxx
b/include/unotools/compatibility.hxx
index c5dc3fb14746..73e77a598ec9 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -46,7 +46,6 @@ class SvtCompatibilityEntry
Module,
/* Editable list of compatibility options. */
-UsePrtMetrics,
AddSpacing,
AddSpacingAtPages,
UseOurTabStops,
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 39a7ec03a703..dce8685a0a05 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -666,14 +666,6 @@
false
-
-
-
- Specifies whether text metrics from the printer will be used
to format text on the screen.
- Use printer metrics for text formatting
-
-false
-
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index db5c7b474ff8..68b369ba09fc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++
[Libreoffice-commits] core.git: cui/inc
cui/inc/treeopt.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 076a7cf9e1c7c06b935bf3c733d606c1dcfe8a0c
Author: Adolfo Jayme Barrientos
AuthorDate: Sat Jul 30 04:20:18 2022 -0500
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Aug 2 15:53:54 2022 +0200
Shorten LanguageTool Options page name
You don’t really need the word “Settings”.
See commit 43f159dafa3fe61c09cafc8467cdd67233a02401
(“Rename ‘Basic IDE Options’ to just ‘Basic IDE’”, 2017-08-07);
its rationale still stands.
Change-Id: I66e09d51950eb903c7d1cd617da3d7daf668bc07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137629
Tested-by: Jenkins
Reviewed-by: Mert Tumer
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index f4fc28c5725b..8a56a6bde4bf 100644
--- a/cui/inc/treeopt.hrc
+++ b/cui/inc/treeopt.hrc
@@ -56,7 +56,7 @@ const std::pair
SID_LANGUAGE_OPTIONS_RES[] =
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Searching in Japanese"),
RID_SVXPAGE_JSEARCH_OPTIONS },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Asian Layout"),
RID_SVXPAGE_ASIAN_LAYOUT },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Complex Text Layout"),
RID_SVXPAGE_OPTIONS_CTL },
-{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server Settings"),
RID_SVXPAGE_LANGTOOL_OPTIONS }
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server"),
RID_SVXPAGE_LANGTOOL_OPTIONS }
};
const std::pair SID_INET_DLG_RES[] =
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f41b9842557c1e475f0ea68d81e4af4274dcd49c
Author: Adolfo Jayme Barrientos
AuthorDate: Sat Jun 11 16:31:00 2022 -0500
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Jun 13 09:53:13 2022 +0200
TotD: Add a couple of missing words
The issue was flagged two years ago (!!) by Steen Rønnow.
Change-Id: I6d023bbe7c5392038f35b767acdf7f0ad0acd718
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135673
Tested-by: Adolfo Jayme Barrientos
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 7f3213b8c1a0..171ae5290a96 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -205,7 +205,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Do not get lost in large documents. Use the
Navigator (F5) to find your way through the content."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Edit ▸ Find and Replace lets you insert
special characters directly: right click in input fields or press
Shift+%MOD1+S."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need custom contents for metadata
properties? File ▸ Properties ▸ Custom Properties tab lets you create what you
want."), "", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to see, but not print, an object in
Draw? Draw it on a layer for which the “Printable” flag is not set (right click
on the tab and “Modify Layer”)."), "", "tipoftheday_d.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to see, but not print, an object in
Draw? Draw it on a layer for which the “Printable” flag is not set (right-click
the layer’s tab and choose “Modify Layer”)."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To insert the current date in your
document, use Insert ▸ Field ▸ Date."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Got many images in your Writer document?
Speed up the display by disabling View ▸ Images and charts."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet ▸ Fill Cells ▸ Random Number to
generate a random series based on various distributions."),
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog",
"tipoftheday_c.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/02140700.html
[Libreoffice-commits] core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/sfx2 include/svtools lingucomponent/Library_LanguageTool.mk lingucomponent/Module_linguco
Repository.mk|1
cui/Library_cui.mk |1
cui/UIConfig_cui.mk |1
cui/inc/treeopt.hrc |3
cui/source/options/optlanguagetool.cxx | 76 +
cui/source/options/optlanguagetool.hxx | 44 +
cui/source/options/treeopt.cxx |2
cui/uiconfig/ui/langtoolconfigpage.ui| 240
+
include/sfx2/pageids.hxx |1
include/svtools/languagetoolcfg.hxx | 59 +
include/svtools/strings.hrc |1
lingucomponent/Library_LanguageTool.mk | 48 +
lingucomponent/Module_lingucomponent.mk |1
lingucomponent/source/spellcheck/languagetool/LanguageTool.component | 26
lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx| 407
++
lingucomponent/source/spellcheck/languagetool/languagetoolimp.hxx| 91 ++
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 30
scripting/source/stringresource/stringresource.cxx |1
svtools/Library_svt.mk |1
svtools/source/config/languagetoolcfg.cxx| 164
20 files changed, 1197 insertions(+), 1 deletion(-)
New commits:
commit d952df361a5e190246d7a0738ae5347b82cd57b5
Author: Mert Tumer
AuthorDate: Tue May 10 13:06:06 2022 +0300
Commit: Christian Lohmaier
CommitDate: Fri Jun 10 13:52:17 2022 +0200
LanguageTool Grammar Checker implementation
Signed-off-by: Mert Tumer
Change-Id: I275cbea668afc5beb5147370119631df8b6a2d46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135178
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/Repository.mk b/Repository.mk
index 4004cbe142df..5ee1546b2504 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -368,6 +368,7 @@ endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
avmedia \
+ LanguageTool \
$(call gb_Helper_optional,AVMEDIA, \
$(if $(filter MACOSX,$(OS)),\
avmediaMacAVF \
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 8f8e73afe6cd..cb26653b395d 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -187,6 +187,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/options/optgdlg \
cui/source/options/optgenrl \
cui/source/options/opthtml \
+cui/source/options/optlanguagetool \
cui/source/options/optinet2 \
cui/source/options/optjava \
cui/source/options/optjsearch \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index eda70a1dd29c..cdedcc15a857 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -143,6 +143,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/opthtmlpage \
+ cui/uiconfig/ui/langtoolconfigpage \
cui/uiconfig/ui/optionsdialog \
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index a3033143983b..f4fc28c5725b 100644
--- a/cui/inc/treeopt.hrc
+++ b/cui/inc/treeopt.hrc
@@ -55,7 +55,8 @@ const std::pair
SID_LANGUAGE_OPTIONS_RES[] =
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Writing Aids"), RID_SFXPAGE_LINGU },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Searching in Japanese"),
RID_SVXPAGE_JSEARCH_OPTIONS },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Asian Layout"),
RID_SVXPAGE_ASIAN_LAYOUT },
-{ NC_("SID_LANGUAGE_OPTIONS_RES", "Complex Text Layout"),
RID_SVXPAGE_OPTIONS_CTL }
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "Complex Text Layout"),
RID_SVXPAGE_OPTIONS_CTL },
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server Settings"),
RID_SVXPAGE_LANGTOOL_OPTIONS }
};
const std::pair SID_INET_DLG_RES[] =
diff --git a/cui/source/options/optlanguagetool.cxx
b/cui/source/options/optlanguagetool.cxx
new file mode 100644
index ..38807bc337d3
--- /dev/null
+++ b/cui/source/options/optlanguagetool.cxx
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor
[Libreoffice-commits] core.git: cui/inc cui/uiconfig sd/inc
cui/inc/strings.hrc |2 +-
cui/uiconfig/ui/querychangelineenddialog.ui |6 +++---
cui/uiconfig/ui/querydeletelineenddialog.ui |4 ++--
sd/inc/strings.hrc |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 5423dfb8549743bd5045b6e3b1ebad7980e62965
Author: Seth Chaiklin
AuthorDate: Fri Apr 22 21:51:33 2022 +0100
Commit: Seth Chaiklin
CommitDate: Wed Jun 1 01:16:28 2022 +0200
tdf#148736 improve labels for Arrow style popup dialogs
Change-Id: Ifc43650a3008cbd96cac8f994675e680368a215b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133287
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index b0dccedc413f..cea0b183e33a 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -319,7 +319,7 @@
#define RID_CUISTR_ADD NC_("RID_SVXSTR_ADD",
"Add")
#define RID_CUISTR_DESC_COLOR
NC_("RID_SVXSTR_DESC_COLOR", "Please enter a name for the new color:")
#define RID_CUISTR_TABLENC_("RID_SVXSTR_TABLE",
"Table")
-#define RID_CUISTR_DESC_LINEEND
NC_("RID_SVXSTR_DESC_LINEEND", "Please enter a name for the new arrowhead:")
+#define RID_CUISTR_DESC_LINEEND
NC_("RID_SVXSTR_DESC_LINEEND", "Please enter a name for the new arrow style:")
#define RID_CUISTR_CHARNAME_NOSTYLE
NC_("RID_SVXSTR_CHARNAME_NOSTYLE", "No %1")
#define RID_CUISTR_CHARNAME_FAMILY
NC_("RID_SVXSTR_CHARNAME_FAMILY", "Family:")
#define RID_CUISTR_CHARNAME_FONT
NC_("RID_SVXSTR_CHARNAME_FONT", "Font:")
diff --git a/cui/uiconfig/ui/querychangelineenddialog.ui
b/cui/uiconfig/ui/querychangelineenddialog.ui
index 6057416728a1..5ec1567001b0 100644
--- a/cui/uiconfig/ui/querychangelineenddialog.ui
+++ b/cui/uiconfig/ui/querychangelineenddialog.ui
@@ -4,15 +4,15 @@
False
-Save
Arrowhead?
+Save Arrow
Style?
False
True
dialog
True
warning
yes-no
-The arrowhead was
modified without saving.
-Would you like to
save the arrowhead now?
+The arrow style was
modified without saving.
+Would you like to
save the arrow style now?
False
diff --git a/cui/uiconfig/ui/querydeletelineenddialog.ui
b/cui/uiconfig/ui/querydeletelineenddialog.ui
index eb1e771a246f..6917fc62422a 100644
--- a/cui/uiconfig/ui/querydeletelineenddialog.ui
+++ b/cui/uiconfig/ui/querydeletelineenddialog.ui
@@ -4,14 +4,14 @@
False
-Delete
Arrowhead?
+Delete Arrow
Style?
False
True
dialog
True
question
yes-no
-Do you really want to
delete the arrowhead?
+Do you really want to
delete the arrow style?
This action cannot be
undone.
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index c67d1c9d1579..05326f9e461a 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -64,7 +64,7 @@
#define STR_AUTOLAYOUT_NOTES
NC_("STR_AUTOLAYOUT_NOTES", "Notes")
#define STR_TRANSFORM NC_("STR_TRANSFORM",
"Transform")
#define STR_LINEEND NC_("STR_LINEEND",
"Line Ends")
-#define STR_DESC_LINEEND
NC_("STR_DESC_LINEEND", "Please enter a name for the new arrowhead:")
+#define STR_DESC_LINEEND
NC_("STR_DESC_LINEEND", "Please enter a name for the new arrow style:")
#define STR_WARN_NAME_DUPLICATE
NC_("STR_WARN_NAME_DUPLICATE", "The name chosen already exists. \nPlease enter
another name.")
#define STR_UNDO_ANIMATION
NC_("STR_UNDO_ANIMATION", "Animation parameters")
#define STR_UNDO_COPYOBJECTS
NC_("STR_UNDO_COPYOBJECTS", "Duplicate")
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |1 +
1 file changed, 1 insertion(+)
New commits:
commit 74de217a52a15588e3fdf4059d62a384777c66db
Author: Seth Chaiklin
AuthorDate: Wed May 25 14:57:17 2022 +0200
Commit: Seth Chaiklin
CommitDate: Fri May 27 13:55:00 2022 +0200
tdf#127294 (related: tdf#147524) add ToD about Customize toolbars
Inspired by tdf#147524
Includes link to relevant help page
Change-Id: Idb2b3da4839a61a5f713400b378babb0c765fb4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134904
Reviewed-by: Adolfo Jayme Barrientos
Reviewed-by: Seth Chaiklin
Tested-by: Adolfo Jayme Barrientos
Tested-by: Jenkins
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 7f9c7fc858df..7f3213b8c1a0 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -273,6 +273,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and XML filters?"),
"https://fridrich.blogspot.com/2013/08/extending-swiss-army-knife-overview.html;,
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Press Shift+F1 to see any available
extended tooltips in dialog boxes, when \"Extended tips\" is not enabled in
Tools ▸ Options ▸ %PRODUCTNAME ▸ General."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/05/0120.html;,
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Never use certain arrow styles? Remove them
by using the Delete button on the Format ▸ Text Box and Shape ▸ Line ▸ Arrow
Styles tab."), "cui/ui/lineendstabpage/BTN_MODIFY", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Don’t like the position of some icons on
your toolbar? Change it with Tools ▸ Customize ▸ Toolbars tab ▸ Target."),
"CUI_HID_SVX_CONFIG_TOOLBAR", ""},
};
#define STR_HELP_LINK NC_("STR_HELP_LINK", "%PRODUCTNAME
Help")
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c150f855b53d8cb2f0b98d86fc5e630144194bab
Author: Rizal Muttaqin
AuthorDate: Tue Apr 12 06:48:00 2022 +0700
Commit: Rizal Muttaqin
CommitDate: Thu May 26 08:40:55 2022 +0200
tdf#142071 Align Tip of The Day with real menu/options
Change-Id: I242cf305d4e6d8ef26968e196c9f169754b90d5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132849
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index d41b6c09c831..7f9c7fc858df 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -212,7 +212,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Rename your slides in Impress to help you
define “Go to page” interactions and to have a summary more explicit than
Slide1, Slide2…"), "", "tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Chapter numbering dialog lets you set text
to be displayed before the chapter number. For example, type “Chapter ” to
display “Chapter 1”"), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Transpose a Writer table? Copy and paste in
Calc, transpose with copy/paste special then copy/paste special ▸ Formatted
text in Writer."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To get the “Vertical Text” tool in the
Drawing toolbar, check Tools ▸ Options ▸ Language Settings ▸ Languages ▸
Default languages ▸ Asian (and make the button visible with right-click)."),
"", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To get the “Vertical Text” tool in the
Drawing toolbar, check Tools ▸ Options ▸ Language Settings ▸ Languages ▸
Default languages for Documents ▸ Asian (and make the button visible with
right-click and then Visible Buttons ▸ Vertical Text)."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "To quickly zoom in on range selection,
right click on the zoom part of the status bar and choose Optimal."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can sign existing PDF files and also
verify those signatures."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/guide/digital_signatures.html;,
""}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Often create one document from another?
Consider using a template."), "", "tipoftheday_w.png"},
@@ -242,7 +242,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to center cells on a printed page in
Calc? Format ▸ Page, Page ▸ Layout settings ▸ Table alignment."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Frames can be linked so that the text can
flow from one to the other as in desktop publishing."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/text_frame.html;,
"tipoftheday_w.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "You can create a chart based on a Writer
table by clicking in the table and choosing Insert ▸ Chart."), "",
"tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Select options in Tools ▸ Options ▸
%PRODUCTNAME Writer ▸ Formatting Aids ▸ Display to specify which non-printing
characters are displayed."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Select options in Tools ▸ Options ▸
%PRODUCTNAME Writer ▸ Formatting Aids ▸ Display Formatting to specify which
non-printing characters are displayed."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to jump to a particular page by its
number? Click the left-most statusbar entry or use Edit ▸ Go To Page… or press
%MOD1+G."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME supports over 150
languages."),
"https://wiki.documentfoundation.org/Language_support_of_LibreOffice;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Uncheck Slide Show ▸ Settings ▸
Presentation always on top if you need another program displays its window to
the front of your presentation."), "", "tipoftheday_i.png"},
@@ -267,7 +267,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Drag & drop cells from Calc into the normal
view of a slide creates a table; into the outline view, each cell creates a
line in the outline."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME helps you not to enter two or
more spaces in Writer. Check Tools ▸ AutoCorrect ▸ AutoCorrect Options ▸
Options ▸ Ignore double spaces."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want the cursor to go into the cell to the
right, after entering a value in Calc? Use the Tab key instead of Enter."), "",
"tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To display the scrollbar to the left,
enable Tools ▸ Options ▸ Language Settings ▸ Languages ▸ Complex text and check
Sheet ▸ Right-To-Left."), "", "tipoftheday_c.png"},
+
[Libreoffice-commits] core.git: cui/inc sw/inc
cui/inc/tipoftheday.hrc |2 +-
sw/inc/strings.hrc |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 969603ffa48c6566b602a2a9174fc0acea307428
Author: Seth Chaiklin
AuthorDate: Tue May 24 17:17:04 2022 +0200
Commit: Seth Chaiklin
CommitDate: Wed May 25 12:05:08 2022 +0200
tdf#149018 a few more "Objects" -> "OLE Objects"
-- part of a general project to use "OLE Object" instead of
"Object" in the UI when appropriate.
* updated command sequence in one "tip of the day" and converted
tip to a question (after preferred style)
* title of dialog box for inserting or editing an OLE object
Change-Id: I519930c2e95c7a157c43a0870dca8b3df362b65d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134895
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 5bcdde749818..d41b6c09c831 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -149,7 +149,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to display only the highest values in
a spreadsheet? Select menu Data ▸ AutoFilter, click the drop-down arrow, and
choose “Top10”."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table
of contents go to Insert ▸ Table of Contents and Index (or right-click and Edit
Index to edit a previously inserted index). In the Entries tab delete the page
number (#) from Structure line."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With the Navigator you can select & move
up/down headings and the text below the heading, in the Navigator and in the
document."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To quickly get a math object in Writer type
your formula, mark it, and use Insert ▸ Object ▸ Formula to convert the
text."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to get a math object into Writer
quickly? Type your formula, select it, and use Insert ▸ OLE Object ▸ Formula to
convert the text."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME it is very easy to
install a new dictionary: they are supplied as extensions."),
"https://extensions.libreoffice.org/?q=[]=50;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a portable version which
gives you mobility. Even without administrator rights on your computer you can
install %PRODUCTNAME Portable to your hard drive too."),
"https://www.libreoffice.org/download/portable-versions/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer lets you number your footnotes per
page, chapter, document: Tools ▸ Footnotes and Endnotes ▸ Footnotes tab ▸
Counting."), "", "tipoftheday_w.png"},
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 3f7d9503b187..4136c2bce029 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1343,8 +1343,8 @@
#define STR_FRMUI_TOP_BASE NC_("STR_FRMUI_TOP_BASE",
"Base line at ~top")
#define STR_FRMUI_BOTTOM_BASE NC_("STR_FRMUI_BOTTOM_BASE",
"~Base line at bottom")
#define STR_FRMUI_CENTER_BASE NC_("STR_FRMUI_CENTER_BASE",
"Base line ~centered")
-#define STR_FRMUI_OLE_INSERTNC_("STR_FRMUI_OLE_INSERT",
"Insert object")
-#define STR_FRMUI_OLE_EDIT NC_("STR_FRMUI_OLE_EDIT",
"Edit object")
+#define STR_FRMUI_OLE_INSERTNC_("STR_FRMUI_OLE_INSERT",
"Insert OLE object")
+#define STR_FRMUI_OLE_EDIT NC_("STR_FRMUI_OLE_EDIT",
"Edit OLE object")
#define STR_FRMUI_COLL_HEADER NC_("STR_FRMUI_COLL_HEADER", "
(Template: ")
#define STR_FRMUI_BORDERNC_("STR_FRMUI_BORDER",
"Borders")
#define STR_FRMUI_PATTERN NC_("STR_FRMUI_PATTERN",
"Background")
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |1 +
1 file changed, 1 insertion(+)
New commits:
commit 93d0c905fea61b689a984001d729f4fdc989b52a
Author: Seth Chaiklin
AuthorDate: Wed Apr 27 12:37:13 2022 +0100
Commit: Seth Chaiklin
CommitDate: Sun May 8 08:53:54 2022 +0200
tdf#127294 add new ToD about deleting arrow styles
Change-Id: I5e6c3878f2c73f7136baf9a1cfaa6ac8aa1030d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133479
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 6bf0e2bb8d0c..5bcdde749818 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -272,6 +272,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "New versions of %PRODUCTNAME provide new
features, bug fixes, and security patches. Keep your software updated!"),
"SFX2_HID_DLG_CHECKFORONLINEUPDATE", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and XML filters?"),
"https://fridrich.blogspot.com/2013/08/extending-swiss-army-knife-overview.html;,
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Press Shift+F1 to see any available
extended tooltips in dialog boxes, when \"Extended tips\" is not enabled in
Tools ▸ Options ▸ %PRODUCTNAME ▸ General."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/05/0120.html;,
""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Never use certain arrow styles? Remove them
by using the Delete button on the Format ▸ Text Box and Shape ▸ Line ▸ Arrow
Styles tab."), "cui/ui/lineendstabpage/BTN_MODIFY", ""},
};
#define STR_HELP_LINK NC_("STR_HELP_LINK", "%PRODUCTNAME
Help")
[Libreoffice-commits] core.git: cui/inc officecfg/registry sc/uiconfig svx/uiconfig sw/uiconfig
cui/inc/tipoftheday.hrc |6 +-
officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |2
sc/uiconfig/scalc/ui/sparklinedatarangedialog.ui |2
sc/uiconfig/scalc/ui/sparklinedialog.ui | 24
+-
svx/uiconfig/ui/surfacewindow.ui |4 -
sw/uiconfig/swriter/ui/autotext.ui|2
sw/uiconfig/swriter/ui/optcompatpage.ui |2
7 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 2fa07953a6dfdcdbb4d214b289fe17a93f40f643
Author: Adolfo Jayme Barrientos
AuthorDate: Wed Apr 13 09:48:09 2022 -0500
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Apr 26 13:54:23 2022 +0200
Translatable string improvements I push so they don’t rot in my local clone
Change-Id: Ic057769718790ced80daf24510d27aad49e3341b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132975
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 3e66e5cf3424..6bf0e2bb8d0c 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -127,7 +127,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to have two or more columns for just a
part of a %PRODUCTNAME Writer page? Insert ▸ Section, set with Columns tab, and
place text in that section."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use Data ▸ Statistics for sampling,
descriptive statistics, analysis of variance, correlation, and much more in
%PRODUCTNAME Calc."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can copy from one sheet to another
without the clipboard. Select the area to copy, %MOD1+click the target sheet’s
tab and use Sheet ▸ Fill Cells ▸ Fill Sheets."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can change the look of %PRODUCTNAME via
View ▸ User Interface"), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can change the look of %PRODUCTNAME via
View ▸ User Interface."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "In %PRODUCTNAME Impress, use Insert ▸ Media
▸ Photo Album to create a slideshow from a series of pictures with the “Photo
Album” feature."), "", "tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can show formulas instead of results
with View ▸ Show Formula (or Tools ▸ Options ▸ %PRODUCTNAME Calc ▸ View ▸
Display ▸ Formulas)."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME is developed by a friendly
community, made up of hundreds of contributors around the world. Join us with
your skills beyond coding."),
"https://www.libreoffice.org/community/get-involved/;, ""},
@@ -157,7 +157,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Citation management? Use a 3rd party
extension."),
"https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to insert a value in the same place on
several sheets? Select the sheets: hold down %MOD1 key and click their tabs
before entering."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to hide some text in a document?
Select the text. Insert ▸ Section, and select “Hide”."),
"modules/swriter/ui/editsectiondialog/hide", "tipoftheday_w.png"}, // online
help is different
https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/hidden_text.html#hd_id3148675
- { NC_("RID_CUI_TIPOFTHEDAY", "You can customize the middle mouse button
per Tools ▸ Options ▸ %PRODUCTNAME ▸ View ▸ Mouse ▸ Middle button:."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can customize the middle mouse button
by going to Tools ▸ Options ▸ %PRODUCTNAME ▸ View ▸ Mouse ▸ Middle button."),
"", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to print two portrait pages on a
landscape one (reducing A4 to A5)? File ▸ Print and select 2 at “Pages per
sheet”."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "For quick access to your document
bookmarks, right-click on the page number of the status bar (lower-left corner
of document window)."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Select an object in the document background
via the Select tool in the Drawing toolbar to surround the object to select."),
"", ""},
@@ -225,7 +225,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer helps you to make backups: with File
▸ Save a Copy you create a new document continuing to work on the original."),
"", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "When you have created a Style based on
another, you can enter a percentage value or a point value (e.g. 110% or −2pt
or +5pt)."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To copy a
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b426a8a4c672c20e515f1ce24404530748cc4df0
Author: Rizal Muttaqin
AuthorDate: Tue Apr 5 08:01:26 2022 +0200
Commit: Rizal Muttaqin
CommitDate: Fri Apr 8 04:42:13 2022 +0200
Resolves tdf#142071 - Align Tip of The Day with real menu/options
Change-Id: I2050d0335d2d25e42b9c0164e56b0c981deee1bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132555
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 99f6218ac537..3e66e5cf3424 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -49,7 +49,7 @@ 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 ▸ Impress tab and select Notes under Document ▸ Type."), "",
"printnote.png"},
+ { 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"},
@@ -59,13 +59,13 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"expand_formula_bar.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Optimize your table layout with Table ▸
Size ▸ Distribute Rows / Columns Evenly."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools ▸
Options ▸ %PRODUCTNAME ▸ View ▸ User Interface ▸ Icon Theme."), "",
"icon_sets.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can display a number as a fraction
(0.125 = 1/8): Format ▸ Cells, Number ▸ Fraction."), "", "fraction.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools ▸
Options ▸ %PRODUCTNAME ▸ View ▸ Icon Theme."), "", "icon_sets.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can display a number as a fraction
(0.125 = 1/8): Format ▸ Cells, under Numbers tab in the Category select
Fraction."), "", "fraction.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove a hyperlink but keep its text,
right-click on the hyperlink, and use “Remove Hyperlink”."), "",
"remove_hyperlink.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove several hyperlinks at once,
select the text with the hyperlinks, then right-click and use “Remove
Hyperlink”."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To zoom a selection to fit the entire
window in Draw, use the / (divide key) on the number pad."), "",
"tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Click a column field (row) PivotTable and
press F12 to group data. Choices adapt to content: Date (month, quarter, year),
number (classes)"), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can restart the slide show after a
pause specified at Slide Show ▸ Slide Show Settings ▸ Loop and repeat."), "",
"tipoftheday_i.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can restart the slide show after a
pause specified at Slide Show ▸ Slide Show Settings ▸ Loop and repeat after."),
"", "tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To distribute some text in multi-columns
select the text and apply Format ▸ Columns."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use View ▸ Value Highlighting to display
cell contents in colors: Text/black, Formulas/green,
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9a773e8ca65ccb30cdfbf47b94aabe356df8cad2
Author: Seth Chaiklin
AuthorDate: Mon Apr 4 13:50:40 2022 +0100
Commit: Heiko Tietze
CommitDate: Thu Apr 7 10:45:02 2022 +0200
tdf#143264 improve expressions with %MOD1 -/+
also add link to relevant help page
Change-Id: I087b3fe2573665a633dc04b222bcc3950edd782a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132385
Reviewed-by: Seth Chaiklin
Reviewed-by: Heiko Tietze
Tested-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index bb50099e35c3..99f6218ac537 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -85,7 +85,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Use the Backspace key instead of Delete in
Calc. You can choose what to delete."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Best way to fix bad-looking MS Word table
cells via Table ▸ Size ▸ Optimal Row Height / Column Width."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To repeat a table heading when a table
spans over a page, use Table ▸ Table Properties ▸ Text Flow ▸ Repeat
heading."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To quickly insert or delete rows, select
the desired number of rows (or columns) and press %MOD1+ to add or %MOD1- to
delete."), "", "tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to quickly insert or delete rows?
Select the desired number of rows (or columns) and press %MOD1+Plus sign (+) to
add or %MOD1+Minus sign (-) to delete."),
"modules/scalc/ui/insertcells/InsertCellsDialog", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To repeat rows/columns on every pages use
Format ▸ Print Ranges ▸ Edit."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Insert images and photos into shapes in
Draw and Impress. Right-click on a shape, choose Area ▸ Image ▸ Add/Import, and
use Options to adjust appearance."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to insert the date in a spreadsheet
cell? Type %MOD1+; or Shift+%MOD1+; to insert the time."), "",
"tipoftheday_c.png"},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a207f96a089094072536911513056427071a1fa9
Author: Seth Chaiklin
AuthorDate: Tue Apr 5 09:40:45 2022 +0100
Commit: Seth Chaiklin
CommitDate: Tue Apr 5 13:29:18 2022 +0200
tdf#148355 add link to help for hyperlink click options in ToD
Change-Id: I0427b69744712596d8693a16490408b48f804d28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132393
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 0badd294008a..bb50099e35c3 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -142,7 +142,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the
toolbar to get quick access to favorite and recent characters to insert."), "",
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Choose “Hierarchical View” in the Styles
sidebar to see the relation between styles."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in
your document consistent. Choose one from the predefined per Styles (F11) or
via Table ▸ AutoFormat Styles..."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to open hyperlinks without pressing
the %MOD1 key? Uncheck “%MOD1+click required to open hyperlinks” in Tools ▸
Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ Security Options."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to open hyperlinks without pressing
the %MOD1 key? Uncheck “%MOD1+click required to open hyperlinks” in Tools ▸
Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ Security Options."),
"cui/ui/securityoptionsdialog/ctrlclick", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "You would like to view the calculation of
individual elements of a formula, select the respective elements and press
F9."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can protect cells with Format ▸ Cells ▸
Protection. To prevent insert, delete, rename, move/copy of sheets use Tools ▸
Protect Sheet."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/cell_protect.html;,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Write along a curve? Draw the line, double
click, type the text, Format ▸ Text Box and Shape ▸ Fontwork."), "",
"tipoftheday_w.png"},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2ad6a4b547bcb62567836fa1c05f88c0051ac729
Author: Seth Chaiklin
AuthorDate: Mon Apr 4 16:29:22 2022 +0100
Commit: Seth Chaiklin
CommitDate: Tue Apr 5 10:18:18 2022 +0200
tdf#148355 improve ToD about hyperlink click options
Change-Id: Ie26d5d35448fc28ae5a77f7be9b95337fc3f83a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132387
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 56ffea262f51..0badd294008a 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -142,7 +142,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the
toolbar to get quick access to favorite and recent characters to insert."), "",
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Choose “Hierarchical View” in the Styles
sidebar to see the relation between styles."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in
your document consistent. Choose one from the predefined per Styles (F11) or
via Table ▸ AutoFormat Styles..."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Configure use of the %MOD1 key to open
hyperlinks? Tools ▸ Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ “%MOD1+click
required to open hyperlinks”."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to open hyperlinks without pressing
the %MOD1 key? Uncheck “%MOD1+click required to open hyperlinks” in Tools ▸
Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ Security Options."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "You would like to view the calculation of
individual elements of a formula, select the respective elements and press
F9."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can protect cells with Format ▸ Cells ▸
Protection. To prevent insert, delete, rename, move/copy of sheets use Tools ▸
Protect Sheet."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/cell_protect.html;,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Write along a curve? Draw the line, double
click, type the text, Format ▸ Text Box and Shape ▸ Fontwork."), "",
"tipoftheday_w.png"},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0e5c2514d7936e63e39cc9322b6bed01c36a8aa2
Author: Adolfo Jayme Barrientos
AuthorDate: Sat Mar 12 16:40:40 2022 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Sun Mar 13 05:27:49 2022 +0100
Fix location of commands in a tip of the day
Thanks Jean-Baptiste Faure and Mihkel Tõnnov.
Change-Id: I17c3f9009e5ca044f3858cbee605dc53c0398d9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131455
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 4c6d7378fbcc..56ffea262f51 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -194,7 +194,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "In %PRODUCTNAME Draw to change the 0/0
point of the rulers, drag the intersection of the two rulers in the top left
corner into the workspace."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Move a column in Calc between two others in
one step? Click the header then a cell in the column, keep mouse button and
move to the target with %MOD2 key."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Automatically mark alphabetical index
entries using a concordance file."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/indices_index.html;,
"tipoftheday_w.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Format ▸ Align (or the context menu)
for precise positioning of objects in Draw/Impress: it centers on the page if
one object is selected or works on the group respectively."), "",
"tipoftheday_d.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Use Format ▸ Align Objects in Impress or
Shape ▸ Align Objects in Draw (or the context menu) for precise positioning of
objects: it centers on the page if one object is selected or works on the group
respectively."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Do not use tabs to space items on a Writer
document. Depending on what you are trying to do, a borderless table can be a
better choice."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "No need to scroll through the list at Tools
▸ Customize ▸ Keyboard to find a shortcut: just type it."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a
numbered caption when you insert objects. See Tools ▸ Options ▸ %PRODUCTNAME
Writer ▸ AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage",
"tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01041100.html
[Libreoffice-commits] core.git: cui/inc cui/uiconfig sd/uiconfig
cui/inc/strings.hrc |2 +-
cui/uiconfig/ui/textcolumnstabpage.ui |2 +-
sd/uiconfig/simpress/ui/publishingdialog.ui |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d6cd44b74cf0b6b0eaeea6f986f749da42d171ac
Author: Adolfo Jayme Barrientos
AuthorDate: Wed Mar 2 00:56:19 2022 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Mar 9 07:44:42 2022 +0100
Fix some mistakes in strings reported by translators
Change-Id: I56defd20865ddfcefd51dae624f3331abc8dd93c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131228
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index c8c1b36fb3b1..b0dccedc413f 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -400,7 +400,7 @@
#define RID_CUISTR_OLE_INSERT
NC_("RID_SVXSTR_OLE_INSERT", "Inserting OLE object...")
#define RID_CUISTR_CLICK_RESULT
NC_("RID_CUISTR_CLICK_RESULT", "(Click on any test to view its resultant bitmap
image)")
-#define RID_CUISTR_ZIPFAIL NC_("RID_CUISTR_ZIPFAIL",
"Creation of Zip file failed!")
+#define RID_CUISTR_ZIPFAIL NC_("RID_CUISTR_ZIPFAIL",
"Creation of ZIP file failed.")
#define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED",
"The results have been successfully saved in the file
'GraphicTestResults.zip'!")
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/textcolumnstabpage.ui
b/cui/uiconfig/ui/textcolumnstabpage.ui
index a0a34c181fc5..6fae67f9ad06 100644
--- a/cui/uiconfig/ui/textcolumnstabpage.ui
+++ b/cui/uiconfig/ui/textcolumnstabpage.ui
@@ -105,7 +105,7 @@
-Sets the columns
layout properties for text in the selected drawing or text object.
+Sets the columns’
layout properties for text in the selected drawing or text object.
diff --git a/sd/uiconfig/simpress/ui/publishingdialog.ui
b/sd/uiconfig/simpress/ui/publishingdialog.ui
index af362fb2b36b..7166d6e8a3a8 100644
--- a/sd/uiconfig/simpress/ui/publishingdialog.ui
+++ b/sd/uiconfig/simpress/ui/publishingdialog.ui
@@ -1192,7 +1192,7 @@
resolution1Radiobutton
-Select a full hd
resolution for a very high quality slide display.
+Select a full HD
resolution for a very high-quality slide display.
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 59bb9076aba89bb13fd16cb68943825554223913
Author: Adolfo Jayme Barrientos
AuthorDate: Mon Jan 31 02:32:35 2022 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Mar 9 07:44:25 2022 +0100
Update a string I forgot to include in
9f16c3b5ac3ae1c9d24fe137ff48b67f54e4899b
Change-Id: If0a281ec47f856720ec7baabfdfd4f9d77a9ada2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131227
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 81894f5c77b2..4c6d7378fbcc 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -59,7 +59,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"expand_formula_bar.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Optimize your table layout with Table ▸
Size ▸ Distribute Rows / Columns Evenly."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools ▸
Options ▸ %PRODUCTNAME ▸ View ▸ User Interface ▸ Icon style."), "",
"icon_sets.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools ▸
Options ▸ %PRODUCTNAME ▸ View ▸ User Interface ▸ Icon Theme."), "",
"icon_sets.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can display a number as a fraction
(0.125 = 1/8): Format ▸ Cells, Number ▸ Fraction."), "", "fraction.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove a hyperlink but keep its text,
right-click on the hyperlink, and use “Remove Hyperlink”."), "",
"remove_hyperlink.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove several hyperlinks at once,
select the text with the hyperlinks, then right-click and use “Remove
Hyperlink”."), "", "tipoftheday_w.png"},
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 23f1d0436f4a23b496c271c86325b8e336d60f3b
Author: Roman Kuznetsov
AuthorDate: Sat Feb 12 23:08:36 2022 +0100
Commit: Roman Kuznetsov
CommitDate: Mon Feb 14 11:06:37 2022 +0100
tdf#143266 Use correct menu item's names in ToD
Change-Id: I0796e6c8b2dc2b6e56e7e69611cbcb97ff3e7e34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129842
Tested-by: Jenkins
Reviewed-by: Sophie Gautier
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index b410d8f5f1ca..81894f5c77b2 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -141,13 +141,13 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in
a Calc spreadsheet by applying different page styles on sheets."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the
toolbar to get quick access to favorite and recent characters to insert."), "",
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Choose “Hierarchical View” in the Styles
sidebar to see the relation between styles."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in
your document consistent. Choose one from the predefined per Styles (F11) or
via Table ▸ AutoFormat."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in
your document consistent. Choose one from the predefined per Styles (F11) or
via Table ▸ AutoFormat Styles..."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Configure use of the %MOD1 key to open
hyperlinks? Tools ▸ Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ “%MOD1+click
required to open hyperlinks”."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "You would like to view the calculation of
individual elements of a formula, select the respective elements and press
F9."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can protect cells with Format ▸ Cells ▸
Protection. To prevent insert, delete, rename, move/copy of sheets use Tools ▸
Protect Sheet."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/cell_protect.html;,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Write along a curve? Draw the line, double
click, type the text, Format ▸ Text Box and Shape ▸ Fontwork."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to display only the highest values in
a spreadsheet? Select menu Data ▸ AutoFilter, click the drop-down arrow, and
choose “Top10”."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table
of contents go to Insert ▸ Table of Contents (or right-click and Edit the
previously inserted index). In the Entries tab delete the page number (#) from
Structure line."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table
of contents go to Insert ▸ Table of Contents and Index (or right-click and Edit
Index to edit a previously inserted index). In the Entries tab delete the page
number (#) from Structure line."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With the Navigator you can select & move
up/down headings and the text below the heading, in the Navigator and in the
document."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To quickly get a math object in Writer type
your formula, mark it, and use Insert ▸ Object ▸ Formula to convert the
text."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME it is very easy to
install a new dictionary: they are supplied as extensions."),
"https://extensions.libreoffice.org/?q=[]=50;, ""},
[Libreoffice-commits] core.git: cui/inc cui/source officecfg/registry
cui/inc/strings.hrc|2 +-
cui/source/dialogs/about.cxx |2 +-
officecfg/registry/data/org/openoffice/Office/Common.xcu |3 +++
officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 +
4 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 96607133f4457b31ddaee5808c04e96243ed99c6
Author: Samuel Mehrbrodt
AuthorDate: Thu Jan 20 13:05:39 2022 +0100
Commit: Samuel Mehrbrodt
CommitDate: Thu Jan 20 16:45:32 2022 +0100
Move credits link to config
as all other related URLs
and replace with a hub link, see
https://redmine.documentfoundation.org/issues/3569
Change-Id: Ic30f2a5980ae17b5dfff184ead391b21cff7ab7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128660
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index eb7d701db964..df987aa0501e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -367,7 +367,6 @@
#define RID_CUISTR_CANNOTCONVERTURL_ERR
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a
filesystem path.")
#define RID_CUISTR_ABOUT_COPYRIGHT
NC_("aboutdialog|copyright", "Copyright © 2000–2022 LibreOffice contributors.")
-#define RID_CUISTR_ABOUT_CREDITS_URLNC_("aboutdialog|link",
"https://www.libreoffice.org/about-us/credits/;)
#define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor",
"This release was supplied by %OOOVENDOR.")
#define RID_CUISTR_ABOUT_BASED_ON
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
#define RID_CUISTR_ABOUT_DERIVEDNC_("aboutdialog|derived",
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
@@ -403,4 +402,5 @@
#define RID_CUISTR_CLICK_RESULT
NC_("RID_CUISTR_CLICK_RESULT", "(Click on any test to view its resultant bitmap
image)")
#define RID_CUISTR_ZIPFAIL NC_("RID_CUISTR_ZIPFAIL",
"Creation of Zip file failed!")
#define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED",
"The results have been successfully saved in the file
'GraphicTestResults.zip'!")
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ae17508cebcd..dd5df31db6ae 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -117,7 +117,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
}
// Links
- m_pCreditsButton->set_uri(CuiResId(RID_CUISTR_ABOUT_CREDITS_URL));
+
m_pCreditsButton->set_uri(officecfg::Office::Common::Menus::CreditsURL::get());
OUString sURL(officecfg::Office::Common::Help::StartCenter::InfoURL::get());
localizeWebserviceURI(sURL);
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index f543b6ebb3c9..4694135efce7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -360,6 +360,9 @@
https://hub.libreoffice.org/ReleaseNotes/
+
+ https://hub.libreoffice.org/credits/
+
https://hub.libreoffice.org/HyphenationMissing/
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 2f3846e4e8bf..dd896317adda 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2103,6 +2103,11 @@
Specifies the URL used with the UNO command WhatsNew
(SID_WHATSNEW).
+
+
+ Specifies the URL for the LibreOffice Credits page.
+
+
Specifies the URL used with the UNO command HyphenationMissing
(SID_HYPHENATIONMISSING).
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc|1 -
cui/source/dialogs/cuihyperdlg.cxx | 23 +--
cui/source/dialogs/hldocntp.cxx| 19 ---
cui/source/dialogs/hltpbase.cxx|7 ---
cui/source/inc/cuihyperdlg.hxx |2 +-
cui/source/inc/hldocntp.hxx|1 -
cui/source/inc/hltpbase.hxx|1 -
7 files changed, 10 insertions(+), 44 deletions(-)
New commits:
commit c6620b4e538d21c1dfa321dde31b568eb8b8bd32
Author: Gabor Kelemen
AuthorDate: Fri Jan 14 21:01:34 2022 +0100
Commit: Thorsten Behrens
CommitDate: Tue Jan 18 23:21:06 2022 +0100
tdf#146612 Drop confirmation question when applying new doc hyperlink
To be consistent with other tabs of the dialog where Apply does
not show a similar question
Change-Id: Id3bced8ec861b7166974da5ad223513dbfec25c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128424
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Thorsten Behrens
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index e2c56b8a0d45..eb7d701db964 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -76,7 +76,6 @@
#define RID_CUISTR_HYPDLG_MACROACT1
NC_("RID_SVXSTR_HYPDLG_MACROACT1", "Mouse over object")
#define RID_CUISTR_HYPDLG_MACROACT2
NC_("RID_SVXSTR_HYPDLG_MACROACT2", "Trigger hyperlink")
#define RID_CUISTR_HYPDLG_MACROACT3
NC_("RID_SVXSTR_HYPDLG_MACROACT3", "Mouse leaves object")
-#define RID_CUISTR_HYPDLG_NOVALIDFILENAME
NC_("RID_SVXSTR_HYPDLG_NOVALIDFILENAME", "Please type in a valid file name.")
#define RID_CUISTR_HYPERDLG_FORM_BUTTON
NC_("RID_SVXSTR_HYPERDLG_FORM_BUTTON", "Button")
#define RID_CUISTR_HYPERDLG_FROM_TEXT
NC_("RID_SVXSTR_HYPERDLG_FROM_TEXT", "Text")
#define RID_CUISTR_HYPERDLG_QUERYOVERWRITE
NC_("RID_SVXSTR_HYPERDLG_QUERYOVERWRITE", "The file already exists. Overwrite?")
diff --git a/cui/source/dialogs/cuihyperdlg.cxx
b/cui/source/dialogs/cuihyperdlg.cxx
index 3eef90cdf696..20c1b1e26f85 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -182,32 +182,27 @@ void SvxHpLinkDlg::Close()
pViewFrame->ToggleChildWindow(SID_HYPERLINK_DIALOG);
}
-void SvxHpLinkDlg::Apply( bool bWarn )
+void SvxHpLinkDlg::Apply()
{
SfxItemSetFixed aItemSet(
SfxGetpApp()->GetPool() );
SvxHyperlinkTabPageBase* pCurrentPage =
static_cast(
GetTabPage( GetCurPageId() ) );
-// tdf#109390: only show warning that the dialog was not filled properly
-// if the user pressed Apply
-if ( pCurrentPage->AskApply( bWarn ) )
-{
-pCurrentPage->FillItemSet( );
+pCurrentPage->FillItemSet( );
-const SvxHyperlinkItem *aItem =
aItemSet.GetItem(SID_HYPERLINK_SETLINK);
-if ( !aItem->GetURL().isEmpty() )
-GetDispatcher()->ExecuteList(SID_HYPERLINK_SETLINK,
-SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { aItem });
+const SvxHyperlinkItem *aItem = aItemSet.GetItem(SID_HYPERLINK_SETLINK);
+if ( !aItem->GetURL().isEmpty() )
+GetDispatcher()->ExecuteList(SID_HYPERLINK_SETLINK,
+SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { aItem });
-static_cast( GetTabPage( GetCurPageId() )
)->DoApply();
-}
+static_cast( GetTabPage( GetCurPageId() )
)->DoApply();
}
/// Click on OK button
IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl, weld::Button&, void)
{
-Apply( false );
+Apply();
m_xDialog->response(RET_OK);
}
@@ -218,7 +213,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl,
weld::Button&, void)
|/
IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl, weld::Button&, void)
{
-Apply( true );
+Apply();
}
/*
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 93921c0bd302..c8233360ce7a 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -234,25 +234,6 @@ void SvxHyperlinkNewDocTp::SetInitFocus()
m_xCbbPath->grab_focus();
}
-/*
-|*
-|* Ask page whether an insert is possible
-|*
-\/
-bool SvxHyperlinkNewDocTp::AskApply( bool bShowWarning )
-{
-INetURLObject aINetURLObject;
-bool bRet = ImplGetURLObject(m_xCbbPath->get_active_text(),
m_xCbbPath->GetBaseURL(), aINetURLObject);
-if ( !bRet && bShowWarning )
-{
-std::unique_ptr
xWarn(Application::CreateMessageDialog(mpDialog->getDialog(),
- VclMessageType::Warning,
VclButtonsType::Ok,
-
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc|5 +
cui/source/dialogs/AdditionsDialog.cxx | 25 +++--
2 files changed, 28 insertions(+), 2 deletions(-)
New commits:
commit b957454e5ed46029ea0ca06a7d345d9608bfa4a1
Author: Gabor Kelemen
AuthorDate: Tue Jan 11 20:00:18 2022 +0100
Commit: Thorsten Behrens
CommitDate: Wed Jan 12 02:40:38 2022 +0100
tdf#142564 Localize extension category names
Change-Id: I57ca7cb194bd325f621841edc24e3af9ef7c3b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128305
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 92e9cb7ed7ae..e2c56b8a0d45 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -391,6 +391,11 @@
#define RID_CUISTR_ADDITIONS_SEARCHING
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
#define RID_CUISTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
#define RID_CUISTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
+#define RID_CUISTR_ADDITIONS_DICTIONARY
NC_("RID_SVXSTR_ADDITIONS_DICTIONARY", "Extensions: Dictionary")
+#define RID_CUISTR_ADDITIONS_GALLERY
NC_("RID_SVXSTR_ADDITIONS_GALLERY", "Extensions: Gallery")
+#define RID_CUISTR_ADDITIONS_ICONS
NC_("RID_SVXSTR_ADDITIONS_ICONS", "Extensions: Icons")
+#define RID_CUISTR_ADDITIONS_PALETTES
NC_("RID_SVXSTR_ADDITIONS_PALETTES", "Extensions: Color Palette")
+#define RID_CUISTR_ADDITIONS_TEMPLATES
NC_("RID_SVXSTR_ADDITIONS_TEMPLATES", "Extensions: Templates")
#define RID_CUISTR_UI_APPLYALL
NC_("RID_SVXSTR_UI_APPLYALL", "Apply to %MODULE")
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index d5b58b5c8aba..d2337d7333a5 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -452,8 +452,29 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent,
const OUString& sAdditio
OUString titlePrefix = CuiResId(RID_CUISTR_ADDITIONS_DIALOG_TITLE_PREFIX);
if (!m_sTag.isEmpty())
-{
-this->set_title(titlePrefix + ": " + sAdditionsTag);
+{ // tdf#142564 localize extension category names
+OUString sDialogTitle = "";
+if (sAdditionsTag == "Templates")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_TEMPLATES);
+}
+else if (sAdditionsTag == "Dictionary")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_DICTIONARY);
+}
+else if (sAdditionsTag == "Gallery")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_GALLERY);
+}
+else if (sAdditionsTag == "Icons")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_ICONS);
+}
+else if (sAdditionsTag == "Color Palette")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_PALETTES);
+}
+this->set_title(sDialogTitle);
}
else
{
[Libreoffice-commits] core.git: cui/inc cui/source include/svl include/vcl vcl/backendtest vcl/inc
cui/inc/strings.hrc |3 +
cui/source/dialogs/GraphicTestsDialog.cxx | 28 ---
include/svl/svl.hrc |6 +++
include/vcl/test/GraphicsRenderTests.hxx |4 +-
vcl/backendtest/GraphicsRenderTests.cxx | 56 ++
vcl/inc/strings.hrc |5 ++
6 files changed, 81 insertions(+), 21 deletions(-)
New commits:
commit cf3840931454553ff25e488dc1ede2af65e0016b
Author: Gabor Kelemen
AuthorDate: Thu Jan 6 12:38:13 2022 +0100
Commit: Thorsten Behrens
CommitDate: Tue Jan 11 09:22:52 2022 +0100
tdf#145919 Localize strings in Graphics Test dialog
but not in the saved log file
Change-Id: I65c580e7b8762b654f1812c96bc53841b882a960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128087
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index fd91ae802b42..92e9cb7ed7ae 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -396,4 +396,7 @@
#define RID_CUISTR_OLE_INSERT
NC_("RID_SVXSTR_OLE_INSERT", "Inserting OLE object...")
+#define RID_CUISTR_CLICK_RESULT
NC_("RID_CUISTR_CLICK_RESULT", "(Click on any test to view its resultant bitmap
image)")
+#define RID_CUISTR_ZIPFAIL NC_("RID_CUISTR_ZIPFAIL",
"Creation of Zip file failed!")
+#define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED",
"The results have been successfully saved in the file
'GraphicTestResults.zip'!")
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/GraphicTestsDialog.cxx
b/cui/source/dialogs/GraphicTestsDialog.cxx
index 555ef3bd888c..c6232c2e8868 100644
--- a/cui/source/dialogs/GraphicTestsDialog.cxx
+++ b/cui/source/dialogs/GraphicTestsDialog.cxx
@@ -14,6 +14,11 @@
#include
#include
#include
+#include
+#include
+
+#include
+#include
GraphicTestEntry::GraphicTestEntry(weld::Container* pParent, weld::Dialog*
pDialog,
OUString aTestName, OUString aTestStatus,
Bitmap aTestBitmap)
@@ -28,17 +33,18 @@ GraphicTestEntry::GraphicTestEntry(weld::Container*
pParent, weld::Dialog* pDial
m_xTestButton->set_label(aTestStatus);
m_xTestButton->set_tooltip_text(aTestName);
m_xTestButton->set_background(
-aTestStatus == "PASSED"
+aTestStatus == SvlResId(GRTSTR_PASSED)
? COL_LIGHTGREEN
-: aTestStatus == "QUIRKY" ? COL_YELLOW
- : aTestStatus == "FAILED" ? COL_LIGHTRED
: COL_LIGHTGRAY);
+: aTestStatus == SvlResId(GRTSTR_QUIRKY)
+ ? COL_YELLOW
+ : aTestStatus == SvlResId(GRTSTR_FAILED) ? COL_LIGHTRED :
COL_LIGHTGRAY);
m_xTestButton->connect_clicked(LINK(this, GraphicTestEntry,
HandleResultViewRequest));
m_xContainer->show();
}
IMPL_LINK(GraphicTestEntry, HandleResultViewRequest, weld::Button&, rButton,
void)
{
-if (rButton.get_label() == "SKIPPED")
+if (rButton.get_label() == SvlResId(GRTSTR_SKIPPED))
{
return;
}
@@ -64,14 +70,14 @@ short GraphicsTestsDialog::run()
{
GraphicsRenderTests aTestObject;
aTestObject.run(true);
-OUString aResultLog = aTestObject.getResultString()
- + "\n(Click on any test to view its resultant bitmap
image)";
+OUString aResultLog
+= aTestObject.getResultString(true) + "\n" +
CuiResId(RID_CUISTR_CLICK_RESULT);
m_xResultLog->set_text(aResultLog);
sal_Int32 nTestNumber = 0;
-for (const VclTestResult& test : aTestObject.getTestResults())
+for (VclTestResult& test : aTestObject.getTestResults())
{
auto xGpTest =
std::make_unique(m_xContainerBox.get(), m_xDialog.get(),
- test.getTestName(),
test.getStatus(),
+ test.getTestName(),
test.getStatus(true),
test.getBitmap());
m_xContainerBox->reorder_child(xGpTest->get_widget(), nTestNumber++);
m_xGraphicTestEntries.push_back(std::move(xGpTest));
@@ -92,13 +98,11 @@ IMPL_LINK_NOARG(GraphicsTestsDialog, HandleDownloadRequest,
weld::Button&, void)
{
std::unique_ptr xBox(
Application::CreateMessageDialog(m_xDialog.get(),
VclMessageType::Warning,
- VclButtonsType::Ok, "Creation of
Zip file failed!"));
+ VclButtonsType::Ok,
CuiResId(RID_CUISTR_ZIPFAIL)));
xBox->run();
return;
}
-FileExportedDialog aDialog(
-m_xDialog.get(),
-"The results have been successfully saved in the file
'GraphicTestResults.zip' !");
+FileExportedDialog aDialog(m_xDialog.get(), CuiResId(RID_CUISTR_SAVED));
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/bitmaps.hlst | 34 +- cui/source/inc/cfg.hxx |2 +- cui/source/inc/helpids.h | 47 +++ 3 files changed, 45 insertions(+), 38 deletions(-) New commits: commit a029e07ffbd6ea4a4a191188c5be2eca7e10066d Author: Noel Grandin AuthorDate: Thu Nov 18 15:41:17 2021 +0200 Commit: Noel Grandin CommitDate: Thu Nov 25 12:23:00 2021 +0100 loplugin:stringliteraldefine in cui Change-Id: I3b0c8811b583d6edf48ccd7e368e50228e70c362 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125480 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst index 3c0faced780b..1fa444fc6da4 100644 --- a/cui/inc/bitmaps.hlst +++ b/cui/inc/bitmaps.hlst @@ -48,33 +48,33 @@ #define RID_SVXBMP_SHADOW_TOP_LEFT "svx/res/sh05.png" #define RID_SVXBMP_SHADOW_TOP_LEFT_32 "svx/res/shadow_top_left_32.png" -#define RID_SVXBMP_BOTTOMLOCK "svx/res/lo01.png" -#define RID_SVXBMP_TOPLOCK "svx/res/lo02.png" -#define RID_SVXBMP_CELLLOCK "svx/res/lo03.png" +inline constexpr OUStringLiteral RID_SVXBMP_BOTTOMLOCK = u"svx/res/lo01.png"; +inline constexpr OUStringLiteral RID_SVXBMP_TOPLOCK = u"svx/res/lo02.png"; +inline constexpr OUStringLiteral RID_SVXBMP_CELLLOCK = u"svx/res/lo03.png"; -#define RID_SVXBMP_LOCK "res/lock.png" +inline constexpr OUStringLiteral RID_SVXBMP_LOCK = u"res/lock.png"; -#define RID_SVXBMP_THEME_NORMAL_BIG "svx/res/galnorl.png" -#define RID_SVXBMP_THEME_READONLY_BIG "svx/res/galrdol.png" -#define RID_SVXBMP_THEME_DEFAULT_BIG"svx/res/galdefl.png" +inline constexpr OUStringLiteral RID_SVXBMP_THEME_NORMAL_BIG = u"svx/res/galnorl.png"; +inline constexpr OUStringLiteral RID_SVXBMP_THEME_READONLY_BIG = u"svx/res/galrdol.png"; +inline constexpr OUStringLiteral RID_SVXBMP_THEME_DEFAULT_BIG = u"svx/res/galdefl.png"; -#define RID_CUIBMP_HARDDISK "res/harddisk_16.png" -#define RID_CUIBMP_LIB "res/im30820.png" -#define RID_CUIBMP_MACRO"res/im30821.png" -#define RID_CUIBMP_DOC "res/im30826.png" +inline constexpr OUStringLiteral RID_CUIBMP_HARDDISK = u"res/harddisk_16.png"; +inline constexpr OUStringLiteral RID_CUIBMP_LIB = u"res/im30820.png"; +inline constexpr OUStringLiteral RID_CUIBMP_MACRO = u"res/im30821.png"; +inline constexpr OUStringLiteral RID_CUIBMP_DOC = u"res/im30826.png"; #define RID_CUIBMP_COLLAPSED"res/plus.png" #define RID_CUIBMP_EXPANDED "res/minus.png" -#define RID_SVXBMP_SCRIPT "res/script.png" +inline constexpr OUStringLiteral RID_SVXBMP_SCRIPT = u"res/script.png"; #define RID_SVXBMP_COLLAPSEDNODE"res/sx18002.png" #define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png" -#define RID_SVXBMP_LEGTYP1 "svx/res/legtyp1.png" -#define RID_SVXBMP_LEGTYP2 "svx/res/legtyp2.png" -#define RID_SVXBMP_LEGTYP3 "svx/res/legtyp3.png" +inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP1 = u"svx/res/legtyp1.png"; +inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP2 = u"svx/res/legtyp2.png"; +inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP3 = u"svx/res/legtyp3.png"; -#define RID_SVXBMP_COMPONENT"res/component_16.png" -#define RID_SVXBMP_MACRO"svx/res/id018.png" +inline constexpr OUStringLiteral RID_SVXBMP_COMPONENT = u"res/component_16.png"; +inline constexpr OUStringLiteral RID_SVXBMP_MACRO = u"svx/res/id018.png"; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index b143367a547f..730c6f0ad234 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -40,7 +40,7 @@ #include "cfgutil.hxx" #include "CommandCategoryListBox.hxx" -#define notebookbarTabScope "notebookbarTabScope" +inline constexpr OUStringLiteral notebookbarTabScope = u"notebookbarTabScope"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL = u"CommandURL"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer"; diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h index 437552504d95..2ac2fbd0b02c 100644 --- a/cui/source/inc/helpids.h +++ b/cui/source/inc/helpids.h @@ -18,26 +18,33 @@ */ #pragma once -#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME" -#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB" -#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH" +inline constexpr OStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME += "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"; +inline constexpr OStringLiteral HID_OFA_FONT_SUBST_CLB = "CUI_HID_OFA_FONT_SUBST_CLB"; +inline constexpr OStringLiteral HID_DBPATH_CTL_PATH = "CUI_HID_DBPATH_CTL_PATH"; #define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR" -#define
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc |2 ++
cui/source/dialogs/insdlg.cxx |8 +++-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3d32baa4df8d4061efcd5c5aa0a381e9a75240fa
Author: Miklos Vajna
AuthorDate: Thu Sep 30 10:56:52 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Sep 30 13:46:39 2021 +0200
cui: better label for the OLE insert progressbar
It's inserting an OLE object, not really loading a document.
Change-Id: Ie33e5ef8e80acbd2bfebd68119540c6d168ab120
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122877
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6d8d75fae35f..44b6a063ae1e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -394,4 +394,6 @@
#define RID_SVXSTR_UI_APPLYALL
NC_("RID_SVXSTR_UI_APPLYALL", "Apply to %MODULE")
+#define RID_SVXSTR_OLE_INSERT
NC_("RID_SVXSTR_OLE_INSERT", "Inserting OLE object...")
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index a8b9507db640..2440d2ef0c0d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -51,8 +51,6 @@
#include
#include
#include
-#include
-#include
#include
@@ -210,7 +208,7 @@ short SvInsertOleDlg::run()
xProgress =
xProgressFactory->createStatusIndicator();
if (xProgress)
{
-aProgressText =
SvxResId(RID_SVXSTR_DOC_LOAD);
+aProgressText =
CuiResId(RID_SVXSTR_OLE_INSERT);
}
}
}
@@ -316,8 +314,8 @@ short SvInsertOleDlg::run()
xProgress = xProgressFactory->createStatusIndicator();
if (xProgress)
{
-OUString aDocLoad(SvxResId(RID_SVXSTR_DOC_LOAD));
-xProgress->start(aDocLoad, 100);
+OUString
aOleInsert(CuiResId(RID_SVXSTR_OLE_INSERT));
+xProgress->start(aOleInsert, 100);
}
}
}
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20c2d7deaab20deb6970cab563d4c7d88fefa53f
Author: Ilmari Lauhakangas
AuthorDate: Sat Jul 24 18:01:59 2021 +0300
Commit: Ilmari Lauhakangas
CommitDate: Sat Jul 24 17:08:32 2021 +0200
tdf#95394 ToTD: Bitmap -> Image
Change-Id: Ifc0ae0719b30086febf9a203d70a55da837135f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119467
Tested-by: Ilmari Lauhakangas
Reviewed-by: Ilmari Lauhakangas
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 081afe453860..d5d5c7f62a8e 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -86,7 +86,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To repeat a table heading when a table
spans over a page, use Table ▸ Table Properties ▸ Text Flow ▸ Repeat
heading."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To quickly insert or delete rows, select
the desired number of rows (or columns) and press %MOD1+ to add or %MOD1- to
delete."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To repeat rows/columns on every pages use
Format ▸ Print Ranges ▸ Edit."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Insert images and photos into shapes in
Draw and Impress. Right-click on a shape, choose Area ▸ Bitmap ▸ Add/Import,
and use Options to adjust appearance."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Insert images and photos into shapes in
Draw and Impress. Right-click on a shape, choose Area ▸ Image ▸ Add/Import, and
use Options to adjust appearance."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to insert the date in a spreadsheet
cell? Type %MOD1+; or Shift+%MOD1+; to insert the time."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Insert your metadata in your document with
Insert ▸ Fields ▸ More Fields… ▸ Document or DocInformation."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Get help from the community via the Ask
portal."), "https://ask.libreoffice.org;, ""},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ee5a1b61b4460b965413a3f7ed4f9152322f1c02
Author: Adolfo Jayme Barrientos
AuthorDate: Thu Jul 22 16:40:14 2021 -0500
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Jul 22 16:40:14 2021 -0500
Fix subtle grammar error
Change-Id: I566b7c8af667f646fee88e47b97acf24d2e70112
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index d2828a62d5ab..081afe453860 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -250,7 +250,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To insert a paragraph before (after) a
section, press %MOD2+Enter at the beginning (end) of the section."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a template center to
create good looking documents—check it out."),
"https://extensions.libreoffice.org/?q=[]=118;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Calculate loan repayments with Calc: eg.
PMT(2%/12;36;2500) interest rate per payment period 2%/12, 36 months, loan
amount 2500."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060119.html?DbPAR=CALC#bm_id3149577;,
"tipoftheday_c.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Cannot find what you want with the VLOOKUP
function in Calc? With INDEX and MATCH you can do everything!"),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060109.html;,
"tipoftheday_c.png"}, //local help missing
+ { NC_("RID_CUI_TIPOFTHEDAY", "Cannot find what you want with the VLOOKUP
function in Calc? With INDEX and MATCH you can do anything!"),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060109.html;,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to show hidden column A? Click a cell
in column B, press the left mouse button, move the mouse to the left, release.
Then switch it on via Format ▸ Columns ▸ Show."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To change the number of a page in Writer,
go to the properties of the first paragraph and at the Text Flow tab check
Break ▸ Insert and enter the number."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Run %PRODUCTNAME in any browser via
rollApp."), "https://www.rollapp.com/app/lowriter;, ""},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc |1 +
cui/source/customize/cfg.cxx | 10 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 487dbbb69bfcf7c0368e9dc17e5aae1f17f8187f
Author: Muhammet Kara
AuthorDate: Sun May 23 11:22:57 2021 +0300
Commit: Heiko Tietze
CommitDate: Wed Jun 2 16:13:24 2021 +0200
tdf#116491: Customize: Add indication for experimental commands
Change-Id: Id485f86598aa89cbce6d742c0207c178e5208ee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116014
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9ee8d66b2e89..2e6b1276739e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -380,6 +380,7 @@
#define RID_SVXSTR_COMMANDLABEL
NC_("RID_SVXSTR_COMMANDLABEL", "Label")
#define RID_SVXSTR_COMMANDNAME
NC_("RID_SVXSTR_COMMANDLABEL", "Command")
#define RID_SVXSTR_COMMANDTIP
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
+#define RID_SVXSTR_COMMANDEXPERIMENTAL
NC_("RID_SVXSTR_COMMANDEXPERIMENTAL", "Experimental")
#define RID_SVXSTR_QRCODEDATALONG
NC_("RID_SVXSTR_QRCODEDATALONG", "The URL or text is too long for the current
error correction level. Either shorten the text or decrease the correction
level.")
#define RID_SVXSTR_DELETEUSERCOLOR1
NC_("RID_SVXSTR_DELETEUSERCOLOR1", "You can only delete user-defined colors")
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index ef65977d3382..25f973016043 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -88,6 +88,7 @@
#include
#include
#include
+#include
namespace uno = com::sun::star::uno;
namespace frame = com::sun::star::frame;
@@ -1620,10 +1621,17 @@ IMPL_LINK_NOARG(SvxConfigPage, SelectFunctionHdl,
weld::TreeView&, void)
SfxGroupInfo_Impl *pData =
reinterpret_cast(m_xFunctions->get_selected_id().toInt64());
if (pData)
{
+bool bIsExperimental
+=
vcl::CommandInfoProvider::IsExperimental(pData->sCommand, m_aModuleId);
+
+OUString aExperimental = "\n" +
CuiResId(RID_SVXSTR_COMMANDEXPERIMENTAL);
OUString aLabel = CuiResId(RID_SVXSTR_COMMANDLABEL) + ": " +
pData->sLabel + "\n";
OUString aName = CuiResId(RID_SVXSTR_COMMANDNAME) + ": " +
pData->sCommand + "\n";
OUString aTip = CuiResId(RID_SVXSTR_COMMANDTIP) + ": " +
pData->sTooltip;
-m_xDescriptionField->set_text(aLabel + aName + aTip);
+if (bIsExperimental)
+m_xDescriptionField->set_text(aLabel + aName + aTip +
aExperimental);
+else
+m_xDescriptionField->set_text(aLabel + aName + aTip);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source include/sfx2 officecfg/registry sfx2/sdi sfx2/source sw/inc sw/sdi sw/source
cui/inc/strings.hrc |
1
cui/source/customize/cfgutil.cxx |
39 -
cui/source/inc/cfgutil.hxx |
3
include/sfx2/sfxsids.hrc |
2
include/sfx2/sidebar/Context.hxx |
4
include/sfx2/sidebar/ResourceManager.hxx |
4
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |
78 +-
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|
5
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
20 ++
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |
23 ++
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |
14 -
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |
10 -
sfx2/sdi/frmslots.sdi|
4
sfx2/sdi/sfx.sdi |
18 ++
sfx2/source/view/viewfrm.cxx |
13 +
sw/inc/cmdid.h |
2
sw/sdi/_viewsh.sdi |
4
sw/sdi/swriter.sdi |
15 -
sw/source/uibase/uiview/view2.cxx|
8 -
19 files changed, 214 insertions(+), 53 deletions(-)
New commits:
commit a80eefb7413245f81692c443b06f7d3a6a92f28c
Author: Jim Raykowski
AuthorDate: Thu Oct 1 22:29:35 2020 -0800
Commit: Jim Raykowski
CommitDate: Tue May 11 06:53:36 2021 +0200
tdf#84502 CuiConfigGroupListBox Macros,Styles like category for Sidebar
Decks
Change-Id: I4d41952547c98ba66c40c1aa1e9776cdf31304c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100455
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1ba91c27c747..9ee8d66b2e89 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -114,6 +114,7 @@
#define RID_SVXSTR_HANJANC_("RID_SVXSTR_HANJA",
"Hanja")
#define RID_SVXSTR_BASICMACROS
NC_("RID_SVXSTR_BASICMACROS", "BASIC Macros")
#define RID_SVXSTR_GROUP_STYLES
NC_("RID_SVXSTR_GROUP_STYLES", "Styles")
+#define RID_SVXSTR_GROUP_SIDEBARDECKS
NC_("RID_SVXSTR_GROUP_SIDEBARDECKS", "Sidebar Decks")
#define RID_SVXSTR_EVENT_STARTAPP
NC_("RID_SVXSTR_EVENT_STARTAPP", "Start Application")
#define RID_SVXSTR_EVENT_CLOSEAPP
NC_("RID_SVXSTR_EVENT_CLOSEAPP", "Close Application")
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 5ac0eda55edb..685af57c83b7 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -55,6 +55,9 @@
#include
#include
+#include
+#include
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
@@ -346,6 +349,7 @@ struct SvxConfigGroupBoxResource_Impl
OUString m_sMacros;
OUString m_sDlgMacros;
OUString m_aStrGroupStyles;
+OUString m_aStrGroupSidebarDecks;
SvxConfigGroupBoxResource_Impl();
};
@@ -355,7 +359,8 @@
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)),
m_sMacros(CuiResId(RID_SVXSTR_BASICMACROS)),
m_sDlgMacros(CuiResId(RID_SVXSTR_PRODMACROS)),
-m_aStrGroupStyles(CuiResId(RID_SVXSTR_GROUP_STYLES))
+m_aStrGroupStyles(CuiResId(RID_SVXSTR_GROUP_STYLES)),
+m_aStrGroupSidebarDecks(CuiResId(RID_SVXSTR_GROUP_SIDEBARDECKS))
{
}
@@ -676,13 +681,18 @@ void CuiConfigGroupListBox::Init(const
css::uno::Reference< css::uno::XComponent
}
}
-// add styles
+// add styles and sidebar decks
if ( bEventMode )
{
aArr.push_back( std::make_unique(
SfxCfgKind::GROUP_STYLES, 0, nullptr ) ); // TODO last parameter should contain
user data
OUString sStyle(xImp->m_aStrGroupStyles);
OUString
sId(OUString::number(reinterpret_cast(aArr.back().get(;
m_xTreeView->insert(nullptr, -1, , , nullptr, nullptr,
true, nullptr);
+
+aArr.push_back(
std::make_unique(SfxCfgKind::GROUP_SIDEBARDECKS, 0));
+OUString sSidebarDecks(xImp->m_aStrGroupSidebarDecks);
+sId = OUString::number(reinterpret_cast(aArr.back().get()));
+m_xTreeView->insert(nullptr, -1, , , nullptr,
nullptr, false, nullptr);
}
m_xTreeView->thaw();
@@ -933,6 +943,31 @@ void CuiConfigGroupListBox::GroupSelected()
break;
}
+case SfxCfgKind::GROUP_SIDEBARDECKS:
+
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc |5 +
cui/source/customize/SvxNotebookbarConfigPage.cxx | 10 +-
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 8ebb54c6c4937a151f2185e8f54b2c39e446368a
Author: Gabor Kelemen
AuthorDate: Wed Apr 21 08:22:12 2021 +0200
Commit: Andras Timar
CommitDate: Tue Apr 27 15:27:32 2021 +0200
tdf#138751 Localize items in Notebookbar customization dropdowns
Change-Id: Idb1483e083f7758acb83da6c3ca9403c40ac9a40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114447
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Andras Timar
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9ec01b758738..1ba91c27c747 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -67,6 +67,11 @@
#define RID_SVXSTR_LABEL_NEW_NAME
NC_("RID_SVXSTR_LABEL_NEW_NAME", "~New name")
#define RID_SVXSTR_RENAME_MENU
NC_("RID_SVXSTR_RENAME_MENU", "Rename Menu")
#define RID_SVXSTR_RENAME_TOOLBAR
NC_("RID_SVXSTR_RENAME_TOOLBAR", "Rename Toolbar")
+#define RID_SVXSTR_ALL_COMMANDS
NC_("RID_SVXSTR_ALL_COMMANDS", "All Commands")
+#define RID_SVXSTR_TABBED NC_("RID_SVXSTR_TABBED",
"Tabbed")
+#define RID_SVXSTR_TABBED_COMPACT
NC_("RID_SVXSTR_TABBED_COMPACT", "Tabbed Compact")
+#define RID_SVXSTR_GROUPEDBAR
NC_("RID_SVXSTR_GROUPEDBAR", "Groupedbar")
+#define RID_SVXSTR_GROUPEDBAR_COMPACT
NC_("RID_SVXSTR_GROUPEDBAR_COMPACT", "Groupedbar Compact")
#define RID_SVXSTR_HYPDLG_CLOSEBUT
NC_("RID_SVXSTR_HYPDLG_CLOSEBUT", "Close")
#define RID_SVXSTR_HYPDLG_MACROACT1
NC_("RID_SVXSTR_HYPDLG_MACROACT1", "Mouse over object")
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 7e93dae121af..978055e1a1bc 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -70,13 +70,13 @@ static OUString charToString(const char* cString)
static OUString getFileName(std::u16string_view aFileName)
{
if (aFileName == u"notebookbar.ui")
-return "Tabbed";
+return CuiResId(RID_SVXSTR_TABBED);
else if (aFileName == u"notebookbar_compact.ui")
-return "TabbedCompact";
+return CuiResId(RID_SVXSTR_TABBED_COMPACT);
else if (aFileName == u"notebookbar_groupedbar_full.ui")
-return "Groupedbar";
+return CuiResId(RID_SVXSTR_GROUPEDBAR);
else if (aFileName == u"notebookbar_groupedbar_compact.ui")
-return "GroupedbarCompact";
+return CuiResId(RID_SVXSTR_GROUPEDBAR_COMPACT);
else
return "None";
}
@@ -154,7 +154,7 @@ void SvxNotebookbarConfigPage::Init()
m_xSaveInListBox->append(sSaveInListBoxID, sScopeName);
m_xSaveInListBox->set_active_id(sSaveInListBoxID);
-m_xTopLevelListBox->append("NotebookBar", "All Commands");
+m_xTopLevelListBox->append("NotebookBar",
CuiResId(RID_SVXSTR_ALL_COMMANDS));
m_xTopLevelListBox->set_active_id("NotebookBar");
SelectElement();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f1a20dc89296ccdf15cabdd50af5e31a9659cdc6
Author: Ming Hua
AuthorDate: Sat Apr 10 13:09:48 2021 +0800
Commit: Heiko Tietze
CommitDate: Mon Apr 12 08:26:43 2021 +0200
Tip-of-the-day: improve a tip and add link (related to tdf#139533)
This was changed in
commit a182dea0413c467b834f206f9cb91dc3f56acd35
tdf#139533 re-word a tip of the day
and "You can" was added to the beginning of all sentences that start
with "Create...". However this particular one is phrased as a question,
and "You can create...?" is obviously grammatically incorrect.
Fix this by combining the two sentences of the tip into one, and drop
the unnecessary and inaccurate note in parentheses.
Also add a link to the help page about creating master document.
Change-Id: Ib6e92b2a7772378e4b7b67e40bdd2e2791d4f07a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113392
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 401ff2c4907a..d2828a62d5ab 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -237,7 +237,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "In Calc use TRIMMEAN() to return the mean
of a data set excluding the highest and lowest values."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060182.html?DbPAR=CALC#bm_id3152966;,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "The 4th optional parameter of VLOOKUP Calc
function indicates whether the first column of data is sorted. If not, enter
FALSE or zero."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Toolbars are contextual—they open depending
on the context. If you do not want that, uncheck them from View ▸ Toolbars."),
"", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create a master document from the
current Writer document? File ▸ Send ▸ Create Master Document (sub-documents
are created depending of outline)."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can create a master document from the
current Writer document by using File ▸ Send ▸ Create Master Document."),
"SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to center cells on a printed page in
Calc? Format ▸ Page, Page ▸ Layout settings ▸ Table alignment."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Frames can be linked so that the text can
flow from one to the other as in desktop publishing."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/text_frame.html;,
"tipoftheday_w.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "You can create a chart based on a Writer
table by clicking in the table and choosing Insert ▸ Chart."), "",
"tipoftheday_w.png"},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc
cui/inc/toolbarmode.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6034f0993111f7b6ee459eec5ad31d0c4ea78eec
Author: Ming Hua
AuthorDate: Wed Mar 31 07:32:34 2021 +0800
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Mar 31 08:40:04 2021 +0200
UI Selection dialog: reword UI description
The description of Groupedbar Compact variant starts with a general
description about both Groupedbar UI variants (the compact variant and
the full variant), then specify what is special about the compact
variant. Therefore it should starts with "The Groupedbar interface
provides...", just like the description of Groupedbar Full variant in
the previous line.
Change-Id: I98bec4efce996b7f17461a8bb1504e80d70279c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113393
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/toolbarmode.hrc b/cui/inc/toolbarmode.hrc
index b65851c2eb08..ab2c9263abd6 100644
--- a/cui/inc/toolbarmode.hrc
+++ b/cui/inc/toolbarmode.hrc
@@ -25,7 +25,7 @@ const std::tuple
TOOLBARMODES_ARRAY[] =
{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface with expanded
sidebar. Expert users who want to quickly change many different properties are
advised to use this UI."), "Sidebar", "sidebar.png" },
{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed Compact variant aims to be
familiar with the Microsoft Office interface, yet occupying less space for
smaller screens."), "notebookbar_compact.ui", "notebookbar_compact.png" },
{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar interface provides access to
functions in groups, with icons for most-frequently used features, and dropdown
menus for others. This full variant favors functions and is slightly larger
than others."), "notebookbar_groupedbar_full.ui",
"notebookbar_groupedbar_full.png" },
-{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar Compact interface provides
access to functions in groups, with icons for most-frequently used features,
and dropdown menus for others. This compact variant favors vertical space."),
"notebookbar_groupedbar_compact.ui", "notebookbar_groupedbar_compact.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar interface provides access to
functions in groups, with icons for most-frequently used features, and dropdown
menus for others. This compact variant favors vertical space."),
"notebookbar_groupedbar_compact.ui", "notebookbar_groupedbar_compact.png" },
{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Single interface shows
functions in a single-line toolbar with context-dependent content."),
"notebookbar_single.ui", "notebookbar_single.png" },
{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Groups interface focuses on
beginners. It exposes the most frequently used functions on groups with the
core action as large icon and a couple of small additional features. All
functions have a label. Depending on the context, an additional section
provides access to those functions."), "notebookbar_groups.ui",
"notebookbar_groups.png" },
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/tipoftheday.hrc |2 +- cui/source/dialogs/tipofthedaydlg.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d553366978bef46f353c99f4fda2c8476a39 Author: Heiko Tietze AuthorDate: Tue Mar 30 11:26:59 2021 +0200 Commit: Rizal Muttaqin CommitDate: Tue Mar 30 16:43:31 2021 +0200 tdf#140839 - TotD image size Previous size of 100x120 has shown to be too small for thumbnails so we agreed on 150x150 Change-Id: Ia43bc424a164024e8a4ecf851cad3fab4f342e67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113343 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index 107e39cf803f..401ff2c4907a 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -41,7 +41,7 @@ * image: * 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 - * do not exceed 100x120px too much - images do not get scaled + * images are scaled to 150x150px; const ThumbSize() in tipoftheday.cxx */ const std::tuple TIPOFTHEDAY_STRINGARRAY[] = diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx index 478780578b56..9d43fd21f4ba 100644 --- a/cui/source/dialogs/tipofthedaydlg.cxx +++ b/cui/source/dialogs/tipofthedaydlg.cxx @@ -43,7 +43,7 @@ #include //size of preview -const Size ThumbSize(100, 120); +const Size ThumbSize(150, 150); TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent) : GenericDialogController(pParent, "cui/ui/tipofthedaydialog.ui", "TipOfTheDayDialog") ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/uiconfig
cui/inc/toolbarmode.hrc |6 +++---
cui/uiconfig/ui/toolbarmodedialog.ui | 26 +-
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 3989fdb4fc7333236869c9bec9612fc86aba77c7
Author: Ayhan Yalçınsoy
AuthorDate: Thu Mar 18 00:32:33 2021 +0300
Commit: Heiko Tietze
CommitDate: Mon Mar 22 14:31:35 2021 +0100
tdf#137925: UI:Preferred user interface rearranged
Change-Id: I9fe39064093a14917810aecaefdf8b75448f130f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112674
Tested-by: Jenkins
Reviewed-by: V, Stuart Foote
Reviewed-by: Eyal Rozenberg
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/toolbarmode.hrc b/cui/inc/toolbarmode.hrc
index 5838d5244da3..b65851c2eb08 100644
--- a/cui/inc/toolbarmode.hrc
+++ b/cui/inc/toolbarmode.hrc
@@ -20,18 +20,18 @@
const std::tuple TOOLBARMODES_ARRAY[] =
{
{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface with menu, toolbar,
and collapsed sidebar. Intended for users who are familiar with the classic
interface."), "Default", "default.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed user interface is the most
similar to the Ribbons used in Microsoft Office. It organizes functions in tabs
and makes the main menu obsolete."), "notebookbar.ui", "notebookbar.png" },
{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface but with
single-line toolbar. Intended for use on small screens."), "Single",
"single.png" },
{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface with expanded
sidebar. Expert users who want to quickly change many different properties are
advised to use this UI."), "Sidebar", "sidebar.png" },
-{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed user interface is the most
similar to the Ribbons used in Microsoft Office. It organizes functions in tabs
and makes the main menu obsolete."), "notebookbar.ui", "notebookbar.png" },
{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed Compact variant aims to be
familiar with the Microsoft Office interface, yet occupying less space for
smaller screens."), "notebookbar_compact.ui", "notebookbar_compact.png" },
-{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar Compact interface provides
access to functions in groups, with icons for most-frequently used features,
and dropdown menus for others. This compact variant favors vertical space."),
"notebookbar_groupedbar_compact.ui", "notebookbar_groupedbar_compact.png" },
{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar interface provides access to
functions in groups, with icons for most-frequently used features, and dropdown
menus for others. This full variant favors functions and is slightly larger
than others."), "notebookbar_groupedbar_full.ui",
"notebookbar_groupedbar_full.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar Compact interface provides
access to functions in groups, with icons for most-frequently used features,
and dropdown menus for others. This compact variant favors vertical space."),
"notebookbar_groupedbar_compact.ui", "notebookbar_groupedbar_compact.png" },
{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Single interface shows
functions in a single-line toolbar with context-dependent content."),
"notebookbar_single.ui", "notebookbar_single.png" },
{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Groups interface focuses on
beginners. It exposes the most frequently used functions on groups with the
core action as large icon and a couple of small additional features. All
functions have a label. Depending on the context, an additional section
provides access to those functions."), "notebookbar_groups.ui",
"notebookbar_groups.png" },
};
//hide experimental UIs
-constexpr int nGroupedbarFull = 6;
+constexpr int nGroupedbarFull = 5;
constexpr int nContextualGroups = 8;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui
b/cui/uiconfig/ui/toolbarmodedialog.ui
index b7c6427ef7b3..37159b96cc2f 100644
--- a/cui/uiconfig/ui/toolbarmodedialog.ui
+++ b/cui/uiconfig/ui/toolbarmodedialog.ui
@@ -106,8 +106,8 @@
vertical
3
-
-Tabbed
+
+Standard Toolbar
True
True
False
@@ -115,7 +115,6 @@
start
True
True
-rbButton1
False
@@ -124,8 +123,8 @@
-
-Standard Toolbar
+
+Tabbed
True
True
False
@@ -133,6 +132,7 @@
[Libreoffice-commits] core.git: cui/inc sw/inc
cui/inc/tipoftheday.hrc|4 ++--
sw/inc/inspectorproperties.hrc |2 +-
sw/inc/strings.hrc |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d652495a0f5626ba02369289c0ad2cb341f9015d
Author: Seth Chaiklin
AuthorDate: Fri Jan 29 14:25:28 2021 +0100
Commit: Heiko Tietze
CommitDate: Thu Mar 18 11:43:27 2021 +0100
tdf#139667 update Styles Inspector and tip of the day to "List Style"
For Tip of the Day
+ add uri to Bullets and Numbering help page for tip about
"Insert Unnumbered Entry"
+ adjust tip for applying List Style to tables, and add link
to "List Style" help page.
For Styles Inspector
* change "Numbering Style" to "List Style"
For Customize dialog ( sw/inc/strings.hrc )
* change "Numbering" to "List" for Style_Family
Change-Id: Id43988490a61437d0068ea22a2bf3b0841b6ad42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110139
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 6483d0335f61..107e39cf803f 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -74,7 +74,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Fit the entire page in a Draw window, use *
on the number pad."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "In a Draw page, use “-” to zoom out; “+” to
zoom in."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to show the contents of another
document within your document? Use Insert ▸ Section and select Link."),
"modules/swriter/ui/editsectiondialog/link", "tipoftheday_w.png"}, //
https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/section_insert.html#par_id3153404
- { NC_("RID_CUI_TIPOFTHEDAY", "To automatically number table rows in
Writer, select the relevant column, then apply a numbering style from List
Styles."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To automatically number table rows in
Writer, select the relevant column, then apply a List Style."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/05130004.html;,
"tipoftheday_w.png"}, // no local help URI
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME allows you to use assistive
tools, such as external screen readers, Braille devices or speech recognition
input devices."), "https://www.libreoffice.org/get-help/accessibility/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to sort a series in %PRODUCTNAME Calc
such as A1, A2, A3, A11, A15, not in alphabetical order but on the number?
Enable natural sort in the Options tab."),
"modules/scalc/ui/sortoptionspage/SortOptionsPage", "tipoftheday_c.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/12030200.html
{ NC_("RID_CUI_TIPOFTHEDAY", "You can change the default function in the
status bar: right click on the area."), "", "statusbar.png"},
@@ -188,7 +188,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to select a large range of cells
without scrolling? Type the range reference (e.g. A1:A1000) in the name box
then Enter."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to know the valid command line
parameters? Start soffice with --help or -h or -?"),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/guide/start_parameters.html;,
""}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Fit your sheet or print ranges to a page
with Format ▸ Page ▸ Sheet Tab ▸ Scaling Mode."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Need an unnumbered item in a list? Use
“Insert Unnumbered Entry” in the Bullets and Numbering toolbar."), "",
"tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Need to include a list item without a
bullet or number? Use “Insert Unnumbered Entry” in the Bullets and Numbering
toolbar."), "HID_NUM_TOOLBOX", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can rotate cells table orientation with
Table ▸ Properties… ▸ Text Flow ▸ Text orientation."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "In %PRODUCTNAME Draw to change the 0/0
point of the rulers, drag the intersection of the two rulers in the top left
corner into the workspace."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Move a column in Calc between two others in
one step? Click the header then a cell in the column, keep mouse button and
move to the target with %MOD2 key."), "", "tipoftheday_c.png"},
diff --git a/sw/inc/inspectorproperties.hrc b/sw/inc/inspectorproperties.hrc
index 6ef374a2f857..1de4f7e25c4c 100644
--- a/sw/inc/inspectorproperties.hrc
+++ b/sw/inc/inspectorproperties.hrc
@@ -178,7 +178,7 @@
#define RID_NUMBERING_LEVEL
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |1 -
1 file changed, 1 deletion(-)
New commits:
commit 6cae56fe25a51c9c0ec05253be8508940a013eee
Author: Xisco Fauli
AuthorDate: Fri Mar 12 12:11:10 2021 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Mar 12 19:59:16 2021 +0100
TipOfTheDay: remove odd tip regarding GSOC
Change-Id: I4d7111de1fb734c51e6449913caa52adaf43b594
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112381
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index d809446acf6d..6483d0335f61 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -107,7 +107,6 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To enable macro recording, check Tools ▸
Options ▸ %PRODUCTNAME ▸ Advanced ▸ Enable macro recording."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to insert a placeholder for an image
in a Writer template? Use Insert ▸ Fields ▸ More fields, click Functions tab,
choose PlaceHolder for Type and Image for Format."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME supports four macro security
levels (from low to very high) and trusted sources."),
"cui/ui/optsecuritypage/OptSecurityPage", ""}, //
https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01030300.html
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME intends to apply as an
organization for Google Summer of Code (GSoC) see:"),
"https://wiki.documentfoundation.org/Development/GSoC;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Did you know that you can attach comments
to portions of text? Just use the shortcut %MOD1+%MOD2+C."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to move one or more paragraphs? No
need to cut and paste: Use the keyboard shortcut %MOD1+%MOD2+Arrow (Up/Down)"),
"", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined
template or current document per Tools ▸ Options ▸ %PRODUCTNAME Writer ▸ Basic
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage",
"tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01040300.html
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source include/svx
cui/inc/strings.hrc| 12
cui/source/tabpages/border.cxx |1 +
include/svx/strings.hrc| 15 +++
3 files changed, 16 insertions(+), 12 deletions(-)
New commits:
commit 0cbd8a5d4571cdf3601ca8deb64d734d35e234f9
Author: Michael Weghorn
AuthorDate: Wed Mar 3 11:03:42 2021 +0100
Commit: Michael Weghorn
CommitDate: Thu Mar 4 08:14:54 2021 +0100
tdf#140762 Move RIDs related to borders to include/svx
They'll be reused for the items in the "Borders" dropdown
button in Calc's formatting toolbar in a subsequent step.
Change-Id: I895d787d185a69f7aa7d3db3c490271184152ddb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111870
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 257fa4ae554f..9ec01b758738 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -349,18 +349,6 @@
#define RID_SVXSTR_STARTQUOTE
NC_("RID_SVXSTR_STARTQUOTE", "Start Quote")
#define RID_SVXSTR_ENDQUOTE NC_("RID_SVXSTR_ENDQUOTE",
"End Quote")
-#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
-#define RID_SVXSTR_TABLE_PRESET_OUTERHORI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal
Lines")
-#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Set Outer Border and All Inner Lines")
-#define RID_SVXSTR_TABLE_PRESET_OUTERINNER
NC_("RID_SVXSTR_TABLE_PRESET_OUTERINNER", "Set Outer Border Without Changing
Inner Lines")
-#define RID_SVXSTR_PARA_PRESET_DIAGONAL
NC_("RID_SVXSTR_PARA_PRESET_DIAGONAL", "Set Diagonal Lines Only")
-#define RID_SVXSTR_PARA_PRESET_ALL
NC_("RID_SVXSTR_PARA_PRESET_ALL", "Set All Four Borders")
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Set Left and Right Borders Only")
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Set Top and Bottom Borders Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT
NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Set Left Border Only")
-#define RID_SVXSTR_HOR_PRESET_ONLYHOR
NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Set Top and Bottom Borders, and All Inner
Lines")
-#define RID_SVXSTR_VER_PRESET_ONLYVER
NC_("RID_SVXSTR_VER_PRESET_ONLYVER", "Set Left and Right Borders, and All Inner
Lines")
#define RID_SVXSTR_SHADOW_STYLE_NONE
NC_("RID_SVXSTR_SHADOW_STYLE_NONE", "No Shadow")
#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT
NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT", "Cast Shadow to Bottom Right")
#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT
NC_("RID_SVXSTR_SHADOW_STYLE_TOPRIGHT", "Cast Shadow to Top Right")
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index b6e3d8d39ed5..cb7429928d44 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index b2c3822757dd..c8f71976d322 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1759,6 +1759,21 @@
#define RID_SVXSTR_TRANSPARENCY
NC_("RID_SVXSTR_TRANSPARENCY", "Transparency:")
+
+// strings related to borders
+#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
+#define RID_SVXSTR_TABLE_PRESET_OUTERHORI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal
Lines")
+#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Set Outer Border and All Inner Lines")
+#define RID_SVXSTR_TABLE_PRESET_OUTERINNER
NC_("RID_SVXSTR_TABLE_PRESET_OUTERINNER", "Set Outer Border Without Changing
Inner Lines")
+#define RID_SVXSTR_PARA_PRESET_DIAGONAL
NC_("RID_SVXSTR_PARA_PRESET_DIAGONAL", "Set Diagonal Lines Only")
+#define RID_SVXSTR_PARA_PRESET_ALL
NC_("RID_SVXSTR_PARA_PRESET_ALL", "Set All Four Borders")
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Set Left and Right Borders Only")
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Set Top and Bottom Borders Only")
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFT
NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Set Left Border Only")
+#define RID_SVXSTR_HOR_PRESET_ONLYHOR
NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Set Top and Bottom
[Libreoffice-commits] core.git: cui/inc extras/source vcl/Package_tipoftheday.mk
cui/inc/tipoftheday.hrc | 12 ++--
extras/source/tipoftheday/expand_formula_bar.png |binary
extras/source/tipoftheday/fraction.png |binary
extras/source/tipoftheday/hybrid_pdf.png |binary
extras/source/tipoftheday/icon_sets.png |binary
extras/source/tipoftheday/remove_hyperlink.png |binary
extras/source/tipoftheday/sum_sheets.png |binary
vcl/Package_tipoftheday.mk |6 ++
8 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 114e105001a4e45573227399e33cc23a94040bee
Author: andreas kainz
AuthorDate: Sat Feb 27 01:16:56 2021 +0100
Commit: Andreas Kainz
CommitDate: Sat Feb 27 13:11:05 2021 +0100
ToD previews added
Change-Id: I3b518478de4369b9bb65c21d4a631a233c3c8bde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111672
Tested-by: Jenkins
Reviewed-by: Andreas Kainz
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f0395489f86a..d809446acf6d 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -51,16 +51,16 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to
File ▸ Print ▸ 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;, ""},
+ { 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)."), "",
"tipoftheday_c.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;,
"formdocuments.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"expand_formula_bar.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Optimize your table layout with Table ▸
Size ▸ Distribute Rows / Columns Evenly."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools ▸
Options ▸ %PRODUCTNAME ▸ View ▸ User Interface ▸ Icon style."), "", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can display a number as a fraction
(0.125 = 1/8): Format ▸ Cells, Number ▸ Fraction."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To remove a hyperlink but keep its text,
right-click on the hyperlink, and use “Remove Hyperlink”."), "",
"tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools ▸
Options ▸ %PRODUCTNAME ▸ View ▸ User Interface ▸ Icon style."), "",
"icon_sets.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can display a number as a fraction
(0.125 = 1/8): Format ▸ Cells, Number ▸ Fraction."), "", "fraction.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To remove a hyperlink but keep its text,
right-click on the hyperlink, and use “Remove Hyperlink”."), "",
"remove_hyperlink.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove several hyperlinks at once,
select the text with the hyperlinks, then right-click and use “Remove
Hyperlink”."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To zoom a
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fd6e736c20f54d253921123e5baeb75da8d248f0
Author: Gabor Kelemen
AuthorDate: Mon Feb 1 12:50:16 2021 +0100
Commit: Gabor Kelemen
CommitDate: Thu Feb 4 08:44:03 2021 +0100
Fix ToD links pointing to extensions site
so that they filter the dictionaries and templates
Change-Id: I7807f5df2e468685f6862949d4ca20139f1be79f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110250
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index d29cf67a32b6..f0395489f86a 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -150,7 +150,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table
of contents go to Insert ▸ Table of Contents (or right-click and Edit the
previously inserted index). In the Entries tab delete the page number (#) from
Structure line."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With the Navigator you can select & move
up/down headings and the text below the heading, in the Navigator and in the
document."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To quickly get a math object in Writer type
your formula, mark it, and use Insert ▸ Object ▸ Formula to convert the
text."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME it is very easy to
install a new dictionary: they are supplied as extensions."),
"https://extensions.libreoffice.org/extensions?getCategories=Dictionary;, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME it is very easy to
install a new dictionary: they are supplied as extensions."),
"https://extensions.libreoffice.org/?q=[]=50;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a portable version which
gives you mobility. Even without administrator rights on your computer you can
install %PRODUCTNAME Portable to your hard drive too."),
"https://www.libreoffice.org/download/portable-versions/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer lets you number your footnotes per
page, chapter, document: Tools ▸ Footnotes and Endnotes ▸ Footnotes tab ▸
Counting."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Your Writer document does not reopen with
the text cursor at the same editing position it was when you saved it? Add
First or Last name in Tools ▸ Options ▸ %PRODUCTNAME ▸ User Data ▸ First/last
name."), "", ""},
@@ -249,7 +249,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to find the words in bold in a Writer
document? Edit ▸ Find and Replace ▸ Other options ▸ Attributes ▸ Font
weight."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/finding.html;,
"tipoftheday_w.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows
alphabetically or numerically per Tools ▸ Sort."),
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/0610.html
{ NC_("RID_CUI_TIPOFTHEDAY", "To insert a paragraph before (after) a
section, press %MOD2+Enter at the beginning (end) of the section."), "",
"tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a template center to
create good looking documents—check it out."),
"http://templates.libreoffice.org/template-center;, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a template center to
create good looking documents—check it out."),
"https://extensions.libreoffice.org/?q=[]=118;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Calculate loan repayments with Calc: eg.
PMT(2%/12;36;2500) interest rate per payment period 2%/12, 36 months, loan
amount 2500."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060119.html?DbPAR=CALC#bm_id3149577;,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Cannot find what you want with the VLOOKUP
function in Calc? With INDEX and MATCH you can do everything!"),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060109.html;,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to show hidden column A? Click a cell
in column B, press the left mouse button, move the mouse to the left, release.
Then switch it on via Format ▸ Columns ▸ Show."), "", "tipoftheday_c.png"},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5f146b91b81eb67d43425ed0b744b267040da987
Author: Gabor Kelemen
AuthorDate: Mon Feb 1 08:36:54 2021 +0100
Commit: Gabor Kelemen
CommitDate: Mon Feb 1 16:55:30 2021 +0100
Change ToD links to https
and point the certicication one to the overview page with text
Change-Id: I1cb2233d67511dc6ca3c8b787a47d88d410b2359
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110249
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 8eb58b5473e8..d29cf67a32b6 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -137,7 +137,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Shift+%MOD1+Del deletes from cursor to the
end of the current sentence."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use column or row labels in formulas. For
example, if you have two columns, “Time” and “KM”, use =Time/KM to get minutes
per kilometer."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the “marching ants” around cells
in Calc? Press escape to stop them; the copied content will remain available
for pasting."), "", "marchingants.gif"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to become a %PRODUCTNAME Ambassador?
There are certifications for developers, admins, and trainers."),
"http://www.documentfoundation.org/certification;, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to become a %PRODUCTNAME Ambassador?
There are certifications for developers, admins, and trainers."),
"https://www.documentfoundation.org/certification/program/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in
a Calc spreadsheet by applying different page styles on sheets."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the
toolbar to get quick access to favorite and recent characters to insert."), "",
""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Choose “Hierarchical View” in the Styles
sidebar to see the relation between styles."), "", "tipoftheday_w.png"},
@@ -151,7 +151,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "With the Navigator you can select & move
up/down headings and the text below the heading, in the Navigator and in the
document."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To quickly get a math object in Writer type
your formula, mark it, and use Insert ▸ Object ▸ Formula to convert the
text."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME it is very easy to
install a new dictionary: they are supplied as extensions."),
"https://extensions.libreoffice.org/extensions?getCategories=Dictionary;, ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a portable version which
gives you mobility. Even without administrator rights on your computer you can
install %PRODUCTNAME Portable to your hard drive too."),
"http://www.libreoffice.org/download/portable-versions/;, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a portable version which
gives you mobility. Even without administrator rights on your computer you can
install %PRODUCTNAME Portable to your hard drive too."),
"https://www.libreoffice.org/download/portable-versions/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer lets you number your footnotes per
page, chapter, document: Tools ▸ Footnotes and Endnotes ▸ Footnotes tab ▸
Counting."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Your Writer document does not reopen with
the text cursor at the same editing position it was when you saved it? Add
First or Last name in Tools ▸ Options ▸ %PRODUCTNAME ▸ User Data ▸ First/last
name."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Citation management? Use a 3rd party
extension."),
"https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;, ""},
@@ -270,7 +270,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To display the scrollbar to the left,
enable Tools ▸ Options ▸ Language Settings ▸ Languages ▸ Complex text and check
Sheet ▸ Right-To-Left."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Drag a formatted object to the Styles and
Formatting window. A dialog box opens, just enter the name of the new style."),
"", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "New versions of %PRODUCTNAME provide new
features, bug fixes, and security patches. Keep your software updated!"),
"SFX2_HID_DLG_CHECKFORONLINEUPDATE", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and XML filters?"),
"http://fridrich.blogspot.com.tr/2013/08/extending-swiss-army-knife-overview.html;,
""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and XML filters?"),
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 849c1e9c74c388df549098a8a4f60131c9b8c6a0
Author: Gabor Kelemen
AuthorDate: Mon Feb 1 08:22:37 2021 +0100
Commit: Heiko Tietze
CommitDate: Mon Feb 1 11:10:57 2021 +0100
related redmine #3457 Fix ToD link to documentation portal
See https://redmine.documentfoundation.org/issues/3457
Change-Id: I066bfe4ed01a4a607c336d35eec51993fe4565eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110238
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index da73cef5a800..8eb58b5473e8 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -164,7 +164,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as
AutoText. You will be able to insert them by their name, shortcut or toolbar in
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog",
"tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/autotext.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Play music throughout a slideshow by
assigning the sound to the first slide transition without clicking the “Apply
to All Slides” button."), "", "tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME Calc does not calculate from
left to right but respects the order Parentheses – Exponents – Multiplication –
Division – Addition – Subtraction."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Get %PRODUCTNAME documentation and free
user guide books at:"), "http://www.libreoffice.org/get-help/documentation;,
""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Get %PRODUCTNAME documentation and free
user guide books at:"), "https://documentation.libreoffice.org/;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to remove all <> at once and keep the
text inside? Edit ▸ Find and Replace: Search = [<>], Replace = blank and check
“Regular expressions” under Other options."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/0211.html;,
""}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to present a report written with
Writer? File ▸ Send ▸ Outline to Presentation automatically creates a slideshow
from the outline."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to manage the presentation of
hyperlinks in a spreadsheet? Insert them with the HYPERLINK function."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060109.html;,
"tipoftheday_c.png"}, //local help missing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc
cui/inc/toolbarmode.hrc | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 751e4e129e4f35491f029f965a4274a9b7b5e6cc
Author: Stéphane Guillou
AuthorDate: Fri Jan 22 15:38:33 2021 +1000
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Jan 22 14:54:48 2021 +0100
fix typos and reword UI descriptions for clarity
Change-Id: I105af83c1f490ab49e0ba061b08069787ebaa49f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109776
Tested-by: Adolfo Jayme Barrientos
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/toolbarmode.hrc b/cui/inc/toolbarmode.hrc
index 602d066e8fe1..5838d5244da3 100644
--- a/cui/inc/toolbarmode.hrc
+++ b/cui/inc/toolbarmode.hrc
@@ -19,15 +19,15 @@
*/
const std::tuple TOOLBARMODES_ARRAY[] =
{
-{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface with menu, toolbar,
and collapsed sidebar. Intended to user who are familiar with the classic
interface."), "Default", "default.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface but with only one
toolbar. Intended for use on small screens."), "Single", "single.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface with expanded
sidebar. Expert users who want to quickly change many different properties are
advised to use this UI."), "Sidebar", "sidebar.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed user interface is the most
similar to the Ribbons used by Microsoft. It organize functions in tabs and
makes the main menu obsolete."), "notebookbar.ui", "notebookbar.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed Compact variant aims to be
familiar with Microsoft's interface having at the same time a short interface
for small screen sizes."), "notebookbar_compact.ui",
"notebookbar_compact.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar Compact variant provides
access to functions in groups with most frequently used features in icons and
less often used in a dropdown menu. The compact variant favors vertical
size."), "notebookbar_groupedbar_compact.ui",
"notebookbar_groupedbar_compact.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar interface provides access to
functions in groups with most frequently used features in icons and less often
used in a dropdown menu. The full variant favors functions and is slightly
larger than other variants."), "notebookbar_groupedbar_full.ui",
"notebookbar_groupedbar_full.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Single interface shows
functions in a single line toolbar with contextual depending content."),
"notebookbar_single.ui", "notebookbar_single.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Groups interface focus on
beginners. It exposes to the most frequently used functions on groups with the
core action as large icon and a couple of small additional features. All
functions have a label. Depending on the context an additional section provides
access to those functions."), "notebookbar_groups.ui",
"notebookbar_groups.png"},
+{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface with menu, toolbar,
and collapsed sidebar. Intended for users who are familiar with the classic
interface."), "Default", "default.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface but with
single-line toolbar. Intended for use on small screens."), "Single",
"single.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "Standard user interface with expanded
sidebar. Expert users who want to quickly change many different properties are
advised to use this UI."), "Sidebar", "sidebar.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed user interface is the most
similar to the Ribbons used in Microsoft Office. It organizes functions in tabs
and makes the main menu obsolete."), "notebookbar.ui", "notebookbar.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed Compact variant aims to be
familiar with the Microsoft Office interface, yet occupying less space for
smaller screens."), "notebookbar_compact.ui", "notebookbar_compact.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar Compact interface provides
access to functions in groups, with icons for most-frequently used features,
and dropdown menus for others. This compact variant favors vertical space."),
"notebookbar_groupedbar_compact.ui", "notebookbar_groupedbar_compact.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar interface provides access to
functions in groups, with icons for most-frequently used features, and dropdown
menus for others. This full variant favors functions and is slightly larger
than others."), "notebookbar_groupedbar_full.ui",
"notebookbar_groupedbar_full.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Single interface shows
functions in a single-line toolbar with context-dependent content."),
"notebookbar_single.ui", "notebookbar_single.png" },
+{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Groups
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit a182dea0413c467b834f206f9cb91dc3f56acd35
Author: Seth Chaiklin
AuthorDate: Fri Jan 15 13:32:17 2021 +0100
Commit: Seth Chaiklin
CommitDate: Sat Jan 16 08:08:50 2021 +0100
tdf#139533 re-word a tip of the day
Change-Id: I897a5906eb2e2669a3924872695ee2a52bf189c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109342
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 95806eb9bff1..7d0a11aac840 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -50,10 +50,10 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to
File ▸ Print ▸ 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", "Create editable Hybrid PDFs with
%PRODUCTNAME."),
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF;, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can create editable Hybrid PDFs with
%PRODUCTNAME."),
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF;, ""},
{ 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)."), "",
"tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDFs)
with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice;,
"formdocuments.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;,
"formdocuments.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Optimize your table layout with Table ▸
Size ▸ Distribute Rows / Columns Evenly."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
@@ -66,7 +66,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "You can restart the slide show after a
pause specified at Slide Show ▸ Slide Show Settings ▸ Loop and repeat."), "",
"tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To distribute some text in multi-columns
select the text and apply Format ▸ Columns."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use View ▸ Value Highlighting to display
cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected
cells/grey background."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/0308.html;,
"tipoftheday_c.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a
presentation template: View ▸ Master Slide and Slide ▸ New Master (or per
toolbar or right click in slide pane)."), "", "masterdocument.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can create different master pages in a
presentation template: View ▸ Master Slide and Slide ▸ New Master (or per
toolbar or right click in slide pane)."), "", "masterdocument.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to sort a pivot table? Click on
drop-list’s arrow in the row/col header and select sort method: ascending,
descending, or custom."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Display photos or images with different
shapes in Writer. Insert and select shape, then Insert ▸ Image. To adjust
image, right-click on selected shape and choose Area."), "",
"tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use Page/Slide ▸ Properties ▸ “Fit object
to paper format” in Draw/Impress to resize the objects so that they fit on your
chosen paper
[Libreoffice-commits] core.git: cui/inc extras/source vcl/Package_tipoftheday.mk
cui/inc/tipoftheday.hrc |8
extras/source/tipoftheday/formdocuments.png |binary
extras/source/tipoftheday/masterdocument.png |binary
extras/source/tipoftheday/printnote.png |binary
extras/source/tipoftheday/statusbar.png |binary
vcl/Package_tipoftheday.mk |4
6 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit c12bc5757c021f8ba3f802b26805964a11aaa71d
Author: andreas kainz
AuthorDate: Fri Nov 27 08:54:43 2020 +0100
Commit: Andreas Kainz
CommitDate: Fri Nov 27 09:35:38 2020 +0100
tdf#127294 add ToD Previews
Change-Id: Icd049b0ae313e4c3095975a98f8765372fa22abf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106719
Tested-by: Jenkins
Reviewed-by: Andreas Kainz
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f5d06db9657e..95806eb9bff1 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -47,13 +47,13 @@ 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 ▸ Impress tab and select Notes under Document ▸ Type."), "",
"tipoftheday_i.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to
File ▸ Print ▸ 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", "Create editable Hybrid PDFs with
%PRODUCTNAME."),
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF;, ""},
{ 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)."), "",
"tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDFs)
with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice;,
""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDFs)
with %PRODUCTNAME."),
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice;,
"formdocuments.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Cannot see all the text in a cell? Expand
the input line in the formula bar and you can scroll."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Optimize your table layout with Table ▸
Size ▸ Distribute Rows / Columns Evenly."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Find all expressions in brackets per Edit ▸
Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"), "",
"tipoftheday_w.png"},
@@ -66,7 +66,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "You can restart the slide show after a
pause specified at Slide Show ▸ Slide Show Settings ▸ Loop and repeat."), "",
"tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To distribute some text in multi-columns
select the text and apply Format ▸ Columns."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use View ▸ Value Highlighting to display
cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected
cells/grey background."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/0308.html;,
"tipoftheday_c.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a
presentation template: View ▸ Master Slide and Slide ▸ New Master (or per
toolbar or right click in slide pane)."), "", "tipoftheday_i.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a
presentation template: View ▸
[Libreoffice-commits] core.git: cui/inc cui/qa cui/source solenv/clang-format
cui/inc/strings.hxx|2 -
cui/qa/unit/cui-dialogs-test.cxx | 12 ++
cui/qa/unit/cui-dialogs-test_2.cxx |9 +---
cui/qa/unit/cui-dialogs-test_3.cxx |9 +---
cui/qa/unit/cui-dialogs-test_4.cxx |9 +---
cui/source/dialogs/cuiimapwnd.cxx | 12 ++
cui/source/dialogs/cuitbxform.cxx |6 +--
cui/source/dialogs/dlgname.cxx |5 +-
cui/source/dialogs/newtabledlg.cxx |4 +-
cui/source/dialogs/showcols.cxx| 25 ++---
cui/source/factory/cuiexp.cxx | 18 +++--
cui/source/factory/cuiresmgr.cxx |5 --
cui/source/inc/cuifmsearch.hxx | 55 -
cui/source/inc/dlgname.hxx | 17 +++-
cui/source/inc/headertablistbox.hxx|6 +--
cui/source/inc/hlmarkwn_def.hxx|6 +--
cui/source/inc/linkdlg.hxx | 32
cui/source/inc/optasian.hxx| 12 +++---
cui/source/inc/screenshotannotationdlg.hxx |6 +--
cui/source/options/tsaurls.cxx | 26 +++--
solenv/clang-format/excludelist| 20 --
21 files changed, 128 insertions(+), 168 deletions(-)
New commits:
commit ec35fc62993111e4e7dd917e7dbc91ef82b02f74
Author: Philipp Hofer
AuthorDate: Thu Nov 12 12:53:37 2020 +0100
Commit: Christian Lohmaier
CommitDate: Fri Nov 13 15:12:03 2020 +0100
tdf#123936 Formatting files in module cui with clang-format
Change-Id: I473e2950bb9bd53043feeae31a27ae0c2fc7801d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105659
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/cui/inc/strings.hxx b/cui/inc/strings.hxx
index 616a5daa6bcb..5b72f3873df4 100644
--- a/cui/inc/strings.hxx
+++ b/cui/inc/strings.hxx
@@ -9,6 +9,6 @@
#pragma once
-#define RID_SVXSTR_KEY_BASIC_PATH "BASIC"
+#define RID_SVXSTR_KEY_BASIC_PATH "BASIC"
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/cui/qa/unit/cui-dialogs-test.cxx b/cui/qa/unit/cui-dialogs-test.cxx
index f580644e37c9..85f6b5f55bbf 100644
--- a/cui/qa/unit/cui-dialogs-test.cxx
+++ b/cui/qa/unit/cui-dialogs-test.cxx
@@ -44,9 +44,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-CuiDialogsTest::CuiDialogsTest()
-{
-}
+CuiDialogsTest::CuiDialogsTest() {}
void CuiDialogsTest::initialize()
{
@@ -67,19 +65,17 @@ VclPtr
CuiDialogsTest::createDialogByID(sal_uInt32 nID)
{
VclPtr pReturnDialog;
-switch ( nID )
+switch (nID)
{
case 0: // "cui/ui/formatcellsdialog.ui"
{
-pReturnDialog = mpFact->CreateSvxFormatCellsDialog(
-nullptr, mxAttr.get(), *mxModel);
+pReturnDialog = mpFact->CreateSvxFormatCellsDialog(nullptr,
mxAttr.get(), *mxModel);
break;
}
case 1: // "cui/ui/textdialog.ui"
{
-pReturnDialog = mpFact->CreateTextTabDialog(
-nullptr, mxAttr.get(), nullptr);
+pReturnDialog = mpFact->CreateTextTabDialog(nullptr, mxAttr.get(),
nullptr);
break;
}
diff --git a/cui/qa/unit/cui-dialogs-test_2.cxx
b/cui/qa/unit/cui-dialogs-test_2.cxx
index af1b27fc5b78..2f9b07f7d465 100644
--- a/cui/qa/unit/cui-dialogs-test_2.cxx
+++ b/cui/qa/unit/cui-dialogs-test_2.cxx
@@ -36,19 +36,14 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-CuiDialogsTest2::CuiDialogsTest2()
-{
-}
+CuiDialogsTest2::CuiDialogsTest2() {}
void CuiDialogsTest2::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
{
// leave empty should be in CuiDialogTest if any
}
-VclPtr CuiDialogsTest2::createDialogByID(sal_uInt32 /*nID*/)
-{
-return nullptr;
-}
+VclPtr CuiDialogsTest2::createDialogByID(sal_uInt32
/*nID*/) { return nullptr; }
void CuiDialogsTest2::openAnyDialog()
{
diff --git a/cui/qa/unit/cui-dialogs-test_3.cxx
b/cui/qa/unit/cui-dialogs-test_3.cxx
index e369fd11fd39..9c3a09a8d240 100644
--- a/cui/qa/unit/cui-dialogs-test_3.cxx
+++ b/cui/qa/unit/cui-dialogs-test_3.cxx
@@ -36,19 +36,14 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-CuiDialogsTest3::CuiDialogsTest3()
-{
-}
+CuiDialogsTest3::CuiDialogsTest3() {}
void CuiDialogsTest3::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
{
// leave empty should be in CuiDialogTest if any
}
-VclPtr CuiDialogsTest3::createDialogByID(sal_uInt32 /*nID*/)
-{
-return nullptr;
-}
+VclPtr CuiDialogsTest3::createDialogByID(sal_uInt32
/*nID*/) { return nullptr; }
void CuiDialogsTest3::openAnyDialog()
{
diff --git a/cui/qa/unit/cui-dialogs-test_4.cxx
b/cui/qa/unit/cui-dialogs-test_4.cxx
index 7183811b98f1..11820389968c 100644
--- a/cui/qa/unit/cui-dialogs-test_4.cxx
+++ b/cui/qa/unit/cui-dialogs-test_4.cxx
@@ -36,19 +36,14 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-CuiDialogsTest4::CuiDialogsTest4()
-{
-}
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 03cafc2ab6b1678f82e9a30b6f81e505660ee702
Author: Seth Chaiklin
AuthorDate: Mon Nov 9 14:18:53 2020 +0200
Commit: Heiko Tietze
CommitDate: Tue Nov 10 10:06:08 2020 +0100
tdf#127294 - add tip about extended tooltips in dialog boxes (Shift+F1)
Also correct (or translate) a "typo"
Change-Id: Ib3817e03b20372eb8d8b415af22b1677a9747ae1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105462
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 0448f6dd87cc..f5d06db9657e 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -256,7 +256,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Include a paragraph that is not a title in
the table of contents by changing Outline & Numbering in the paragraph settings
to an outline level."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Apart from table of contents, %PRODUCTNAME
can create Alphabetical, Illustrations, Tables, Objects, Bibliography,
User-Defined indexes."), "modules/swriter/ui/tocdialog/TocDialog",
"tipoftheday_w.png"},
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/indices_toc.html
{ NC_("RID_CUI_TIPOFTHEDAY", "Unable to modify or delete a custom cell
style? Check all sheets, none should be protected."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You need to fill a serie? Select the cell
range and Sheet ▸ Fill Cells ▸ Fill Series and choose between Linear, Growth,
Date and AutoFill."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/calc_series.html;,
"tipoftheday_c.png"}, //local help missing
+ { NC_("RID_CUI_TIPOFTHEDAY", "You need to fill a series? Select the cell
range and Sheet ▸ Fill Cells ▸ Fill Series and choose between Linear, Growth,
Date and AutoFill."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/calc_series.html;,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to know if a cell is referred in
formulas of other cells? Tools ▸ Detective ▸ Trace Dependents (Shift+F5)."),
"", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "In the replace input field of auto correct
options you can use the wildcards .*"), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to duplicate the above line? Press
%MOD1+D or use Sheet ▸ Fill Cells ▸ Fill Down."), "", "tipoftheday_c.png"},
@@ -268,6 +268,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Drag a formatted object to the Styles and
Formatting window. A dialog box opens, just enter the name of the new style."),
"", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "New versions of %PRODUCTNAME provide new
features, bug fixes, and security patches. Keep your software updated!"),
"SFX2_HID_DLG_CHECKFORONLINEUPDATE", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and XML filters?"),
"http://fridrich.blogspot.com.tr/2013/08/extending-swiss-army-knife-overview.html;,
""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Press Shift+F1 to see any available
extended tooltips in dialog boxes, when \"Extended tips\" is not enabled in
Tools ▸ Options ▸ %PRODUCTNAME ▸ General."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/05/0120.html;,
""},
};
#define STR_HELP_LINK NC_("STR_HELP_LINK", "%PRODUCTNAME
Help")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig extras/source vcl/Package_tipoftheday.mk
cui/inc/tipoftheday.hrc|2
cui/source/dialogs/tipofthedaydlg.cxx | 28 --
cui/source/inc/tipofthedaydlg.hxx |7 ++
cui/uiconfig/ui/tipofthedaydialog.ui | 79 +
extras/source/tipoftheday/marchingants.gif |binary
vcl/Package_tipoftheday.mk |1
6 files changed, 56 insertions(+), 61 deletions(-)
New commits:
commit 92ab0afa1c36bfbc99de25a53a108b6f28e0e627
Author: Heiko Tietze
AuthorDate: Fri Oct 23 13:30:17 2020 +0200
Commit: Heiko Tietze
CommitDate: Sat Oct 24 10:12:08 2020 +0200
Show animated GIFs in TotD
marchingants.gif added as an example
Change-Id: I555aebc4a4e191b8afb4be06dfc1e5f3e6d1a911
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104718
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index e78d4aaa019d..0448f6dd87cc 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -133,7 +133,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Date/time value is just a number of days
since a chosen day zero; in the number, integer part represents date, and
fractional part is time (elapsed part of a day), with 0.5 representing noon."),
"", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Shift+%MOD1+Del deletes from cursor to the
end of the current sentence."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use column or row labels in formulas. For
example, if you have two columns, “Time” and “KM”, use =Time/KM to get minutes
per kilometer."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the “marching ants” around cells
in Calc? Press escape to stop them; the copied content will remain available
for pasting."), "", "tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the “marching ants” around cells
in Calc? Press escape to stop them; the copied content will remain available
for pasting."), "", "marchingants.gif"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to become a %PRODUCTNAME Ambassador?
There are certifications for developers, admins, and trainers."),
"http://www.documentfoundation.org/certification;, ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in
a Calc spreadsheet by applying different page styles on sheets."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the
toolbar to get quick access to favorite and recent characters to insert."), "",
""},
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx
b/cui/source/dialogs/tipofthedaydlg.cxx
index beed468ba5b6..b88369890529 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -25,8 +25,6 @@
#include
#include
#include
-#include
-#include
#include
#include
@@ -46,11 +44,11 @@
TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
: GenericDialogController(pParent, "cui/ui/tipofthedaydialog.ui",
"TipOfTheDayDialog")
-, m_pImage(m_xBuilder->weld_image("imImage"))
, m_pText(m_xBuilder->weld_label("lbText"))
, m_pShowTip(m_xBuilder->weld_check_button("cbShowTip"))
, m_pNext(m_xBuilder->weld_button("btnNext"))
, m_pLink(m_xBuilder->weld_link_button("btnLink"))
+, m_pPreview(new weld::CustomWeld(*m_xBuilder, "imPreview", m_aPreview))
{
m_pShowTip->set_active(officecfg::Office::Common::Misc::ShowTipOfTheDay::get());
m_pNext->connect_clicked(LINK(this, TipOfTheDayDialog, OnNextClick));
@@ -62,6 +60,8 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
if (m_nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
m_nCurrentTip++;
+m_aPreview.init(_aGraphic, LINK(this, TipOfTheDayDialog, ImplModifyHdl));
+
UpdateTip();
}
@@ -172,20 +172,16 @@ void TipOfTheDayDialog::UpdateTip()
// image
OUString aURL("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/tipoftheday/");
rtl::Bootstrap::expandMacros(aURL);
-OUString aImage = sImage;
+OUString aImageName = sImage;
// use default image if none is available with the number
-if (aImage.isEmpty() || !file_exists(aURL + aImage))
-aImage = "tipoftheday.png";
-// draw image
-Graphic aGraphic;
-if (GraphicFilter::LoadGraphic(aURL + aImage, OUString(), aGraphic) ==
ERRCODE_NONE)
-{
-ScopedVclPtr m_pVirDev =
m_pImage->create_virtual_device();
-m_pVirDev->SetOutputSizePixel(aGraphic.GetSizePixel());
-m_pVirDev->DrawBitmapEx(Point(0, 0), aGraphic.GetBitmapEx());
-m_pImage->set_image(m_pVirDev.get());
-m_pVirDev.disposeAndClear();
-}
+if (aImageName.isEmpty() || !file_exists(aURL + aImageName))
+aImageName = "tipoftheday.png";
+GraphicFilter::LoadGraphic(aURL + aImageName, OUString(), m_aGraphic);
+}
+
[Libreoffice-commits] core.git: cui/inc cui/source framework/uiconfig officecfg/registry
cui/inc/tipoftheday.hrc |1
cui/source/dialogs/tipofthedaydlg.cxx| 48
+-
framework/uiconfig/startmodule/menubar/menubar.xml |1
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3
4 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit 31763e5af060f598c1699662adefe43f13d4db0e
Author: Heiko Tietze
AuthorDate: Tue Oct 20 12:11:20 2020 +0200
Commit: Heiko Tietze
CommitDate: Thu Oct 22 11:50:39 2020 +0200
Resolves tdf#137607 and tdf#137500 - Improvements to TotD
Shows tooltip for UNO commands
Check if the UNO command is available in the current module
Don't show the menu entry on the start center
Change-Id: I5c67ec3f8543b5442a6e2c2a478bfeb4ec0e1f3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104558
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 33b551ecc2fc..e78d4aaa019d 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -32,6 +32,7 @@
* uri:
* if uri is empty, do not show any link
* if uri starts with "http", show the link directly in the browser
+ * if uri starts with ".uno:", run the command if available in the current
module
* all other strings are converted to a link for the offline help
* to find the right uri, look in instdir/help/hid2file.js after building
--with-help=html
* structure of hid2file.js 'uri' : 'rest of URL' (that starts:
https://help.libreoffice.org/latest/en-US/)
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx
b/cui/source/dialogs/tipofthedaydlg.cxx
index 88b61a8d0b2b..beed468ba5b6 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -21,11 +21,19 @@
#include
#include
+#include
+#include
#include
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+
#include
#include
#include
@@ -105,10 +113,42 @@ void TipOfTheDayDialog::UpdateTip()
}
else if (sLink.startsWith(".uno:"))
{
-m_pLink->set_uri(sLink);
-m_pLink->set_label(CuiResId(STR_UNO_LINK));
-m_pLink->set_visible(true);
-m_pLink->connect_activate_link(LINK(this, TipOfTheDayDialog,
OnLinkClick));
+m_pLink->set_visible(false);
+//show the link only if the UNO command is available in the current
module
+SfxViewFrame* pViewFrame = SfxViewFrame::Current();
+if (pViewFrame)
+{
+const auto xFrame = pViewFrame->GetFrame().GetFrameInterface();
+const css::uno::Reference
xDispatchProvider(
+xFrame, css::uno::UNO_QUERY);
+if (xDispatchProvider.is())
+{
+css::util::URL aCommandURL;
+aCommandURL.Complete = sLink;
+const css::uno::Reference xContext
+= comphelper::getProcessComponentContext();
+const css::uno::Reference xParser
+= css::util::URLTransformer::create(xContext);
+xParser->parseStrict(aCommandURL);
+const css::uno::Reference xDisp
+= xDispatchProvider->queryDispatch(aCommandURL,
OUString(), 0);
+if (xDisp.is())
+{
+m_pLink->set_label(CuiResId(STR_UNO_LINK));
+m_pLink->set_uri(sLink);
+
+const OUString aModuleName(
+vcl::CommandInfoProvider::GetModuleIdentifier(xFrame));
+const auto aProperties
+=
vcl::CommandInfoProvider::GetCommandProperties(sLink, aModuleName);
+m_pLink->set_tooltip_text(
+vcl::CommandInfoProvider::GetTooltipForCommand(sLink,
aProperties, xFrame));
+
+m_pLink->set_visible(true);
+m_pLink->connect_activate_link(LINK(this,
TipOfTheDayDialog, OnLinkClick));
+}
+}
+}
}
else if (sLink.startsWith("http"))
{
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml
b/framework/uiconfig/startmodule/menubar/menubar.xml
index eb0532080155..96ac15d10f81 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -61,7 +61,6 @@
-
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 240a86d8487e..d7e9837838ad 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6233,6 +6233,9 @@
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/tipoftheday.hrc |1
cui/source/dialogs/tipofthedaydlg.cxx | 81 +-
cui/source/inc/tipofthedaydlg.hxx |5 --
3 files changed, 33 insertions(+), 54 deletions(-)
New commits:
commit 1d66b9970b7ecf8d8e144cfa3b2fbb7ce3dd1a08
Author: Heiko Tietze
AuthorDate: Thu Oct 15 12:18:28 2020 +0200
Commit: Mike Kaganski
CommitDate: Tue Oct 20 11:18:35 2020 +0200
Beautification of code and fix for on-/offline help
Change-Id: I0c731f2c472ceb435f529956011a7fd5a00a27ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104358
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index acb7bdd15d3e..33b551ecc2fc 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -272,7 +272,6 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
#define STR_HELP_LINK NC_("STR_HELP_LINK", "%PRODUCTNAME
Help")
#define STR_MORE_LINK NC_("STR_MORE_LINK", "More info")
#define STR_UNO_LINKNC_("STR_UNO_LINK", "Run this action
now...")
-#define STR_UNO_EXECUTE NC_("STR_UNO_EXECUTE", "Execute the
command %COMMAND") //tooltip for STR_UNO_LINK
#define STR_TITLE NC_("STR_TITLE", "Tip of the Day:
%CURRENT/%TOTAL")
#define STR_CMD NC_("STR_CMD", "⌘ Cmd") //use narrow
no-break space U+202F here
#define STR_CTRLNC_("STR_CTRL", "Ctrl")
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx
b/cui/source/dialogs/tipofthedaydlg.cxx
index 005584027547..88b61a8d0b2b 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -47,12 +47,12 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
m_pShowTip->set_active(officecfg::Office::Common::Misc::ShowTipOfTheDay::get());
m_pNext->connect_clicked(LINK(this, TipOfTheDayDialog, OnNextClick));
-nCurrentTip = officecfg::Office::Common::Misc::LastTipOfTheDayID::get();
+m_nCurrentTip = officecfg::Office::Common::Misc::LastTipOfTheDayID::get();
const auto t0 = std::chrono::system_clock::now().time_since_epoch();
-nDay = std::chrono::duration_cast(t0).count() / 24;
//days since 1970-01-01
-if (nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
-nCurrentTip++;
+m_nDay = std::chrono::duration_cast(t0).count() / 24;
+if (m_nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
+m_nCurrentTip++;
UpdateTip();
}
@@ -61,8 +61,8 @@ TipOfTheDayDialog::~TipOfTheDayDialog()
{
std::shared_ptr xChanges(
comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::LastTipOfTheDayShown::set(nDay, xChanges);
-officecfg::Office::Common::Misc::LastTipOfTheDayID::set(nCurrentTip,
xChanges);
+officecfg::Office::Common::Misc::LastTipOfTheDayShown::set(m_nDay,
xChanges);
+officecfg::Office::Common::Misc::LastTipOfTheDayID::set(m_nCurrentTip,
xChanges);
officecfg::Office::Common::Misc::ShowTipOfTheDay::set(m_pShowTip->get_active(),
xChanges);
xChanges->commit();
}
@@ -77,16 +77,17 @@ void TipOfTheDayDialog::UpdateTip()
{
constexpr sal_Int32 nNumberOfTips =
SAL_N_ELEMENTS(TIPOFTHEDAY_STRINGARRAY);
-if ((nCurrentTip >= nNumberOfTips) || (nCurrentTip < 0))
-nCurrentTip = 0;
+if ((m_nCurrentTip >= nNumberOfTips) || (m_nCurrentTip < 0))
+m_nCurrentTip = 0;
//title
m_xDialog->set_title(CuiResId(STR_TITLE)
- .replaceFirst("%CURRENT",
OUString::number(nCurrentTip + 1))
+ .replaceFirst("%CURRENT",
OUString::number(m_nCurrentTip + 1))
.replaceFirst("%TOTAL",
OUString::number(nNumberOfTips)));
+auto[sTip, sLink, sImage] = TIPOFTHEDAY_STRINGARRAY[m_nCurrentTip];
+
// text
-OUString aText =
CuiResId(std::get<0>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]));
//replace MOD1 & MOD2 shortcuts depending on platform
#ifdef MACOSX
const OUString aMOD1 = CuiResId(STR_CMD);
@@ -95,64 +96,43 @@ void TipOfTheDayDialog::UpdateTip()
const OUString aMOD1 = CuiResId(STR_CTRL);
const OUString aMOD2 = CuiResId(STR_Alt);
#endif
-sal_Int32 aPos;
-aPos = aText.indexOf("%MOD1");
-while (aPos != -1)
-{
-aText = aText.replaceAt(aPos, 5, aMOD1);
-aPos = aText.indexOf("%MOD1");
-}
-aPos = aText.indexOf("%MOD2");
-while (aPos != -1)
-{
-aText = aText.replaceAt(aPos, 5, aMOD2);
-aPos = aText.indexOf("%MOD2");
-}
-m_pText->set_label(aText);
+m_pText->set_label(CuiResId(sTip).replaceAll("%MOD1",
aMOD1).replaceAll("%MOD2", aMOD2));
// hyperlink
-aLink = std::get<1>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]);
-if (aLink.isEmpty())
+if (sLink.isEmpty())
{
m_pLink->set_visible(false);
}
-
[Libreoffice-commits] core.git: cui/inc cui/source officecfg/registry
cui/inc/tipoftheday.hrc|2 -
cui/source/dialogs/tipofthedaydlg.cxx | 17 +++--
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 -
3 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 728548f8d7698d06c21ae37b2e03fa8e73676341
Author: Heiko Tietze
AuthorDate: Wed Oct 14 12:38:44 2020 +0200
Commit: Heiko Tietze
CommitDate: Wed Oct 14 15:09:28 2020 +0200
Fixes to TipOfTheDay dialog
* Reverts 231a4e024b85aa0ad06a5632d3f514152babea30 and sets
initial value to -1 to start from zero
* Improves translatability of string
Change-Id: Ib541a72fa3f6eecdf5bbdf17ce2a4e56ff90c397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104276
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f464a1f3d936..acb7bdd15d3e 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -273,7 +273,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
#define STR_MORE_LINK NC_("STR_MORE_LINK", "More info")
#define STR_UNO_LINKNC_("STR_UNO_LINK", "Run this action
now...")
#define STR_UNO_EXECUTE NC_("STR_UNO_EXECUTE", "Execute the
command %COMMAND") //tooltip for STR_UNO_LINK
-#define STR_TITLE NC_("STR_TITLE", "Tip of the Day")
+#define STR_TITLE NC_("STR_TITLE", "Tip of the Day:
%CURRENT/%TOTAL")
#define STR_CMD NC_("STR_CMD", "⌘ Cmd") //use narrow
no-break space U+202F here
#define STR_CTRLNC_("STR_CTRL", "Ctrl")
#define STR_Alt NC_("STR_CMD", "Alt")
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx
b/cui/source/dialogs/tipofthedaydlg.cxx
index ee4a9edebb50..d4f7d8f1c860 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -76,13 +76,16 @@ static bool file_exists(const OUString& fileName)
void TipOfTheDayDialog::UpdateTip()
{
-if ((nCurrentTip > nNumberOfTips) || (nCurrentTip < 1))
-nCurrentTip = 1;
-m_xDialog->set_title(CuiResId(STR_TITLE) + ": " +
OUString::number(nCurrentTip) + "/"
- + OUString::number(nNumberOfTips));
+if ((nCurrentTip >= nNumberOfTips) || (nCurrentTip < 0))
+nCurrentTip = 0;
+
+//title
+m_xDialog->set_title(CuiResId(STR_TITLE)
+ .replaceFirst("%CURRENT",
OUString::number(nCurrentTip + 1))
+ .replaceFirst("%TOTAL",
OUString::number(nNumberOfTips)));
// text
-OUString aText = CuiResId(std::get<0>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip
- 1]));
+OUString aText =
CuiResId(std::get<0>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]));
//replace MOD1 & MOD2 shortcuts depending on platform
#ifdef MACOSX
const OUString aMOD1 = CuiResId(STR_CMD);
@@ -107,7 +110,7 @@ void TipOfTheDayDialog::UpdateTip()
m_pText->set_label(aText);
// hyperlink
-aLink = std::get<1>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip - 1]);
+aLink = std::get<1>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]);
if (aLink.isEmpty())
{
m_pLink->set_visible(false);
@@ -148,7 +151,7 @@ void TipOfTheDayDialog::UpdateTip()
// image
OUString aURL("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/tipoftheday/");
rtl::Bootstrap::expandMacros(aURL);
-OUString aImage = std::get<2>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip - 1]);
+OUString aImage = std::get<2>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]);
// use default image if none is available with the number
if (aImage.isEmpty() || !file_exists(aURL + aImage))
aImage = "tipoftheday.png";
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b5bcb9c8bde0..f0420ec158cd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5621,7 +5621,7 @@
The last shown Tip-of-the-Day.
- 0
+ -1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/toolbarmode.hrc |4 ++--
cui/source/dialogs/toolbarmodedlg.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c35db66435cfecaa957b469d96ca70a31187a224
Author: Heiko Tietze
AuthorDate: Tue Oct 13 13:02:57 2020 +0200
Commit: Heiko Tietze
CommitDate: Tue Oct 13 14:46:27 2020 +0200
Resolves tdf#137424 - UI Picker missing 'Contextual single'
Exclusion by experimental on/off updated
Change-Id: I714b8ffc5a148d09607ab20763b6d35de2a9e2be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104231
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/toolbarmode.hrc b/cui/inc/toolbarmode.hrc
index 7e7510b08eda..602d066e8fe1 100644
--- a/cui/inc/toolbarmode.hrc
+++ b/cui/inc/toolbarmode.hrc
@@ -31,7 +31,7 @@ const std::tuple
TOOLBARMODES_ARRAY[] =
};
//hide experimental UIs
-constexpr int nContextSingle = 7;
-constexpr int nContextGroup = 8;
+constexpr int nGroupedbarFull = 6;
+constexpr int nContextualGroups = 8;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/toolbarmodedlg.cxx
b/cui/source/dialogs/toolbarmodedlg.cxx
index 21bd7055bd96..7362ad22e54b 100644
--- a/cui/source/dialogs/toolbarmodedlg.cxx
+++ b/cui/source/dialogs/toolbarmodedlg.cxx
@@ -118,8 +118,8 @@ ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent)
if (!SvtMiscOptions().IsExperimentalMode())
{
-m_pRadioButtons[nContextSingle]->set_visible(false);
-m_pRadioButtons[nContextGroup]->set_visible(false);
+m_pRadioButtons[nGroupedbarFull]->set_visible(false);
+m_pRadioButtons[nContextualGroups]->set_visible(false);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig icon-themes/breeze icon-themes/breeze_dark icon-themes/colibre icon-themes/elementary icon-themes/karasa_jaga icon-themes/sifr icon-them
cui/inc/strings.hrc|2
cui/source/dialogs/AdditionsDialog.cxx | 58 +++-
cui/source/inc/AdditionsDialog.hxx |3
cui/uiconfig/ui/additionsdialog.ui | 31 +-
cui/uiconfig/ui/additionsfragment.ui | 402 +++--
icon-themes/breeze/links.txt |3
icon-themes/breeze_dark/links.txt |3
icon-themes/colibre/links.txt |3
icon-themes/elementary/links.txt |3
icon-themes/karasa_jaga/links.txt |2
icon-themes/sifr/links.txt |3
icon-themes/sifr_dark/links.txt|3
icon-themes/sukapura/links.txt |3
13 files changed, 317 insertions(+), 202 deletions(-)
New commits:
commit 479363562b2148481b3808250575379ca2c9c37e
Author: Heiko Tietze
AuthorDate: Thu Oct 8 11:29:10 2020 +0200
Commit: Heiko Tietze
CommitDate: Mon Oct 12 16:59:52 2020 +0200
Resolves tdf#135270 - Make the tight extensions dialog shiny
Information rearranged, empty icons instead of hidden,
background and scaling of thumbnail
Change-Id: Iae095134a717cb50670bf5d1786774c6424d283e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104079
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index e96e76e85fd2..19b7730b60a4 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -394,8 +394,6 @@
#define RID_SVXSTR_ADDITIONS_INSTALLBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
#define RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON", "Installed")
#define RID_SVXSTR_ADDITIONS_INSTALLING
NC_("RID_SVXSTR_ADDITIONS_INSTALLING", "Installing")
-#define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
-#define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
#define RID_SVXSTR_ADDITIONS_SEARCHING
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
#define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
#define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index 7d5d953ad976..ad8f5de0928b 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -282,6 +282,8 @@ bool getPreviewFile(const AdditionInfo& aAdditionInfo,
OUString& sPreviewFile)
void LoadImage(const OUString& rPreviewFile, std::shared_ptr
pCurrentItem)
{
+const sal_Int8 Margin = 6;
+
SolarMutexGuard aGuard;
GraphicFilter aFilter;
@@ -292,11 +294,30 @@ void LoadImage(const OUString& rPreviewFile,
std::shared_ptr pCur
// for VCL to be able to create bitmaps / do visual changes in the thread
aFilter.ImportGraphic(aGraphic, aURLObj);
BitmapEx aBmp = aGraphic.GetBitmapEx();
+Size aBmpSize = aBmp.GetSizePixel();
+Size aThumbSize(pCurrentItem->m_xImageScreenshot->get_size_request());
+if (!aBmp.IsEmpty())
+{
+double aScale;
+if (aBmpSize.Width() > aThumbSize.Width() - 2 * Margin)
+{
+aScale = static_cast(aBmpSize.Width()) /
(aThumbSize.Width() - 2 * Margin);
+aBmp.Scale(Size(aBmpSize.Width() / aScale, aBmpSize.Height() /
aScale));
+}
+else if (aBmpSize.Height() > aThumbSize.Height() - 2 * Margin)
+{
+aScale = static_cast(aBmpSize.Height()) /
(aThumbSize.Height() - 2 * Margin);
+aBmp.Scale(Size(aBmpSize.Width() / aScale, aBmpSize.Height() /
aScale));
+};
+aBmpSize = aBmp.GetSizePixel();
+}
ScopedVclPtr xVirDev =
pCurrentItem->m_xImageScreenshot->create_virtual_device();
-xVirDev->SetOutputSizePixel(aBmp.GetSizePixel());
-xVirDev->DrawBitmapEx(Point(0, 0), aBmp);
-
+xVirDev->SetOutputSizePixel(aThumbSize);
+//white background since images come with a white border
+xVirDev->SetBackground(Wallpaper(COL_WHITE));
+xVirDev->Erase();
+xVirDev->DrawBitmapEx(Point(aThumbSize.Width() / 2 - aBmpSize.Width() / 2,
Margin), aBmp);
pCurrentItem->m_xImageScreenshot->set_image(xVirDev.get());
xVirDev.disposeAndClear();
}
@@ -606,12 +627,13 @@ AdditionsItem::AdditionsItem(weld::Widget* pParent,
AdditionsDialog* pParentDial
, m_xContainer(m_xBuilder->weld_widget("additionsEntry"))
, m_xImageScreenshot(m_xBuilder->weld_image("imageScreenshot"))
, m_xButtonInstall(m_xBuilder->weld_button("buttonInstall"))
-, m_xLinkButtonName(m_xBuilder->weld_link_button("linkButtonName"))
+, m_xLinkButtonWebsite(m_xBuilder->weld_link_button("btnWebsite"))
+, m_xLabelName(m_xBuilder->weld_label("lbName"))
, m_xLabelAuthor(m_xBuilder->weld_label("labelAuthor"))
,
[Libreoffice-commits] core.git: cui/inc
cui/inc/toolbarmode.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e116efdeff09e8ce9a45d459af53216015cd5347
Author: Andrea Gelmini
AuthorDate: Wed Oct 7 23:02:30 2020 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Oct 9 21:26:33 2020 +0200
Fix typo
Change-Id: I25b9d697de27d9d4222a0e0e59f28f8a3457b469
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104075
Tested-by: Jenkins
Reviewed-by: Julien Nabet
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/toolbarmode.hrc b/cui/inc/toolbarmode.hrc
index 25de3b569cdf..7e7510b08eda 100644
--- a/cui/inc/toolbarmode.hrc
+++ b/cui/inc/toolbarmode.hrc
@@ -25,7 +25,7 @@ const std::tuple
TOOLBARMODES_ARRAY[] =
{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed user interface is the most
similar to the Ribbons used by Microsoft. It organize functions in tabs and
makes the main menu obsolete."), "notebookbar.ui", "notebookbar.png"},
{ NC_("RID_CUI_TOOLBARMODES", "The Tabbed Compact variant aims to be
familiar with Microsoft's interface having at the same time a short interface
for small screen sizes."), "notebookbar_compact.ui",
"notebookbar_compact.png"},
{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar Compact variant provides
access to functions in groups with most frequently used features in icons and
less often used in a dropdown menu. The compact variant favors vertical
size."), "notebookbar_groupedbar_compact.ui",
"notebookbar_groupedbar_compact.png"},
-{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar interface provides access to
functions in groups with most frequently used features in icons and less often
used in a dropdown menu. The full variant favors functions and is slighly
larger than other variants."), "notebookbar_groupedbar_full.ui",
"notebookbar_groupedbar_full.png"},
+{ NC_("RID_CUI_TOOLBARMODES", "The Groupedbar interface provides access to
functions in groups with most frequently used features in icons and less often
used in a dropdown menu. The full variant favors functions and is slightly
larger than other variants."), "notebookbar_groupedbar_full.ui",
"notebookbar_groupedbar_full.png"},
{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Single interface shows
functions in a single line toolbar with contextual depending content."),
"notebookbar_single.ui", "notebookbar_single.png"},
{ NC_("RID_CUI_TOOLBARMODES", "The Contextual Groups interface focus on
beginners. It exposes to the most frequently used functions on groups with the
core action as large icon and a couple of small additional features. All
functions have a label. Depending on the context an additional section provides
access to those functions."), "notebookbar_groups.ui",
"notebookbar_groups.png"},
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source include/sfx2 officecfg/registry Repository.mk sfx2/sdi sfx2/source solenv/sanitizer
Repository.mk|1
cui/Library_cui.mk |1
cui/UIConfig_cui.mk |1
cui/inc/strings.hrc |2
cui/inc/tipoftheday.hrc |3
cui/inc/toolbarmode.hrc | 37
cui/source/dialogs/tipofthedaydlg.cxx| 31
cui/source/dialogs/toolbarmodedlg.cxx| 214
+
cui/source/factory/dlgfact.cxx |8
cui/source/factory/dlgfact.hxx |2
cui/source/inc/toolbarmodedlg.hxx| 33
cui/uiconfig/ui/toolbarmodedialog.ui | 381
++
extras/source/tipoftheday/toolbarmode.png|binary
extras/source/toolbarmode/default.png|binary
extras/source/toolbarmode/notebookbar.png|binary
extras/source/toolbarmode/notebookbar_compact.png|binary
extras/source/toolbarmode/notebookbar_groupedbar_compact.png |binary
extras/source/toolbarmode/notebookbar_groupedbar_full.png|binary
extras/source/toolbarmode/notebookbar_groups.png |binary
extras/source/toolbarmode/notebookbar_single.png |binary
extras/source/toolbarmode/sidebar.png|binary
extras/source/toolbarmode/single.png |binary
include/sfx2/sfxdlg.hxx |2
include/sfx2/sfxsids.hrc |1
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8
sfx2/sdi/appslots.sdi|4
sfx2/sdi/sfx.sdi | 16
sfx2/source/appl/appserv.cxx |9
solenv/sanitizers/ui/cui.suppr |1
vcl/Module_vcl.mk|1
vcl/Package_tipoftheday.mk |1
vcl/Package_toolbarmode.mk | 24
32 files changed, 775 insertions(+), 6 deletions(-)
New commits:
commit ed8df0ec6ed1af600a4d31223d5bfc3f65c5d7ba
Author: Heiko Tietze
AuthorDate: Sun Aug 2 17:10:00 2020 +0200
Commit: Heiko Tietze
CommitDate: Wed Oct 7 18:02:06 2020 +0200
Resolves tdf#117463 - Dialog to show UI options
* New dialog to pick and apply one of the UI variants
* Tip-of-the-Day enhanced to execute UNO commands in order
to advertise the UI chooser on first start
Change-Id: I5e5c4a8e0fb11d11bafc99cc37b7ec244a993781
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99957
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/Repository.mk b/Repository.mk
index 4e5d64efba34..08061a692087 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -939,6 +939,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
wizards_properties \
wizards_wizardshare \
tipoftheday_images \
+ toolbarmode_images \
vcl_opengl_shader \
vcl_theme_definitions \
$(if $(filter WNT,$(OS)), \
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index ec2d222a34d9..1d1f0feb9ea8 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/splitcelldlg \
cui/source/dialogs/srchxtra \
cui/source/dialogs/thesdlg \
+cui/source/dialogs/toolbarmodedlg \
cui/source/dialogs/zoom \
cui/source/factory/cuiexp \
cui/source/factory/cuiresmgr \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index a6dcd3bfb88f..153d6fe98fda 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -203,6 +203,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/textdialog \
cui/uiconfig/ui/textflowpage \
cui/uiconfig/ui/thesaurus \
+ cui/uiconfig/ui/toolbarmodedialog \
cui/uiconfig/ui/transparencytabpage \
cui/uiconfig/ui/tsaurldialog \
cui/uiconfig/ui/twolinespage \
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index fb43379f1d8b..e96e76e85fd2 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -400,4 +400,6 @@
#define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
#define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
+#define RID_SVXSTR_UI_APPLYALL
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/bitmaps.hlst |5 + cui/inc/numcategories.hrc |5 + cui/inc/strings.hrc|4 +--- cui/inc/strings.hxx|5 + cui/inc/tipoftheday.hrc|5 + cui/inc/treeopt.hrc|5 + cui/inc/twolines.hrc |5 + cui/source/factory/dlgfact.hxx |5 + cui/source/inc/DiagramDialog.hxx |5 + cui/source/inc/FontFeaturesDialog.hxx |5 + cui/source/inc/QrCodeGenDialog.hxx |5 + cui/source/inc/SignSignatureLineDialog.hxx |5 + cui/source/inc/SignatureLineDialog.hxx |5 + cui/source/inc/SignatureLineDialogBase.hxx |5 + cui/source/inc/SpellDialog.hxx |5 + cui/source/inc/about.hxx |5 + cui/source/inc/align.hxx |5 + cui/source/inc/autocdlg.hxx|5 + cui/source/inc/backgrnd.hxx|5 + cui/source/inc/bbdlg.hxx |5 + cui/source/inc/border.hxx |5 + cui/source/inc/cfgutil.hxx |5 + cui/source/inc/chardlg.hxx |5 + cui/source/inc/connect.hxx |5 + cui/source/inc/cuifmsearch.hxx |5 + cui/source/inc/cuigaldlg.hxx |5 + cui/source/inc/cuigrfflt.hxx |5 + cui/source/inc/cuihyperdlg.hxx |5 + cui/source/inc/cuiimapwnd.hxx |5 + cui/source/inc/cuioptgenrl.hxx |5 + cui/source/inc/cuisrchdlg.hxx |5 + cui/source/inc/cuitabarea.hxx |5 + cui/source/inc/cuitabline.hxx |5 + cui/source/inc/cuitbxform.hxx |5 + cui/source/inc/dbregister.hxx |5 + cui/source/inc/defdlgname.hxx |5 + cui/source/inc/dlgname.hxx |5 + cui/source/inc/dstribut.hxx|5 + cui/source/inc/grfpage.hxx |5 + cui/source/inc/hangulhanjadlg.hxx |5 + cui/source/inc/headertablistbox.hxx|5 + cui/source/inc/helpids.h |5 + cui/source/inc/hldocntp.hxx|5 + cui/source/inc/hldoctp.hxx |5 + cui/source/inc/hlinettp.hxx|5 + cui/source/inc/hlmailtp.hxx|5 + cui/source/inc/hlmarkwn.hxx|5 + cui/source/inc/hlmarkwn_def.hxx|5 + cui/source/inc/hltpbase.hxx|5 + cui/source/inc/hyphen.hxx |5 + cui/source/inc/iconcdlg.hxx|5 + cui/source/inc/insdlg.hxx |5 + cui/source/inc/insrc.hxx |5 + cui/source/inc/labdlg.hxx |5 + cui/source/inc/linkdlg.hxx |5 + cui/source/inc/macroass.hxx|5 + cui/source/inc/macropg.hxx |5 + cui/source/inc/measure.hxx |5 + cui/source/inc/multipat.hxx|5 + cui/source/inc/newtabledlg.hxx |5 + cui/source/inc/numfmt.hxx |5 + cui/source/inc/numpages.hxx|5 + cui/source/inc/optasian.hxx|5 + cui/source/inc/optdict.hxx |5 + cui/source/inc/optlingu.hxx|5 + cui/source/inc/optpath.hxx |5 + cui/source/inc/page.hxx|5 + cui/source/inc/paragrph.hxx|5 + cui/source/inc/passwdomdlg.hxx |5 + cui/source/inc/pastedlg.hxx|5 + cui/source/inc/postdlg.hxx |5 + cui/source/inc/screenshotannotationdlg.hxx |5 + cui/source/inc/scriptdlg.hxx |5 + cui/source/inc/sdrcelldlg.hxx |5 + cui/source/inc/showcols.hxx|5 + cui/source/inc/splitcelldlg.hxx|5 + cui/source/inc/srchxtra.hxx|5 + cui/source/inc/swpossizetabpage.hxx|5 + cui/source/inc/tabstpge.hxx|5 + cui/source/inc/textanim.hxx|5 + cui/source/inc/textattr.hxx|5 + cui/source/inc/thesdlg.hxx |5 + cui/source/inc/tipofthedaydlg.hxx |5 + cui/source/inc/transfrm.hxx|5 + cui/source/inc/treeopt.hxx |5 + cui/source/inc/zoom.hxx|5 + cui/source/options/optbasic.hxx|5 + cui/source/options/optchart.hxx
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc|3 ++-
cui/source/dialogs/AdditionsDialog.cxx | 19 ++-
2 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 627e13079adb5ff6281530c9584da9065d6410ab
Author: Muhammet Kara
AuthorDate: Fri Sep 11 00:44:03 2020 +0300
Commit: Muhammet Kara
CommitDate: Fri Sep 11 10:26:38 2020 +0200
Additions: Clean-up and localize labels
Change-Id: I7073df0d277399745a9c7e0de4d240121ce7b37b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102410
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index d1b39a67e541..92f5b665c7ee 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -393,11 +393,12 @@
#define RID_SVXSTR_DELETEUSERCOLOR2
NC_("RID_SVXSTR_DELETEUSERCOLOR2", "Please select the color to delete")
#define RID_SVXSTR_ADDITIONS_INSTALLBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
+#define RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON", "Installed")
+#define RID_SVXSTR_ADDITIONS_INSTALLING
NC_("RID_SVXSTR_ADDITIONS_INSTALLING", "Installing")
#define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
#define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
#define RID_SVXSTR_ADDITIONS_SEARCHING
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
#define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
-#define RID_SVXSTR_ADDITIONS_NORESULTS
NC_("ID_SVXSTR_ADDITIONS_NORESULTS", "No results found")
#define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
#endif
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index fcae696e7e5f..c9b70b2bf908 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -408,7 +408,8 @@ void SearchAndParseThread::CheckInstalledExtensions()
else
{
rInfo->m_xButtonInstall->set_sensitive(false);
-rInfo->m_xButtonInstall->set_label("Installed");
+rInfo->m_xButtonInstall->set_label(
+CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));
}
}
}
@@ -756,14 +757,14 @@ IMPL_LINK_NOARG(AdditionsItem, ShowMoreHdl,
weld::Button&, void)
IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, void)
{
-m_xButtonInstall->set_label("Installing");
+m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLING));
m_xButtonInstall->set_sensitive(false);
OUString aExtensionFile;
bool bResult = getExtensionFile(aExtensionFile); // info vector json data
if (!bResult)
{
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
m_xButtonInstall->set_sensitive(true);
SAL_INFO("cui.dialogs", "Couldn't get the extension file.");
@@ -778,36 +779,36 @@ IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&,
void)
{
m_pParentDialog->m_xExtensionManager->addExtension(
aExtensionFile, uno::Sequence(), "user",
xAbortChannel, xCmdEnv);
-m_xButtonInstall->set_label("Installed");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));
}
catch (const ucb::CommandFailedException)
{
SAL_WARN("cui.dialogs", "Additions: addExtension
CommandFailedException occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
m_xButtonInstall->set_sensitive(true);
}
catch (const ucb::CommandAbortedException)
{
SAL_WARN("cui.dialogs", "Additions: addExtension
CommandAbortedException occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
m_xButtonInstall->set_sensitive(true);
}
catch (const deployment::DeploymentException)
{
SAL_WARN("cui.dialogs", "Additions: addExtension DeploymentException
occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
m_xButtonInstall->set_sensitive(true);
}
catch (const lang::IllegalArgumentException)
{
SAL_WARN("cui.dialogs", "Additions: addExtension
IllegalArgumentException occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
[Libreoffice-commits] core.git: cui/inc cui/source include/sfx2 include/vcl sc/source sd/source sfx2/sdi sfx2/source sw/source
cui/inc/strings.hrc|2 +-
cui/source/dialogs/AdditionsDialog.cxx | 26 --
cui/source/factory/dlgfact.cxx |6 +++---
cui/source/factory/dlgfact.hxx |2 +-
cui/source/inc/AdditionsDialog.hxx |3 ++-
include/sfx2/sfxsids.hrc |1 +
include/vcl/abstdlg.hxx|2 +-
sc/source/ui/view/tabvwshb.cxx | 21 ++---
sd/source/ui/view/drviews2.cxx |8 +++-
sfx2/sdi/sfx.sdi |2 +-
sfx2/source/appl/appuno.cxx|1 +
sw/source/uibase/uiview/viewdlg2.cxx | 10 +-
12 files changed, 61 insertions(+), 23 deletions(-)
New commits:
commit 6e50e03262aa12921f108b502d3c76ce983d54f1
Author: Yusuf Keten
AuthorDate: Sun Jul 19 20:22:23 2020 +0300
Commit: Muhammet Kara
CommitDate: Tue Jul 21 22:25:13 2020 +0200
tdf#133026: Additions - Parameter support to UNO Command
After this patch, parameter support to uno command(.uno:AdditionsDialog)
will be available.
To use parameter, add "?AdditionsTag:string=YourParameter" to UNO command.
Parameters are the tags of extensions on webpage.
Change-Id: I0072c7340bda14ee13c21c347e06a04545cba69a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99007
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index be9c3f7d3a3e..d1b39a67e541 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -398,7 +398,7 @@
#define RID_SVXSTR_ADDITIONS_SEARCHING
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
#define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
#define RID_SVXSTR_ADDITIONS_NORESULTS
NC_("ID_SVXSTR_ADDITIONS_NORESULTS", "No results found")
-
+#define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index 73b0247b8b0a..975fa57415fd 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -207,7 +207,7 @@ void parseResponse(const std::string& rResponse,
std::vector& aAdd
RTL_TEXTENCODING_UTF8),
OStringToOUString(OString(arrayElement.child("author").string_value().get()),
RTL_TEXTENCODING_UTF8),
-
OStringToOUString(OString(arrayElement.child("URL").string_value().get()),
+
OStringToOUString(OString(arrayElement.child("url").string_value().get()),
RTL_TEXTENCODING_UTF8),
OStringToOUString(OString(arrayElement.child("screenshotURL").string_value().get()),
RTL_TEXTENCODING_UTF8),
@@ -219,13 +219,13 @@ void parseResponse(const std::string& rResponse,
std::vector& aAdd
RTL_TEXTENCODING_UTF8),
OStringToOUString(OString(arrayElement.child("releases")
.child(0)
- .child("compatibleVersion")
+ .child("compatibility")
.string_value()
.get()),
RTL_TEXTENCODING_UTF8),
OStringToOUString(OString(arrayElement.child("releases")
.child(0)
- .child("releaseNumber")
+ .child("releaseName")
.string_value()
.get()),
RTL_TEXTENCODING_UTF8),
@@ -414,7 +414,7 @@ void SearchAndParseThread::execute()
m_pAdditionsDialog->SetProgress(sProgress);
}
-AdditionsDialog::AdditionsDialog(weld::Window* pParent)
+AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString&
sAdditionsTag)
: GenericDialogController(pParent, "cui/ui/additionsdialog.ui",
"AdditionsDialog")
, m_aSearchDataTimer("SearchDataTimer")
, m_xEntrySearch(m_xBuilder->weld_entry("entrySearch"))
@@ -430,8 +430,22 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent)
m_xEntrySearch->connect_changed(LINK(this, AdditionsDialog,
SearchUpdateHdl));
m_xEntrySearch->connect_focus_out(LINK(this, AdditionsDialog,
FocusOut_Impl));
-// TODO - Temporary URL
-OString rURL = "https://yusufketen.com/extensionTest.json;;
+m_sTag = OUStringToOString(sAdditionsTag, RTL_TEXTENCODING_UTF8);
+
+OUString titlePrefix = CuiResId(RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX);
+if
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig
cui/inc/strings.hrc|3
cui/source/dialogs/AdditionsDialog.cxx | 301 +++--
cui/source/inc/AdditionsDialog.hxx | 30 +++
cui/uiconfig/ui/additionsdialog.ui | 47 -
4 files changed, 323 insertions(+), 58 deletions(-)
New commits:
commit daefcf77bd99d9dae9aaa08695c40c2a99d753d7
Author: Yusuf Keten
AuthorDate: Tue Jul 7 03:22:01 2020 +0300
Commit: Muhammet Kara
CommitDate: Fri Jul 10 12:39:56 2020 +0200
tdf#133026: Tight integration of extensions - Adding thread structure
- Add new class - SearchAndParseThread.
- Add new label to show progress such as not found, loading, searching, etc.
- Add cache to prevent unnecessary data transfers.
Change-Id: Ieb5dbdabc3c9b5224e89be959728ca9b6d5c63b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98226
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index d54a0f9cd370..be9c3f7d3a3e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -395,6 +395,9 @@
#define RID_SVXSTR_ADDITIONS_INSTALLBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
#define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
#define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
+#define RID_SVXSTR_ADDITIONS_SEARCHING
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
+#define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
+#define RID_SVXSTR_ADDITIONS_NORESULTS
NC_("ID_SVXSTR_ADDITIONS_NORESULTS", "No results found")
#endif
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index 5ed8ad97e46c..ba49e07b9365 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -7,23 +7,41 @@
* file, You can obtain one at http://mozilla.org/MPL/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
+
+#include
+#include
+#include
+#include
+#include
#include
#include
@@ -40,14 +58,25 @@ using ::com::sun::star::graphic::XGraphicProvider;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::PropertyValue;
using ::com::sun::star::graphic::XGraphic;
+using namespace com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::ucb;
+using namespace ::com::sun::star::beans;
+
+#ifdef UNX
+const char kUserAgent[] = "LibreOffice AdditionsDownloader/1.0 (Linux)";
+#else
+const char kUserAgent[] = "LibreOffice AdditionsDownloader/1.0 (unknown
platform)";
+#endif
namespace
{
struct AdditionInfo
{
+OUString sExtensionID;
OUString sName;
OUString sAuthorName;
-OUString sPreviewURL;
+OUString sExtensionURL;
OUString sScreenshotURL;
OUString sIntroduction;
OUString sDescription;
@@ -72,6 +101,18 @@ size_t WriteCallback(void* ptr, size_t size, size_t nmemb,
void* userp)
return real_size;
}
+// Callback to get the response data from server to a file.
+size_t WriteCallbackFile(void* ptr, size_t size, size_t nmemb, void* userp)
+{
+if (!userp)
+return 0;
+
+SvStream* response = static_cast(userp);
+size_t real_size = size * nmemb;
+response->WriteBytes(ptr, real_size);
+return real_size;
+}
+
// Gets the content of the given URL and returns as a standard string
std::string curlGet(const OString& rURL)
{
@@ -104,6 +145,36 @@ std::string curlGet(const OString& rURL)
return response_body;
}
+// Downloads and saves the file at the given rURL to a local path (sFileURL)
+void curlDownload(const OString& rURL, const OUString& sFileURL)
+{
+CURL* curl = curl_easy_init();
+SvFileStream aFile(sFileURL, StreamMode::WRITE);
+
+if (!curl)
+return;
+
+curl_easy_setopt(curl, CURLOPT_URL, rURL.getStr());
+curl_easy_setopt(curl, CURLOPT_USERAGENT, kUserAgent);
+
+curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallbackFile);
+curl_easy_setopt(curl, CURLOPT_WRITEDATA, static_cast());
+
+CURLcode cc = curl_easy_perform(curl);
+long http_code = 0;
+curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, _code);
+
+if (http_code != 200)
+{
+SAL_WARN("cui.dialogs", "Download failed. Error code: " << http_code);
+}
+
+if (cc != CURLE_OK)
+{
+SAL_WARN("cui.dialogs", "curl error: " << cc);
+}
+}
+
void parseResponse(const std::string& rResponse, std::vector&
aAdditions)
{
orcus::json::document_tree aJsonDoc;
@@ -130,6 +201,8 @@ void parseResponse(const std::string& rResponse,
[Libreoffice-commits] core.git: cui/inc cui/source editeng/source include/editeng officecfg/registry
cui/inc/strings.hrc|1
cui/source/inc/autocdlg.hxx|1
cui/source/tabpages/autocdlg.cxx | 17 +-
editeng/source/misc/acorrcfg.cxx | 22 +
editeng/source/misc/svxacorr.cxx |5 ++
editeng/source/misc/swafopt.cxx|1
include/editeng/svxacorr.hxx |3 +
include/editeng/swafopt.hxx|1
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8
10 files changed, 58 insertions(+), 9 deletions(-)
New commits:
commit 77b213890a96d144d9cfacdfd35ac0bba68b9f7a
Author: László Németh
AuthorDate: Tue Jun 23 18:49:46 2020 +0200
Commit: László Németh
CommitDate: Fri Jun 26 09:01:20 2020 +0200
tdf#133524 add option to angle quote AutoCorrect
in Localized Options page of AutoCorrect Options
dialog window:
[x] Replace << and >> with angle quotes
Note: this is optional part of Double Quotes replacement.
Change-Id: Ib0c7e8837a89c3772c5db76720811d440e62183a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97094
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 20ec52202bc0..d54a0f9cd370 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -333,6 +333,7 @@
#define RID_SVXSTR_NON_BREAK_SPACE
NC_("RID_SVXSTR_NON_BREAK_SPACE", "Add non-breaking space before specific
punctuation marks in French text")
#define RID_SVXSTR_ORDINAL NC_("RID_SVXSTR_ORDINAL",
"Format ordinal numbers suffixes (1st -> 1^st)")
#define RID_SVXSTR_OLD_HUNGARIAN
NC_("RID_SVXSTR_OLD_HUNGARIAN", "Transliterate to Old Hungarian if the text
direction is from right to left")
+#define RID_SVXSTR_ANGLE_QUOTES
NC_("RID_SVXSTR_ANGLE_QUOTES", "Replace << and >> with angle quotes")
#define RID_SVXSTR_DEL_EMPTY_PARA
NC_("RID_SVXSTR_DEL_EMPTY_PARA", "Remove blank paragraphs")
#define RID_SVXSTR_USER_STYLE
NC_("RID_SVXSTR_USER_STYLE", "Replace Custom Styles")
#define RID_SVXSTR_BULLET NC_("RID_SVXSTR_BULLET",
"Replace bullets with: %1")
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 11eb7b9de89b..e0c780fe831e 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -269,6 +269,7 @@ private:
OUStringsNonBrkSpace;
OUStringsOrdinal;
OUStringsTransliterateRTL;
+OUStringsAngleQuotes;
sal_UCS4cSglStartQuote;
sal_UCS4cSglEndQuote;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 807f0cd2d284..ef413c52d54d 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1525,7 +1525,8 @@ enum OfaQuoteOptions
{
ADD_NONBRK_SPACE,
REPLACE_1ST,
-TRANSLITERATE_RTL
+TRANSLITERATE_RTL,
+REPLACE_ANGLE_QUOTES
};
}
@@ -1546,6 +1547,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(weld::Container* pPage,
weld::DialogController*
, sNonBrkSpace(CuiResId(RID_SVXSTR_NON_BREAK_SPACE))
, sOrdinal(CuiResId(RID_SVXSTR_ORDINAL))
, sTransliterateRTL(CuiResId(RID_SVXSTR_OLD_HUNGARIAN))
+, sAngleQuotes(CuiResId(RID_SVXSTR_ANGLE_QUOTES))
, cSglStartQuote(0)
, cSglEndQuote(0)
, cStartQuote(0)
@@ -1620,6 +1622,7 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
pAutoCorrect->SetAutoCorrFlag(ACFlags::AddNonBrkSpace,
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgOrdinalNumber,
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
pAutoCorrect->SetAutoCorrFlag(ACFlags::TransliterateRTL,
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
+pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgAngleQuotes,
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
}
bool bModified = false;
@@ -1644,6 +1647,12 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
pOpt->bTransliterateRTL = bCheck;
pAutoCorrect->SetAutoCorrFlag(ACFlags::TransliterateRTL,
m_xSwCheckLB->get_toggle(TRANSLITERATE_RTL,
CBCOL_SECOND) == TRISTATE_TRUE);
+
+bCheck = m_xSwCheckLB->get_toggle(REPLACE_ANGLE_QUOTES, CBCOL_FIRST)
== TRISTATE_TRUE;
+bModified |= pOpt->bChgAngleQuotes != bCheck;
+pOpt->bChgAngleQuotes = bCheck;
+pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgAngleQuotes,
+m_xSwCheckLB->get_toggle(REPLACE_ANGLE_QUOTES,
CBCOL_SECOND) == TRISTATE_TRUE);
}
pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgQuotes,
m_xDoubleTypoCB->get_active());
@@ -1704,6 +1713,7 @@ void
[Libreoffice-commits] core.git: cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/sfx2 include/vcl officecfg/registry sc/sdi sc/source sd/sdi sd/source sfx2/sdi sw/sdi sw/
cui/Library_cui.mk |1
cui/UIConfig_cui.mk |2
cui/inc/strings.hrc |4
cui/source/dialogs/AdditionsDialog.cxx | 260
+
cui/source/factory/dlgfact.cxx | 12
cui/source/factory/dlgfact.hxx | 17
cui/source/inc/AdditionsDialog.hxx | 71 ++
cui/uiconfig/ui/additionsdialog.ui | 183
++
cui/uiconfig/ui/additionsfragment.ui | 277
++
include/sfx2/sfxsids.hrc |1
include/vcl/abstdlg.hxx | 10
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 17
sc/sdi/tabvwsh.sdi |1
sc/source/ui/view/tabvwshb.cxx |9
sd/sdi/_drvwsh.sdi |5
sd/source/ui/view/drviews2.cxx | 11
sfx2/sdi/docslots.sdi|5
sfx2/sdi/sfx.sdi | 17
sw/sdi/viewsh.sdi|6
sw/source/uibase/uiview/viewdlg2.cxx |8
20 files changed, 917 insertions(+)
New commits:
commit 12bbcce5018a09f1ab4c629bdab813f9bf079605
Author: Yusuf Keten
AuthorDate: Fri Jun 5 14:50:39 2020 +0300
Commit: Muhammet Kara
CommitDate: Thu Jun 25 22:16:55 2020 +0200
tdf#133026: Tight integration of extensions - Additions Dialog first
iteration
- Add the uno command .uno:AdditionsDialog
- Add the necessary commands to cui makefiles.
- Add the dialog AdditionsDialog for only test
- Implement the basic functionality to show up when clicked on the
menu/toolbar item.
Change-Id: I89dd74e49f5ff246ca355d2f8d1397621b26dea6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95593
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 27d89ec1c3b6..ed1e07d5ff13 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/customize/SvxNotebookbarConfigPage \
cui/source/customize/CustomNotebookbarGenerator \
cui/source/dialogs/about \
+cui/source/dialogs/AdditionsDialog \
cui/source/dialogs/colorpicker \
cui/source/dialogs/cuicharmap \
cui/source/dialogs/cuifmsearch \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index ca8911310c2c..62291eff5acf 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -14,6 +14,8 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutconfigdialog\
cui/uiconfig/ui/aboutconfigvaluedialog \
cui/uiconfig/ui/accelconfigpage \
+ cui/uiconfig/ui/additionsdialog \
+ cui/uiconfig/ui/additionsfragment \
cui/uiconfig/ui/agingdialog \
cui/uiconfig/ui/acorexceptpage \
cui/uiconfig/ui/acoroptionspage \
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index dcfbcc0f4e9c..20ec52202bc0 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -391,6 +391,10 @@
#define RID_SVXSTR_DELETEUSERCOLOR1
NC_("RID_SVXSTR_DELETEUSERCOLOR1", "You can only delete user-defined colors")
#define RID_SVXSTR_DELETEUSERCOLOR2
NC_("RID_SVXSTR_DELETEUSERCOLOR2", "Please select the color to delete")
+#define RID_SVXSTR_ADDITIONS_INSTALLBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
+#define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
+#define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
new file mode 100644
index ..5ed8ad97e46c
--- /dev/null
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -0,0 +1,260 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig
cui/inc/strings.hrc|1
cui/source/dialogs/passwdomdlg.cxx | 30 +
cui/source/inc/passwdomdlg.hxx |7 +
cui/uiconfig/ui/password.ui| 222 -
4 files changed, 209 insertions(+), 51 deletions(-)
New commits:
commit a81d7c4e0379a021664f8f6c5e9032a47fcf61d6
Author: Caolán McNamara
AuthorDate: Wed Jun 17 14:09:29 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Jun 17 16:37:17 2020 +0200
tdf#43452 indicate when maximum password length has been reached
Change-Id: I58ba5887d41a80aa0ef2be547351f2faeccfa3cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96533
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6312f38b6d53..dcfbcc0f4e9c 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -210,6 +210,7 @@
#define RID_SVXSTR_TWO_PASSWORDS_MISMATCH
NC_("RID_SVXSTR_TWO_PASSWORDS_MISMATCH", "The confirmation passwords did not
match the original passwords. Set the passwords again.")
#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON
NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON", "Please enter a password to open
or to modify, or check the open read-only option to continue.")
#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2
NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2", "Set the password by entering
the same password in both boxes.")
+#define RID_SVXSTR_PASSWORD_LEN_INDICATOR
NC_("RID_SVXSTR_PASSWORD_LEN_INDICATOR", "Password length limit of %1 reached")
#define STR_AUTOLINKNC_("STR_AUTOLINK",
"Automatic")
#define STR_MANUALLINK NC_("STR_MANUALLINK",
"Manual")
diff --git a/cui/source/dialogs/passwdomdlg.cxx
b/cui/source/dialogs/passwdomdlg.cxx
index f7b359bac237..250f9e728253 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -69,21 +69,43 @@ IMPL_LINK_NOARG(PasswordToOpenModifyDialog, OkBtnClickHdl,
weld::Button&, void)
}
}
+IMPL_LINK(PasswordToOpenModifyDialog, ChangeHdl, weld::Entry&, rEntry, void)
+{
+weld::Label* pIndicator = nullptr;
+int nLength = rEntry.get_text().getLength();
+if ( == m_xPasswdToOpenED.get())
+pIndicator = m_xPasswdToOpenInd.get();
+else if ( == m_xReenterPasswdToOpenED.get())
+pIndicator = m_xReenterPasswdToOpenInd.get();
+else if ( == m_xPasswdToModifyED.get())
+pIndicator = m_xPasswdToModifyInd.get();
+else if ( == m_xReenterPasswdToModifyED.get())
+pIndicator = m_xReenterPasswdToModifyInd.get();
+assert(pIndicator);
+pIndicator->set_visible(nLength >= m_nMaxPasswdLen);
+}
+
PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent,
sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify)
: SfxDialogController(pParent, "cui/ui/password.ui", "PasswordDialog")
, m_xPasswdToOpenED(m_xBuilder->weld_entry("newpassEntry"))
+, m_xPasswdToOpenInd(m_xBuilder->weld_label("newpassIndicator"))
, m_xReenterPasswdToOpenED(m_xBuilder->weld_entry("confirmpassEntry"))
+, m_xReenterPasswdToOpenInd(m_xBuilder->weld_label("confirmpassIndicator"))
, m_xOptionsExpander(m_xBuilder->weld_expander("expander"))
, m_xOk(m_xBuilder->weld_button("ok"))
, m_xOpenReadonlyCB(m_xBuilder->weld_check_button("readonly"))
, m_xPasswdToModifyFT(m_xBuilder->weld_label("label7"))
, m_xPasswdToModifyED(m_xBuilder->weld_entry("newpassroEntry"))
+, m_xPasswdToModifyInd(m_xBuilder->weld_label("newpassroIndicator"))
, m_xReenterPasswdToModifyFT(m_xBuilder->weld_label("label8"))
, m_xReenterPasswdToModifyED(m_xBuilder->weld_entry("confirmropassEntry"))
+,
m_xReenterPasswdToModifyInd(m_xBuilder->weld_label("confirmropassIndicator"))
, m_aOneMismatch( CuiResId( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) )
, m_aTwoMismatch( CuiResId( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) )
, m_aInvalidStateForOkButton( CuiResId(
RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) )
, m_aInvalidStateForOkButton_v2( CuiResId(
RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) )
+,
m_aIndicatorTemplate(CuiResId(RID_SVXSTR_PASSWORD_LEN_INDICATOR).replaceFirst("%1",
OUString::number(nMaxPasswdLen)))
+, m_nMaxPasswdLen(nMaxPasswdLen)
, m_bIsPasswordToModify( bIsPasswordToModify )
{
m_xOk->connect_clicked(LINK(this, PasswordToOpenModifyDialog,
OkBtnClickHdl));
@@ -91,9 +113,17 @@
PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, s
if (nMaxPasswdLen)
{
m_xPasswdToOpenED->set_max_length( nMaxPasswdLen );
+m_xPasswdToOpenED->connect_changed(LINK(this,
PasswordToOpenModifyDialog, ChangeHdl));
+m_xPasswdToOpenInd->set_label(m_aIndicatorTemplate);
m_xReenterPasswdToOpenED->set_max_length( nMaxPasswdLen );
+m_xReenterPasswdToOpenED->connect_changed(LINK(this,
PasswordToOpenModifyDialog,
[Libreoffice-commits] core.git: cui/inc
cui/inc/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c0511b6b6cfda1fdb675fe9cfbb7199860cf522
Author: Adolfo Jayme Barrientos
AuthorDate: Sat Jun 13 17:51:38 2020 -0500
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Jun 13 17:51:38 2020 -0500
Related: tdf#130272 Improve English in error message
Change-Id: Iaf42c102462409e4119e9422abdb41c5b4ab22ff
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 0039d4d02fdc..6312f38b6d53 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -386,7 +386,7 @@
#define RID_SVXSTR_COMMANDNAME
NC_("RID_SVXSTR_COMMANDLABEL", "Command")
#define RID_SVXSTR_COMMANDTIP
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
-#define RID_SVXSTR_QRCODEDATALONG
NC_("RID_SVXSTR_QRCODEDATALONG", "Text exceeds the maximum bits for Error
Correction, Enter shorter text")
+#define RID_SVXSTR_QRCODEDATALONG
NC_("RID_SVXSTR_QRCODEDATALONG", "The URL or text is too long for the current
error correction level. Either shorten the text or decrease the correction
level.")
#define RID_SVXSTR_DELETEUSERCOLOR1
NC_("RID_SVXSTR_DELETEUSERCOLOR1", "You can only delete user-defined colors")
#define RID_SVXSTR_DELETEUSERCOLOR2
NC_("RID_SVXSTR_DELETEUSERCOLOR2", "Please select the color to delete")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc |2 ++
cui/source/tabpages/tpcolor.cxx | 15 +++
2 files changed, 17 insertions(+)
New commits:
commit c895a6d8298a349784cd0aafff4bf518ac8d0a7d
Author: Heiko Tietze
AuthorDate: Fri May 15 10:51:10 2020 +0200
Commit: Heiko Tietze
CommitDate: Fri May 15 11:46:52 2020 +0200
Resolves tdf#132799 - Deleting of colors unclear
Tooltips added for disabled states
Change-Id: Iad8bdd1c22ce6619e233a4a20b4efcc2d4c5a27c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94264
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index fb5a67ef015d..c70c46d59a39 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -395,6 +395,8 @@
#define RID_SVXSTR_COMMANDTIP
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
#define RID_SVXSTR_QRCODEDATALONG
NC_("RID_SVXSTR_QRCODEDATALONG", "Text exceeds the maximum bits for Error
Correction, Enter shorter text")
+#define RID_SVXSTR_DELETEUSERCOLOR1
NC_("RID_SVXSTR_DELETEUSERCOLOR1", "You can only delete user-defined colors")
+#define RID_SVXSTR_DELETEUSERCOLOR2
NC_("RID_SVXSTR_DELETEUSERCOLOR2", "Please select the color to delete")
#endif
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 62d6d321fe1c..5933985a9b50 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -125,6 +125,7 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage,
weld::DialogController*
// disable modify buttons
// Color palettes can't be modified
m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) );
// disable preset color values
m_xRGBpreset->set_sensitive(false);
@@ -365,6 +366,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl,
weld::Button&, void)
m_xValSetColorList->InsertItem( nId + 1 , aCurrentColor, aName );
m_xValSetColorList->SelectItem( nId + 1 );
m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2)
);
ImpColorCountChanged();
}
@@ -421,7 +423,10 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl,
weld::Button&, void)
SelectValSetHdl_Impl(m_xValSetColorList.get());
}
else
+{
m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2)
);
+}
}
IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBox&, void)
@@ -454,7 +459,10 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl,
weld::ComboBox&, void)
}
}
if (nPos != 0)
+{
m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR1)
);
+}
m_xValSetColorList->Resize();
}
@@ -476,14 +484,21 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl,
ValueSet*, pValSet, void)
{
m_xValSetRecentList->SetNoSelection();
if (m_xSelectPalette->get_active() == 0 &&
m_xValSetColorList->GetSelectedItemId() != 0)
+{
m_xBtnDelete->set_sensitive(true);
+m_xBtnDelete->set_tooltip_text("");
+}
else
+{
m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text(
SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) );
+}
}
if (pValSet == m_xValSetRecentList.get())
{
m_xValSetColorList->SetNoSelection();
m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2)
);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
