diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt index fcfd4ac0..378c6891 100644 --- a/includes/CMakeLists.txt +++ b/includes/CMakeLists.txt @@ -37,7 +37,6 @@ install( KBookmarkMenu KBookmarkOwner KBreadcrumbSelectionModel - KBugReport KBuildSycocaProgressDialog KButtonGroup KCapacityBar diff --git a/includes/KBugReport b/includes/KBugReport deleted file mode 100644 index 254d7f65..00000000 --- a/includes/KBugReport +++ /dev/null @@ -1 +0,0 @@ -#include "../kbugreport.h" diff --git a/kdecore/kernel/kaboutdata.cpp b/kdecore/kernel/kaboutdata.cpp index ee7a087d..2b86b384 100644 --- a/kdecore/kernel/kaboutdata.cpp +++ b/kdecore/kernel/kaboutdata.cpp @@ -407,7 +407,6 @@ public: QList _licenseList; KLocalizedString translatorName; KLocalizedString translatorEmail; - QString productName; QString programIconName; QVariant programLogo; KLocalizedString customAuthorPlainText, customAuthorRichText; @@ -669,24 +668,11 @@ KAboutData &KAboutData::setOrganizationDomain( const QByteArray &domain ) return *this; } -KAboutData &KAboutData::setProductName( const QByteArray &_productName ) -{ - d->productName = QString::fromUtf8(_productName); - return *this; -} - QString KAboutData::appName() const { return QString::fromUtf8(d->_appName); } -QString KAboutData::productName() const -{ - if (!d->productName.isEmpty()) - return d->productName; - return appName(); -} - QString KAboutData::programName() const { if (!d->_programName.isEmpty()) diff --git a/kdecore/kernel/kaboutdata.h b/kdecore/kernel/kaboutdata.h index cc242c03..f4799966 100644 --- a/kdecore/kernel/kaboutdata.h +++ b/kdecore/kernel/kaboutdata.h @@ -173,9 +173,8 @@ class KAboutLicense; * for bug reporting, multiple authors and contributors * (using KAboutPerson), license and copyright information. * - * Currently, the values set here are shown by the "About" box - * (see KAboutDialog), used by the bug report dialog (see KBugReport), - * and by the help shown on command line (see KCmdLineArgs). + * Currently, the values set here are shown by the "About" box (see + * KAboutDialog), and by the help shown on command line (see KCmdLineArgs). * They are also used for the icon and the name of the program's windows. * * @note Instead of the more usual i18n calls, for translatable text the ki18n @@ -631,31 +630,12 @@ class KDECORE_EXPORT KAboutData */ KAboutData &setOrganizationDomain( const QByteArray &domain ); - /** - * Defines the product name which will be used in the KBugReport dialog. - * By default it's the appName, but you can overwrite it here to provide - * support for special components e.g. in the form 'product/component', - * such as 'kontact/summary'. - * - * @param name The name of product - */ - KAboutData &setProductName( const QByteArray &name ); - /** * Returns the application's internal name. * @return the internal program name. */ QString appName() const; - /** - * Returns the application's product name, which will be used in KBugReport - * dialog. By default it returns appName(), otherwise the one which is set - * with setProductName() - * - * @return the product name. - */ - QString productName() const; - /** * Returns the translated program name. * @return the program name (translated). diff --git a/kdecore/kernel/kglobal.h b/kdecore/kernel/kglobal.h index 5fa866fc..749a4224 100644 --- a/kdecore/kernel/kglobal.h +++ b/kdecore/kernel/kglobal.h @@ -473,13 +473,13 @@ namespace KGlobal /** * The component currently active (useful in a multi-component * application, such as a KParts application). - * Don't use this - it's mainly for KAboutDialog and KBugReport. + * Don't use this - it's mainly for KAboutDialog * @internal */ KDECORE_EXPORT KComponentData activeComponent(); /** - * Set the active component for use by KAboutDialog and KBugReport. + * Set the active component for use by KAboutDialog. * To be used only by a multi-component (KParts) application. * * @see activeComponent() diff --git a/kdecore/tests/kaboutdatatest.cpp b/kdecore/tests/kaboutdatatest.cpp index 13912ba8..91ea57d4 100644 --- a/kdecore/tests/kaboutdatatest.cpp +++ b/kdecore/tests/kaboutdatatest.cpp @@ -49,7 +49,6 @@ void KAboutDataTest::testConstructorWithDefaults() KAboutData aboutData(AppName, CatalogName, ki18n(ProgramName), Version ); QCOMPARE( aboutData.appName(), QLatin1String(AppName) ); - QCOMPARE( aboutData.productName(), QLatin1String(AppName) ); QCOMPARE( aboutData.programName(), ki18n(ProgramName).toString() ); QCOMPARE( aboutData.programIconName(), QLatin1String(AppName) ); QCOMPARE( aboutData.programLogo(), QVariant() ); @@ -93,7 +92,6 @@ void KAboutDataTest::testConstructor() HomePageAddress, BugsEmailAddress ); QCOMPARE( aboutData.appName(), QLatin1String(AppName) ); - QCOMPARE( aboutData.productName(), QLatin1String(AppName) ); QCOMPARE( aboutData.programName(), ki18n(ProgramName).toString() ); QCOMPARE( aboutData.programIconName(), QLatin1String(AppName) ); QCOMPARE( aboutData.programLogo(), QVariant() ); diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index 3a5ab2ff..8e74ee01 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -86,7 +86,6 @@ set(kdeui_LIB_SRCS dialogs/kassistantdialog.cpp dialogs/kconfigdialog.cpp dialogs/kconfigdialogmanager.cpp - dialogs/kbugreport.cpp dialogs/kdialog.cpp dialogs/kedittoolbar.cpp dialogs/kinputdialog.cpp @@ -480,7 +479,6 @@ install( config/kconfigskeleton.h dialogs/kaboutapplicationdialog.h dialogs/kassistantdialog.h - dialogs/kbugreport.h dialogs/kconfigdialog.h dialogs/kconfigdialogmanager.h dialogs/kdeprintdialog.h diff --git a/kdeui/dialogs/kbugreport.cpp b/kdeui/dialogs/kbugreport.cpp deleted file mode 100644 index ef4e3f93..00000000 --- a/kdeui/dialogs/kbugreport.cpp +++ /dev/null @@ -1,570 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 1999 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kbugreport.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "kdepackages.h" -#include "kdeversion.h" - -#include - -class KBugReportPrivate { -public: - KBugReportPrivate(KBugReport *q): q(q) {} - - void _k_slotConfigureEmail(); - void _k_slotSetFrom(); - void _k_appChanged(int); - void _k_updateUrl(); - - KBugReport *q; - QProcess * m_process; - const KAboutData * m_aboutData; - - KTextEdit * m_lineedit; - KLineEdit * m_subject; - QLabel * m_from; - QLabel * m_version; - QString m_strVersion; - QGroupBox * m_bgSeverity; - QPushButton * m_configureEmail; - - KComboBox *appcombo; - QString lastError; - QString kde_version; - QString appname; - QString os; - KUrl url; - QList severityButtons; - int currentSeverity() { - for (int i=0;iisChecked()) return i; - return -1; - } - bool submitBugWeb; -}; - -KBugReport::KBugReport( QWidget * _parent, bool modal, const KAboutData *aboutData ) - : KDialog( _parent ), d( new KBugReportPrivate(this) ) -{ - setCaption( i18n("Submit Bug Report") ); - setButtons( Ok | Cancel ); - setModal(modal); - - // Use supplied aboutdata, otherwise the one from the active componentData - // otherwise the KGlobal one. _activeInstance should neved be 0L in theory. - d->m_aboutData = aboutData ? aboutData - : (KGlobal::activeComponent().isValid() ? KGlobal::activeComponent().aboutData() - : KGlobal::mainComponent().aboutData()); - d->m_process = 0; - QWidget * parent = new QWidget(this); - d->submitBugWeb = false; - - if ( d->m_aboutData->bugAddress() == QLatin1String("submit@bugs.kde.org") ) - { - // This is a core KDE application -> redirect to the web form - d->submitBugWeb = true; - setButtonGuiItem( Cancel, KStandardGuiItem::close() ); - } - - QLabel * tmpLabel; - QVBoxLayout * lay = new QVBoxLayout( parent); - - KTitleWidget *title = new KTitleWidget( this ); - title->setText(i18n( "Submit Bug Report" ) ); - title->setPixmap( KIcon( "tools-report-bug" ).pixmap( 32 ) ); - lay->addWidget( title ); - - QGridLayout *glay = new QGridLayout(); - lay->addLayout(glay); - - int row = 0; - - if ( !d->submitBugWeb ) - { - // From - QString qwtstr = i18n( "Your email address. If incorrect, use the Configure Email button to change it" ); - tmpLabel = new QLabel( i18nc("Email sender address", "From:"), parent ); - glay->addWidget( tmpLabel, row,0 ); - tmpLabel->setWhatsThis(qwtstr ); - d->m_from = new QLabel( parent ); - glay->addWidget( d->m_from, row, 1 ); - d->m_from->setWhatsThis(qwtstr ); - - - // Configure email button - d->m_configureEmail = new QPushButton( i18n("Configure Email..."), - parent ); - connect( d->m_configureEmail, SIGNAL(clicked()), this, - SLOT(_k_slotConfigureEmail()) ); - glay->addWidget( d->m_configureEmail, 0, 2, 3, 1, Qt::AlignTop|Qt::AlignRight ); - - // To - qwtstr = i18n( "The email address this bug report is sent to." ); - tmpLabel = new QLabel( i18nc("Email receiver address", "To:"), parent ); - glay->addWidget( tmpLabel, ++row,0 ); - tmpLabel->setWhatsThis(qwtstr ); - tmpLabel = new QLabel( d->m_aboutData->bugAddress(), parent ); - tmpLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); - glay->addWidget( tmpLabel, row, 1 ); - tmpLabel->setWhatsThis(qwtstr ); - - setButtonGuiItem( Ok, KGuiItem( i18n("&Send"), "mail-send", i18n( "Send bug report." ), - i18n( "Send this bug report to %1." , d->m_aboutData->bugAddress() ) ) ); - row++; - } - else - { - d->m_configureEmail = 0; - d->m_from = 0; - } - - // Program name - QString qwtstr = i18n( "The application for which you wish to submit a bug report - if incorrect, please use the Report Bug menu item of the correct application" ); - tmpLabel = new QLabel( i18n("Application: "), parent ); - glay->addWidget( tmpLabel, row, 0 ); - tmpLabel->setWhatsThis(qwtstr ); - d->appcombo = new KComboBox( false, parent ); - d->appcombo->setWhatsThis(qwtstr ); - QStringList packageList; - for (int c = 0; packages[c]; ++c) - packageList << QString::fromLatin1(packages[c]); - d->appcombo->addItems(packageList); - connect(d->appcombo, SIGNAL(activated(int)), SLOT(_k_appChanged(int))); - d->appname = d->m_aboutData - ? d->m_aboutData->productName() - : qApp->applicationName() ; - glay->addWidget( d->appcombo, row, 1 ); - int index = 0; - for (; index < d->appcombo->count(); index++) { - if (d->appcombo->itemText(index) == d->appname) { - break; - } - } - if (index == d->appcombo->count()) { // not present - d->appcombo->addItem(d->appname); - } - d->appcombo->setCurrentIndex(index); - - tmpLabel->setWhatsThis(qwtstr ); - - // Version - qwtstr = i18n( "The version of this application - please make sure that no newer version is available before sending a bug report" ); - tmpLabel = new QLabel( i18n("Version:"), parent ); - glay->addWidget( tmpLabel, ++row, 0 ); - tmpLabel->setWhatsThis(qwtstr ); - if (d->m_aboutData) - d->m_strVersion = d->m_aboutData->version(); - else - d->m_strVersion = i18n("no version set (programmer error)"); - d->kde_version = QString::fromLatin1( KDE_VERSION_STRING ); - d->kde_version += ", " + QString::fromLatin1( KDE_DISTRIBUTION_TEXT ); - if ( !d->submitBugWeb ) - d->m_strVersion += ' ' + d->kde_version; - d->m_version = new QLabel( d->m_strVersion, parent ); - d->m_version->setTextInteractionFlags(Qt::TextBrowserInteraction); - //glay->addWidget( d->m_version, row, 1 ); - glay->addWidget( d->m_version, row, 1, 1, 2 ); - d->m_version->setWhatsThis(qwtstr ); - - tmpLabel = new QLabel(i18n("OS:"), parent); - glay->addWidget( tmpLabel, ++row, 0 ); - - struct utsname unameBuf; - uname( &unameBuf ); - d->os = QString::fromLatin1( unameBuf.sysname ) + - " (" + QString::fromLatin1( unameBuf.machine ) + ") " - "release " + QString::fromLatin1( unameBuf.release ); - - tmpLabel = new QLabel(d->os, parent); - tmpLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); - glay->addWidget( tmpLabel, row, 1, 1, 2 ); - - tmpLabel = new QLabel(i18n("Compiler:"), parent); - glay->addWidget( tmpLabel, ++row, 0 ); - tmpLabel = new QLabel(QString::fromLatin1(KDE_COMPILER_VERSION), parent); - tmpLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); - glay->addWidget( tmpLabel, row, 1, 1, 2 ); - - if ( !d->submitBugWeb ) - { - // Severity - d->m_bgSeverity = new QGroupBox( i18n("Se&verity"), parent ); - static const char * const sevNames[5] = { "critical", "grave", "normal", "wishlist", "i18n" }; - const QString sevTexts[5] = { i18n("Critical"), i18n("Grave"), i18nc("normal severity","Normal"), i18n("Wishlist"), i18n("Translation") }; - QHBoxLayout *severityLayout=new QHBoxLayout(d->m_bgSeverity); - for (int i = 0 ; i < 5 ; i++ ) - { - // Store the severity string as the name - QRadioButton *rb = new QRadioButton( sevTexts[i], d->m_bgSeverity); - rb->setObjectName(sevNames[i] ); - d->severityButtons.append(rb); - severityLayout->addWidget(rb); - if (i==2) rb->setChecked(true); // default : "normal" - } - - lay->addWidget( d->m_bgSeverity ); - - // Subject - QHBoxLayout * hlay = new QHBoxLayout(); - lay->addItem(hlay); - tmpLabel = new QLabel( i18n("S&ubject: "), parent ); - hlay->addWidget( tmpLabel ); - d->m_subject = new KLineEdit( parent ); - d->m_subject->setClearButtonShown(true); - d->m_subject->setFocus(); - tmpLabel->setBuddy( d->m_subject ); - hlay->addWidget( d->m_subject ); - - QString text = i18n("Enter the text (in English if possible) that you wish to submit for the " - "bug report.\n" - "If you press \"Send\", a mail message will be sent to the maintainer of " - "this program.\n"); - QLabel * label = new QLabel( parent); - - label->setText( text ); - lay->addWidget( label ); - - // The multiline-edit - d->m_lineedit = new KTextEdit( parent); - d->m_lineedit->setMinimumHeight( 180 ); // make it big - d->m_lineedit->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); - d->m_lineedit->setLineWrapMode(QTextEdit::WidgetWidth); - d->m_lineedit->setCheckSpellingEnabled(true); - d->m_lineedit->setSpellCheckingLanguage("en"); - lay->addWidget( d->m_lineedit, 10 /*stretch*/ ); - - d->_k_slotSetFrom(); - } else { - // Point to the web form - - lay->addSpacing(10); - QString text = i18n("To submit a bug report, click on the button below. This will open a web browser " - "window on http://bugs.kde.org where you will find " - "a form to fill in. The information displayed above will be transferred to that server."); - QLabel * label = new QLabel( text, parent); - label->setOpenExternalLinks( true ); - label->setTextInteractionFlags( Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard ); - label->setWordWrap( true ); - lay->addWidget( label ); - lay->addSpacing(10); - - d->appcombo->setFocus(); - - d->_k_updateUrl(); - - setButtonText(Ok, i18n("&Launch Bug Report Wizard")); - setButtonIcon(Ok, KIcon("tools-report-bug")); - } - parent->setMinimumHeight( parent->sizeHint().height() + 20 ); // WORKAROUND: prevent "cropped" kcombobox - setMainWidget(parent); -} - -KBugReport::~KBugReport() -{ - delete d; -} - -QString KBugReport::messageBody() const -{ - if ( !d->submitBugWeb ) - return d->m_lineedit->toPlainText(); - else - return QString(); -} - -void KBugReport::setMessageBody(const QString &messageBody) -{ - if ( !d->submitBugWeb ) - d->m_lineedit->setPlainText(messageBody); -} - -void KBugReportPrivate::_k_updateUrl() -{ - url = KUrl( "https://bugs.kde.org/enter_bug.cgi" ); - url.addQueryItem( "format", "guided" ); // use the guided form - - // the string format is product/component, where component is optional - QStringList list = appcombo->currentText().split('/'); - url.addQueryItem( "product", list[0] ); - if (list.size() == 2) { - url.addQueryItem( "component", list[1] ); - } - - url.addQueryItem( "version", m_strVersion ); - - // TODO: guess and fill OS(sys_os) and Platform(rep_platform) fields -} - -void KBugReportPrivate::_k_appChanged(int i) -{ - QString appName = appcombo->itemText(i); - int index = appName.indexOf( '/' ); - if ( index > 0 ) - appName = appName.left( index ); - kDebug() << "appName " << appName; - - QString strDisplayVersion; //Version string to show in the UI - if (appname == appName && m_aboutData) { - m_strVersion = m_aboutData->version(); - strDisplayVersion = m_strVersion; - } else { - m_strVersion = QLatin1String("unknown"); //English string to put in the bug report - strDisplayVersion = i18nc("unknown program name", "unknown"); - } - - if ( !submitBugWeb ) { - m_strVersion += ' ' + kde_version; - strDisplayVersion += ' ' + kde_version; - } - - m_version->setText(strDisplayVersion); - if ( submitBugWeb ) - _k_updateUrl(); -} - -void KBugReportPrivate::_k_slotConfigureEmail() -{ - if (m_process) return; - m_process = new QProcess; - QObject::connect( m_process, SIGNAL(finished(int,QProcess::ExitStatus)), q, SLOT(_k_slotSetFrom()) ); - m_process->start( QString::fromLatin1("kcmshell4"), QStringList() << QString::fromLatin1("kcm_useraccount") ); - if ( !m_process->waitForStarted() ) - { - kDebug() << "Couldn't start kcmshell4.."; - delete m_process; - m_process = 0; - return; - } - m_configureEmail->setEnabled(false); -} - -void KBugReportPrivate::_k_slotSetFrom() -{ - delete m_process; - m_process = 0; - m_configureEmail->setEnabled(true); - - // ### KDE4: why oh why is KEMailSettings in kio? - KConfig emailConf( QString::fromLatin1("emaildefaults") ); - - KConfigGroup cg(&emailConf, "Defaults"); - // find out the default profile - QString profile = QString::fromLatin1("PROFILE_"); - profile += cg.readEntry( QString::fromLatin1("Profile"), - QString::fromLatin1("Default") ); - - KConfigGroup profileGrp(&emailConf, profile ); - QString fromaddr = profileGrp.readEntry( "EmailAddress" ); - if (fromaddr.isEmpty()) { - struct passwd *p; - p = getpwuid(getuid()); - fromaddr = QString::fromLatin1(p->pw_name); - } else { - QString name = profileGrp.readEntry( "FullName" ); - if (!name.isEmpty()) - fromaddr = name + QString::fromLatin1(" <") + fromaddr + QString::fromLatin1(">"); - } - m_from->setText( fromaddr ); -} - -void KBugReport::accept() -{ - if ( d->submitBugWeb ) { - KToolInvocation::invokeBrowser( d->url.url() ); - return; - } - - if( d->m_lineedit->toPlainText().isEmpty() || - d->m_subject->text().isEmpty() ) - { - QString msg = i18n("You must specify both a subject and a description " - "before the report can be sent."); - KMessageBox::error(this,msg); - return; - } - - switch ( d->currentSeverity()) - { - case 0: // critical - if ( KMessageBox::questionYesNo( this, i18n( - "

You chose the severity Critical. " - "Please note that this severity is intended only for bugs that:

" - "
  • break unrelated software on the system (or the whole system)
    • " - "
  • cause serious data loss
    • " - "
  • introduce a security hole on the system where the affected package is installed
\n" - "

Does the bug you are reporting cause any of the above damage? " - "If it does not, please select a lower severity. Thank you.

" ),QString(),KStandardGuiItem::cont(),KStandardGuiItem::cancel() ) == KMessageBox::No ) - return; - break; - case 1: // grave - if ( KMessageBox::questionYesNo( this, i18n( - "

You chose the severity Grave. " - "Please note that this severity is intended only for bugs that:

" - "
  • make the package in question unusable or mostly so
    • " - "
  • cause data loss
    • " - "
  • introduce a security hole allowing access to the accounts of users who use the affected package
\n" - "

Does the bug you are reporting cause any of the above damage? " - "If it does not, please select a lower severity. Thank you.

" ),QString(),KStandardGuiItem::cont(),KStandardGuiItem::cancel() ) == KMessageBox::No ) - return; - break; - default: - break; - } - if( !sendBugReport() ) - { - QString msg = i18n("Unable to send the bug report.\n" - "Please submit a bug report manually....\n" - "See http://bugs.kde.org/ for instructions."); - KMessageBox::error(this, msg + "\n\n" + d->lastError); - return; - } - - KMessageBox::information(this, - i18n("Bug report sent, thank you for your input.")); - KDialog::accept(); -} - -void KBugReport::closeEvent( QCloseEvent * e) -{ - if( !d->submitBugWeb && ( (d->m_lineedit->toPlainText().length()>0) || d->m_subject->isModified() ) ) - { - int rc = KMessageBox::warningYesNo( this, - i18n( "Close and discard\nedited message?" ), - i18n( "Close Message" ), KStandardGuiItem::discard(), KStandardGuiItem::cont() ); - if( rc == KMessageBox::No ) - { - e->ignore(); - return; - } - } - KDialog::closeEvent(e); -} - - -QString KBugReport::text() const -{ - kDebug() << d->severityButtons[d->currentSeverity()]->objectName(); - // Prepend the pseudo-headers to the contents of the mail - QString severity = d->severityButtons[d->currentSeverity()]->objectName(); - QString appname = d->appcombo->currentText(); - QString os = QString::fromLatin1("OS: %1 (%2)\n"). - arg(KDE_COMPILING_OS). - arg(KDE_DISTRIBUTION_TEXT); - QString bodyText; -/* for(int i = 0; i < m_lineedit->numLines(); i++) - { - QString line = m_lineedit->textLine(i); - if (!line.endsWith("\n")) - line += '\n'; - bodyText += line; - } -*/ - bodyText=d->m_lineedit->toPlainText(); - if (bodyText.length()>0) - if (bodyText[bodyText.length()-1]!='\n') bodyText+='\n'; - if (severity == QLatin1String("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { - // Case 1 : i18n bug - QString package = QString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language()); - package = package.replace('_', '-'); - return QString::fromLatin1("Package: %1").arg(package) + - QString::fromLatin1("\n" - "Application: %1\n" - // not really i18n's version, so better here IMHO - "Version: %2\n").arg(appname).arg(d->m_strVersion)+ - os+QString::fromLatin1("\n")+bodyText; - } else { - appname = appname.replace('_', '-'); - // Case 2 : normal bug - return QString::fromLatin1("Package: %1\n" - "Version: %2\n" - "Severity: %3\n") - .arg(appname).arg(d->m_strVersion).arg(severity)+ - QString::fromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+ - os+QString::fromLatin1("\n")+bodyText; - } -} - -bool KBugReport::sendBugReport() -{ - QString recipient ( d->m_aboutData ? - d->m_aboutData->bugAddress() : - QString::fromLatin1("submit@bugs.kde.org") ); - - QString command; - command = KStandardDirs::locate("exe", "ksendbugmail"); - if (command.isEmpty()) - command = KStandardDirs::findExe( QString::fromLatin1("ksendbugmail") ); - - QProcess proc; - QStringList args; - args << "--subject" << d->m_subject->text() << "--recipient" << recipient; - proc.start( command, args ); - //kDebug() << command << args; - if (!proc.waitForStarted()) - { - kError() << "Unable to open a pipe to " << command << endl; - return false; - } - proc.write( text().toUtf8() ); - proc.closeWriteChannel(); - - proc.waitForFinished(); - kDebug() << "kbugreport: sendbugmail exit, status " << proc.exitStatus() << " code " << proc.exitCode(); - - QByteArray line; - if (proc.exitStatus() == QProcess::NormalExit && proc.exitCode() != 0) { - // XXX not stderr? - while (!proc.atEnd()) - line = proc.readLine(); - d->lastError = QString::fromUtf8( line ); - return false; - } - return true; -} - - -#include "moc_kbugreport.cpp" diff --git a/kdeui/dialogs/kbugreport.h b/kdeui/dialogs/kbugreport.h deleted file mode 100644 index 29c09cdb..00000000 --- a/kdeui/dialogs/kbugreport.h +++ /dev/null @@ -1,120 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 1999 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#ifndef KBUGREPORT_H -#define KBUGREPORT_H - -#include - -class KAboutData; -class KBugReportPrivate; - -/** - * @short A dialog box for sending bug reports. - * - * All the information needed by the dialog box - * (program name, version, bug-report address, etc.) - * comes from the KAboutData class. - * Make sure you create an instance of KAboutData and pass it - * to KCmdLineArgs. - * - * \image html kbugreport.png "KDE Bug Report Dialog" - * - * @author David Faure - */ -class KDEUI_EXPORT KBugReport : public KDialog -{ - Q_OBJECT - -public: - /** - * Creates a bug-report dialog. - * Note that you shouldn't have to do this manually, - * since KHelpMenu takes care of the menu item - * for "Report Bug..." and of creating a KBugReport dialog. - */ - // ###KDE5: remove modal argument - explicit KBugReport(QWidget *parent = 0L, bool modal=true, const KAboutData *aboutData = 0L); - - /** - * Destructor - */ - virtual ~KBugReport(); - - /** - * The message body of the bug report - * @return The message body of the bug report. - */ - QString messageBody() const; - - /** - * Sets the message body of the bug report. - */ - void setMessageBody(const QString &messageBody); - - /** - * OK has been clicked - */ - virtual void accept(); - -private: - /** - * "Configure email" has been clicked - this calls kcmshell4 System/email - */ - Q_PRIVATE_SLOT(d, void _k_slotConfigureEmail()) - - /** - * Sets the "From" field from the e-mail configuration - * Called at creation time, but also after "Configure email" is closed. - */ - Q_PRIVATE_SLOT(d, void _k_slotSetFrom()) - - /** - * Application combo selection changed (and was activated) - */ - Q_PRIVATE_SLOT(d, void _k_appChanged(int)) - - /** - * Update the url to match the current os, compiler, selected app, etc - */ - Q_PRIVATE_SLOT(d, void _k_updateUrl()) - -protected: - /** - * A complete copy of the bug report - * @return QString copy of the bug report. - */ - QString text() const; - - /** - * Attempt to e-mail the bug report. - * @return true on success - */ - bool sendBugReport(); - - virtual void closeEvent(QCloseEvent *e); - -private: - friend class KBugReportPrivate; - KBugReportPrivate *const d; - - Q_DISABLE_COPY(KBugReport) -}; - -#endif - diff --git a/kdeui/kdepackages.h b/kdeui/kdepackages.h deleted file mode 100644 index f4a6a094..00000000 --- a/kdeui/kdepackages.h +++ /dev/null @@ -1,1046 +0,0 @@ -const char * const packages[] = { -"abakus", -"aki", -"aki/libakicore", -"akiirc", -"akiirc/ChannelView", -"akiirc/ChatInput", -"akiirc/notifications", -"akiirc/ServerView", -"Akonadi", -"Akonadi/ICal file resource", -"Akonadi/IMAP resource", -"Akonadi/KResource compat bridges", -"Akonadi/libakonadi", -"Akonadi/server", -"Akonadi/VCard dir resource", -"Akonadi/VCard file resource", -"akregator", -"akregator/akregator konqueror plugin", -"akregator/feed parser", -"akregator/internal browser", -"akregator/kontact plugin", -"akregator/metakit plugin", -"amarok", -"amarok/AFT", -"amarok/Collection", -"amarok/CollectionBrowser", -"amarok/ContextView", -"amarok/DAAP", -"amarok/DynamicPlaylists", -"amarok/Engines", -"amarok/FileBrowser", -"amarok/Mediabrowser", -"amarok/OSD", -"amarok/Playlist", -"amarok/PlaylistBrowser", -"amarok/Podcast", -"amarok/ScriptManager", -"amarok/ServiceBrowser", -"amor", -"ark", -"ark/Konqueror Plugin", -"artwork", -"basket", -"bindings", -"blinken", -"bovo", -"bugs.kde.org", -"bugs.kde.org/code customizations", -"bugs.kde.org/database", -"bugs.kde.org/product/component changes", -"bugs.kde.org/templates", -"buildsystem", -"buildsystem/KDE4 (cmake)", -"cervisia", -"choqok", -"datakiosk", -"digikam", -"digikam/Albums GUI", -"digikam/Batch Queue Manager", -"digikam/Camera GUI", -"digikam/Color Management", -"digikam/Database", -"digikam/Dates", -"digikam/Export", -"digikam/Filter", -"digikam/Fuzzy Searches", -"digikam/Geolocation", -"digikam/Image Editor", -"digikam/Import", -"digikam/Kioslave", -"digikam/Kipiinterface", -"digikam/Light Table", -"digikam/Map Searches", -"digikam/Metadata", -"digikam/Portability", -"digikam/Preview", -"digikam/RAW files management", -"digikam/Searches", -"digikam/setup", -"digikam/SlideShow", -"digikam/Tags", -"digikam/Themes", -"digikam/Thumbnails", -"digikam/Time Line", -"digikam/Usability", -"digikam/Workflow", -"digikamimageplugins", -"digikamimageplugins/Adjust Curves", -"digikamimageplugins/AdjustLevels", -"digikamimageplugins/Anti-Vignetting", -"digikamimageplugins/Blur Fx", -"digikamimageplugins/Border", -"digikamimageplugins/Channel Mixer", -"digikamimageplugins/Charcoal", -"digikamimageplugins/ColorFx", -"digikamimageplugins/Core Plugin", -"digikamimageplugins/Distortion Fx", -"digikamimageplugins/Emboss", -"digikamimageplugins/Filmgrain", -"digikamimageplugins/Free Rotation", -"digikamimageplugins/Hot Pixels", -"digikamimageplugins/Infrared", -"digikamimageplugins/Inpainting", -"digikamimageplugins/Insert Text", -"digikamimageplugins/Lens Distortion", -"digikamimageplugins/Noise Reduction", -"digikamimageplugins/OilPaint", -"digikamimageplugins/Perspective", -"digikamimageplugins/Raindrops", -"digikamimageplugins/Refocus", -"digikamimageplugins/Restoration", -"digikamimageplugins/Shear", -"digikamimageplugins/Super-Impose", -"digikamimageplugins/Texture", -"digikamimageplugins/Unsharp", -"digikamimageplugins/White Balance", -"digikamimageplugins/Wish for new plugin", -"docs", -"docs/Corrections", -"docs/docs.kde.org", -"docs/faq", -"docs/ksgmltools", -"docs/Missing Content", -"docs/Screenshots", -"dolphin", -"dragonplayer", -"drkonqi", -"drkonqi/backtraceparsing", -"filelight", -"grantlee", -"guidance", -"gwenview", -"HIG", -"i18n", -"i18n/af", -"i18n/bg", -"i18n/br", -"i18n/ca", -"i18n/cs", -"i18n/cy", -"i18n/da", -"i18n/de", -"i18n/el", -"i18n/en_GB", -"i18n/eo", -"i18n/es", -"i18n/et", -"i18n/eu", -"i18n/fi", -"i18n/fr", -"i18n/ga", -"i18n/gl", -"i18n/gu", -"i18n/he", -"i18n/hr", -"i18n/hu", -"i18n/is", -"i18n/it", -"i18n/ja", -"i18n/ko", -"i18n/lt", -"i18n/lv", -"i18n/mk", -"i18n/nb", -"i18n/nl", -"i18n/nn", -"i18n/oc", -"i18n/pl", -"i18n/pt", -"i18n/pt-BR", -"i18n/ro", -"i18n/ru", -"i18n/sk", -"i18n/sl", -"i18n/sr", -"i18n/sv", -"i18n/ta", -"i18n/th", -"i18n/tr", -"i18n/uk", -"i18n/wa", -"i18n/zh-CN.GB2312", -"i18n/zh_TW", -"juk", -"k3b", -"k3b/Audio Project", -"k3b/Burning/Hardware", -"k3b/Copying", -"k3b/Data Project", -"k3b/eMovix project", -"k3b/GUI/Usability", -"k3b/Image Formats", -"k3b/Mixed Mode Project", -"k3b/Plugins", -"k3b/Verfication", -"k3b/Video CD project", -"k3b/Video DVD", -"kaddressbook", -"kaddressbook/ldap search", -"kaddressbook/printing", -"kaffeine", -"kalarm", -"kalarm/kalarmd", -"kalcul", -"kalgebra", -"kalzium", -"kalzium/Calculator", -"kanagram", -"kandy", -"kapman", -"kappfinder", -"kapptemplate", -"karbon", -"karbon/opendocument", -"karbon/usability", -"kard", -"kate", -"kate/application", -"kate/folding", -"kate/indentation", -"kate/kwrite", -"kate/part", -"kate/syntax", -"kate/Vi Input Mode", -"katomic", -"kaudiocreator", -"kbackgammon", -"kbattleship", -"kblackbox", -"kblocks", -"kbounce", -"kbreakout", -"kbruch", -"kcachegrind", -"kcalc", -"KCall", -"kcanvas", -"kcharselect", -"kchart", -"kchart/opendocument", -"kchart/shape", -"kchart/usability", -"kcoloredit", -"kcron", -"kde", -"kde/clipboard", -"kde/dualhead", -"kde/xinerama", -"kde-windows", -"kde-windows/buildsystem", -"kde-windows/gui", -"kde-windows/installer", -"kde-windows/network&files", -"kde-windows/other", -"kde-windows/porting", -"kdebugdialog", -"kdelibs", -"kdelibs/kbugreport", -"kdelibs/kcertpart", -"kdelibs/kdecore", -"kdelibs/kded", -"kdelibs/kdeinit", -"kdelibs/kdesasl", -"kdelibs/kdeui", -"kdelibs/kdewebkit", -"kdelibs/kedittoolbar", -"kdelibs/kimgio", -"kdelibs/klauncher", -"kdelibs/klocale", -"kdelibs/kmdi", -"kdelibs/knetwork", -"kdelibs/knewstuff", -"kdelibs/knotify", -"kdelibs/kpasswdserver", -"kdelibs/kspell", -"kdelibs/kstyle", -"kdelibs/ksycoca", -"kdelibs/kwallet", -"kdelibs/print-dialog", -"kdelibs/qt", -"kdelibs/kmediaplayer", -"kdelibs/shortcuts", -"kdemultimedia", -"kdepasswd", -"kdepimlibs", -"kdepimlibs/gpgme++", -"kdepimlibs/kabc", -"kdepimlibs/kblog", -"kdepimlibs/kcal", -"kdepimlibs/kholidays", -"kdepimlibs/kldap", -"kdepimlibs/kmime", -"kdepimlibs/kpimidentities", -"kdepimlibs/kpimtextedit", -"kdepimlibs/mailtransport", -"kdepimlibs/qgpgme", -"kdepimlibs/syndication", -"kdesdk-scripts", -"kdesdk-scripts/cmake", -"kdesdk-scripts/Miscellaneous", -"kdesdk-scripts/source_control", -"kdesu", -"kdesu/kdesu", -"kdesu/kdesud", -"kdesvn-build", -"kdevelop", -"kdevelop/abbreviation plugin", -"kdevelop/all build tools", -"kdevelop/all editors", -"kdevelop/application templates", -"kdevelop/astyle", -"kdevelop/bookmarks part", -"kdevelop/Build tools: ANT", -"kdevelop/Build tools: Automake", -"kdevelop/Build tools: CMake", -"kdevelop/Build tools: Custom Makefiles", -"kdevelop/Build tools: QMake", -"kdevelop/Buildtools: Make", -"kdevelop/classview", -"kdevelop/code completion", -"kdevelop/coverage", -"kdevelop/CPP Debugger", -"kdevelop/cpp-parser", -"kdevelop/CTags", -"kdevelop/distpart", -"kdevelop/doctreeview", -"kdevelop/documentation viewer", -"kdevelop/documentview", -"kdevelop/doxygen integration", -"kdevelop/file create", -"kdevelop/file groups", -"kdevelop/file selector", -"kdevelop/file tree", -"kdevelop/grep frontend", -"kdevelop/ident", -"kdevelop/kdevelop 2.x (obsolete)", -"kdevelop/Language Support: Ada", -"kdevelop/Language Support: CPP", -"kdevelop/Language Support: Java", -"kdevelop/Language Support: Pascal", -"kdevelop/Language Support: Perl", -"kdevelop/Language Support: PHP", -"kdevelop/Language Support: Python", -"kdevelop/Language Support: Ruby", -"kdevelop/Output Views", -"kdevelop/partexplorer", -"kdevelop/php support", -"kdevelop/problem reporter", -"kdevelop/Profiles", -"kdevelop/qeditor", -"kdevelop/Qt Designer Integration", -"kdevelop/replace part", -"kdevelop/scriptproject", -"kdevelop/UI: all modes", -"kdevelop/UI: childframe window", -"kdevelop/UI: IDEAl", -"kdevelop/UI: tabbed pages", -"kdevelop/UI: toplevel window", -"kdevelop/valgrind integration", -"kdevelop/VCS: Clearcase", -"kdevelop/VCS: CVS", -"kdevelop/VCS: CVSService", -"kdevelop/VCS: Perforce", -"kdevplatform", -"kdevplatform/appwizard", -"kdevplatform/bazaar", -"kdevplatform/classbrowser", -"kdevplatform/contextbrowser", -"kdevplatform/documentswitcher", -"kdevplatform/dvcs", -"kdevplatform/editor integration", -"kdevplatform/filemanager", -"kdevplatform/git", -"kdevplatform/konsole integration", -"kdevplatform/kross", -"kdevplatform/language", -"kdevplatform/mercurial", -"kdevplatform/outputview", -"kdevplatform/problemreporter", -"kdevplatform/project", -"kdevplatform/quickopen", -"kdevplatform/run support", -"kdevplatform/shell", -"kdevplatform/snippet", -"kdevplatform/sourceformatter", -"kdevplatform/sublime", -"kdevplatform/subversion", -"kdevplatform/util", -"kdevplatform/vcs", -"kdevplatform/veritas", -"kdf", -"kdialog", -"kdiamond", -"kdiff3", -"kdiff3/KDiff3Part", -"kdm", -"kdm/kdmdesktop", -"kdm/krootimage", -"keditbookmarks", -"kephal", -"kephal/General", -"kexi", -"kexi/Forms", -"kexi/General", -"kexi/KexiDB", -"kexi/Migration/Import/Export", -"kexi/Queries", -"kexi/Reports and Printouts", -"kexi/Scripting", -"kexi/Tables", -"kexi/Usability", -"Keyboard status applet", -"kfax", -"kfile", -"kfile/kfileplacesview", -"kfile-plugins", -"kfile-plugins/avi", -"kfile-plugins/exr", -"kfile-plugins/jpeg", -"kfile-plugins/mp3", -"kfile-plugins/mpeg", -"kfile-plugins/ogg", -"kfile-plugins/OOo", -"kfile-plugins/pdf", -"kfile-plugins/PNG", -"kfile-plugins/ps", -"kfile-plugins/wav", -"kfilereplace", -"kfind", -"kfloppy", -"kformula", -"kformula/filters", -"kformula/usability", -"kfourinline", -"kftpgrabber", -"kgeography", -"kget", -"kget/Core", -"kget/konqextension", -"kget/metalink", -"kget/Multisegkio", -"kget/plasma widget", -"kget/torrent", -"kget/UI", -"kget/webinterface", -"kgoldrunner", -"kgpg", -"kgrapheditor", -"kgraphviewer", -"Khalkhi", -"Khalkhi/kicker applet", -"khangman", -"khelpcenter", -"khotkeys", -"khotkeys/Voice recognition", -"kiconedit", -"kig", -"kile", -"kile/editor", -"kile/user interface", -"killbots", -"kimagemapeditor", -"kinfocenter", -"kio", -"kio/audiocd", -"kio/cgi", -"kio/devices", -"kio/file", -"kio/fish", -"kio/floppy", -"kio/ftp", -"kio/gopher", -"kio/help", -"kio/home", -"kio/http", -"kio/imap", -"kio/info", -"kio/kamera", -"kio/kfile", -"kio/kioslave", -"kio/kssl", -"kio/man", -"kio/media", -"kio/network", -"kio/nfs", -"kio/nntp", -"kio/pop3", -"kio/remote", -"kio/settings", -"kio/sftp", -"kio/sieve", -"kio/smb", -"kio/smbro", -"kio/smtp", -"kio/svn", -"kio/system", -"kio/tar", -"kio/thumbnail", -"kio/trash", -"kio/uiserver", -"kio/webdav", -"kio/zeroconf", -"kio/zip", -"kiosk", -"kiosk/kiosktool", -"kipiplugins", -"kipiplugins/acquireimages", -"kipiplugins/AdvancedSlideshow", -"kipiplugins/batchprocessimages", -"kipiplugins/calendar", -"kipiplugins/cdarchiving", -"kipiplugins/DngConverter", -"kipiplugins/Facebook/23", -"kipiplugins/findimages", -"kipiplugins/FlashExport", -"kipiplugins/flickrexport", -"kipiplugins/galleryexport", -"kipiplugins/GPSSync", -"kipiplugins/HTMLExport", -"kipiplugins/imageviewer", -"kipiplugins/IpodExport", -"kipiplugins/jpeglossless", -"kipiplugins/kameraklient", -"kipiplugins/libkdcraw", -"kipiplugins/libkexiv2", -"kipiplugins/libkipi", -"kipiplugins/metadataedit", -"kipiplugins/mpegencoder", -"kipiplugins/picasawebexport", -"kipiplugins/printwizard", -"kipiplugins/rawconverter", -"kipiplugins/RemoveRedEyes", -"kipiplugins/sendimages", -"kipiplugins/Smug", -"kipiplugins/timeadjust", -"kipiplugins/wallpaper", -"kipiplugins/Wish For New Plugins", -"kiriki", -"kit/icons", -"kitchensync", -"kiten", -"kivio", -"kivio/usability", -"kjots", -"kjsembed", -"kjsembed/Core", -"kjsembed/Docs and examples", -"kjsembed/Plugins", -"kjumpingcube", -"kleopatra", -"kleopatra/Assuan UI Server", -"klettres", -"klickety", -"klines", -"klinkstatus", -"klipper", -"kmag", -"kmahjongg", -"kmail2", -"kmail2/commands and actions", -"kmail2/composer", -"kmail2/composereditor-ng", -"kmail2/config dialog", -"kmail2/crypto", -"kmail2/filtering", -"kmail2/folders", -"kmail2/general", -"kmail2/MDN", -"kmail2/message list", -"kmail2/misc", -"kmail2/sieve", -"kmail2/UI", -"kmenuedit", -"kmid", -"kmines", -"kmix", -"kmix/Backend: Pulseaudio", -"kmix/KMix Panel Applet", -"kmix/KMix Panel Docking", -"kmix/On-Screen-Display (OSD)", -"kmix/Soundcard specific", -"kmldonkey", -"kmldonkey/libkmldonkey", -"kmobiletools", -"kmobiletools/AT Engine", -"kmobiletools/Gammu Engine", -"kmousetool", -"kmouth", -"kmplayer", -"kmplot", -"kmtrace", -"knemo", -"knetattach", -"knetwalk", -"knode", -"knotes", -"kolf", -"kollision", -"kolourpaint", -"kolourpaint/general-kde4", -"kolourpaint/imagelib", -"kolourpaint/ui", -"kolourpaint/ui-kde4", -"kommander", -"kommander/Kommander editor", -"kommander/Kommander executor", -"kompare", -"kompare/navigationpart", -"kompare/parser", -"kompare/viewpart", -"konqueror", -"konqueror/bookmarks", -"konqueror/file icon view", -"konqueror/file list view", -"konqueror/fsview", -"konqueror/imagerotation", -"konqueror/kcookiejar", -"konqueror/khtml", -"konqueror/khtml adblock", -"konqueror/khtml ecma", -"konqueror/khtml event", -"konqueror/khtml forms", -"konqueror/khtml image part", -"konqueror/khtml parsing", -"konqueror/khtml part", -"konqueror/khtml printing", -"konqueror/khtml renderer", -"konqueror/khtml svg", -"konqueror/khtml xml", -"konqueror/kimgalleryplugin", -"konqueror/kjava", -"konqueror/kjs", -"konqueror/konq-e", -"konqueror/kuick", -"konqueror/New Plugin wishes", -"konqueror/nsplugins", -"konqueror/nspluginscan", -"konqueror/nspluginviewer", -"konqueror/photobook", -"konqueror/reaktivate", -"konqueror/rellinks", -"konqueror/searchbarplugin", -"konqueror/servicemenus", -"konqueror/session restore", -"konqueror/sidebar", -"konqueror/sidebar media player", -"konqueror/sidebar newsticker", -"konqueror/tabbing", -"konqueror/webarchiverplugin", -"konquest", -"konsole", -"konsole/kwrited", -"konsolekalendar", -"kontact", -"kontact/akregator", -"kontact/calendar", -"kontact/contacts", -"kontact/journal", -"kontact/ktimetracker", -"kontact/mail", -"kontact/new plugin wishes", -"kontact/news", -"kontact/newsticker", -"kontact/notes", -"kontact/planner summary", -"kontact/special dates", -"kontact/summary", -"kontact/todo", -"konversation", -"konversation/dcc", -"konversation/documentation", -"konversation/inputline", -"konversation/ircview", -"konversation/logging", -"konversation/notifications", -"konversation/protocol", -"konversation/tabcompletion", -"konversation/upnp", -"kooka", -"kooka/libkscan", -"kopete", -"kopete/Add Contact Wizard", -"kopete/Addressbook integration", -"kopete/Alias Plugin", -"kopete/Audio/Video Plugin", -"kopete/Auto-Away Plugin", -"kopete/Autoreplace plugin", -"kopete/Bonjour Plugin", -"kopete/Bookmarks plugin", -"kopete/Chat Window", -"kopete/Chatwindow Styles", -"kopete/Connection Status Plugin", -"kopete/Contact list", -"kopete/Contact Notes Plugin", -"kopete/Cryptography Plugin", -"kopete/DBus", -"kopete/DCOP Interface", -"kopete/Gadu-Gadu Plugin", -"kopete/History Plugin", -"kopete/ICQ and AIM Plugins", -"kopete/Importer plugin", -"kopete/IRC Plugin", -"kopete/Jabber Plugin", -"kopete/Latex Plugin", -"kopete/libkopete", -"kopete/Lotus Sametime Plugin", -"kopete/Main Application", -"kopete/Meanwhile plugin", -"kopete/MSN Plugin", -"kopete/New plugin wishes", -"kopete/Notifications", -"kopete/Novell GroupWise Messenger Plugin", -"kopete/Now Listening Plugin", -"kopete/OTR Plugin", -"kopete/Pipes Plugin", -"kopete/Privacy Plugin", -"kopete/QQ Plugin", -"kopete/Skype Plugin", -"kopete/SMS Plugin", -"kopete/SpellCheck Plugin", -"kopete/Statistics plugin", -"kopete/Testbed Plugin", -"kopete/Texteffect Plugin", -"kopete/Translator Plugin", -"kopete/Web Presence Plugin", -"kopete/WinPopup Plugin", -"kopete/WLM Plugin", -"kopete/Yahoo Plugin", -"korganizer", -"korganizer/agendaview (weekview)", -"korganizer/embedded", -"korganizer/exchangeplugin", -"korganizer/groupware", -"korganizer/html export", -"korganizer/import/export", -"korganizer/invitations", -"korganizer/journalview", -"korganizer/monthview", -"korganizer/otherviews", -"korganizer/printing", -"korganizer/reminder daemon (korgac)", -"korganizer/todoview", -"kpat", -"kphotoalbum", -"kphotoalbum/Annotation Dialog", -"kphotoalbum/Backend", -"kphotoalbum/Browser", -"kphotoalbum/Datebar", -"kphotoalbum/EXIF viewer/search", -"kphotoalbum/HTML generator", -"kphotoalbum/Import/Export", -"kphotoalbum/SQL backend", -"kphotoalbum/Thumbnail Viewer", -"kphotoalbum/Viewer", -"kphotoalbum/XML backend", -"kpovmodeler", -"kppp", -"kpresenter", -"kpresenter/filters", -"kpresenter/opendocument", -"kpresenter/usability", -"krandr", -"krandr/control center", -"krandr/krandrtray", -"krazy", -"krdc", -"krdc/NX", -"krdc/RDP", -"krdc/VNC", -"krecord", -"kregexpeditor", -"kresources", -"kresources/birthdays", -"kresources/blogging", -"kresources/bugzilla", -"kresources/egroupware", -"kresources/exchange", -"kresources/featureplan", -"kresources/framework", -"kresources/groupdav", -"kresources/groupwise", -"kresources/imap", -"kresources/ldap", -"kresources/local", -"kresources/newexchange", -"kresources/remote", -"kresources/SLOX", -"kreversi", -"krfb", -"krita", -"krita/adjustment layers", -"krita/Color models", -"krita/Documentation", -"krita/File formats", -"krita/Filters", -"krita/Tile manager", -"krita/Tools", -"krita/transform", -"krita/usability", -"kruler", -"krunner", -"krunner/quicksand", -"krusader", -"ksayit", -"kscd", -"kscreensaver", -"kscreensaver/kcheckpass", -"kscreensaver/kpartsaver", -"kscreensaver/ktux", -"kscreensaver/kxsrun", -"kscreensaver/screensavers", -"kshisen", -"ksirk", -"ksirkskineditor", -"ksmserver", -"ksnapshot", -"kspaceduel", -"ksplash", -"kspread", -"kspread/filters", -"kspread/opendocument", -"kspread/usability", -"KSquares", -"kst", -"kst/datasources", -"kst/documentation", -"kst/elog extension", -"kst/equations", -"kst/i18n", -"kst/packaging", -"kst/plotting", -"kst/plugins", -"kst/scripting", -"kst/ui", -"kst/view objects", -"kstars", -"kstart", -"kstartperf", -"ksudoku", -"ksvg2", -"ksysguard", -"ksysguard/ksysguard", -"ksysguard/ksysguardd", -"ksysguard/Plasmoid / Applet", -"ksysguard/Process Controller - krunner part", -"KSystemLog", -"kteatime", -"ktimer", -"ktimetracker", -"ktimetracker/reporting", -"ktnef", -"ktorrent", -"ktouch", -"ktron", -"kttt", -"ktuberling", -"kturtle", -"kubrick", -"kuickshow", -"kuiviewer", -"kuser", -"kverbos", -"kvkbd", -"kvoctrain", -"kvpnc", -"kwalletmanager", -"kwebkitpart", -"kwikdisk", -"kwin", -"kwin/compatibility", -"kwin/compositing", -"kwin/decorations", -"kwin/eyecandy", -"kwin/multihead", -"kwin/xinerama", -"kwordquiz", -"kxkb", -"kxsldbg", -"kxsldbg/kxsldbg", -"kxsldbg/xsldbg", -"libkcddb", -"libkdegames", -"libkdepim", -"libkdepim/libkpgp", -"libksane", -"lokalize", -"lokalize/editor", -"lokalize/glossary", -"lokalize/project management", -"lokalize/translation memory", -"lskat", -"marble", -"marble/data", -"marble/plasmoid", -"metabar", -"Network Management", -"Network Management/Control Module", -"Network Management/KDED Module", -"Network Management/knetworkmanager", -"Network Management/Plasma Widget", -"okteta", -"okular", -"okular/CHM backend", -"okular/Comicbook backend", -"okular/DjVu backend", -"okular/DVI backend", -"okular/EPub backend", -"okular/New backend wishes", -"okular/ODT backend", -"okular/PDF backend", -"okular/PS backend", -"okular/TIFF backend", -"okular/XPS backend", -"Oxygen", -"Oxygen/icons", -"Oxygen/sound", -"Oxygen/style", -"Oxygen/win deco", -"parley", -"partitionmanager", -"Planet KDE", -"Planet KDE/feeds", -"plasma", -"plasma/containment-desktop", -"plasma/containment-panel", -"plasma/desktop", -"plasma/multihead", -"plasma/multiscreen", -"plasma/notifications", -"plasma/panel", -"plasma/screensaver overlay", -"plasma/scriptengines", -"plasma/wallpaper-image", -"plasma/widget browser", -"plasma/widget-battery", -"plasma/widget-clock", -"plasma/widget-comic", -"plasma/widget-fifteenpuzzle", -"plasma/widget-folderview", -"plasma/widget-frame", -"plasma/widget-kickoff", -"plasma/widget-lancelot", -"plasma/widget-microblogging", -"plasma/widget-misc", -"plasma/widget-notifier", -"plasma/widget-nowplaying", -"plasma/widget-osx", -"plasma/widget-pager", -"plasma/widget-pastebin", -"plasma/widget-quicklaunch", -"plasma/widget-rememberthemilk", -"plasma/widget-systemmonitor", -"plasma/widget-systemtray", -"plasma/widget-taskbar", -"plasma/widget-trashcan", -"plasma/widget-weather", -"policykit-kde", -"policykit-kde/kcm_auth", -"policykit-kde/manager", -"qca", -"rekonq", -"Rocs", -"showfoto", -"Skanlite", -"skrooge", -"solid", -"solid/control::bluetooth", -"solid/control::network", -"solid/libsolid", -"solid/powermanagement" -"solid/powermanagement-daemon", -"solid/powermanagement-kcm", -"step", -"step/stepcore", -"superkaramba", -"sweeper", -"systemsettings", -"systemsettings/kcm_accessibility", -"systemsettings/kcm_autostart", -"systemsettings/kcm_bell", -"systemsettings/kcm_clock", -"systemsettings/kcm_colors", -"systemsettings/kcm_componentchooser", -"systemsettings/kcm_desktop", -"systemsettings/kcm_desktoppath", -"systemsettings/kcm_desktopthemedetails", -"systemsettings/kcm_emoticons", -"systemsettings/kcm_energy", -"systemsettings/kcm_fileshare", -"systemsettings/kcm_filetypes", -"systemsettings/kcm_fontinst", -"systemsettings/kcm_fonts", -"systemsettings/kcm_icons", -"systemsettings/kcm_joystick", -"systemsettings/kcm_kded", -"systemsettings/kcm_kdm", -"systemsettings/kcm_kdnssd", -"systemsettings/kcm_keyboard", -"systemsettings/kcm_keyboard_layout", -"systemsettings/kcm_keys", -"systemsettings/kcm_kgamma", -"systemsettings/kcm_khotkeys", -"systemsettings/kcm_ksmserver", -"systemsettings/kcm_ksplashthememgr", -"systemsettings/kcm_kthememanage", -"systemsettings/kcm_kwincompositing", -"systemsettings/kcm_kwindecoration", -"systemsettings/kcm_kwinoptions", -"systemsettings/kcm_language", -"systemsettings/kcm_launch", -"systemsettings/kcm_mouse", -"systemsettings/kcm_netpref", -"systemsettings/kcm_notify", -"systemsettings/kcm_proxy", -"systemsettings/kcm_randr", -"systemsettings/kcm_samba", -"systemsettings/kcm_screensaver", -"systemsettings/kcm_solid-actions", -"systemsettings/kcm_standard_actions", -"systemsettings/kcm_style", -"systemsettings/kcm_useraccount", -"systemsettings/treeview", -"taglib", -"telepathy", -"telepathy/accountmanager-kwallet", -"telepathy/accounts-kcm", -"telepathy/presence-applet", -"telepathy/presence-dataengine", -"telepathy/telepathy-qt", -"tellico", -"umbrello", -"unknown", -"valgrind", -"valgrind/addrcheck (defunct)", -"valgrind/cachegrind", -"valgrind/callgrind", -"valgrind/drd", -"valgrind/helgrind", -"valgrind/massif", -"valgrind/memcheck", -"valgrind/ptrcheck", -"valgrind/vex", -"www.kde.org", -"yakuake", -0 }; diff --git a/kdeui/make_kdepackages_updated.py b/kdeui/make_kdepackages_updated.py deleted file mode 100644 index e5033900..00000000 --- a/kdeui/make_kdepackages_updated.py +++ /dev/null @@ -1,61 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Script to automatically update the "kdepackages.h" file -# FIXME - This is a slow script. Rewrite me using a smart logic. Thanks! -# -import string -import urllib - -def unescape(text): - text = text.replace(" "," ") - text = text.replace("‑","-") - text = text.replace("&","&") - return text - - -print "Fetching products and components from bugs.kde.org..." - -pkg = open("kdepackages.h","w") -pkg.write("// DO NOT EDIT - EDIT bugs/Maintainers instead\n") -pkg.write("const char * const packages[] = {\n") - -data = urllib.urlopen('http://bugs.kde.org/describecomponents.cgi').read() - -for line in string.split(data,' '): - if line.count("describecomponents.cgi") > 0: - index1 = line.index("\">")+2 - product = line[index1:len(line)] - index2 = product.index("<") - product = product[0:index2] - - link = "describecomponents.cgi?product=" - index1 = line.index(link) - link = line[index1:len(line)] - index2 = link.index("\"") - link = link[0:index2] - - link = 'http://bugs.kde.org/' + link - data2 = urllib.urlopen(link).read() - - productname = unescape(product) - print productname - pkg.write("\"" + productname + "\",\n") - data2 = string.split(data2,'\n') - iter = 0 - end = len(data2) - while( iter < end-1 ): - iter = iter+1 - line = data2[iter] - if line.count("")>0: - iter = iter+1 - line = data2[iter] - index1 = line.index("\">")+2 - product = line[index1:len(line)] - index2 = product.index("<") - product = unescape(product[0:index2]) - if product!="general": - pkg.write("\"" + productname + "/" + product + "\",\n") - print productname + "/" + product - -pkg.write("0 };\n") -pkg.close() \ No newline at end of file diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt index 6833f6c5..f477a92a 100644 --- a/kdeui/tests/CMakeLists.txt +++ b/kdeui/tests/CMakeLists.txt @@ -81,7 +81,6 @@ KDEUI_EXECUTABLE_TESTS( kcharselecttest kapptest kassistantdialogtest - kbugreporttest kcategorizedviewtest kcodecactiontest kcolorcollectiontest diff --git a/kdeui/tests/kbugreporttest.cpp b/kdeui/tests/kbugreporttest.cpp deleted file mode 100644 index d0806337..00000000 --- a/kdeui/tests/kbugreporttest.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2005 Joseph Wenninger - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include -#include -#include -#include - -int main(int argc, char **argv) { - - // First a bug report to bugs.kde.org - KAboutData about("kbugreporttest", 0, ki18n("kbugreporttest"), "version"); - KCmdLineArgs::init(argc, argv, &about); - - KApplication a; - a.setQuitOnLastWindowClosed(false); - KBugReport rep(0,true,&about); - rep.exec(); - - // Then a bug report by email. - // Change the email address to check if it worked :) - KAboutData about1("kbugreporttest", 0, ki18n("kbugreporttest"), "version", - ki18n("description"), KAboutData::License_Unknown, - ki18n("copyright"), ki18n("bug report tool"), - QByteArray(), "null@bugs.kde.org"); - KBugReport rep1(0,true,&about1); - rep1.exec(); - - return 0; -} diff --git a/kdeui/widgets/kcmodule.h b/kdeui/widgets/kcmodule.h index c7d022d9..552f93ca 100644 --- a/kdeui/widgets/kcmodule.h +++ b/kdeui/widgets/kcmodule.h @@ -146,7 +146,7 @@ public: virtual QString quickHelp() const; /** - * This is generally only called for the KBugReport. + * This is generally only called for the KBugReport (which is no more). * If you override you should have it return a pointer to a constant. * * diff --git a/kdewebkit/kwebkitpart/src/kwebkitpart.cpp b/kdewebkit/kwebkitpart/src/kwebkitpart.cpp index cf5e952a..77cd5d08 100644 --- a/kdewebkit/kwebkitpart/src/kwebkitpart.cpp +++ b/kdewebkit/kwebkitpart/src/kwebkitpart.cpp @@ -97,7 +97,6 @@ KWebKitPart::KWebKitPart(QWidget *parentWidget, QObject *parent, about.addAuthor(ki18n("Michael Howell"), ki18n("Developer"), "mhowell123@gmail.com"); about.addAuthor(ki18n("Laurent Montel"), ki18n("Developer"), "montel@kde.org"); about.addAuthor(ki18n("Dirk Mueller"), ki18n("Developer"), "mueller@kde.org"); - about.setProductName("kwebkitpart/general"); KComponentData componentData(&about); setComponentData(componentData, false /*don't load plugins yet*/); diff --git a/kparts/partmanager.h b/kparts/partmanager.h index 4c6ade14..8e13c31f 100644 --- a/kparts/partmanager.h +++ b/kparts/partmanager.h @@ -246,7 +246,7 @@ Q_SIGNALS: protected: /** * Changes the active instance when the active part changes. - * The active instance is used by KBugReport and KAboutDialog. + * The active instance is used by KAboutDialog. * Override if you really need to - usually you don't need to. */ virtual void setActiveComponent(const KComponentData &instance);