Skip to content
GitLab
Commit 03a7fc18 authored by Mark Kretschmann's avatar Mark Kretschmann
Browse files

Remove the LikeBack system. 

BUG: 312498
BUG: 252323
FIXED-IN: 2.8
parent 447af2c9
Expand all Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ 03a7fc18
......@@ -20,7 +20,8 @@ VERSION 2.8-Beta 1
* Added support for .asx playlists; patch by Tatjana Gornak. (BR 170207)
* Add Radio GFM radio streams to Cool Stream Script. (BR 317978)
* Added options to pause playback on system suspend and to inhibit automatic suspend
if playing a track (enabled by default); patch by Anmol Ahuja. (BR 259862, 222571)
if playing a track (enabled by default); patch by Anmol Ahuja.
(BR 259862) (BR 222571)
* Playlist files are now read asynchronously when possible; patch and great deal of
refactoring by Tatjana Gornak. (BR 291934)
* Added support to filter tracks to scrobble to Last.fm by label. Patch by Vedant
......@@ -35,6 +36,7 @@ VERSION 2.8-Beta 1
* Added Ctrl+H shortcut to randomize playlist, patch by Harsh Gupta. (BR 208061)
CHANGES:
* Removed LikeBack (a development feature in debug builds). (BR 312498) (BR 252323)
* Collection Browser: Artist level was renamed to Track Artist and replaced by Album
Artist by default. Various Artists item is no longer shown under Track Artist level.
* Removed the splash screen.
......
images/CMakeLists.txt
View file @ 03a7fc18
......@@ -75,11 +75,6 @@ install(FILES
emblem-wikipedia.png
emblem-xing.png
likeback_like.png
likeback_dislike.png
likeback_bug.png
likeback_feature.png
DESTINATION ${DATA_INSTALL_DIR}/amarok/images
)
......
src/ActionClasses.cpp
View file @ 03a7fc18
......@@ -151,13 +151,10 @@ Menu::helpMenu( QWidget *parent ) //STATIC
KMenu* menu = s_helpMenu->menu();
// NOTE: We hide "Report Bug..." because we need to add it on our own to name the dialog
// so it can be blacklisted from LikeBack.
s_helpMenu->action( KHelpMenu::menuReportBug )->setVisible( false );
// NOTE: "What's This" isn't currently defined for anything in Amarok, so let's remove that too
// "What's This" isn't currently defined for anything in Amarok, so let's remove it
s_helpMenu->action( KHelpMenu::menuWhatsThis )->setVisible( false );
// Hide the default "About App" dialog, as we replace it with a custom one
s_helpMenu->action( KHelpMenu::menuAboutApp )->setVisible( false );
return menu;
......
src/CMakeLists.txt
View file @ 03a7fc18
......@@ -36,15 +36,6 @@ if ( KDEMULTIMEDIA_FOUND )
include_directories( ${KDEMULTIMEDIA_INCLUDE_DIR} )
endif ( KDEMULTIMEDIA_FOUND )
#####################################################################
# LIKEBACK
#####################################################################
set(likeback_SRCS
likeback/LikeBack.cpp
likeback/LikeBackBar.cpp
likeback/LikeBackDialog.cpp
)
#####################################################################
# PROXYCOLLECTION
#####################################################################
......@@ -573,7 +564,6 @@ set(amaroklib_LIB_SRCS
${libserviceframework_SRCS}
${libservicebrowser_SRCS}
${libdynamic_SRCS}
${likeback_SRCS}
${libmetaimpl_SRCS}
${core_interfaces_SRCS}
${apg_SRCS}
......@@ -825,8 +815,6 @@ kde4_add_ui_files(amaroklib_LIB_SRCS
dialogs/TagGuessOptions.ui
dialogs/OrganizeCollectionOptions.ui
dialogs/OrganizeCollectionDialogBase.ui
likeback/LikeBackBar.ui
likeback/LikeBackDialog.ui
playlist/layouts/PlaylistLayoutEditDialog.ui
core-impl/podcasts/sql/PodcastSettingsBase.ui
core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui
......
src/MainWindow.cpp
View file @ 03a7fc18
......@@ -48,7 +48,6 @@
#include "covermanager/CoverManager.h" // for actions
#include "dialogs/DiagnosticDialog.h"
#include "dialogs/EqualizerDialog.h"
#include "likeback/LikeBack.h"
#include "moodbar/MoodbarManager.h"
#include "network/NetworkAccessManagerProxy.h"
#ifdef DEBUG_BUILD_TYPE
......@@ -1044,19 +1043,6 @@ MainWindow::createActions()
ac->addAction( "reportBug", action );
connect( action, SIGNAL(triggered()), SLOT(showReportBug()) );
LikeBack *likeBack = new LikeBack( LikeBack::AllButBugs,
LikeBack::isDevelopmentVersion( KGlobal::mainComponent().aboutData()->version() ) );
likeBack->setServer( "amarok.likeback.kde.org", "/send.php" );
likeBack->setAcceptedLanguages( QStringList( "en" ) );
likeBack->setWindowNamesListing( LikeBack::WarnUnnamedWindows ); //Notify if a window has no name
KActionCollection *likeBackActions = new KActionCollection( this, KGlobal::mainComponent() );
likeBackActions->addAssociatedWidget( this );
likeBack->createActions( likeBackActions );
ac->addAction( "likeBackSendComment", likeBackActions->action( "likeBackSendComment" ) );
ac->addAction( "likeBackShowIcons", likeBackActions->action( "likeBackShowIcons" ) );
PERF_LOG( "MainWindow::createActions 8" )
new Amarok::MenuAction( ac, this );
new Amarok::StopAction( ac, this );
......@@ -1188,16 +1174,10 @@ MainWindow::createMenus()
m_menubar.data()->addMenu( m_settingsMenu.data() );
KMenu *helpMenu = Amarok::Menu::helpMenu();
helpMenu->insertAction( helpMenu->actions().first(),
Amarok::actionCollection()->action( "reportBug" ) );
helpMenu->insertAction( helpMenu->actions().last(),
Amarok::actionCollection()->action( "extendedAbout" ) );
helpMenu->insertAction( helpMenu->actions().last(),
Amarok::actionCollection()->action( "diagnosticDialog" ) );
helpMenu->insertAction( helpMenu->actions().at( 4 ),
Amarok::actionCollection()->action( "likeBackSendComment" ) );
helpMenu->insertAction( helpMenu->actions().at( 5 ),
Amarok::actionCollection()->action( "likeBackShowIcons" ) );
m_menubar.data()->addSeparator();
m_menubar.data()->addMenu( helpMenu );
......
src/likeback/LikeBack.cpp deleted 100644 → 0
View file @ 447af2c9
/****************************************************************************************
* Copyright (c) 2006 Sebastien Laout <slaout@linux62.org> *
* Copyright (c) 2008,2009 Valerio Pilo <amroth@kmess.org> *
* Copyright (c) 2008,2009 Sjors Gielen <sjors@kmess.org> *
* Copyright (c) 2010 Téo Mrnjavac <teo@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) any later *
* version. *
* *
* 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/>. *
****************************************************************************************/
#include "LikeBack.h"
#include "LikeBackBar.h"
#include "LikeBackDialog.h"
#include "LikeBackPrivate.h"
#include <KAboutData>
#include <KAction>
#include <KActionCollection>
#include <KApplication>
#include <KComponentData>
#include <KConfigGroup>
#include <KEMailSettings>
#include <KMessageBox>
#include <KStandardDirs>
#include <KToggleAction>
#ifdef DEBUG_LIKEBACK
#include "core/support/Debug.h"
#endif
// Constructor
LikeBack::LikeBack( Button buttons, bool showBarByDefault, KConfig *config, const KAboutData *aboutData )
: QObject()
{
// Use default KApplication config and aboutData if not provided:
if( config == 0 )
{
config = KGlobal::config().data();
}
if( aboutData == 0 )
{
aboutData = KGlobal::mainComponent().aboutData();
}
// Initialize properties (1/2):
d = new LikeBackPrivate();
d->buttons = buttons;
d->config = config->group( "LikeBack" );
d->aboutData = aboutData;
d->showBarByDefault = showBarByDefault;
// Initialize properties (2/2) [Needs aboutData to be set]:
d->showBar = d->config.readEntry( "userWantToShowBar", d->showBarByDefault );
// Initialize the button-bar:
d->bar = new LikeBackBar( this );
// Show the information message if it is the first time, and if the button-bar is shown:
showInformationMessage();
// Show the bar if that's wanted by the developer or the user:
if( d->showBar )
d->bar->setBarVisible( true );
}
// Destructor
LikeBack::~LikeBack()
{
delete d;
}
// Set the windows listing flag
void LikeBack::setWindowNamesListing(WindowListing windowListing)
{
d->windowListing = windowListing;
}
// Return the windows listing flag
LikeBack::WindowListing LikeBack::windowNamesListing()
{
return d->windowListing;
}
// Set which languages are accepted by the developers for the comments
void LikeBack::setAcceptedLanguages( const QStringList &locales )
{
d->acceptedLocales = locales;
}
// Return the accepted languages for the comments
QStringList LikeBack::acceptedLocales()
{
return d->acceptedLocales;
}
// Set the site address where to send feedback
void LikeBack::setServer(const QString &hostName, const QString &remotePath, quint16 hostPort)
{
d->hostName = hostName;
d->remotePath = remotePath;
d->hostPort = hostPort;
}
// Get the developers site hostname
QString LikeBack::hostName()
{
return d->hostName;
}
// Get the path on the developers site
QString LikeBack::remotePath()
{
return d->remotePath;
}
// Get the developers site port
quint16 LikeBack::hostPort()
{
return d->hostPort;
}
// Disable the LikeBack Bar
void LikeBack::disableBar()
{
d->disabledCount++;
if( d->bar )
d->bar->setBarVisible( d->disabledCount <= 0 );
}
// Enable the LikeBack Bar
void LikeBack::enableBar()
{
d->disabledCount--;
#ifdef DEBUG_LIKEBACK
if( d->disabledCount < 0 )
{
debug() << "Enabled more times than it was disabled. Please refer to the disableBar() documentation for more information and hints.";
}
#endif
if( d->bar )
d->bar->setBarVisible( d->disabledCount <= 0 && userWantsToShowBar() );
#ifdef DEBUG_LIKEBACK
debug() << "User wants to show feedback bar: " << userWantsToShowBar() << " " << d->disabledCount;
#endif
}
// Get whether the bar is enabled or not
bool LikeBack::enabledBar()
{
return d->disabledCount <= 0;
}
// Display the Send Comments dialog
void LikeBack::execCommentDialog( Button type, const QString &initialComment, const QString &windowPath, const QString &context )
{
LikeBackDialog *dialog = new LikeBackDialog( type, initialComment, windowPath, context, this );
disableBar();
connect( dialog, SIGNAL(finished()), this, SLOT(enableBar()) );
dialog->show();
}
// Display the Send Comments dialog
void LikeBack::execCommentDialogFromHelp()
{
execCommentDialog( AllButtons, /*initialComment=*/"", /*windowPath=*/"HelpMenuAction" );
}
// Retrieve which feedback buttons are active
LikeBack::Button LikeBack::buttons()
{
return d->buttons;
}
// Get the KAboutData stored object
const KAboutData* LikeBack::aboutData()
{
return d->aboutData;
}
// Get the KDE config stored object
KConfig *LikeBack::config()
{
return d->config.config();
}
// Create the menu actions
void LikeBack::createActions( KActionCollection *parent )
{
if( d->sendAction == 0 )
{
d->sendAction = new KAction( KIcon("mail-message-new"), i18n("&Send a Comment to the Developers"), this );
connect( d->sendAction, SIGNAL(triggered(bool)), this, SLOT(execCommentDialog()) );
parent->addAction( "likeBackSendComment", d->sendAction );
}
if( d->showBarAction == 0 )
{
d->showBarAction = new KToggleAction( KIcon( "help-feedback" ), i18n( "Show &Feedback Icons" ), this );
d->showBarAction->setChecked( userWantsToShowBar() );
connect( d->showBarAction, SIGNAL(triggered(bool)), this, SLOT(setUserWantsToShowBar(bool)) );
parent->addAction( "likeBackShowIcons", d->showBarAction );
}
}
// Return whether the user wants to enable the likeback bar or not
bool LikeBack::userWantsToShowBar()
{
// You can choose to store the button bar status per version.
// On debug builds from SVN, where the version changes at almost every build,
// it's very annoying to have the bar reappearing every time.
// return d->config.readEntry( "userWantToShowBarForVersion_" + d->aboutData->version(), d->showBarByDefault );
return d->showBar;
}
// Set whether the user wants to enable the likeback bar or not
void LikeBack::setUserWantsToShowBar( bool showBar )
{
if( showBar == d->showBar )
return;
d->showBar = showBar;
// You can choose to store the button bar status per version.
// On debug builds from SVN, where the version changes at almost every build,
// it's very annoying to have the bar reappearing every time.
// d->config.writeEntry( "userWantToShowBarForVersion_" + d->aboutData->version(), showBar );
d->config.writeEntry( "userWantToShowBar", showBar );
d->config.sync(); // Make sure the option is saved, even if the application crashes after that.
d->bar->setBarVisible( showBar );
}
// Show a dialog box to introduce the user to LikeBack
void LikeBack::showInformationMessage()
{
// don't show the message if the bar isn't enabled.
// message doesn't make sense without the bar
if ( ! d->showBar ) return;
// Load and register the images needed by the message:
QString likeIconPath( KStandardDirs::locate( "data", "amarok/images/likeback_like.png" ) );
QString dislikeIconPath( KStandardDirs::locate( "data", "amarok/images/likeback_dislike.png" ) );
QString bugIconPath( KStandardDirs::locate( "data", "amarok/images/likeback_bug.png" ) );
QString featureIconPath( KStandardDirs::locate( "data", "amarok/images/likeback_feature.png" ) );
// Show a message reflecting the allowed types of comment:
int buttons = d->buttons;
int nbButtons = ( buttons & Like ? 1 : 0 ) +
( buttons & Dislike ? 1 : 0 ) +
( buttons & Bug ? 1 : 0 ) +
( buttons & Feature ? 1 : 0 );
// We use bugzilla for bug reporting but we still want to show the icon here:
buttons = buttons | LikeBack::Bug;
// Construct the welcome phrase
QString welcomePhrase;
if( isDevelopmentVersion( d->aboutData->version() ) )
{
welcomePhrase = i18nc( "Welcome dialog text, header text for test apps",
"Welcome to this testing version of %1.", d->aboutData->programName() );
}
else
{
welcomePhrase = i18nc( "Welcome dialog text, header text for released apps",
"Welcome to %1.", d->aboutData->programName() );
}
// Construct the like and dislike explanation
QString likeAndDislikePhrase;
if( ( buttons & LikeBack::Like ) && ( buttons & LikeBack::Dislike ) )
{
likeAndDislikePhrase = i18nc( "Welcome dialog text, explanation for both the like and dislike buttons",
"Each time you have a great or frustrating experience, "
"please click on the appropriate face below the window title bar, "
"briefly describe what you like or dislike and click on 'Send'." );
}
else if( buttons & LikeBack::Like )
{
likeAndDislikePhrase = i18nc( "Welcome dialog text, explanation for the like button alone",
"Each time you have a great experience, "
"please click on the smiling face below the window title-bar, "
"briefly describe what you like and click on 'Send'." );
}
else
{
likeAndDislikePhrase = i18nc( "Welcome dialog text, explanation for the dislike button alone",
"Each time you have a frustrating experience, "
"please click on the frowning face below the window title-bar, "
"briefly describe what you dislike and click on 'Send'." );
}
// Construct the bug report explanation
QString bugPhrase;
if( buttons & LikeBack::Bug )
{
bugPhrase = i18nc( "Welcome dialog text, explanation for the bug button",
"If you experience an improper behavior in the application, just click on "
"the bug icon in the top-right corner of the window and follow the instructions "
"to submit a bug report." );
}
// Construct the usage examples
QString examplesBlocks;
if( buttons & LikeBack::Like )
{
examplesBlocks += "<img src=\"" + likeIconPath + "\"/> &nbsp;"
"<span>" +
i18nc( "Welcome dialog text, usage example",
"<b>I like</b> the new artwork. Very refreshing." ) +
"</span><br/>";
}
if( buttons & LikeBack::Dislike )
{
examplesBlocks += "<img src=\"" + dislikeIconPath + "\"/> &nbsp;"
"<span>" +
i18nc( "Welcome dialog text, usage example",
"<b>I dislike</b> the welcome page of this assistant. Too time consuming." ) +
"</span><br/>";
}
if( buttons & LikeBack::Bug )
{
examplesBlocks += "<img src=\"" + bugIconPath + "\"/> &nbsp;"
"<span>" +
i18nc( "Welcome dialog text, usage example",
"<b>The application shows an improper behavior</b> when clicking the Add button. Nothing happens." ) +
"</span><br/>";
}
if( buttons & LikeBack::Feature )
{
examplesBlocks += "<img src=\"" + featureIconPath + "\"/> &nbsp;"
"<span>" +
i18nc( "Welcome dialog text, usage example",
"<b>I desire a new feature</b> allowing me to send my work by email." ) +
"</span>";
}
// Finally, merge all the strings together
QString dialogText( "<html><h3>%1</h3>"
"<p>%2</p>"
"<p>%3</p>"
"<p>%4</p>"
"<h3>%5:</h3>"
"<p>%6</p></html>" );
dialogText = dialogText.arg( welcomePhrase )
.arg( i18nc( "Welcome dialog text, us=the developers, it=the application",
"To help us improve it, your comments are important." ) )
.arg( likeAndDislikePhrase )
.arg( bugPhrase )
.arg( i18ncp( "Welcome dialog text, header for the examples", "Example", "Examples", nbButtons ) )
.arg( examplesBlocks );
// And show them
KMessageBox::information( 0,
dialogText,
i18nc( "Welcome dialog title", "Help Improve the Application" ),
"LikeBack_starting_information",
KMessageBox::Notify );
}
// Return the current window hierarchy
QString LikeBack::activeWindowPath()
{
// Compute the window hierarchy (from the oldest to the latest, each time prepending to the list):
QStringList windowNames;
QWidget *window = kapp->activeWindow();
while( window )
{
QString name( window->objectName() );
// Append the class name to the window name if it is unnamed:
if( name == "unnamed" || name.isEmpty() )
{
name = QString( "unnamed:" ) + window->metaObject()->className();
}
windowNames.prepend( name );
window = dynamic_cast<QWidget*>( window->parent() );
}
// Return the string of windows starting by the end (from the oldest to the latest):
return windowNames.join( " -> " );
}
// Return whether the email address was confirmed by the user
bool LikeBack::emailAddressAlreadyProvided()
{
return d->config.readEntry( "emailAlreadyAsked", false );
}
// Return the currently saved email address, or the account's email address, if present
QString LikeBack::emailAddress()
{
KEMailSettings emailSettings;
return d->config.readEntry( "emailAddress", emailSettings.getSetting( KEMailSettings::EmailAddress ) );
}
// Change the saved email address
void LikeBack::setEmailAddress( const QString &address, bool userProvided )
{
d->config.writeEntry( "emailAddress", address );
d->config.writeEntry( "emailAlreadyAsked", ( userProvided || emailAddressAlreadyProvided() ) );
d->config.sync(); // Make sure the option is saved, even if the application crashes after that.
}
// FIXME: Should be moved to KAboutData? Cigogne will also need it.
bool LikeBack::isDevelopmentVersion( const QString &version )
{
return version.indexOf( "alpha", 0, Qt::CaseInsensitive ) != -1 ||
version.indexOf( "beta", 0, Qt::CaseInsensitive ) != -1 ||
version.indexOf( "rc", 0, Qt::CaseInsensitive ) != -1 ||
version.indexOf( "svn", 0, Qt::CaseInsensitive ) != -1 ||
version.indexOf( "git", 0, Qt::CaseInsensitive ) != -1 ||
version.indexOf( "cvs", 0, Qt::CaseInsensitive ) != -1;
}
// Return whether the Like button is active
bool LikeBack::isLikeActive() const
{
return ( d->buttons & Like );
}
// Return whether the Dislike button is active
bool LikeBack::isDislikeActive() const
{
return ( d->buttons & Dislike );
}
// Return whether the Bug button is active
bool LikeBack::isBugActive() const
{
return ( d->buttons & Bug );
}
// Return whether the Feature button is active
bool LikeBack::isFeatureActive() const
{
return ( d->buttons & Feature );
}
#include "LikeBack.moc"