Lubuntu
/
qps-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cherry-picking upstream-version 1.10.18.

Browse Source
ubuntu/disco debian/1.10.18-1
Alf Gaida 6 years ago
parent 8a448e8866
commit 3f0560d302
13 changed files with 410 additions and 39 deletions
Show Stats Download Patch File Download Diff File

18
CHANGELOG
Unescape View File

@ -1,7 +1,23 @@
qps-1.10.17 / 2017-09-22
qps-1.10.18 / 2018-05-21
========================
* Bumped patch version to 18 (#45)
* Update from Weblate. (#41)
* Added transltion state to README.md
* Add da translation
* translation update
* Added translation using Weblate (German)
* Create qps_da.ts
* Update qps.desktop.in
* i18n: Update Polish translation
* Drop Qt foreach
* Fix links QtDesktop --> lxqt
1.10.17 / 2017-09-22
====================
* Release 1.10.17: Update changelog
* some whitespaces fixed
* l10n: Polish translation
* Remove obsolete cpack

9
CMakeLists.txt
Unescape View File

@ -12,9 +12,12 @@ endif()
set(MAJOR_VERSION 1)
set(MINOR_VERSION 10)
set(PATCH_VERSION 17)
set(PATCH_VERSION 18)
set(QPS_VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
add_definitions(-DQPS_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
add_definitions(
-DQPS_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
-DQT_NO_FOREACH
)
# C++11 support
include(CheckCXXCompilerFlag)
@ -28,7 +31,7 @@ else()
message(FATAL "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. C++11 support is required")
endif()
find_package(Qt5 REQUIRED COMPONENTS Widgets X11Extras DBus LinguistTools)
find_package(Qt5 5.7.1 REQUIRED COMPONENTS Widgets X11Extras DBus LinguistTools)
include(GNUInstallDirs)
include(LXQtTranslateTs) # Although the name it doesn't depend on LXQt in any way

6
README.md
Unescape View File

@ -8,3 +8,9 @@
Qps is licensed under the terms of the
[GPLv2](http://choosealicense.com/licenses/gpl-2.0/) or any later version.
### Translation Status
<a href="https://weblate.lxqt.org/engage/qps/?utm_source=widget">
<img src="https://weblate.lxqt.org/widgets/qps/-/qps/287x66-grey.png" alt="Translation status" />
</a>

6
debian/changelog vendored
Unescape View File

@ -1,3 +1,9 @@
qps (1.10.18-1) unstable; urgency=medium
* Cherry-picking upstream-version 1.10.18.
-- Alf Gaida <agaida@siduction.org> Mon, 21 May 2018 18:51:56 +0200
qps (1.10.17-3) unstable; urgency=medium
* Bumped compat to 11

1
debian/rules vendored
Unescape View File

@ -11,4 +11,3 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_BUILD_TYPE=RelWithDebInfo

4
qps.desktop.in
Unescape View File

@ -2,7 +2,11 @@
Type=Application
Name=qps
GenericName=Qt process manager
GenericName[da]=Qt-proceshåndtering
GenericName[pl]=Menedżer procesów Qt
Comment=Qt application to display and manage running processes
Comment[da]=Qt-program til at vise og håndtere kørende processer
Comment[pl]=Aplikacja Qt do wyświetlania i zarządzania uruchomionymi procesami
Icon=qps
Categories=System;
TryExec=qps

9
src/infobar.cpp
Unescape View File

@ -806,7 +806,6 @@ void IO_Graph::paintEvent ( QPaintEvent *e )
QString doHistory(SysHistory *sysh)
{
QString str;
Procinfo *p;
int max = 0;
char buf[128];
@ -820,7 +819,7 @@ QString doHistory(SysHistory *sysh)
// qsort(ps->data(), ps->size(), sizeof(Procinfo *),(compare_func)
// compare_backwards);
foreach (p, sysh->procs)
for (const auto *p : qAsConst(sysh->procs))
{
if (p->pcpu == 0)
continue;
@ -835,14 +834,13 @@ QString doHistory(SysHistory *sysh)
QString GraphBase::doHistoryTXT(SysHistory *sysh)
{
QString str;
Procinfo *p;
int max = 0;
char buf[128];
// sprintf(buf,"miniHistory /* %.02f%%",sysh->load_cpu*100);
sprintf(buf, "%%CPU miniHistory test");
str += QString::fromLatin1(buf);
foreach (p, sysh->procs)
for (const auto *p : qAsConst(sysh->procs))
{
if (p->pcpu == 0)
continue;
@ -906,7 +904,6 @@ void GraphBase::mouseMoveEvent(QMouseEvent *e)
QString IO_Graph::doHistoryTXT(SysHistory *sysh)
{
QString str;
Procinfo *p;
int max = 0;
char buf[64], mem_str[64];
@ -914,7 +911,7 @@ QString IO_Graph::doHistoryTXT(SysHistory *sysh)
sprintf(buf, "miniHistory IO");
str += QString::fromLatin1(buf);
foreach (p, sysh->procs)
for (const auto *p : qAsConst(sysh->procs))
{
if (p->io_read_KBps == 0 and p->io_write_KBps == 0)
continue;

3
src/proc_common.cpp
Unescape View File

@ -1089,8 +1089,7 @@ void Procview::refresh()
SysHistory::~SysHistory()
{
Procinfo *p;
foreach (p, procs)
for (const auto *p : qAsConst(procs))
{
delete p;
}

4
src/qps.cpp
Unescape View File

@ -2328,9 +2328,9 @@ void Qps::about()
str.append(qVersion());
str.append("<br><br>"
"<b>Source: </b><a href=\"https://github.com/QtDesktop/qps\">http://github.com/QtDesktop/qps/</a>"
"<b>Source: </b><a href=\"https://github.com/lxqt/qps\">https://github.com/lxqt/qps/</a>"
"<br>"
"<b>Bugtracker: </b><a href=\"https://github.com/QtDesktop/qps/issues\">https://github.com/QtDesktop/qps/issues</a>"
"<b>Bugtracker: </b><a href=\"https://github.com/lxqt/qps/issues\">https://github.com/lxqt/qps/issues</a>"
);
label->setText(str);

22
src/translations/qps.ts
Unescape View File

@ -4,7 +4,7 @@
<context>
<name>ControlBar</name>
<message>
<location filename="../misc.cpp" line="964"/>
<location filename="../misc.cpp" line="986"/>
<source>Pause (Ctrl+Space)</source>
<translation type="unfinished"></translation>
</message>
@ -114,7 +114,7 @@
<context>
<name>Qps</name>
<message>
<location filename="../qps.cpp" line="335"/>
<location filename="../qps.cpp" line="351"/>
<source>Detail</source>
<translation type="unfinished"></translation>
</message>
@ -122,47 +122,47 @@
<context>
<name>Screenshot</name>
<message>
<location filename="../screenshot.cpp" line="271"/>
<location filename="../screenshot.cpp" line="294"/>
<source>/untitled.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="276"/>
<location filename="../screenshot.cpp" line="299"/>
<source>Save As</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="277"/>
<location filename="../screenshot.cpp" line="300"/>
<source>%1 Files (*.%2);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="304"/>
<location filename="../screenshot.cpp" line="327"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="307"/>
<location filename="../screenshot.cpp" line="330"/>
<source> s</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="312"/>
<location filename="../screenshot.cpp" line="335"/>
<source>Screenshot Delay:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="314"/>
<location filename="../screenshot.cpp" line="337"/>
<source>Hide This Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="326"/>
<location filename="../screenshot.cpp" line="349"/>
<source>New Screenshot</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="327"/>
<location filename="../screenshot.cpp" line="350"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>

171
src/translations/qps_da.ts
Unescape View File

@ -0,0 +1,171 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="da">
<context>
<name>ControlBar</name>
<message>
<location filename="../misc.cpp" line="986"/>
<source>Pause (Ctrl+Space)</source>
<translation>Pause (Ctrl+Mellemrum)</translation>
</message>
</context>
<context>
<name>EventDialog</name>
<message>
<location filename="../watchdog.ui" line="23"/>
<source>Watchdog 0.1 alpha</source>
<translation>Watchdog 0.1 alfa</translation>
</message>
<message>
<location filename="../watchdog.ui" line="117"/>
<source>Eventcat</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../watchdog.ui" line="162"/>
<source>Select condition</source>
<translation>Vælg betingelse</translation>
</message>
<message>
<location filename="../watchdog.ui" line="170"/>
<source>labelDescrition</source>
<translation>etiketbeskrivelse</translation>
</message>
<message>
<location filename="../watchdog.ui" line="193"/>
<source>Enable</source>
<translation>Aktivér</translation>
</message>
<message>
<location filename="../watchdog.ui" line="219"/>
<source>process name</source>
<translation>procesnavn</translation>
</message>
<message>
<location filename="../watchdog.ui" line="229"/>
<source>cpu</source>
<translation>cpu</translation>
</message>
<message>
<location filename="../watchdog.ui" line="248"/>
<source>%</source>
<translation> %</translation>
</message>
<message>
<location filename="../watchdog.ui" line="280"/>
<source>include already running process</source>
<translation>inkluder allerede kørende proces</translation>
</message>
<message>
<location filename="../watchdog.ui" line="309"/>
<source>run command</source>
<translation>kør kommando</translation>
</message>
<message>
<location filename="../watchdog.ui" line="342"/>
<source>show Message</source>
<translation>vis meddelelse</translation>
</message>
<message>
<location filename="../watchdog.ui" line="367"/>
<source>Help (Not yet. just concept)</source>
<translation>Hjælp (ikke endnu, kun et koncept)</translation>
</message>
<message>
<location filename="../watchdog.ui" line="394"/>
<source>%p : pid
%c : command</source>
<translation>%p: pid
%c: kommando</translation>
</message>
<message>
<location filename="../watchdog.ui" line="425"/>
<source>New</source>
<translation>Ny</translation>
</message>
<message>
<location filename="../watchdog.ui" line="432"/>
<source>Add</source>
<translation>Tilføj</translation>
</message>
<message>
<location filename="../watchdog.ui" line="439"/>
<source>Delete</source>
<translation>Slet</translation>
</message>
<message>
<location filename="../watchdog.ui" line="446"/>
<source>Close</source>
<translation>Luk</translation>
</message>
</context>
<context>
<name>ExecWindow</name>
<message>
<location filename="../message.ui" line="13"/>
<source>Qps</source>
<translation>Qps</translation>
</message>
<message>
<location filename="../message.ui" line="27"/>
<source>Ok</source>
<translation>OK</translation>
</message>
</context>
<context>
<name>Qps</name>
<message>
<location filename="../qps.cpp" line="351"/>
<source>Detail</source>
<translation>Detalje</translation>
</message>
</context>
<context>
<name>Screenshot</name>
<message>
<location filename="../screenshot.cpp" line="294"/>
<source>/untitled.</source>
<translation>/unavngivet.</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="299"/>
<source>Save As</source>
<translation>Gem som</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="300"/>
<source>%1 Files (*.%2);;All Files (*)</source>
<translation>%1 filer (*.%2);;Alle filer (*)</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="327"/>
<source>Options</source>
<translation>Valgmuligheder</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="330"/>
<source> s</source>
<translation> s</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="335"/>
<source>Screenshot Delay:</source>
<translation>Forsinkelse for skærmbillede:</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="337"/>
<source>Hide This Window</source>
<translation>Skjul vinduet</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="349"/>
<source>New Screenshot</source>
<translation>Nyt skærmbillede</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="350"/>
<source>Quit</source>
<translation>Afslut</translation>
</message>
</context>
</TS>

170
src/translations/qps_de.ts
Unescape View File

@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de">
<context>
<name>ControlBar</name>
<message>
<location filename="../misc.cpp" line="986"/>
<source>Pause (Ctrl+Space)</source>
<translation>Pause (Strg+Leertaste)</translation>
</message>
</context>
<context>
<name>EventDialog</name>
<message>
<location filename="../watchdog.ui" line="23"/>
<source>Watchdog 0.1 alpha</source>
<translation></translation>
</message>
<message>
<location filename="../watchdog.ui" line="117"/>
<source>Eventcat</source>
<translation></translation>
</message>
<message>
<location filename="../watchdog.ui" line="162"/>
<source>Select condition</source>
<translation>Bedingung auswählen</translation>
</message>
<message>
<location filename="../watchdog.ui" line="170"/>
<source>labelDescrition</source>
<translation></translation>
</message>
<message>
<location filename="../watchdog.ui" line="193"/>
<source>Enable</source>
<translation>Aktivieren</translation>
</message>
<message>
<location filename="../watchdog.ui" line="219"/>
<source>process name</source>
<translation>Prozessname</translation>
</message>
<message>
<location filename="../watchdog.ui" line="229"/>
<source>cpu</source>
<translation>CPU</translation>
</message>
<message>
<location filename="../watchdog.ui" line="248"/>
<source>%</source>
<translation></translation>
</message>
<message>
<location filename="../watchdog.ui" line="280"/>
<source>include already running process</source>
<translation>bereits laufenden Prozess einbeziehen</translation>
</message>
<message>
<location filename="../watchdog.ui" line="309"/>
<source>run command</source>
<translation>starte Befehl</translation>
</message>
<message>
<location filename="../watchdog.ui" line="342"/>
<source>show Message</source>
<translation>zeige Nachricht</translation>
</message>
<message>
<location filename="../watchdog.ui" line="367"/>
<source>Help (Not yet. just concept)</source>
<translation>Hilfe (Noch nicht. Nur Konzept)</translation>
</message>
<message>
<location filename="../watchdog.ui" line="394"/>
<source>%p : pid
%c : command</source>
<translation></translation>
</message>
<message>
<location filename="../watchdog.ui" line="425"/>
<source>New</source>
<translation>Neu</translation>
</message>
<message>
<location filename="../watchdog.ui" line="432"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
<location filename="../watchdog.ui" line="439"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
<location filename="../watchdog.ui" line="446"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
</context>
<context>
<name>ExecWindow</name>
<message>
<location filename="../message.ui" line="13"/>
<source>Qps</source>
<translation></translation>
</message>
<message>
<location filename="../message.ui" line="27"/>
<source>Ok</source>
<translation></translation>
</message>
</context>
<context>
<name>Qps</name>
<message>
<location filename="../qps.cpp" line="351"/>
<source>Detail</source>
<translation></translation>
</message>
</context>
<context>
<name>Screenshot</name>
<message>
<location filename="../screenshot.cpp" line="294"/>
<source>/untitled.</source>
<translation></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="299"/>
<source>Save As</source>
<translation>Speichern unter</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="300"/>
<source>%1 Files (*.%2);;All Files (*)</source>
<translation>%1 Dateien (*.%2);;Alle Dateien (*)</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="327"/>
<source>Options</source>
<translation>Optionen</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="330"/>
<source> s</source>
<translation></translation>
</message>
<message>
<location filename="../screenshot.cpp" line="335"/>
<source>Screenshot Delay:</source>
<translation>Bildschirmfoto Verzögerung:</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="337"/>
<source>Hide This Window</source>
<translation>Verstecke Dieses Fenster</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="349"/>
<source>New Screenshot</source>
<translation>Neues Bildschirmfoto</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="350"/>
<source>Quit</source>
<translation>Beenden</translation>
</message>
</context>
</TS>

26
src/translations/qps_pl.ts
Unescape View File

@ -4,7 +4,7 @@
<context>
<name>ControlBar</name>
<message>
<location filename="../misc.cpp" line="964"/>
<location filename="../misc.cpp" line="986"/>
<source>Pause (Ctrl+Space)</source>
<translation>Pauzuj (Ctrl+Spacja)</translation>
</message>
@ -14,7 +14,7 @@
<message>
<location filename="../watchdog.ui" line="23"/>
<source>Watchdog 0.1 alpha</source>
<translation type="unfinished">Watchdog 0.1 alpha</translation>
<translation>Watchdog 0.1 alpha</translation>
</message>
<message>
<location filename="../watchdog.ui" line="117"/>
@ -115,7 +115,7 @@
<context>
<name>Qps</name>
<message>
<location filename="../qps.cpp" line="335"/>
<location filename="../qps.cpp" line="351"/>
<source>Detail</source>
<translation>Szczegół</translation>
</message>
@ -123,47 +123,47 @@
<context>
<name>Screenshot</name>
<message>
<location filename="../screenshot.cpp" line="271"/>
<location filename="../screenshot.cpp" line="294"/>
<source>/untitled.</source>
<translation>/bez tytułu.</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="276"/>
<location filename="../screenshot.cpp" line="299"/>
<source>Save As</source>
<translation>Zapisz jako</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="277"/>
<location filename="../screenshot.cpp" line="300"/>
<source>%1 Files (*.%2);;All Files (*)</source>
<translation>%1 plików (*.%2);;Wszystkie pliki (*)</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="304"/>
<location filename="../screenshot.cpp" line="327"/>
<source>Options</source>
<translation>Opcje</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="307"/>
<location filename="../screenshot.cpp" line="330"/>
<source> s</source>
<translation> sek</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="312"/>
<location filename="../screenshot.cpp" line="335"/>
<source>Screenshot Delay:</source>
<translation>Opóźnienie zrzutu ekranu</translation>
<translation>Opóźnienie wykonania zrzutu ekranu:</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="314"/>
<location filename="../screenshot.cpp" line="337"/>
<source>Hide This Window</source>
<translation>Ukryj to okno</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="326"/>
<location filename="../screenshot.cpp" line="349"/>
<source>New Screenshot</source>
<translation>Nowy zrzut ekranu</translation>
</message>
<message>
<location filename="../screenshot.cpp" line="327"/>
<location filename="../screenshot.cpp" line="350"/>
<source>Quit</source>
<translation>Wyjdź</translation>
</message>

Write Preview
Loading…
Cancel
Save