Request 801 (accepted)
Update to latest tarballs
Submit package home:sebas:br...l:frameworks / libksysguard to package home:plfiorin...l:frameworks / libksysguard
| [-] [+] | Changed | libksysguard.spec |
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/CMakeLists.txt ^ |
| @@ -1,16 +1,23 @@ project(libksysguard) -set(PROJECT_VERSION "5.1.0") +set(PROJECT_VERSION "5.1.90") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) include(FeatureSummary) include(WriteBasicConfigVersionFile) -find_package(ECM 0.0.9 REQUIRED NO_MODULE) +find_package(ECM 1.2.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Widgets Script) -find_package(Qt5 COMPONENTS WebKitWidgets) +find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets Script) +find_package(Qt5WebKitWidgets CONFIG) +set_package_properties(Qt5WebKitWidgets PROPERTIES + URL "git://gitorious.org/qt/qtwebkit.git" + DESCRIPTION "Qt Webkit module (web browsing engine)" + TYPE OPTIONAL + PURPOSE "Used by the HTML-based GUI ksysguard library" + ) + find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service Plasma) find_package(ZLIB REQUIRED) set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams" | ||
| [-] [+] | Added | libksysguard-5.1.90.tar.xz/COPYING ^ |
| @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorAgent.cpp ^ |
| @@ -1,21 +1,23 @@ /* - KSysGuard, the KDE System Guard + KSysGuard, the KDE System Guard - Copyright (c) 1999 - 2001 Chris Schlaeger <cs@kde.org> - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + Copyright (c) 1999 - 2001 Chris Schlaeger <cs@kde.org> + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -306,4 +308,4 @@ return mId; } -#include "SensorAgent.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorAgent.h ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 1999, 2000 Chris Schlaeger <cs@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorClient.h ^ |
| @@ -4,19 +4,21 @@ Copyright (c) 1999, 2000 Chris Schlaeger <cs@kde.org> Copyright (c) 2006 John Tapsell <tapsell@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorManager.cpp ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 1999 - 2001 Chris Schlaeger <cs@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -428,4 +430,4 @@ it.next().value()->disconnectClient( client ); } -#include "SensorManager.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorManager.h ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 1999, 2000 Chris Schlaeger <cs@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorShellAgent.cpp ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 1999 - 2001 Chris Schlaeger <cs@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -145,4 +147,4 @@ return mDaemon->write( msg, len ) != -1; } -#include "SensorShellAgent.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorShellAgent.h ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 1999, 2000 Chris Schlaeger <cs@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorSocketAgent.cpp ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 1999 - 2001 Chris Schlaeger <cs@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -129,4 +131,4 @@ return writtenLength == len; } -#include "SensorSocketAgent.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/ksgrd/SensorSocketAgent.h ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 1999, 2000 Chris Schlaeger <cs@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/lsofui/LsofSearchWidget.cpp ^ |
| @@ -22,21 +22,31 @@ */ -#include <klocale.h> -#include <kdebug.h> +#include <KLocalizedString> +#include <KConfigGroup> +#include <QDialogButtonBox> +#include <QPushButton> +#include <QVBoxLayout> + -#include "LsofSearchWidget.moc" #include "ui_LsofSearchWidget.h" LsofSearchWidget::LsofSearchWidget(QWidget* parent, int pid ) - : KDialog( parent ) + : QDialog( parent ) { setObjectName( "Renice Dialog" ); setModal( true ); - setCaption( i18n("Renice Process") ); - setButtons( Close ); + setWindowTitle( i18n("Renice Process") ); + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close); + QWidget *mainWidget = new QWidget(this); + QVBoxLayout *mainLayout = new QVBoxLayout; + setLayout(mainLayout); + mainLayout->addWidget(mainWidget); + connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); + connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); QWidget *widget = new QWidget(this); - setMainWidget(widget); + mainLayout->addWidget(widget); + mainLayout->addWidget(buttonBox); ui = new Ui_LsofSearchWidget(); ui->setupUi(widget); ui->klsofwidget->setPid(pid); | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/lsofui/LsofSearchWidget.h ^ |
| @@ -23,7 +23,7 @@ #ifndef _LsofSearchWidget_h_ #define _LsofSearchWidget_h_ -#include <kdialog.h> +#include <QDialog> class Ui_LsofSearchWidget; @@ -31,7 +31,7 @@ * This class creates and handles a simple dialog to change the scheduling * priority of a process. */ -class LsofSearchWidget : public KDialog +class LsofSearchWidget : public QDialog { Q_OBJECT | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/lsofui/lsof.cpp ^ |
| @@ -86,4 +86,4 @@ } } -#include "lsof.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes.cpp ^ |
| @@ -538,5 +538,5 @@ } } -#include "processes.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes.h ^ |
| @@ -23,6 +23,7 @@ #define PROCESSES_H_ #include "process.h" +#include <QtCore/QObject> #include <QtCore/QHash> namespace KSysGuard | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes_base_p.cpp ^ |
| @@ -19,4 +19,4 @@ */ -#include "processes_base_p.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes_dragonfly_p.cpp ^ |
| @@ -21,7 +21,7 @@ #include "processes_local_p.h" #include "process.h" -#include <klocale.h> +#include <KLocalizedString> #include <QSet> | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes_freebsd_p.cpp ^ |
| @@ -20,7 +20,7 @@ #include "processes_local_p.h" #include "process.h" -#include <klocale.h> +#include <KLocalizedString> #include <QSet> | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes_netbsd_p.cpp ^ |
| @@ -21,7 +21,7 @@ #include "processes_local_p.h" #include "process.h" -#include <klocale.h> +#include <KLocalizedString> #include <QSet> | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes_openbsd_p.cpp ^ |
| @@ -20,7 +20,7 @@ #include "processes_local_p.h" #include "process.h" -#include <klocale.h> +#include <KLocalizedString> #include <QSet> | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes_remote_p.cpp ^ |
| @@ -269,5 +269,5 @@ } -#include "processes_remote_p.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processcore/processes_solaris_p.cpp ^ |
| @@ -27,7 +27,7 @@ #include "processes_local_p.h" #include "process.h" -#include <klocale.h> +#include <KLocalizedString> #include <QSet> | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processui/KTextEditVT.cpp ^ |
| @@ -24,7 +24,7 @@ #include "KTextEditVT.h" -#include "KTextEditVT.moc" + #include <QFontDatabase> | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processui/ProcessFilter.cpp ^ |
| @@ -145,4 +145,4 @@ mFilter = filter; filterChanged();//Tell the proxy view to refresh all its information } -#include "ProcessFilter.moc" + | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processui/ProcessModel.cpp ^ |
| @@ -54,7 +54,7 @@ #include <sys/types.h> #endif -#include "ProcessModel.moc" + #ifdef HAVE_XRES #include <X11/extensions/XRes.h> @@ -1139,14 +1139,14 @@ } QString ProcessModel::getStringForProcess(KSysGuard::Process *process) const { - return xi18nc("Short description of a process. PID, name, user", "<numid>%1</numid>: %2, owned by user %3", (long)(process->pid), process->name, d->getUsernameForUser(process->uid, false)); + return xi18nc("Short description of a process. PID, name, user", "%1: %2, owned by user %3", (long)(process->pid), process->name, d->getUsernameForUser(process->uid, false)); } QString ProcessModelPrivate::getGroupnameForGroup(long gid) const { if(mIsLocalhost) { QString groupname = KUserGroup(gid).name(); if(!groupname.isEmpty()) - return xi18n("%1 (gid: <numid>%2</numid>)", groupname, gid); + return xi18n("%1 (gid: %2)", groupname, gid); } return QString::number(gid); } @@ -1342,7 +1342,7 @@ if(process->tracerpid >= 0) { KSysGuard::Process *process_tracer = d->mProcesses->getProcess(process->tracerpid); if(process_tracer) //it is possible for this to be not the case in certain race conditions - tracer = xi18nc("tooltip. name,pid ","This process is being debugged by %1 (<numid>%2</numid>)", process_tracer->name, (long int)process->tracerpid); + tracer = xi18nc("tooltip. name,pid ","This process is being debugged by %1 (%2)", process_tracer->name, (long int)process->tracerpid); } switch(index.column()) { case HeadingName: { @@ -1367,14 +1367,14 @@ } else if(process->name == "kthreadd") { tooltip += i18n("<b>KThreadd</b> manages kernel threads. The children processes run in the kernel, controlling hard disk access, etc.<br/>"); } - tooltip += xi18nc("name column tooltip. first item is the name","<b>%1</b><br />Process ID: <numid>%2</numid>", process->name, (long int)process->pid); + tooltip += xi18nc("name column tooltip. first item is the name","<b>%1</b><br />Process ID: %2", process->name, (long int)process->pid); } else { KSysGuard::Process *parent_process = d->mProcesses->getProcess(process->parent_pid); if(parent_process) { //In race conditions, it's possible for this process to not exist - tooltip = xi18nc("name column tooltip. first item is the name","<b>%1</b><br />Process ID: <numid>%2</numid><br />Parent: %3<br />Parent's ID: <numid>%4</numid>", process->name, (long int)process->pid, parent_process->name, (long int)process->parent_pid); + tooltip = xi18nc("name column tooltip. first item is the name","<b>%1</b><br />Process ID: %2<br />Parent: %3<br />Parent's ID: %4", process->name, (long int)process->pid, parent_process->name, (long int)process->parent_pid); } else { - tooltip = xi18nc("name column tooltip. first item is the name","<b>%1</b><br />Process ID: <numid>%2</numid><br />Parent's ID: <numid>%3</numid>", process->name, (long int)process->pid, (long int)process->parent_pid); + tooltip = xi18nc("name column tooltip. first item is the name","<b>%1</b><br />Process ID: %2<br />Parent's ID: %3", process->name, (long int)process->pid, (long int)process->parent_pid); } } if(process->numThreads >= 1) | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processui/ReniceDlg.cpp ^ |
| @@ -25,7 +25,7 @@ #include <klocalizedstring.h> -#include "ReniceDlg.moc" + #include <QListWidget> #include <QButtonGroup> #include <QDialog> | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/processui/ksysguardprocesslist.cpp ^ |
| @@ -21,7 +21,7 @@ */ -#include "ksysguardprocesslist.moc" + #include "ksysguardprocesslist.h" #include "../config-ksysguard.h" @@ -468,8 +468,6 @@ KSysGuard::Process *parent_process = d->mModel.getProcess(process->parent_pid); if(parent_process) { //it should not be possible for this process to not exist, but check just incase QString parent_name = parent_process->name; - if(parent_name.size() > 20) //Elide the text if it is too long - parent_name = parent_process->name.left(15) + QString::fromUtf8("…"); d->selectParent->setText(i18n("Jump to Parent Process (%1)", parent_name)); d->mProcessContextMenu->addAction(d->selectParent); } @@ -1281,8 +1279,6 @@ if (!confirm) continue; QString name = d->mModel.getStringForProcess(process); - if(name.size() > 100) - name = name.left(95) + QString::fromUtf8("…"); selectedAsStrings << name; } | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/signalplotter/kgraphicssignalplotter.cpp ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 2006 - 2009 John Tapsell <tapsell@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/signalplotter/kgraphicssignalplotter.h ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 2006 - 2009 John Tapsell <tapsell@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/signalplotter/ksignalplotter.cpp ^ |
| @@ -1,21 +1,21 @@ /* - This file is part of the KDE project + Copyright (c) 2006 - 2009 John Tapsell <tapsell@kde.org> - Copyright (c) 2006 - 2009 John Tapsell <tapsell@kde.org> + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/signalplotter/ksignalplotter.h ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 2006 - 2009 John Tapsell <tapsell@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/signalplotter/ksignalplotter_p.h ^ |
| @@ -3,19 +3,21 @@ Copyright (c) 2006 - 2009 John Tapsell <tapsell@kde.org> - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License version 2 or at your option version 3 as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/tests/guitest.cpp ^ |
| @@ -20,10 +20,8 @@ #include <QtTest> #include <QtCore> - -#include <klocale.h> -#include <kdebug.h> -#include <qtest_kde.h> +#include <QDebug> +#include <qtest.h> #include <processui/ksysguardprocesslist.h> @@ -38,10 +36,10 @@ for(int i =0; i < 10; i++) { processlist.updateList(); } - kDebug() << "time taken: " << t.elapsed() << "ms"; + qDebug() << "time taken: " << t.elapsed() << "ms"; } -QTEST_KDEMAIN(testGuiProcess, GUI) +QTEST_MAIN(testGuiProcess) + -#include "guitest.moc" | ||
| [-] [+] | Changed | libksysguard-5.1.90.tar.xz/tests/processtest.cpp ^ |
| @@ -217,5 +217,5 @@ } QTEST_MAIN(testProcess) -#include "processtest.moc" + | ||
| [-] [+] | Changed | libksysguard.yaml ^ |
| @@ -1,5 +1,5 @@ Name : libksysguard -Version : 5.1.0 +Version : 5.1.90 Release : 1 Group : System/Base License : GPLv2+ | ||
