From 8d38062cbcd3b1c5a0d62008068e1c149a7e8864 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Tue, 21 Aug 2012 13:54:01 -0500 Subject: Fix branding, default server, and update server list. --- kbugbuster/backend/bugcommand.cpp | 10 +++++----- kbugbuster/backend/bugserver.cpp | 13 +++++++------ kbugbuster/backend/bugserverconfig.cpp | 13 +++++++------ kbugbuster/backend/kbbprefs.cpp | 18 +++++++++--------- kbugbuster/backend/mailsender.cpp | 2 +- kbugbuster/gui/cwloadingwidget.cpp | 4 ++-- kbugbuster/gui/kbbmainwindow.cpp | 2 +- kbugbuster/gui/loadallbugsdlg.cpp | 2 +- kbugbuster/gui/msginputdialog.cpp | 6 +++--- kbugbuster/gui/preferencesdialog.cpp | 16 ++++++++-------- kbugbuster/kresources/kcalresource.cpp | 2 +- 11 files changed, 45 insertions(+), 43 deletions(-) (limited to 'kbugbuster') diff --git a/kbugbuster/backend/bugcommand.cpp b/kbugbuster/backend/bugcommand.cpp index 5aa4d522..25e08184 100644 --- a/kbugbuster/backend/bugcommand.cpp +++ b/kbugbuster/backend/bugcommand.cpp @@ -67,7 +67,7 @@ TQString BugCommandClose::mailAddress() const if (m_message.isEmpty()) { return TQString(); } else { - return m_bug.number() + "-done@bugs.kde.org"; + return m_bug.number() + "-done@bugs.trinitydesktop.org"; } } @@ -194,15 +194,15 @@ void BugCommandUnmerge::save( KConfig *config ) TQString BugCommandReply::mailAddress() const { - return m_bug.number() + "@bugs.kde.org"; + return m_bug.number() + "@bugs.trinitydesktop.org"; #if 0 switch ( m_recipient ) { case Normal: - return m_bug.number() + "@bugs.kde.org"; + return m_bug.number() + "@bugs.trinitydesktop.org"; case Maintonly: - return m_bug.number() + "-maintonly@bugs.kde.org"; + return m_bug.number() + "-maintonly@bugs.trinitydesktop.org"; case Quiet: - return m_bug.number() + "-quiet@bugs.kde.org"; + return m_bug.number() + "-quiet@bugs.trinitydesktop.org"; } return TQString(); #endif diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index 6c8aa6fb..1ad90567 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -54,7 +54,8 @@ void BugServer::init() TQString bugzilla = mServerConfig.bugzillaVersion(); - if ( bugzilla == "KDE" ) mProcessor = new DomProcessor( this ); + if ( bugzilla == "TDE" ) mProcessor = new DomProcessor( this ); + else if ( bugzilla == "KDE" ) mProcessor = new DomProcessor( this ); else if ( bugzilla == "2.10" ) mProcessor = new HtmlParser_2_10( this ); else if ( bugzilla == "2.14.2" ) mProcessor = new HtmlParser_2_14_2( this ); else if ( bugzilla == "2.17.1" ) mProcessor = new HtmlParser_2_17_1( this ); @@ -231,8 +232,8 @@ void BugServer::sendCommands( MailSender *mailer, const TQString &senderName, const TQString &senderEmail, bool sendBCC, const TQString &recipient ) { - // Disable mail commands for non-KDE servers - if ( mServerConfig.baseUrl() != KURL( "http://bugs.kde.org" ) ) return; + // Disable mail commands for non-TDE servers + if ( mServerConfig.baseUrl() != KURL( "http://bugs.trinitydesktop.org" ) ) return; TQString controlText; @@ -249,7 +250,7 @@ void BugServer::sendCommands( MailSender *mailer, const TQString &senderName, if (!cmd->package().isNull()) pkg = cmd->package(); if (!cmd->controlString().isNull()) { - kdDebug() << "control@bugs.kde.org: " << cmd->controlString() << endl; + kdDebug() << "control@bugs.trinitydesktop.org: " << cmd->controlString() << endl; controlText += cmd->controlString() + "\n"; } else { kdDebug() << cmd->mailAddress() << ": " << cmd->mailText() << endl; @@ -283,9 +284,9 @@ void BugServer::sendCommands( MailSender *mailer, const TQString &senderName, } if (!controlText.isEmpty()) { - kdDebug() << "control@bugs.kde.org doesn't work anymore" << endl; + kdDebug() << "control@bugs.trinitydesktop.org doesn't work anymore" << endl; #if 0 - if ( !mailer->send( senderName, senderEmail, "control@bugs.kde.org", + if ( !mailer->send( senderName, senderEmail, "control@bugs.trinitydesktop.org", i18n("Mail generated by KBugBuster"), controlText, sendBCC, recipient )) return; diff --git a/kbugbuster/backend/bugserverconfig.cpp b/kbugbuster/backend/bugserverconfig.cpp index aca9d5cd..a09e6c29 100644 --- a/kbugbuster/backend/bugserverconfig.cpp +++ b/kbugbuster/backend/bugserverconfig.cpp @@ -31,14 +31,14 @@ BugServerConfig::BugServerConfig() { - mName = "KDE"; - mBaseUrl = "http://bugs.kde.org"; - mUser = "bugzilla@kde.org"; - mBugzillaVersion = "KDE"; + mName = "Trinity"; + mBaseUrl = "http://bugs.trinitydesktop.org"; + mUser = "bugzilla@trinitydesktop.org"; + mBugzillaVersion = "TDE"; } BugServerConfig::BugServerConfig( const TQString &name, const KURL &baseUrl ) - : mName( name ), mBaseUrl( baseUrl ), mBugzillaVersion( "KDE" ) + : mName( name ), mBaseUrl( baseUrl ), mBugzillaVersion( "TDE" ) { } @@ -104,6 +104,7 @@ TQStringList BugServerConfig::bugzillaVersions() v << "2.14.2"; v << "2.16.2"; v << "2.17.1"; + v << "TDE"; v << "KDE"; v << "Bugworld"; @@ -120,7 +121,7 @@ void BugServerConfig::readConfig( KConfig *cfg, const TQString &name ) mUser = cfg->readEntry( "User" ); mPassword = cfg->readEntry( "Password" ); - mBugzillaVersion = cfg->readEntry( "BugzillaVersion", "KDE" ); + mBugzillaVersion = cfg->readEntry( "BugzillaVersion", "TDE" ); mRecentPackages = cfg->readListEntry( "RecentPackages" ); mCurrentPackage = cfg->readEntry( "CurrentPackage" ); diff --git a/kbugbuster/backend/kbbprefs.cpp b/kbugbuster/backend/kbbprefs.cpp index 7b6dbb7b..f6f3a69c 100644 --- a/kbugbuster/backend/kbbprefs.cpp +++ b/kbugbuster/backend/kbbprefs.cpp @@ -134,21 +134,21 @@ void KBBPrefs::usrWriteConfig() void KBBPrefs::setMessageButtonsDefault() { mMessageButtons.clear(); - mMessageButtons.insert(i18n("Bug Fixed in CVS"),"Thank you for your bug report.\n" + mMessageButtons.insert(i18n("Bug Fixed in GIT"),"Thank you for your bug report.\n" "The bug that you reported has been identified and has been fixed in the\n" - "latest development (CVS) version of KDE. The bug report will be closed.\n"); + "latest development version of TDE. The bug report will be closed.\n"); mMessageButtons.insert(i18n("Duplicate Report"),"Thank you for your bug report.\n" "This bug/feature request has already been reported and this report will\n" "be marked as a duplicate.\n"); mMessageButtons.insert(i18n("Packaging Bug"),"Thank you for your bug report.\n" "The bug that you reported appears to be a packaging bug, due to a\n" "problem in the way in which your distribution/vendor has packaged\n" - "KDE for distribution.\n" - "The bug report will be closed since it is not a KDE problem.\n" + "TDE for distribution.\n" + "The bug report will be closed since it is not a TDE problem.\n" "Please send the bug report to your distribution/vendor instead.\n"); - mMessageButtons.insert(i18n("Feature Implemented in CVS"),"Thank you for your bug report.\n" + mMessageButtons.insert(i18n("Feature Implemented in GIT"),"Thank you for your bug report.\n" "The feature that you requested has been implemented in the latest\n" - "development (CVS) version of KDE. The feature request will be closed.\n"); + "development version of TDE. The feature request will be closed.\n"); mMessageButtons.insert(i18n("More Information Required"),"Thank you for your bug report.\n" "You have not provided enough information for us to be able to reproduce\n" "the bug. Please provide a detailed account of the steps required to\n" @@ -156,15 +156,15 @@ void KBBPrefs::setMessageButtonsDefault() "able to reproduce, identify and fix the bug.\n"); mMessageButtons.insert(i18n("No Longer Applicable"),"Thank you for your bug report.\n" "The bug that your reported no longer applies to the latest development\n" - "(CVS) version of KDE. This is most probably because it has been fixed,\n" + "version of TDE. This is most probably because it has been fixed,\n" "the application has been substantially modified or the application no\n" "longer exists. The bug report will be closed.\n"); mMessageButtons.insert(i18n("Won't Fix Bug"),"Thank you for your bug report/feature request.\n" "Unfortunately, this bug will never be fixed or the feature never\n" "implemented. The bug report/feature request will be closed.\n"); mMessageButtons.insert(i18n("Cannot Reproduce Bug"),"Thank you for your bug report.\n" - "This bug can not be reproduced using the current development (CVS)\n" - "version of KDE. This suggests that the bug has already been fixed.\n" + "This bug can not be reproduced using the current development (GIT)\n" + "version of TDE. This suggests that the bug has already been fixed.\n" "The bug report will be closed.\n"); } diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp index 93b74eff..c4d4f9a1 100644 --- a/kbugbuster/backend/mailsender.cpp +++ b/kbugbuster/backend/mailsender.cpp @@ -107,7 +107,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T return false; } - emit status( i18n( "Passing mail to KDE email program..." ) ); + emit status( i18n( "Passing mail to TDE email program..." ) ); if (!kMailOpenComposer(to,"", (bcc ? from : ""), subject,body,0,KURL())) { TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); return false; diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp index f2a62573..1672d31f 100644 --- a/kbugbuster/gui/cwloadingwidget.cpp +++ b/kbugbuster/gui/cwloadingwidget.cpp @@ -147,8 +147,8 @@ void CWLoadingWidget::updatePixmap() // Draw intro text TQString desc = i18n( "Welcome to KBugBuster, a tool to manage the " - "KDE Bug Report System. With KBugBuster you can " - "manage outstanding bug reports for KDE from a " + "TDE Bug Report System. With KBugBuster you can " + "manage outstanding bug reports for TDE from a " "convenient front end." ); p.setPen( black ); p.drawText( 28, 128, cr.width() - 28, 184 - 128, diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index 3c57c6eb..e88d20fb 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -173,7 +173,7 @@ void KBBMainWindow::initActions() new KAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( searchBugNumber() ), actionCollection(), "search_bugnumber" ); // For now "Description" searches by title. Maybe later we can have a - // full-text search interfacing bugs.kde.org and rename the current one to "By Title". + // full-text search interfacing bugs.trinitydesktop.org and rename the current one to "By Title". new KAction( i18n("Search by &Description...") ,"find", CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT( searchDescription() ), actionCollection(), "search_description" ); diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp index d6203c07..c53f8f81 100644 --- a/kbugbuster/gui/loadallbugsdlg.cpp +++ b/kbugbuster/gui/loadallbugsdlg.cpp @@ -51,7 +51,7 @@ void LoadAllBugsDlg::slotBugDetailsAvailable( const Bug &bug, const BugDetails & void LoadAllBugsDlg::slotBugDetailsLoadingError() { - // Abort at the first error. Otherwise we get spammed with "no host bugs.kde.org" msg boxes.... + // Abort at the first error. Otherwise we get spammed with "no host bugs.trinitydesktop.org" msg boxes.... reject(); } diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp index 989b4d85..c34a18be 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -60,9 +60,9 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, rlayout->add( rlabel ); mRecipient = new TQComboBox( r ); - mRecipient->insertItem( i18n("Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"), BugCommand::Normal ); - mRecipient->insertItem( i18n("Maintonly (bugs.kde.org & Maintainer)"), BugCommand::Maintonly ); - mRecipient->insertItem( i18n("Quiet (bugs.kde.org only)"), BugCommand::Quiet ); + mRecipient->insertItem( i18n("Normal (bugs.trinitydesktop.org & Maintainer & tde-bugs-dist)"), BugCommand::Normal ); + mRecipient->insertItem( i18n("Maintonly (bugs.trinitydesktop.org & Maintainer)"), BugCommand::Maintonly ); + mRecipient->insertItem( i18n("Quiet (bugs.trinitydesktop.org only)"), BugCommand::Quiet ); rlabel->setBuddy( mRecipient ); rlayout->add( mRecipient ); diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp index a4354749..48cd1fae 100644 --- a/kbugbuster/gui/preferencesdialog.cpp +++ b/kbugbuster/gui/preferencesdialog.cpp @@ -281,14 +281,14 @@ SelectServerDlg::SelectServerDlg(PreferencesDialog *parent, const char */*name*/ list = new ServerListView(this ); setMainWidget( list ); - parent->createServerItem( list, "KDE", "http://bugs.kde.org", "KDE" ); - parent->createServerItem( list, "GNOME", "http://bugzilla.gnome.org", "2.10" ); - parent->createServerItem( list, "Mozilla", "http://bugzilla.mozilla.org", "2.17.1" ); - parent->createServerItem( list, "Apache", "http://nagoya.apache.org/bugzilla/", "2.14.2" ); - parent->createServerItem( list, "XFree86", "http://bugs.xfree86.org/cgi-bin/bugzilla/", "2.14.2" ); - parent->createServerItem( list, "Ximian", "http://bugzilla.ximian.com", "2.10" ); - parent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "2.17.1" ); - parent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "2.17.4" ); + parent->createServerItem( list, "Trinity", "http://bugs.trinitydesktop.org", "TDE" ); + parent->createServerItem( list, "KDE", "http://bugs.kde.org", "KDE" ); + parent->createServerItem( list, "GNOME", "http://bugzilla.gnome.org", "3.4.13" ); + parent->createServerItem( list, "Mozilla", "http://bugzilla.mozilla.org", "4.0.7" ); + parent->createServerItem( list, "Apache", "http://issues.apache.org/bugzilla/", "4.2.1" ); + parent->createServerItem( list, "Xorg", "http://bugs.freedesktop.org/", "4.0.7" ); + parent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "4.2.2" ); + parent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "4.0.6" ); connect( list, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotDoubleClicked( TQListViewItem *))); } diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp index b219343a..bbd7ab27 100644 --- a/kbugbuster/kresources/kcalresource.cpp +++ b/kbugbuster/kresources/kcalresource.cpp @@ -211,7 +211,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &, if ( !todo ) { newTodo = new KCal::Todo; newTodo->setUid( uid ); - TQString uri = "http://bugs.kde.org/show_bug.cgi?id=%1"; + TQString uri = "http://bugs.trinitydesktop.org/show_bug.cgi?id=%1"; newTodo->addAttachment( new KCal::Attachment( uri.arg( bug.number() ) ) ); todo = newTodo; } -- cgit v1.2.3