Permalink
Browse files

Rename image files and remove kontactinterfaces.

We don't need kontactinterfaces any more, because the kdepim folks have
made it a public API in kdepimlibs.  We can simply use the system code
instead of keeping our own copy.

Also, rename images so they show up in the hicolor folder.  The
crystalsvg stuff doesn't work any more.
  • Loading branch information...
1 parent 7b8c3e4 commit 8f686f17bdf3b0a94d903a92cdd8527260c807e7 @atomopawn atomopawn committed Oct 23, 2009
View
@@ -13,20 +13,20 @@
<file>images/hi48-app-basket.png</file>
<file>images/hi64-app-basket.png</file>
<file>images/hi128-app-basket.png</file>
- <file>tags/tag_checkbox.png</file>
- <file>tags/tag_checkbox_checked.png</file>
- <file>tags/tag_for_later.png</file>
- <file>tags/tag_fun.png</file>
- <file>tags/tag_important.png</file>
- <file>tags/tag_preference_bad.png</file>
- <file>tags/tag_preference_excelent.png</file>
- <file>tags/tag_preference_good.png</file>
- <file>tags/tag_priority_high.png</file>
- <file>tags/tag_priority_low.png</file>
- <file>tags/tag_priority_medium.png</file>
- <file>tags/tag_progress_000.png</file>
- <file>tags/tag_progress_025.png</file>
- <file>tags/tag_progress_075.png</file>
- <file>tags/tag_progress_100.png</file>
+ <file>tags/hi16-action-tag_checkbox.png</file>
+ <file>tags/hi16-action-tag_checkbox_checked.png</file>
+ <file>tags/hi16-action-tag_for_later.png</file>
+ <file>tags/hi16-action-tag_fun.png</file>
+ <file>tags/hi16-action-tag_important.png</file>
+ <file>tags/hi16-action-tag_preference_bad.png</file>
+ <file>tags/hi16-action-tag_preference_excellent.png</file>
+ <file>tags/hi16-action-tag_preference_good.png</file>
+ <file>tags/hi16-action-tag_priority_high.png</file>
+ <file>tags/hi16-action-tag_priority_low.png</file>
+ <file>tags/hi16-action-tag_priority_medium.png</file>
+ <file>tags/hi16-action-tag_progress_000.png</file>
+ <file>tags/hi16-action-tag_progress_025.png</file>
+ <file>tags/hi16-action-tag_progress_075.png</file>
+ <file>tags/hi16-action-tag_progress_100.png</file>
</qresource>
</RCC>
View
@@ -118,7 +118,7 @@ kde4_add_plugin(kontact_basketplugin ${kontact_basket_PLUGIN_SRCS})
qt4_add_dbus_interfaces(kontact_basket_PLUGIN_SRCS org.kde.basket.basket.xml)
-target_link_libraries(kontact_basketplugin ${KDE4_CORE_LIBS} kontactinterfaces basketcommon kparts kdeui ${KDE4_KPARTS_LIBS})
+target_link_libraries(kontact_basketplugin ${KDE4_CORE_LIBS} kontactinterface kdepim basketcommon kparts kdeui ${KDE4_KPARTS_LIBS})
install(TARGETS kontact_basketplugin DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES basket_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
View
@@ -23,8 +23,8 @@
#include "basket_part.h"
-#include <kontactinterfaces/core.h>
-#include <kontactinterfaces/plugin.h>
+#include <kontactinterface/core.h>
+#include <kontactinterface/plugin.h>
#include <KDE/KActionCollection>
#include <KDE/KGenericFactory>
@@ -33,8 +33,8 @@
EXPORT_KONTACT_PLUGIN(BasketPlugin, basket)
-BasketPlugin::BasketPlugin(Kontact::Core *core, const QVariantList &)
- : Kontact::Plugin(core, core, "Basket")
+BasketPlugin::BasketPlugin(KontactInterface::Core *core, const QVariantList &)
+ : KontactInterface::Plugin(core, core, "Basket")
{
setComponentData(KontactPluginFactory::componentData());
Global::basketConfig = KSharedConfig::openConfig("basketrc");
View
@@ -21,15 +21,15 @@
#ifndef BASKET_PLUGIN_H
#define BASKET_PLUGIN_H
-#include <kontactinterfaces/plugin.h>
+#include <kontactinterface/plugin.h>
#include <KDE/KParts/Part>
-class BasketPlugin : public Kontact::Plugin
+class BasketPlugin : public KontactInterface::Plugin
{
Q_OBJECT
public:
- BasketPlugin(Kontact::Core *core, const QVariantList &);
+ BasketPlugin(KontactInterface::Core *core, const QVariantList &);
~BasketPlugin();
virtual void readProperties(const KConfigGroup &config);
@@ -1,98 +0,0 @@
-/*
- This file is part of the KDE Kontact Plugin Interface Library.
-
- Copyright (c) 2001 Matthias Hoelzer-Kluepfel <mhk@kde.org>
- Copyright (c) 2002-2003 Daniel Molkentin <molkentin@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
-*/
-#ifndef KONTACTINTERFACES_CORE_H
-#define KONTACTINTERFACES_CORE_H
-
-#include "kontactinterfaces_export.h"
-#include <kparts/mainwindow.h>
-#include <kparts/part.h>
-
-namespace Kontact
-{
-
-class Plugin;
-
-/**
- This class provides the interface to the Kontact core for the plugins.
-*/
-class KONTACTINTERFACES_EXPORT Core : public KParts::MainWindow
-{
- Q_OBJECT
-public:
- virtual ~Core();
-
- /**
- Selects the given plugin and raises the associated part.
- @see selectPlugin(const QString &)
-
- @param plugin is a pointer to the Kontact Plugin to select.
- */
- virtual void selectPlugin(Kontact::Plugin *plugin) = 0;
-
- /**
- This is an overloaded member function
- @see selectPlugin(Kontact::Plugin *)
-
- @param plugin is the name of the Kontact Plugin select.
- */
- virtual void selectPlugin(const QString &plugin) = 0;
-
- /**
- Returns the pointer list of available plugins.
- */
- virtual QList<Kontact::Plugin*> pluginList() const = 0;
-
- /**
- @internal (for Plugin)
- */
- KParts::ReadOnlyPart *createPart(const char *libname);
-
- /**
- @internal (for Plugin)
- Tell kontact that a part was loaded
- */
- virtual void partLoaded(Plugin *plugin, KParts::ReadOnlyPart *part) = 0;
-
-Q_SIGNALS:
- /**
- Emitted when a new day starts
- */
- void dayChanged(const QDate &);
-
-protected:
- explicit Core(QWidget *parentWidget = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS);
-
- QString lastErrorMessage() const;
-
-private:
- class Private;
- Private *const d;
- Q_PRIVATE_SLOT(d, void slotPartDestroyed(QObject *))
- Q_PRIVATE_SLOT(d, void checkNewDay())
-};
-
-}
-
-#endif
-
-// vim: sw=2 sts=2 et tw=80
@@ -1,38 +0,0 @@
-/*
- This file is part of the KDE Kontact Plugin Interface Library.
-
- Copyright (C) 2007 David Faure <faure@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KONTACTINTERFACES_EXPORT_H
-#define KONTACTINTERFACES_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef KONTACTINTERFACES_EXPORT
-# if defined(MAKE_KONTACTINTERFACES_LIB)
-/* We are building this library */
-# define KONTACTINTERFACES_EXPORT KDE_EXPORT
-# else
-/* We are using this library */
-# define KONTACTINTERFACES_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#endif
Oops, something went wrong.

0 comments on commit 8f686f1

Please sign in to comment.