diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,6 @@ add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) add_subdirectory (src) -add_subdirectory (pixmaps) if (ENABLE_EXAMPLES) add_subdirectory(examples) endif() diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt deleted file mode 100644 --- a/pixmaps/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -INSTALL (FILES dummy_avatar.png DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kpeople/) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,6 +21,7 @@ personpluginmanager.cpp personmanager.cpp personssortfilterproxymodel.cpp + resources.qrc ) add_library(KF5::People ALIAS KF5People) diff --git a/src/global.h b/src/global.h --- a/src/global.h +++ b/src/global.h @@ -63,4 +63,6 @@ } +void initResources(); + #endif // GLOBAL_H diff --git a/src/global.cpp b/src/global.cpp --- a/src/global.cpp +++ b/src/global.cpp @@ -92,3 +92,8 @@ return 7; } + +void initResources() +{ + Q_INIT_RESOURCE(resources); +} diff --git a/src/persondata.cpp b/src/persondata.cpp --- a/src/persondata.cpp +++ b/src/persondata.cpp @@ -147,7 +147,7 @@ } if (avatar.isNull()) { - static QString defaultAvatar = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kf5/kpeople/dummy_avatar.png")); + static QString defaultAvatar = QStringLiteral(":/org.kde.kpeople/pixmaps/dummy_avatar.png"); avatar = QPixmap(defaultAvatar); } return avatar; diff --git a/src/personsmodel.cpp b/src/personsmodel.cpp --- a/src/personsmodel.cpp +++ b/src/personsmodel.cpp @@ -40,7 +40,6 @@ public: PersonsModelPrivate(PersonsModel *q) : q(q) - , genericAvatarImagePath(QStandardPaths::locate(QStandardPaths::QStandardPaths::GenericDataLocation, QStringLiteral("kf5/kpeople/dummy_avatar.png"))) , initialFetchesDoneCount(0) , isInitialized(false) , hasError(false) @@ -57,7 +56,6 @@ //a list so we have an order in the model QVector metacontacts; - QString genericAvatarImagePath; QVector m_sourceMonitors; int initialFetchesDoneCount; @@ -110,6 +108,8 @@ connect(PersonManager::instance(), &PersonManager::contactAddedToPerson, d, &PersonsModelPrivate::onAddContactToPerson); connect(PersonManager::instance(), &PersonManager::contactRemovedFromPerson, d, &PersonsModelPrivate::onRemoveContactsFromPerson); + + initResources(); } PersonsModel::~PersonsModel() @@ -178,7 +178,7 @@ // If none of the above were valid images, // return the generic one - return QPixmap(genericAvatarImagePath); + return QPixmap(QStringLiteral(":/org.kde.kpeople/pixmaps/dummy_avatar.png")); } case PersonsModel::PersonUriRole: return personUri; diff --git a/pixmaps/dummy_avatar.png b/src/pixmaps/dummy_avatar.png rename from pixmaps/dummy_avatar.png rename to src/pixmaps/dummy_avatar.png index 7eff69dd7dca1909e98adcbdcf464747dbe85a5e..7eff69dd7dca1909e98adcbdcf464747dbe85a5e GIT binary patch literal 2213 zc$@*H2wL}vP)vUa&CSiv&(G4*($&?~+S=OWlLt=(Kw}({|S(wumKtkMJK`*3D9u34$O9f*=TjAP9mW2!bF8f*=TjAP9mW z2m%I1Df0l~u?5@`+QWMXukKGUc&%6MSXLOC|DrQp#4l?FfHn=!_h$A6Tu+ z-FAZi;8H0oLOrBXS$iJge;9X}$Ys^ObKrwJWV|27hg7>8_~LezRoXB;U@GhUrTYFb zZa0T2(@L`w%;?s^d?t53wWZ}Hm@0aBnQ^;m_*i_ajsq;ioeCau>3t8&8BTi!zP+j( z1mSidZ@N@FLMZyZrmaNtP2+G*fRZDFkFw;TFxni%D>L3DBL($5s_8vnl z7z%m`30;j4hYLBeY~~;qJ8EW2<*xmy9F?T0>Z5A~w>=HDY%#_cYba=l z6(=)8R4lU#g38yq}B8!*@A3HfiD*cDz zI1ou_*qJ2;Q-g@*ZQqX|*KlR_9dZhB!)xjWegtt!y19^8|!8zSCA3O}9Da_|JY*--u((n!HS$Msay#x~>zQOEo6bhY$$GsN=ahmzo0EE8#z9nER*aXizW z=Hz^Rki@%xJRPH!-;rHl5xzX_GOAmOB6tr+x_e}TJEl}-lcJdTobWoQ;GNzrE# zMXS}m?FV=>kGq(FQdyJVUZ71hul6pQr&12q#7f^qqinr0r9STB zX}>bL%)?DMxjU?qVOOZt*e-=f#U^(+p3QcC^M>(Z4P^?5X_2xneS;arZ7=g}e=DpRk>Nq_Bm z?Ar|CIzA57aeIgKai=n}_hnR>`l0&eI`&P(K-;J)AAu5=Hj-RcmH7nJxHLL~?b6w4 z1d8;*>)2K`4u~>zCg|ZZc5?^1oQr^#OBWX)&8-f06?N%=IAf?)1-iTed8ROGnY{xB zjCBaR6>;^%y6jefk$70k30L57Exw2-E74X$v-BdyZeU*%O9!?@*$uE-7EV1y+IhJW zPRp!T2U||8#9B1?)UbLC7Y_4O2VP<=ig?t9 zmsr~+zJs~)5^G#AC)SiBFR_+bcwYYdlO?MQ95=CEAFInJ?-$}dbo|76^=PRM81kys zx^Wci{!#{z=fQgQXgQu@y<)X=15DY>e-QCTSF8;u<~^o~=X(oZ$ZByau6||qRxNYk zE7shFKAc({erIOgg0sn*U76;W$y(sVtDdu1b7##v&SK4rcx*9p77N-r_t3Dm?=#&} zjtS*onU!4TR$TqctYWL~d5blxQ44Df>uR6F87uDWe&8+EoPftLYs>nb857erbI)N` zbjaOv0LZn3(ca9+|M4wW{A5Pag3GVDzcV9Q%H7SH(-F_D`~8oOmXQRFHwRw}Z|XaH zvAkEl>XyA${tXXYn~gqYw6tWi{4-isN<01;E%{gBkN;l_Ct~@2F6Z6n@DtB!n5o3g z@^-Yu&6?q8iJSGrvpGbvSx-DOTKXbV`De7mb9iv~>ZFkb%?#f`>R=yuRl}qXHY4vK zIfog~p^?YXJCv4c#ZNq%LnJbs5gnRZWcpwyVuck;+$?{wY;hF6Q+Wi3RteupYq_!@ n2!bF8f*=TjAP52z{t;jR+5Gpnfqhs}00000NkvXXu0mjfbFWYp literal 2213 zc$@*H2wL}vP)vUa&CSiv&(G4*($&?~+S=OWlLt=(Kw}({|S(wumKtkMJK`*3D9u34$O9f*=TjAP9mW2!bF8f*=TjAP9mW z2m%I1Df0l~u?5@`+QWMXukKGUc&%6MSXLOC|DrQp#4l?FfHn=!_h$A6Tu+ z-FAZi;8H0oLOrBXS$iJge;9X}$Ys^ObKrwJWV|27hg7>8_~LezRoXB;U@GhUrTYFb zZa0T2(@L`w%;?s^d?t53wWZ}Hm@0aBnQ^;m_*i_ajsq;ioeCau>3t8&8BTi!zP+j( z1mSidZ@N@FLMZyZrmaNtP2+G*fRZDFkFw;TFxni%D>L3DBL($5s_8vnl z7z%m`30;j4hYLBeY~~;qJ8EW2<*xmy9F?T0>Z5A~w>=HDY%#_cYba=l z6(=)8R4lU#g38yq}B8!*@A3HfiD*cDz zI1ou_*qJ2;Q-g@*ZQqX|*KlR_9dZhB!)xjWegtt!y19^8|!8zSCA3O}9Da_|JY*--u((n!HS$Msay#x~>zQOEo6bhY$$GsN=ahmzo0EE8#z9nER*aXizW z=Hz^Rki@%xJRPH!-;rHl5xzX_GOAmOB6tr+x_e}TJEl}-lcJdTobWoQ;GNzrE# zMXS}m?FV=>kGq(FQdyJVUZ71hul6pQr&12q#7f^qqinr0r9STB zX}>bL%)?DMxjU?qVOOZt*e-=f#U^(+p3QcC^M>(Z4P^?5X_2xneS;arZ7=g}e=DpRk>Nq_Bm z?Ar|CIzA57aeIgKai=n}_hnR>`l0&eI`&P(K-;J)AAu5=Hj-RcmH7nJxHLL~?b6w4 z1d8;*>)2K`4u~>zCg|ZZc5?^1oQr^#OBWX)&8-f06?N%=IAf?)1-iTed8ROGnY{xB zjCBaR6>;^%y6jefk$70k30L57Exw2-E74X$v-BdyZeU*%O9!?@*$uE-7EV1y+IhJW zPRp!T2U||8#9B1?)UbLC7Y_4O2VP<=ig?t9 zmsr~+zJs~)5^G#AC)SiBFR_+bcwYYdlO?MQ95=CEAFInJ?-$}dbo|76^=PRM81kys zx^Wci{!#{z=fQgQXgQu@y<)X=15DY>e-QCTSF8;u<~^o~=X(oZ$ZByau6||qRxNYk zE7shFKAc({erIOgg0sn*U76;W$y(sVtDdu1b7##v&SK4rcx*9p77N-r_t3Dm?=#&} zjtS*onU!4TR$TqctYWL~d5blxQ44Df>uR6F87uDWe&8+EoPftLYs>nb857erbI)N` zbjaOv0LZn3(ca9+|M4wW{A5Pag3GVDzcV9Q%H7SH(-F_D`~8oOmXQRFHwRw}Z|XaH zvAkEl>XyA${tXXYn~gqYw6tWi{4-isN<01;E%{gBkN;l_Ct~@2F6Z6n@DtB!n5o3g z@^-Yu&6?q8iJSGrvpGbvSx-DOTKXbV`De7mb9iv~>ZFkb%?#f`>R=yuRl}qXHY4vK zIfog~p^?YXJCv4c#ZNq%LnJbs5gnRZWcpwyVuck;+$?{wY;hF6Q+Wi3RteupYq_!@ n2!bF8f*=TjAP52z{t;jR+5Gpnfqhs}00000NkvXXu0mjfbFWYp diff --git a/src/resources.qrc b/src/resources.qrc new file mode 100644 --- /dev/null +++ b/src/resources.qrc @@ -0,0 +1,6 @@ + + + pixmaps/dummy_avatar.png + + +