Commit 36f8f1ea authored by Alf Gaida's avatar Alf Gaida

Cherry-picking new upstream version 0.14.1.

* Bumped minimum versions:
  - liblxqt0-dev (>= 0.14.1~)
  - liblxqt-globalkeys0-dev (>= 0.14.1~)
  - liblxqt-globalkeys-ui0-dev (>= 0.14.1~)
* Improve the description for l10n a bit
parent 956f2f30
lxqt-runner-0.14.1 / 2019-02-24
===============================
* MathItem: Use documented API of muparser and check for possible ArgSep()
and DecSep() conflict. Also do not use grouping for output values.
* Updated translations
* Note for packagers: lxqt-runner now depends on liblxqt >= 0.14.1
lxqt-runner-0.14.0 / 2019-01-25
===============================
......
......@@ -27,7 +27,7 @@ cmake_dependent_option(RUNNER_VBOX_HEADLESS
# Minimum Versions
set(KF5_MINIMUM_VERSION "5.36.0")
set(LIBMENUCACHE_MINIMUM_VERSION "1.1.0")
set(LXQT_MINIMUM_VERSION "0.14.0")
set(LXQT_MINIMUM_VERSION "0.14.1")
set(QT_MINIMUM_VERSION "5.7.1")
find_package(Qt5Widgets ${QT_MINIMUM_VERSION} REQUIRED)
......@@ -43,7 +43,7 @@ include(LXQtPreventInSourceBuilds)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
# Patch Version
set(LXQT_RUNNER_PATCH_VERSION 0)
set(LXQT_RUNNER_PATCH_VERSION 1)
set(LXQT_RUNNER_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_RUNNER_PATCH_VERSION})
add_definitions(
"-DLXQT_RUNNER_VERSION=\"${LXQT_RUNNER_VERSION}\""
......
lxqt-runner (0.14.1-1) unstable; urgency=medium
* Cherry-picking new upstream version 0.14.1.
* Bumped minimum versions:
- liblxqt0-dev (>= 0.14.1~)
- liblxqt-globalkeys0-dev (>= 0.14.1~)
- liblxqt-globalkeys-ui0-dev (>= 0.14.1~)
* Improve the description for l10n a bit
-- Alf Gaida <agaida@siduction.org> Mon, 25 Feb 2019 01:07:36 +0100
lxqt-runner (0.14.0-1) unstable; urgency=medium
* Cherry-picking new upstream version 0.14.0.
......
......@@ -6,9 +6,9 @@ Section: x11
Priority: optional
Build-Depends: debhelper-compat (= 12),
libkf5windowsystem-dev,
liblxqt0-dev (>= 0.14.0~),
liblxqt-globalkeys0-dev (>= 0.14.0~),
liblxqt-globalkeys-ui0-dev (>= 0.14.0~),
liblxqt0-dev (>= 0.14.1~),
liblxqt-globalkeys0-dev (>= 0.14.1~),
liblxqt-globalkeys-ui0-dev (>= 0.14.1~),
libmuparser-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
......@@ -30,7 +30,8 @@ Suggests: lxqt | lxqt-core
Breaks: lxqt-common (<< 0.12.0)
Replaces: lxqt-common (<< 0.12.0)
Description: LXQt program launcher
Tool used to launch programs quickly by typing their names
The LXQt runner provides a GUI that comes up on the desktop and allows for
launching applications, doing some math or shutting down the system.
.
This package contain LXQt runner.
......@@ -43,4 +44,7 @@ Depends: ${misc:Depends},
Breaks: lxqt-runner (<< 0.11.0)
Replaces: lxqt-runner (<< 0.11.0)
Description: Language package for lxqt-runner
The LXQt runner provides a GUI that comes up on the desktop and allows for
launching applications, doing some math or shutting down the system.
.
This package contains the l10n files needed by the lxqt-runner.
......@@ -793,26 +793,47 @@ bool VirtualBoxProvider::isOutDated() const
#ifdef MATH_ENABLED
#include <muParser.h>
class MathItem::Parser : public mu::Parser
class MathItem::Parser : private mu::Parser
{
public:
static void initLocale()
Parser()
: mLocale(QLocale::system())
{
try
{
// use the system's locale instead of the "C"
s_locale = std::locale{""};
const std::locale loc{""};
auto && numpunct = std::use_facet<std::numpunct<mu::char_type>>(loc);
SetDecSep(numpunct.decimal_point());
SetThousandsSep(0); // means no grouping for muparser API
const char arg_sep = GetArgSep();
if (numpunct.decimal_point() == arg_sep)
{
if (arg_sep == ',')
SetArgSep(';');
else
SetArgSep(',');
}
} catch (const std::runtime_error & e)
{
qWarning().noquote() << "Unable to set locale for Math, " << e.what();
}
// do not group in output
mLocale.setNumberOptions(mLocale.numberOptions() | QLocale::OmitGroupSeparator);
}
QString evalString(const QString & s)
{
SetExpr(s.toStdString());
return mLocale.toString(Eval()); // can throw
}
private:
QLocale mLocale;
};
static void muParserInitLocale()
{
MathItem::Parser::initLocale();
}
Q_COREAPP_STARTUP_FUNCTION(muParserInitLocale)
/************************************************
......@@ -875,8 +896,7 @@ bool MathItem::compare(const QRegExp &regExp) const
{
try
{
mParser->SetExpr(s.toStdString());
self->mTitle = s + QL1C('=') + QLocale::system().toString(mParser->Eval());
self->mTitle = s + QL1C('=') + mParser->evalString(s);
break;
} catch (const mu::Parser::exception_type & e)
{
......
......@@ -6,7 +6,7 @@
<message>
<location filename="../configuredialog/configuredialog.ui" line="14"/>
<source>Runner Settings</source>
<translation type="unfinished"></translation>
<translation>Käynnistimen asetukset</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="20"/>
......@@ -26,27 +26,27 @@
<message>
<location filename="../configuredialog/configuredialog.ui" line="46"/>
<source>Show history first</source>
<translation type="unfinished"></translation>
<translation>Näytä historia ensin</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="53"/>
<source>Store/show history</source>
<translation type="unfinished"></translation>
<translation>Säilytä/näytä historia</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="60"/>
<source>&lt;b&gt;Note&lt;/b&gt;: The size of top-level widgets are constrained to 2/3 of the desktop&apos;s height and width.</source>
<translation type="unfinished"></translation>
<translation>&lt;b&gt;Huomautus:&lt;/b&gt; Päätason elementtien maksimikoko on 2/3 työpöydän leveydestä ja korkeudesta.</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="63"/>
<source>Show list with:</source>
<translation type="unfinished"></translation>
<translation>Ehdotukset:</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="70"/>
<source> item(s)</source>
<translation type="unfinished"></translation>
<translation> kohde(tta)</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="90"/>
......@@ -56,27 +56,27 @@
<message>
<location filename="../configuredialog/configuredialog.cpp" line="61"/>
<source>Top edge of the screen</source>
<translation type="unfinished"></translation>
<translation>Ylhäällä</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.cpp" line="62"/>
<source>Center of the screen</source>
<translation type="unfinished"></translation>
<translation>Keskellä</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.cpp" line="68"/>
<source>Focused screen</source>
<translation type="unfinished"></translation>
<translation>Aktiivisella näytöllä</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.cpp" line="72"/>
<source>Always on screen %1</source>
<translation type="unfinished"></translation>
<translation>Aina näytöllä %1</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.cpp" line="81"/>
<source>Reset</source>
<translation type="unfinished"></translation>
<translation>Palauta</translation>
</message>
</context>
<context>
......@@ -89,17 +89,17 @@
<message>
<location filename="../dialog.cpp" line="94"/>
<source>Configure</source>
<translation type="unfinished"></translation>
<translation>Asetukset</translation>
</message>
<message>
<location filename="../dialog.cpp" line="98"/>
<source>Clear History</source>
<translation type="unfinished"></translation>
<translation>Tyhjennä historia</translation>
</message>
<message>
<location filename="../dialog.cpp" line="351"/>
<source>Show/hide runner dialog</source>
<translation type="unfinished"></translation>
<translation>Näytä/piilota käynnistin</translation>
</message>
</context>
<context>
......
......@@ -31,17 +31,17 @@
<message>
<location filename="../configuredialog/configuredialog.ui" line="53"/>
<source>Store/show history</source>
<translation>Sauvegarder/Montrer l&apos;historique</translation>
<translation>Enregistrer/Montrer l&apos;historique</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="60"/>
<source>&lt;b&gt;Note&lt;/b&gt;: The size of top-level widgets are constrained to 2/3 of the desktop&apos;s height and width.</source>
<translation type="unfinished"></translation>
<translation>&lt;b&gt;Note&lt;/b&gt;: La taille des widgets de niveau supérieur est limitée à 2/3 de la hauteur et de la largeur du bureau.</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="63"/>
<source>Show list with:</source>
<translation>Montrer la liste avec :</translation>
<translation>Afficher une liste comportant :</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="70"/>
......@@ -84,7 +84,7 @@
<message>
<location filename="../dialog.ui" line="26"/>
<source>Application launcher </source>
<translation>Lanceur d&apos;application</translation>
<translation>Lanceur d&apos;application </translation>
</message>
<message>
<location filename="../dialog.cpp" line="94"/>
......
......@@ -76,7 +76,7 @@
<message>
<location filename="../configuredialog/configuredialog.cpp" line="81"/>
<source>Reset</source>
<translation>Reiniciar</translation>
<translation>Restabelecer</translation>
</message>
</context>
<context>
......
......@@ -36,7 +36,7 @@
<message>
<location filename="../configuredialog/configuredialog.ui" line="60"/>
<source>&lt;b&gt;Note&lt;/b&gt;: The size of top-level widgets are constrained to 2/3 of the desktop&apos;s height and width.</source>
<translation>&lt;b&gt;Noto&lt;/b&gt;: o tamanho dos widgets do nível superior está restringido a 2/3 da altura e da largura da área de trabalho.</translation>
<translation>&lt;b&gt;Nota&lt;/b&gt;: o tamanho dos widgets de nível superior está restringido a 2/3 da altura e da largura da área de trabalho.</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="63"/>
......
......@@ -6,7 +6,7 @@
<message>
<location filename="../configuredialog/configuredialog.ui" line="14"/>
<source>Runner Settings</source>
<translation>Настройки ускорителя запуска</translation>
<translation>Настройки ускорителя</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="20"/>
......@@ -26,12 +26,12 @@
<message>
<location filename="../configuredialog/configuredialog.ui" line="46"/>
<source>Show history first</source>
<translation type="unfinished"></translation>
<translation>Сначала показывать историю</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="53"/>
<source>Store/show history</source>
<translation type="unfinished"></translation>
<translation>Хранить/показывать историю</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="60"/>
......@@ -41,7 +41,7 @@
<message>
<location filename="../configuredialog/configuredialog.ui" line="63"/>
<source>Show list with:</source>
<translation type="unfinished"></translation>
<translation>Показывать список с:</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="70"/>
......
......@@ -26,27 +26,27 @@
<message>
<location filename="../configuredialog/configuredialog.ui" line="46"/>
<source>Show history first</source>
<translation type="unfinished"></translation>
<translation>Önce geçmişi göster</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="53"/>
<source>Store/show history</source>
<translation type="unfinished"></translation>
<translation>Geçmişi kaydet/göster</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="60"/>
<source>&lt;b&gt;Note&lt;/b&gt;: The size of top-level widgets are constrained to 2/3 of the desktop&apos;s height and width.</source>
<translation type="unfinished"></translation>
<translation>&lt;b&gt;Not&lt;/b&gt;: Üst seviye gereçlerin boyutu masaüstü yükseklik ve genişliğinin 2/3 ü ile sınırlıdır.</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="63"/>
<source>Show list with:</source>
<translation type="unfinished"></translation>
<translation>Liste genişliğini göster:</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="70"/>
<source> item(s)</source>
<translation type="unfinished"></translation>
<translation> öge(ler)</translation>
</message>
<message>
<location filename="../configuredialog/configuredialog.ui" line="90"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment