From 77142704a641ac86f393567b271f23e635926298 Mon Sep 17 00:00:00 2001 From: Flavio Tordini Date: Sun, 25 Jul 2010 17:17:00 +0200 Subject: [PATCH] Always rely on native icons on X11 --- Info.plist | 18 -------------- images/media-playback-pause.png | Bin 770 -> 0 bytes images/media-playback-start.png | Bin 1255 -> 0 bytes images/media-playback-stop.png | Bin 745 -> 0 bytes images/media-skip-forward.png | Bin 1395 -> 0 bytes images/view-fullscreen.png | Bin 1084 -> 0 bytes minitube.icns | Bin 40342 -> 0 bytes minitube.ico | Bin 67646 -> 0 bytes minitube.rc | 2 -- resources.qrc | 5 ---- src/Constants.h | 16 ------------- src/MainWindow.cpp | 12 +++++----- src/iconloader/qticonloader.cpp | 41 ++++++++++++++++++++------------ src/iconloader/qticonloader.h | 2 +- 14 files changed, 33 insertions(+), 63 deletions(-) delete mode 100644 Info.plist delete mode 100644 images/media-playback-pause.png delete mode 100644 images/media-playback-start.png delete mode 100644 images/media-playback-stop.png delete mode 100644 images/media-skip-forward.png delete mode 100644 images/view-fullscreen.png delete mode 100644 minitube.icns delete mode 100644 minitube.ico delete mode 100644 minitube.rc delete mode 100755 src/Constants.h diff --git a/Info.plist b/Info.plist deleted file mode 100644 index 27b03c3..0000000 --- a/Info.plist +++ /dev/null @@ -1,18 +0,0 @@ - - - - - CFBundleName - Minitube - CFBundleIconFile - minitube.icns - CFBundlePackageType - APPL - CFBundleGetInfoString - Copyright 2009 Flavio Tordini - CFBundleExecutable - minitube - CFBundleIdentifier - org.tordini.flavio.minitube - - diff --git a/images/media-playback-pause.png b/images/media-playback-pause.png deleted file mode 100644 index 2faccc2edcc9407474c539309d0b82fdf8683481..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 770 zcmV+d1O5DoP)MFuT& z_a}hI0Kj>o5JF%8DP|-Gz`EfRT+}yr51%$nssLyJm5JmIz%76TK!3P)ug?dOR{;@* zq1IYIBceb`$pB!C$*i@#BuV~UU0oRf$n(W<+`YcOz8L})2iV=+mD}6f4U+D(pJkhq znqvNGjW{sIBmf|#oa-FH<_ph5D-hZ6Zj*bsE_g?M? zQ50PQK#uRl-rjy=XJ_XEcgIx>V10d^>h-!F-G4s$1R;R8Z#pAgTWci%5YgE8<@5xA z!|PY?#=aj?k|!*IfF=}IY+rm0KQbjml| zDMVzGB=Hh?E6{GYEfI}BAX{7QDSdf)xzEfF02+%M80$4b}UvB060it*FbpQYW07*qoM6N<$f^$q% A7ytkO diff --git a/images/media-playback-start.png b/images/media-playback-start.png deleted file mode 100644 index c933f110705d171c5f12c0386726d32a83ab33d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1255 zcmVK~z|U&6jUX8)Y2FzrW}1xoc@@N#P2NI@6FiaYD8@nng`S z2zz5>iOIzH%8}^eUa(A!Zx%AmWN!0MgyEuW!a(CP_QEBaII{UC!IuIWtm~S?|slEeMOPbcNuPJjvxQx!>nL-`{i39T|p!tsHDitN$MW#8elFh?b9yP0EUr z-8WHONK6BO20-6vkW>apQ4|vZYcv`)B9X{EfCVCoAueP?K#~GfR8%kk*4(_D=FySy z^MOFX7YGDqB9X`(fJGwGHUc6kKxt{IU^biWgTvkfyLOk=go2?quXnI>Y-}tLjYh+& zsz!-u2^q$cbQQSWZdP1eYyp7grWX16+S*rkmX%!fcs%iXJ{zw{u*=$~;R1`%_ z&xFw5-wSh=nchG10k1n)_rfEOKK%7#<-1>Wxm?=|3JRR~Cl+Bnv7|I0isG7M#u$hQ z6XSkNhe9adQ!YI5_>=aI&WjD%*6i9l!Qd&&pO*e`I2@Xqno<#8wkcyt32-kAV+@Q4 z#29o#$I$Q~va_>s@TEGjre=T1*_P(E9J~G7;Xz-sEX%&x+1Ze)s&hoNlnf#b00E2% zD*!|U0%2i(0p8nx!QsfIcTO~ly}ds_^I7|asv=j>S>Lelb5&K1fq{V-fXn~{L4?2< z7!yE@z=(k5hz%e-GYwUp#g2z|u$HECSy!%He*MPx*PkOM)>l_o{{SGCA%GB{j3s&@ zZXsUZfT0^}&Jhtf=gjrMgW|rbeMy`BJ^%zTfvq&;vH`0#8+LmR`ucnI_KR&xB_%sM z-#h)`m%6Usb~qfFHz8vT0%I#6EMY>HW!P+XOa+5R!|`LfEXh4@y!K|h)9Lhb&iy8n zX$DF3rv*TX=36c-$r9|g92f@B-qEhz{Qc(8vo$rXdp&#mIOl#zlI{SQ1F(enR-PdM z2n2u_!Dh3=VzHvy4Kx&ZKmR>$_uX^ zI{f3RoM!&W1#*9$-ZH~=Y8@Gdgcoi4yK1SN`Y%8$u^y$3d}@bcL5f5R;Y_!}5Ow{Xsu Rh@}7k002ovPDHLkV1n>jLzn;n diff --git a/images/media-playback-stop.png b/images/media-playback-stop.png deleted file mode 100644 index e4fb4bd8c237c554cad05c4a78ea18f0695481f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmVK~z|U?Uzq$)Ib=TM#Yo_GHV7$4c?wT|s&) zr5{nmi-;FLfr#Iro`izZLs4h~-OP-KNp`o(CMGL&J@kc;KNIHp<(YS8-be@m>kO_{ z{SM%N05DCBA|i;8vSR-MfDa9sE_H3Ccmluz*eD^|f`sz829N`o)Il^kAX{5o)>`|3 zWU8trgwP5=M1pg!@ZSH-^ZfheETh`Yauf#}@!5od9-rcG&OtZFT?t!#hv} z5P?7-g7O-;nHtgQmoHvb{n)FktJ>MtI15Nl+Y^&OMCJ}4=IJ893}Ug5&H(d~B&HPR z6abJph~)r(idq0`tr#4LxF!$a+0AO^0TmTRN;T8c@K`N*Og%CW24T$mTNAdk>PqId@$Y#Sc~e z+UxZ$02EyT1hE|31keMZ=vIS0~;E;MQa9{{?pd bYX|rZ)c?0QsPgfx00000NkvXXu0mjf5jjKe diff --git a/images/media-skip-forward.png b/images/media-skip-forward.png deleted file mode 100644 index 704ca1706bf8d8b138c588a3e02135215116c5b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1395 zcmV-(1&sQMP)) zb$VKU3;;(6AxaBL?neM90GJm-I4dl+9K z$ykJtyt{DauUoUPt*!NFnpQ_C^#Oq6IHqM;Ny9LTJQj3xP_ zq$VaN(g18iNTIyU>-1F~ul#)>Uu**aN#?pem*1X9BrMY1-K{E$()#Pb)$47ot@*KA zw}z*aGd=Nm{CCqdjp^y>SpYcz^8iG5cehgMXC_lUx~|{XYns;9f9;n)zB=~}0ATm4 zyRiAm*e1)ebRLOBsG=wy3;>7UdtbhKt^bLSK0b5SAE-G$a&zp2s;cAZblRMoo67>o zd%a%f_xm+qsjm&xoF9pgo={bF+%(N}CX=yBJ{SyYrR&jm@dp$N1=QEqdu-dL6aZ9J z{OV8Y7WN$mjD_4Gs<}j4^4M@90?c4Gj%V z<(?42O93QF0swH%Ip98qj^mUb4-5?tA~{)u7hiaZJ-7XN-o}S z$jwd1jvxEXAE^1(OlQufQYqiPeE2@zFpTQT0E7^tX&RxWFXcd%B*?OiOlB5CLpR{} z*OJ~Nz4B|Xzp{R}(y;qjWb*0w$W#V@%8l>s>8;1UPt9Go!_NBIG4?4 zdC9MO2>?J*6x7w#BcIRX$dM0*(k_)xM?uH_Nh&L?RLSH$JvGHelO!y4;rn zFvdi&SX|r(7Ap{mMB(*%aq(i`{DlkO*;}`6`*hEqH~Sc4;{Yb7rlyL9VQB01?*4PP z0+wZoU@+(afDi(=5(%6tqk<5URTO2qvFXvzyLNW{$T`2Qs_F!QSu8XT z^H^v;5C{aEwR%daRqL-E-P!eWGXVGl{?Uep2Fr0AL4*+8vaDb-nQVzfB6&hcs#HDz zMF5qZ&YHb#+aV!DE2Xr~z2}mIkhsU=nIdjmrUKC1gKf8b^SJj|ulKpfzzu5xxI^5= zrMzKuO66N&tkn|$40ks^#|r?kx?KOjHAbdx`jWmd)AWtCmK2!*T+pu&Ka%}5zf-IGmZX#5TFCxyZ7xE9==B+GO3i(Pcop0I7+Es zHQb+`KK<=a9l*o)sQ>(hyBGQ|`c5)+s9jx$)x znWkw(B7?r-#`{UAAy7)`hG7s01dbf^!Hsu_2tWT}^5DihfR?>s7}QZWc)PBPQtHS8 z0F+W_n%3~Qf4?^~4FR6#p=n2NieF~qwLk~&_hN3U_^GKW!r}0dMYJ=^vY4KpZWW-E zA`}WSfB!zgM1pfyuhMh*GQmWGu4EEA#UsMj+qZ0Ivy|VwVRLbj?QE7WpFC+o-4IY` z6HF%AUR}l6+~l8hn#i3y1d~ZP#K_*t(VniO0`r% z@9V=bO?t=1a9y|K-~hd2V_2_VAtHzfJ)@&7#omyjltM)49vNu_*8%~Gv$MFi-Ei`` z%e8Hav$JS{0ETIz_w~^|GJ=S-M-Yg|>A!W0^W)=KFJB@`VHXMn<(@ z5uTV}V{VQ>Jl-CG=Xv-C2ML=d0)!?eunPqY)9iRc*1rivB8cBl`1*Aa!SlRNX8`u} zXT9KjK8$D-PvlTVXhfq3AbZ8{^V5RhG^{Ox)38q>sCU6>3uxq`jzB!`-*&22+0Nyf z&pvl~-tM>6YSY<&cEQg2I$N0xp=;OpFgFL9wp-1ySVyRmgvQ7DFh5V% z@GwR++8%+O%VE8EL3wczUoc1@k-$GN&@mqWzyMpXUt?#pl+$Ud`8=9o;5W_old!V9 zj8iI6&FArKo8D9kbiHE)=sLZr6rOEU&F67SB`V9y2T#H}g38hoj%76*Z7wWuE|u!& z_I2A_SioLi$0?O?OC>5xO9v04dJ*pAa`e^L;Q{n)1>d_P3)Bw zD(N&kx!i#na9r2b%jGh|j~}=CsyXb`{IMARSd5-jivHSJxm>Q#8wWsFN@?H!_}#OW z)yy|DGc!J2Khb9aj^nVhnsGrrQ%Y&Nh`=b0000 diff --git a/minitube.icns b/minitube.icns deleted file mode 100644 index 00532783bc9bb34b4618f8f5f07f662bcec787c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40342 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 Zv!m#*|MOql0;$V0qF{j`9=MJ8{{X7qOxOSb diff --git a/minitube.ico b/minitube.ico deleted file mode 100644 index 9a3acbe747912c44801fae5653e9e4353e6e4bdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67646 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 B(Axk2 diff --git a/minitube.rc b/minitube.rc deleted file mode 100644 index 2c1795b..0000000 --- a/minitube.rc +++ /dev/null @@ -1,2 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "minitube.ico" - diff --git a/resources.qrc b/resources.qrc index 639421a..53d1d4d 100755 --- a/resources.qrc +++ b/resources.qrc @@ -1,10 +1,5 @@ images/app.png - images/view-fullscreen.png - images/media-playback-pause.png - images/media-playback-start.png - images/media-playback-stop.png - images/media-skip-forward.png diff --git a/src/Constants.h b/src/Constants.h deleted file mode 100755 index 8ba79e8..0000000 --- a/src/Constants.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef CONSTANTS_H -#define CONSTANTS_H - -#include - -namespace Constants { - static const char *VERSION = "1.0"; - static const char *APP_NAME = "Minitube"; - static const char *ORG_NAME = "Flavio Tordini"; - static const char *ORG_DOMAIN = "flavio.tordini.org"; - static const char *WEBSITE = "http://flavio.tordini.org/minitube"; - static const char *EMAIL = "flavio.tordini@gmail.com"; - static const QString USER_AGENT = QString(APP_NAME) + " " + VERSION + " (" + WEBSITE + ")"; -} - -#endif diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index b785fc1..d01d9e0 100755 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -77,27 +77,27 @@ void MainWindow::createActions() { QMap *actions = The::globalActions(); - stopAct = new QAction(QtIconLoader::icon("media-playback-stop", QIcon(":/images/media-playback-stop.png")), tr("&Stop"), this); + stopAct = new QAction(QtIconLoader::icon("media-playback-stop"), tr("&Stop"), this); stopAct->setStatusTip(tr("Stop playback and go back to the search view")); stopAct->setShortcuts(QList() << QKeySequence(Qt::Key_Escape) << QKeySequence(Qt::Key_MediaStop)); actions->insert("stop", stopAct); connect(stopAct, SIGNAL(triggered()), this, SLOT(stop())); - skipAct = new QAction(QtIconLoader::icon("media-skip-forward", QIcon(":/images/media-skip-forward.png")), tr("S&kip"), this); + skipAct = new QAction(QtIconLoader::icon("media-skip-forward"), tr("S&kip"), this); skipAct->setStatusTip(tr("Skip to the next video")); skipAct->setShortcuts(QList() << QKeySequence(Qt::CTRL + Qt::Key_Right) << QKeySequence(Qt::Key_MediaNext)); skipAct->setEnabled(false); actions->insert("skip", skipAct); connect(skipAct, SIGNAL(triggered()), mediaView, SLOT(skip())); - pauseAct = new QAction(QtIconLoader::icon("media-playback-pause", QIcon(":/images/media-playback-pause.png")), tr("&Pause"), this); + pauseAct = new QAction(QtIconLoader::icon("media-playback-pause"), tr("&Pause"), this); pauseAct->setStatusTip(tr("Pause playback")); pauseAct->setShortcuts(QList() << QKeySequence(Qt::Key_Space) << QKeySequence(Qt::Key_MediaPlay)); pauseAct->setEnabled(false); actions->insert("pause", pauseAct); connect(pauseAct, SIGNAL(triggered()), mediaView, SLOT(pause())); - fullscreenAct = new QAction(QtIconLoader::icon("view-fullscreen", QIcon(":/images/view-fullscreen.png")), tr("&Full Screen"), this); + fullscreenAct = new QAction(QtIconLoader::icon("view-fullscreen"), tr("&Full Screen"), this); fullscreenAct->setStatusTip(tr("Go full screen")); fullscreenAct->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Return)); fullscreenAct->setShortcutContext(Qt::ApplicationShortcut); @@ -522,7 +522,7 @@ void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState case Phonon::PlayingState: pauseAct->setEnabled(true); - pauseAct->setIcon(QtIconLoader::icon("media-playback-pause", QIcon(":/images/media-playback-pause.png"))); + pauseAct->setIcon(QtIconLoader::icon("media-playback-pause")); pauseAct->setText(tr("&Pause")); pauseAct->setStatusTip(tr("Pause playback") + " (" + pauseAct->shortcut().toString(QKeySequence::NativeText) + ")"); skipAct->setEnabled(true); @@ -536,7 +536,7 @@ void MainWindow::stateChanged(Phonon::State newState, Phonon::State /* oldState case Phonon::PausedState: skipAct->setEnabled(true); pauseAct->setEnabled(true); - pauseAct->setIcon(QtIconLoader::icon("media-playback-start", QIcon(":/images/media-playback-start.png"))); + pauseAct->setIcon(QtIconLoader::icon("media-playback-start")); pauseAct->setText(tr("&Play")); pauseAct->setStatusTip(tr("Resume playback") + " (" + pauseAct->shortcut().toString(QKeySequence::NativeText) + ")"); break; diff --git a/src/iconloader/qticonloader.cpp b/src/iconloader/qticonloader.cpp index 551e1ac..0649c5c 100644 --- a/src/iconloader/qticonloader.cpp +++ b/src/iconloader/qticonloader.cpp @@ -88,7 +88,7 @@ private: Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoaderInstance) #endif -/*! + /*! Returns the standard icon for the given icon /a name as specified in the freedesktop icon spec @@ -99,28 +99,25 @@ Q_GLOBAL_STATIC(QtIconLoaderImplementation, iconLoaderInstance) crossplatform code. */ -QIcon QtIconLoader::icon(const QString &name, const QIcon &fallback) + QIcon QtIconLoader::icon(const QString &name) { QIcon icon; -#if QT_VERSION < 0x040600 - #ifdef Q_WS_X11 +#if QT_VERSION < 0x040600 QString pngExtension(QLatin1String(".png")); QList iconSizes; - iconSizes << 16 << 24 << 32 << 48 << 64; + iconSizes << 16 << 22 << 24 << 32 << 48; Q_FOREACH (int size, iconSizes) { - icon.addPixmap(iconLoaderInstance()->findIcon(size, name + pngExtension)); + icon.addPixmap(iconLoaderInstance()->findIcon(size, name)); } +#else + icon = QIcon::fromTheme(name); #endif - #else - icon = QIcon::fromTheme(name, fallback); + icon = QIcon(QString(":/images/%1.png").arg(name)); #endif - if (icon.isNull()) - icon = fallback; - Q_UNUSED(name); return icon; } @@ -233,7 +230,7 @@ void QtIconLoaderImplementation::lookupIconTheme() const dataDirs.prepend(QDir::homePath() + QLatin1String("/:")); QStringList kdeDirs = QFile::decodeName(getenv("KDEDIRS")).split(QLatin1Char(':')); Q_FOREACH (const QString dirName, kdeDirs) - dataDirs.append(QLatin1Char(':') + dirName + QLatin1String("/share")); + dataDirs.append(QLatin1Char(':') + dirName + QLatin1String("/share")); iconDirs = dataDirs.split(QLatin1Char(':')); QFileInfo fileInfo(QLatin1String("/usr/share/icons/default.kde")); @@ -313,9 +310,23 @@ QPixmap QtIconLoaderImplementation::findIconHelper(int size, const QString &them QString contentDir = (iconDirs[i].startsWith(QDir::homePath())) ? QLatin1String("/.icons/") : QLatin1String("/icons/"); QString fileName = iconDirs[i] + contentDir + themeName + QLatin1Char('/') + subDirs[j] + QLatin1Char('/') + iconName; - QFile file(fileName); - if (file.exists()) - pixmap.load(fileName); + + QString svgExtension(QLatin1String(".svg")); + QString svgFilename = fileName + svgExtension; + QFile svgFile(svgFilename); + if (false && svgFile.exists()) { + // qDebug() << "Found svg"; + pixmap.load(svgFilename); + } else { + QString pngExtension(QLatin1String(".png")); + QString pngFilename = fileName + pngExtension; + QFile pngFile(pngFilename); + if (pngFile.exists()) { + // qDebug() << "Found png"; + pixmap.load(pngFilename); + } + } + if (!pixmap.isNull()) break; } diff --git a/src/iconloader/qticonloader.h b/src/iconloader/qticonloader.h index 89fc1b2..a40da0f 100644 --- a/src/iconloader/qticonloader.h +++ b/src/iconloader/qticonloader.h @@ -50,7 +50,7 @@ class QtIconLoader { public: - static QIcon icon(const QString &name, const QIcon &fallback = QIcon()); + static QIcon icon(const QString &name); }; #endif // QTICONLOADER_H -- 2.39.5