mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 05:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Set an "active" role for the menubar icon on Mac"

Browse source 
Apart from a small mistake in this commit, there seems to be
something else wrong.

This reverts commit 97362cff32.
This commit is contained in:
Daniel Molkentin 2014-05-21 13:00:20 +02:00
parent 4edbeece49
commit 5b298abba1
2 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mirall/theme.cpp
View file

@ -16,8 +16,6 @@
#include "version.h" #include "version.h"
#include "config.h" #include "config.h"
#include "mirall/utility.h"
#include <QtCore> #include <QtCore>
#ifndef TOKEN_AUTH_ONLY #ifndef TOKEN_AUTH_ONLY
#include <QtGui> #include <QtGui>
@ -127,10 +125,10 @@ QIcon Theme::themeIcon( const QString& name, bool sysTray ) const
icon = QIcon::fromTheme( name ); icon = QIcon::fromTheme( name );
} else { } else {
QList<int> sizes; QList<int> sizes;
sizes << 16 << 22 << 32 << 48 << 64 << 128; sizes <<16 << 22 << 32 << 48 << 64 << 128;
foreach (int size, sizes) { foreach (int size, sizes) {
QString pixmapName = QString::fromLatin1(":/mirall/theme/%3/%1-%2.png").arg(name).arg(size); QString pixmapName = QString::fromLatin1(":/mirall/theme/%1/%2-%3.png").arg(flavor).arg(name).arg(size);
if (QFile::exists(pixmapName.arg(flavor))) { if (QFile::exists(pixmapName)) {
QPixmap px(pixmapName); QPixmap px(pixmapName);
// HACK, get rid of it by supporting FDO icon themes, this is really just emulating ubuntu-mono // HACK, get rid of it by supporting FDO icon themes, this is really just emulating ubuntu-mono
if (qgetenv("DESKTOP_SESSION") == "ubuntu") { if (qgetenv("DESKTOP_SESSION") == "ubuntu") {
@ -140,10 +138,6 @@ QIcon Theme::themeIcon( const QString& name, bool sysTray ) const
p.drawPixmap(px.rect(), mask, mask.rect()); p.drawPixmap(px.rect(), mask, mask.rect());
} }
icon.addPixmap(px); icon.addPixmap(px);
if (Utility::isMac()) {
QString selIcon = pixmapName.arg(systrayIconFlavorSelected(_mono));
icon.addPixmap(QPixmap(selIcon), QIcon::Selected);
}
} }
} }
if (icon.isNull()) { if (icon.isNull()) {
@ -184,22 +178,11 @@ QString Theme::systrayIconFlavor(bool mono) const
{ {
QString flavor; QString flavor;
if (mono) { if (mono) {
if (Utility::isMac()) { #ifdef Q_OS_MAC
flavor = QLatin1String("black"); flavor = QLatin1String("black");
} else { #else
flavor = QLatin1String("white");
}
} else {
flavor = QLatin1String("colored");
}
return flavor;
}
QString Theme::systrayIconFlavorSelected(bool mono) const
{
QString flavor;
if (mono) {
flavor = QLatin1String("white"); flavor = QLatin1String("white");
#endif
} else { } else {
flavor = QLatin1String("colored"); flavor = QLatin1String("colored");
} }

1
src/mirall/theme.h
View file

@ -131,7 +131,6 @@ public:
/** colored, white or black */ /** colored, white or black */
QString systrayIconFlavor(bool mono) const; QString systrayIconFlavor(bool mono) const;
QString systrayIconFlavorSelected(bool mono) const;
#ifndef TOKEN_AUTH_ONLY #ifndef TOKEN_AUTH_ONLY
/** /**