Commit 3a821372 authored by Alf Gaida's avatar Alf Gaida

Cherry-picking upstream release: 0.13.0.

* Bumped bbuild dependency liblxqt0-dev to >= 0.13.0~

 Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
parent 3ea25f9e
Upstream authors:
LXQt team: http://lxqt.org
LXQt team: https://lxqt.org
Razor team: http://razor-qt.org
Copyright:
Copyright (c) 2010-2012 Razor team
Copyright (c) 2012-2017 LXQt team
Copyright (c) 2012-2018 LXQt team
Petr Vanek <petr@scribus.info>
License: LGPL-2.1+
......
lxqt-about-0.12.0 / 2017-10-21
lxqt-about-0.13.0 / 2018-05-21
==============================
* CMake: Prevent in-source builds
* Fixed razor and http -> https
* Fixed some LXDE mentions
* Drop Qt foreach
* Add Traditional Chinese translations
* Add Simplified Chinese translations
* Add Spanish desktop entry
* translators_ru: Remove "Translator X." prefix
* Make translators_lt.info tidy again
0.12.0 / 2017-10-21
===================
* Release 0.12.0: Update changelog
* Set patch version 0
* Don't export github templates
* Added Lithuanian translation
......
......@@ -23,6 +23,7 @@ set(UI_FILES
find_package(lxqt REQUIRED)
include(LXQtPreventInSourceBuilds)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
if(NOT CMAKE_BUILD_TYPE)
......@@ -33,7 +34,10 @@ endif()
set(LXQT_ABOUT_PATCH_VERSION 0)
set(LXQT_ABOUT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_ABOUT_PATCH_VERSION})
add_definitions("-DLXQT_ABOUT_VERSION=\"${LXQT_ABOUT_VERSION}\"")
add_definitions(
"-DLXQT_ABOUT_VERSION=\"${LXQT_ABOUT_VERSION}\""
"-DQT_NO_FOREACH"
)
# Translations **********************************
include(LXQtTranslate)
......
......@@ -2,19 +2,28 @@
## Overview
`lxqt-about` is a dialogue window providing information about LXQt and the system it's running on.
`lxqt-about` is a dialogue window providing information about LXQt and the
system it's running on.
## Installation
### Sources
The only runtime dependency is [liblxqt](https://github.com/lxde/liblxqt).
CMake is needed to build as well as optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.
The only runtime dependency is [liblxqt](https://github.com/lxqt/liblxqt).
CMake is needed to build as well as optionally Git to pull latest VCS checkouts.
The localization files were outsourced to repository
[lxqt-l10n](https://github.com/lxqt/lxqt-l10n) so the corresponding dependencies
are needed, too. Please refer to this repository's `README.md` for further
information.
Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` will normally have to be set to `/usr`.
Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX`
will normally have to be set to `/usr`.
To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual.
To build run `make`, to install `make install` which accepts variable `DESTDIR`
as usual.
### Binary packages
The library is provided by all major Linux distributions like Arch Linux, Debian, Fedora and openSUSE. Just use your package manager to search for string `lxqt-about`.
The library is provided by all major Linux distributions like Arch Linux,
Debian, Fedora and openSUSE. Just use your package manager to search for string
`lxqt-about`.
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - The Lightweight Desktop Environment
* http://lxqt.org
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......@@ -100,11 +100,11 @@ QString AboutDialogPrivate::aboutText() const
tr("Copyright: © %1-%2 %3", "About dialog, 'About' tab text")
.arg("2010", QDate::currentDate().toString("yyyy"), "LXQt team"),
tr("Homepage: %1", "About dialog, 'About' tab text")
.arg("<a href=\"http://lxqt.org\">http://lxqt.org</a>"),
.arg("<a href=\"https://lxqt.org\">https://lxqt.org</a>"),
tr("License: %1", "About dialog, 'About' tab text")
.arg("<a href=\"http://www.gnu.org/licenses/lgpl-2.1.html\">GNU Lesser General Public License version 2.1 or later</a>"
.arg("<a href=\"https://www.gnu.org/licenses/lgpl-2.1.html\">GNU Lesser General Public License version 2.1 or later</a>"
" and partly under the "
"<a href=\"http://www.gnu.org/licenses/gpl-2.0.html\">GNU General Public License version 2</a>")
"<a href=\"https://www.gnu.org/licenses/gpl-2.0.html\">GNU General Public License version 2</a>")
);
}
......@@ -112,9 +112,9 @@ QString AboutDialogPrivate::authorsText() const
{
return QString("<p>%1</p><p>%2</p>").arg(
tr("LXQt is developed by the <a %1>LXQt Team and contributors</a>.", "About dialog, 'Authors' tab text")
.arg(" href=\"https://github.com/lxde/lxde-qt\""),
.arg(" href=\"https://github.com/lxqt/lxqt\""),
tr("If you are interested in working with our development team, <a %1>join us</a>.", "About dialog, 'Authors' tab text")
.arg("href=\"http://lxqt.org\"")
.arg("href=\"https://lxqt.org\"")
);
}
......@@ -129,7 +129,7 @@ QString AboutDialogPrivate::thanksText() const
"<li>Andy Fitzsimon (logo/icon)</li>"
"<li>Eugene Pivnev (QtDesktop)</li>"
"<li>Manuel Meier (for ideas)</li>"
"<li>KDE &lt;<a href=\"http://kde.org/\">http://kde.org/</a>&gt;</li>"
"<li>KDE &lt;<a href=\"https://kde.org/\">https://kde.org/</a>&gt;</li>"
).arg(tr("Special thanks to:", "About dialog, 'Thanks' tab text"));
}
......
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......@@ -72,7 +72,7 @@ QString TechInfoTable::html() const
res += QString("<b>%1</b>").arg(mTitle);
res += "<table width='100%'>";
QPair<QString,QString> row;
foreach(row, mRows)
for(const auto& row : qAsConst(mRows))
{
res += QString("<tr>"
"<td class=techInfoTd width='1%'>"
......@@ -92,7 +92,7 @@ QString TechInfoTable::text(int nameFieldWidth) const
res += QString("%1\n").arg(mTitle);
QPair<QString,QString> row;
foreach(row, mRows)
for(const auto& row : qAsConst(mRows))
{
res += QString(" %1 %2\n")
.arg(row.first + ":", -nameFieldWidth)
......@@ -105,7 +105,7 @@ int TechInfoTable::maxNameLength() const
{
int res = 0;
QPair<QString,QString> row;
foreach (row, mRows)
for(const auto& row : qAsConst(mRows))
res = qMax(res, row.first.length());
return res;
......@@ -115,7 +115,7 @@ int TechInfoTable::maxNameLength() const
QString TechnicalInfo::html() const
{
QString res;
foreach (TechInfoTable* item, mItems)
for(const TechInfoTable* item : qAsConst(mItems))
{
res += item->html();
res += "<br><br>";
......@@ -126,11 +126,11 @@ QString TechnicalInfo::html() const
QString TechnicalInfo::text() const
{
int nameWidth = 0;
foreach (TechInfoTable* item, mItems)
for(const TechInfoTable* item : qAsConst(mItems))
nameWidth = qMax(nameWidth, item->maxNameLength());
QString res;
foreach (TechInfoTable* item, mItems)
for(const TechInfoTable* item : qAsConst(mItems))
{
res += item->text(nameWidth + 2);
res += "\n\n";
......
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
lxqt-about (0.13.0-1) unstable; urgency=medium
* Cherry-picking upstream release: 0.13.0.
* Bumped build dependency liblxqt0-dev to >= 0.13.0~
-- Alf Gaida <agaida@siduction.org> Thu, 24 May 2018 20:02:55 +0200
lxqt-about (0.12.0-5) unstable; urgency=medium
* Bumped Standards to 4.1.4, no changes needed
......@@ -83,7 +90,7 @@ lxqt-about (0.11.0-2) unstable; urgency=medium
lxqt-about (0.10.0-4) unstable; urgency=medium
* Bump Standards to 3.9.8, no changes needed
* Bump Standards to 3.9.8, no changes needed
* Fixed VCS fields, use https and plain /git/
* Fixed copyright Format field, use https
* Bump year in copyright
......
......@@ -7,7 +7,7 @@ Section: x11
Priority: optional
Build-Depends: debhelper (>= 11~),
libkf5windowsystem-dev,
liblxqt0-dev (>= 0.12.0),
liblxqt0-dev (>= 0.13.0~),
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev
......
version=4
opts="pgpsigurlmangle=s/$/.asc/" \
https://github.com/lxde/lxqt-about/releases .*/lxqt-about-([\d\.]+).tar.xz
https://github.com/lxqt/lxqt-about/releases .*/lxqt-about-([\d\.]+).tar.xz
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
Name[es]=Acerca de LXQt
GenericName[es]=Acerca de LXQt
Comment[es]=Saber más acerca LXQt
Name[zh_CN]=关于 LXQt
GenericName[zh_CN]=关于 LXQt
Comment[zh_CN]=进一步了解 LXQt。
Name[zh_TW]=關於 LXQt
GenericName[zh_TW]=關於 LXQt
Comment[zh_TW]=進一步了解 LXQt。
......@@ -5,9 +5,9 @@ translator_1_nameEnglish = PICCORO Lenz McKAY
translator_1_nameNative = PICCORO Lenz McKAY
translator_1_contact = mckaygerhard@gmail.com
# translator_2_nameEnglish = Translator 2. Your name in English.
# translator_2_nameNative = Translator 2. Your name in the native language.
# translator_2_contact = Translator 2. Contact information, email or web site address.
translator_2_nameEnglish = Jair López
translator_2_nameNative = Jair López
translator_2_contact = jairlopez@etca.com.ve
# translator_3_nameEnglish = Translator 3. Your name in English.
# translator_3_nameNative = Translator 3. Your name in the native language.
......
......@@ -4,41 +4,41 @@ _help = Don't translate this text, it is only help. \
translator_1_nameEnglish = Moo
translator_1_nameNative = Translator 1. Your name in the native language.
translator_1_contact = Translator 1. Contact information, email or web site address.
# translator_1_nameNative = Translator 1. Your name in the native language.
# translator_1_contact = Translator 1. Contact information, email or web site address.
translator_2_nameEnglish = Translator 2. Your name in English.
translator_2_nameNative = Translator 2. Your name in the native language.
translator_2_contact = Translator 2. Contact information, email or web site address.
# translator_2_nameEnglish = Translator 2. Your name in English.
# translator_2_nameNative = Translator 2. Your name in the native language.
# translator_2_contact = Translator 2. Contact information, email or web site address.
translator_3_nameEnglish = Translator 3. Your name in English.
translator_3_nameNative = Translator 3. Your name in the native language.
translator_3_contact = Translator 3. Contact information, email or web site address.
# translator_3_nameEnglish = Translator 3. Your name in English.
# translator_3_nameNative = Translator 3. Your name in the native language.
# translator_3_contact = Translator 3. Contact information, email or web site address.
translator_4_nameEnglish = Translator 4. Your name in English.
translator_4_nameNative = Translator 4. Your name in the native language.
translator_4_contact = Translator 4. Contact information, email or web site address.
# translator_4_nameEnglish = Translator 4. Your name in English.
# translator_4_nameNative = Translator 4. Your name in the native language.
# translator_4_contact = Translator 4. Contact information, email or web site address.
translator_5_nameEnglish = Translator 5. Your name in English.
translator_5_nameNative = Translator 5. Your name in the native language.
translator_5_contact = Translator 5. Contact information, email or web site address.
# translator_5_nameEnglish = Translator 5. Your name in English.
# translator_5_nameNative = Translator 5. Your name in the native language.
# translator_5_contact = Translator 5. Contact information, email or web site address.
translator_6_nameEnglish = Translator 6. Your name in English.
translator_6_nameNative = Translator 6. Your name in the native language.
translator_6_contact = Translator 6. Contact information, email or web site address.
# translator_6_nameEnglish = Translator 6. Your name in English.
# translator_6_nameNative = Translator 6. Your name in the native language.
# translator_6_contact = Translator 6. Contact information, email or web site address.
translator_7_nameEnglish = Translator 7. Your name in English.
translator_7_nameNative = Translator 7. Your name in the native language.
translator_7_contact = Translator 7. Contact information, email or web site address.
# translator_7_nameEnglish = Translator 7. Your name in English.
# translator_7_nameNative = Translator 7. Your name in the native language.
# translator_7_contact = Translator 7. Contact information, email or web site address.
translator_8_nameEnglish = Translator 8. Your name in English.
translator_8_nameNative = Translator 8. Your name in the native language.
translator_8_contact = Translator 8. Contact information, email or web site address.
# translator_8_nameEnglish = Translator 8. Your name in English.
# translator_8_nameNative = Translator 8. Your name in the native language.
# translator_8_contact = Translator 8. Contact information, email or web site address.
translator_9_nameEnglish = Translator 9. Your name in English.
translator_9_nameNative = Translator 9. Your name in the native language.
translator_9_contact = Translator 9. Contact information, email or web site address.
# translator_9_nameEnglish = Translator 9. Your name in English.
# translator_9_nameNative = Translator 9. Your name in the native language.
# translator_9_contact = Translator 9. Contact information, email or web site address.
translator_10_nameEnglish = Translator 10. Your name in English.
translator_10_nameNative = Translator 10. Your name in the native language.
translator_10_contact = Translator 10. Contact information, email or web site address.
# translator_10_nameEnglish = Translator 10. Your name in English.
# translator_10_nameNative = Translator 10. Your name in the native language.
# translator_10_contact = Translator 10. Contact information, email or web site address.
......@@ -5,13 +5,13 @@ translator_1_nameEnglish = Alexander Sokolov
translator_1_nameNative = Александр Соколов
translator_1_contact = sokoloff.a@gmail.com
translator_2_nameEnglish = Translator 2. Oleg Maximov
translator_2_nameNative = Translator 2. Олег Максимов
translator_2_contact = Translator 2. gruz103@gmail.com
translator_2_nameEnglish = Oleg Maximov
translator_2_nameNative = Олег Максимов
translator_2_contact = gruz103@gmail.com
translator_3_nameEnglish = Translator 3. Ilya Shestopalov
translator_3_nameNative = Translator 3. Илья Шестопалов
translator_3_contact = Translator 3. yast4ik@yahoo.com
translator_3_nameEnglish = Ilya Shestopalov
translator_3_nameNative = Илья Шестопалов
translator_3_contact = yast4ik@yahoo.com
translator_4_nameEnglish = Igor Zakharov
translator_4_nameNative = Игорь Захаров
......
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......@@ -339,7 +339,8 @@ TranslatorsInfo::TranslatorsInfo()
QSettings src(":/translatorsInfo", QSettings::IniFormat);
src.setIniCodec("UTF-8");
foreach(QString group, src.childGroups())
const auto groups = src.childGroups();
for(const QString& group : qAsConst(groups))
{
QString lang = group.section("_", 1).remove(".info");
src.beginGroup(group);
......@@ -369,7 +370,7 @@ TranslatorsInfo::~TranslatorsInfo()
QString TranslatorsInfo::asHtml() const
{
QString ret;
foreach(TranslatorPerson *translator, mItems)
for(const TranslatorPerson *translator : qAsConst(mItems))
{
ret += "<li>" + translator->asHtml() + "</li>";
}
......@@ -436,7 +437,7 @@ void TranslatorPerson::addLanguage(QString langId)
}
QString TranslatorPerson::asHtml()
QString TranslatorPerson::asHtml() const
{
QString ret(mInfo);
ret += " - " + mLanguages.join(", ");
......
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......@@ -48,7 +48,7 @@ public:
QString info() const { return mInfo; }
void addLanguage(QString langId);
QString asHtml();
QString asHtml() const;
private:
QString mEnglishName;
......
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