[Libreoffice-commits] core.git: cui/inc cui/source

[Julien Nabet (via logerrit)]

 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 <serval2...@yahoo.fr>
AuthorDate: Sat Dec 2 11:36:06 2023 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
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 <serval2...@yahoo.fr>

diff --git a/cui/inc/personas.hrc b/cui/inc/personas.hrc
new file mode 100644
index 000000000000..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 <sal/types.h>
+#include <unotools/resmgr.hxx>
+
+#include <utility>
+
+#define NC_(Context, String) TranslateId(Context, u8##String)
+
+// it must be synchronized with 
extras/source/gallery/personas/personas_list.txt
+std::pair<TranslateId, sal_uInt16> 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 <dialmgr.hxx>
+
 #include <comphelper/processfactory.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <rtl/bootstrap.hxx>
@@ -21,6 +23,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/virdev.hxx>
+#include <personas.hrc>
 
 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);