dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Capitalize strawberry in osd and tooltip, change cdcase and remove some

Browse Source 
unused code
This commit is contained in:
Jonas Kvinge
2019-02-10 21:25:36 +01:00
parent a831519b54
commit 333a0bc05a
12 changed files with 47 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/qtsystemtrayicon.cpp
View File

@@ -44,26 +44,27 @@ QtSystemTrayIcon::QtSystemTrayIcon(QObject *parent)
: SystemTrayIcon(parent),
tray_(new QSystemTrayIcon(this)),
menu_(new QMenu),
app_name_(QCoreApplication::applicationName()),
icon_(":/icons/48x48/strawberry.png"),
normal_icon_(icon_.pixmap(48, QIcon::Normal)),
grey_icon_(icon_.pixmap(48, QIcon::Disabled)),
action_play_pause_(nullptr),
action_stop_(nullptr),
action_stop_after_this_track_(nullptr),
action_mute_(nullptr) {
QIcon icon(":/icons/48x48/strawberry.png");
normal_icon_ = icon.pixmap(48, QIcon::Normal);
grey_icon_ = icon.pixmap(48, QIcon::Disabled);
tray_->setIcon(normal_icon_);
tray_->installEventFilter(this);
ClearNowPlaying();
QFile pattern_file(":/misc/playing_tooltip.txt");
QFile pattern_file(":/misc/playing-tooltip.html");
pattern_file.open(QIODevice::ReadOnly);
pattern_ = QString::fromLatin1(pattern_file.readAll());
connect(tray_, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(Clicked(QSystemTrayIcon::ActivationReason)));
app_name_[0] = app_name_[0].toUpper();
}
QtSystemTrayIcon::~QtSystemTrayIcon() {
@@ -230,7 +231,7 @@ void QtSystemTrayIcon::SetNowPlaying(const Song &song, const QString &image_path
QString clone = pattern_;
clone.replace("%columns" , QString::number(columns));
clone.replace("%appName" , QCoreApplication::applicationName());
clone.replace("%appName" , app_name_);
clone.replace("%titleKey" , tr("Title") % ":");
clone.replace("%titleValue" , song.PrettyTitle().toHtmlEscaped());
@@ -256,5 +257,5 @@ void QtSystemTrayIcon::SetNowPlaying(const Song &song, const QString &image_path
}
void QtSystemTrayIcon::ClearNowPlaying() {
tray_->setToolTip(QCoreApplication::applicationName());
tray_->setToolTip(app_name_);
}

8
src/core/qtsystemtrayicon.h
View File

@@ -72,15 +72,17 @@ private slots:
private:
QSystemTrayIcon *tray_;
QMenu *menu_;
QString app_name_;
QIcon icon_;
QPixmap normal_icon_;
QPixmap grey_icon_;
QAction *action_play_pause_;
QAction *action_stop_;
QAction *action_stop_after_this_track_;
QAction *action_mute_;
QString pattern_;
QPixmap normal_icon_;
QPixmap grey_icon_;
};
#endif // QTSYSTEMTRAYICON_H