summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
44797cb)
Now Quassel uses your KDE4 icon theme! Enabling KDE support implicitly
disables integrating our own Oxygen copy into the binary as well.
# Define install locations. Using variables will allow overriding this by the KDE macros later.
set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
# Define install locations. Using variables will allow overriding this by the KDE macros later.
set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
-set(DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/apps)
+set(DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/apps/quassel)
set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
set(XDG_APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
set(XDG_APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
set(HAVE_KDE 1)
set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_KDE)
set(QUASSEL_KDE_LIBRARIES ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY})
set(HAVE_KDE 1)
set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_KDE)
set(QUASSEL_KDE_LIBRARIES ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY})
+ set(OXYGEN_ICONS "External")
else(KDE4_FOUND)
message(STATUS "KDE4 not found, disabling KDE integration")
endif(KDE4_FOUND)
else(KDE4_FOUND)
message(STATUS "KDE4 not found, disabling KDE integration")
endif(KDE4_FOUND)
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "icon.h"
#include "iconloader.h"
#include "icon.h"
#include "iconloader.h"
#ifndef ICON_H_
#define ICON_H_
#ifndef ICON_H_
#define ICON_H_
#include <QIcon>
/// A very thin wrapper around QIcon
#include <QIcon>
/// A very thin wrapper around QIcon
Icon& operator=(const Icon &other);
};
Icon& operator=(const Icon &other);
};
+#else /* HAVE_KDE */
+#include <KIcon>
+class Icon : public KIcon {
+
+ public:
+ inline Icon() : KIcon() {};
+ inline explicit Icon(const QString &iconName) : KIcon(iconName) {};
+ inline explicit Icon(const QIcon& copy) : KIcon(copy) {};
+};
+
+#endif /* HAVE_KDE */
+
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <QCoreApplication>
#include <QDebug>
#include <QDir>
#include <QCoreApplication>
#include <QDebug>
#include <QDir>
IconLoader *loader = IconLoader::global();
return loader->loadIcon(name, IconLoader::Small, force_size);
}
IconLoader *loader = IconLoader::global();
return loader->loadIcon(name, IconLoader::Small, force_size);
}
#ifndef ICONLOADER_H_
#define ICONLOADER_H_
#ifndef ICONLOADER_H_
#define ICONLOADER_H_
#include <QPixmap>
/// Provides basic facilities to load icons from standard locations or resources
#include <QPixmap>
/// Provides basic facilities to load icons from standard locations or resources
QString IconLoader::theme() const { return _theme; }
QString IconLoader::theme() const { return _theme; }
+#else /* HAVE_KDE */
+
+#include <KIconLoader>
+class IconLoader : public KIconLoader { Q_OBJECT };
+
+#endif /* HAVE_KDE */
+