From 74415d89e6eec9f93754a37716476a6137555507 Mon Sep 17 00:00:00 2001 From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:59:42 +0200 Subject: [PATCH] 1.9.1 --- CHANGELOG.md | 2 +- SandboxiePlus/MiscHelpers/Common/Finder.cpp | 19 +++++++++++++------ SandboxiePlus/MiscHelpers/Common/Finder.h | 7 +++++++ SandboxiePlus/SandMan/SandMan.cpp | 6 ++++++ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6102fe5f..9069978d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - fixed Qt6 compatybility issue with 7z FS implementation [#2681](https://github.com/sandboxie-plus/Sandboxie/issues/2681) - fixed issue with tls support using Qt6 [#2682](https://github.com/sandboxie-plus/Sandboxie/issues/2682) - added template preset for spotify [#2673](https://github.com/sandboxie-plus/Sandboxie/issues/2673) - +- added missing localisation to finder [#2845](https://github.com/sandboxie-plus/Sandboxie/issues/2845) ## [1.9.0 / 5.64.0] - 2023-04-17 diff --git a/SandboxiePlus/MiscHelpers/Common/Finder.cpp b/SandboxiePlus/MiscHelpers/Common/Finder.cpp index 41da663c..3aa27381 100644 --- a/SandboxiePlus/MiscHelpers/Common/Finder.cpp +++ b/SandboxiePlus/MiscHelpers/Common/Finder.cpp @@ -3,6 +3,13 @@ bool CFinder::m_DarkMode = false; +QString CFinder::m_CaseInsensitive = "Case Sensitive"; +QString CFinder::m_RegExpStr = "RegExp"; +QString CFinder::m_Highlight = "Highlight"; +QString CFinder::m_CloseStr = "Close"; +QString CFinder::m_FindStr = "&Find ..."; +QString CFinder::m_AllColumns = "All columns"; + QWidget* CFinder::AddFinder(QTreeView* pTree, QObject* pFilterTarget, int iOptions, CFinder** ppFinder) { QWidget* pWidget = new QWidget(); @@ -37,7 +44,7 @@ CFinder::CFinder(QObject* pFilterTarget, QWidget *parent, int iOptions) if ((iOptions & eCaseSens) != 0) { - m_pCaseSensitive = new QCheckBox(tr("Case Sensitive")); + m_pCaseSensitive = new QCheckBox(m_CaseInsensitive); m_pSearchLayout->addWidget(m_pCaseSensitive); connect(m_pCaseSensitive, SIGNAL(stateChanged(int)), this, SLOT(OnUpdate())); } @@ -46,7 +53,7 @@ CFinder::CFinder(QObject* pFilterTarget, QWidget *parent, int iOptions) if ((iOptions & eRegExp) != 0) { - m_pRegExp = new QCheckBox(tr("RegExp")); + m_pRegExp = new QCheckBox(m_RegExpStr); m_pSearchLayout->addWidget(m_pRegExp); connect(m_pRegExp, SIGNAL(stateChanged(int)), this, SLOT(OnUpdate())); } @@ -67,7 +74,7 @@ CFinder::CFinder(QObject* pFilterTarget, QWidget *parent, int iOptions) if ((iOptions & eHighLight) != 0) { - m_pHighLight = new QCheckBox(tr("Highlight")); + m_pHighLight = new QCheckBox(m_Highlight); if ((iOptions & eHighLightDefault) == eHighLightDefault) m_pHighLight->setChecked(true); m_pSearchLayout->addWidget(m_pHighLight); @@ -79,7 +86,7 @@ CFinder::CFinder(QObject* pFilterTarget, QWidget *parent, int iOptions) QToolButton* pClose = new QToolButton(this); pClose->setIcon(QIcon(":/close.png")); pClose->setAutoRaise(true); - pClose->setText(tr("Close")); + pClose->setText(m_CloseStr); m_pSearchLayout->addWidget(pClose); QObject::connect(pClose, SIGNAL(clicked()), this, SLOT(Close())); @@ -97,7 +104,7 @@ CFinder::CFinder(QObject* pFilterTarget, QWidget *parent, int iOptions) if (parent) { - QAction* pFind = new QAction(tr("&Find ..."), parent); + QAction* pFind = new QAction(m_FindStr, parent); pFind->setShortcut(QKeySequence::Find); pFind->setShortcutContext(Qt::WidgetWithChildrenShortcut); parent->addAction(pFind); @@ -143,7 +150,7 @@ void CFinder::Open() { if (m_pColumn && m_pColumn->count() == 0) { - m_pColumn->addItem(tr("All columns"), -1); + m_pColumn->addItem(m_AllColumns, -1); for (int i = 0; i < m_pModel->columnCount(); i++) m_pColumn->addItem(m_pModel->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString(), i); m_pColumn->setVisible(true); diff --git a/SandboxiePlus/MiscHelpers/Common/Finder.h b/SandboxiePlus/MiscHelpers/Common/Finder.h index c3495362..2b8029cd 100644 --- a/SandboxiePlus/MiscHelpers/Common/Finder.h +++ b/SandboxiePlus/MiscHelpers/Common/Finder.h @@ -28,6 +28,13 @@ public: eHighLightDefault = eHighLight | 0x08, }; + static QString m_CaseInsensitive; + static QString m_RegExpStr; + static QString m_Highlight; + static QString m_CloseStr; + static QString m_FindStr; + static QString m_AllColumns; + signals: void SetFilter(const QString& Exp, int iOptions = 0, int Column = -1); void SelectNext(); diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp index 6f435bef..a92af625 100644 --- a/SandboxiePlus/SandMan/SandMan.cpp +++ b/SandboxiePlus/SandMan/SandMan.cpp @@ -3245,6 +3245,12 @@ void CSandMan::LoadLanguage() CPanelView::m_CopyCell = tr("Copy Cell"); CPanelView::m_CopyRow = tr("Copy Row"); CPanelView::m_CopyPanel = tr("Copy Panel"); + CFinder::m_CaseInsensitive = tr("Case Sensitive"); + CFinder::m_RegExpStr = tr("RegExp"); + CFinder::m_Highlight = tr("Highlight"); + CFinder::m_CloseStr = tr("Close"); + CFinder::m_FindStr = tr("&Find ..."); + CFinder::m_AllColumns = tr("All columns"); } void CSandMan::LoadLanguage(const QString& Lang, const QString& Module, int Index)