SVN commit 807893 by pino:

add my copyright to the files where i contributed in a significant way


M +1 -0 NetworkManager-networkinterface.cpp
M +1 -0 NetworkManager-networkinterface.h
M +1 -0 NetworkManager-networkmanager.cpp
M +1 -0 NetworkManager-networkmanager.h
M +1 -0 NetworkManager-wirelessaccesspoint.cpp
M +1 -0 NetworkManager-wirelessaccesspoint.h
M +1 -0 NetworkManager-wirelessnetwork.cpp
M +1 -0 NetworkManager-wirelessnetwork.h
M +1 -0 module.cpp


--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkinterface.cpp #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkinterface.h #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkmanager.cpp #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkmanager.h #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-wirelessaccesspoint.cpp #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-wirelessaccesspoint.h #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-wirelessnetwork.cpp #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-wirelessnetwork.h #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/module.cpp #807892:807893
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2006 Will Stephenson <wstephenson@kde.org>
+ Copyright (C) 2008 Pino Toscano <pino@kde.org>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public

SVN commit 807892 by aseigo:

update the dbus interface


M +1 -3 org.kde.plasma.App.xml
M +1 -1 plasmaapp.cpp


--- trunk/KDE/kdebase/workspace/plasma/plasma/org.kde.plasma.App.xml #807891:807892
@@ -1,8 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
- <interface name="org.kde.plasma.App">
- <method name="initializeWallpaper">
- </method>
+ <interface name="local.PlasmaApp">
<method name="toggleDashboard">
</method>
</interface>
--- trunk/KDE/kdebase/workspace/plasma/plasma/plasmaapp.cpp #807891:807892
@@ -119,7 +119,7 @@
{
KGlobal::locale()->insertCatalog("libplasma");

- new AppAdaptor(this);
+ new PlasmaAppAdaptor(this);
QDBusConnection::sessionBus().registerObject("/App", this);
notifyStartup(false);

SVN commit 807891 by sebsauer:

* always set the pageNumber back to -1 to be sure we don't deal at some point with a prev value but discover possible probs there faster.
* assert if anchor-type=="page" but no anchor-page-number got provided.
* be sure we always have a no anchor-page-number >= 1 like defined in the specs.



M +3 -4 KoTextAnchor.cpp


--- trunk/koffice/libs/kotext/KoTextAnchor.cpp #807890:807891
@@ -206,15 +206,14 @@

bool KoTextAnchor::loadOdfFromShape () {
if (shape()->hasAdditionalAttribute("text:anchor-type")) {
+ d->pageNumber = -1;
QString anchorType = shape()->additionalAttribute("text:anchor-type");
if (anchorType == "paragraph")
d->anchorType = Paragraph;
else if (anchorType == "page") {
d->anchorType = Page;
- if (shape()->hasAdditionalAttribute("text:anchor-page-number"))
- d->pageNumber = (shape()->additionalAttribute("text:anchor-page-number")).toInt();
- else
- d->pageNumber = -1;
+ Q_ASSERT(shape()->hasAdditionalAttribute("text:anchor-page-number"));
+ d->pageNumber = qMax(1,shape()->additionalAttribute("text:anchor-page-number").toInt());
} else if (anchorType == "frame")
d->anchorType = Frame;
else if (anchorType == "char")

SVN commit 807890 by aseigo:

reimpliment this when the wallpaper kcms and plugins occur in 4.2


M +0 -6 plasmaapp.cpp
M +0 -1 plasmaapp.h


--- trunk/KDE/kdebase/workspace/plasma/plasma/plasmaapp.cpp #807889:807890
@@ -261,12 +261,6 @@
delete m_corona;
}

-void PlasmaApp::initializeWallpaper()
-{
- //FIXME this has moved to Containment, so .....
- //m_root->desktop()->initializeWallpaper();
-}
-
void PlasmaApp::toggleDashboard()
{
int currentScreen = 0;
--- trunk/KDE/kdebase/workspace/plasma/plasma/plasmaapp.h #807889:807890
@@ -78,7 +78,6 @@
public Q_SLOTS:
// DBUS interface. if you change these methods, you MUST run:
// qdbuscpp2xml plasmaapp.h -o org.kde.plasma.App.xml
- void initializeWallpaper();
void toggleDashboard();

private Q_SLOTS:

SVN commit 807889 by pino:

SVN_SILENT use specific includes for QtDBus classes


M +3 -1 NetworkManager-wirelessaccesspoint.cpp


--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-wirelessaccesspoint.cpp #807888:807889
@@ -19,7 +19,9 @@

#include "NetworkManager-wirelessaccesspoint.h"

-#include <QtDBus>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusMessage>
+
#include <kdebug.h>

namespace AP

SVN commit 807888 by pino:

kill NMDBusAccessPointProperties, no more used


M +0 -10 NetworkManager-networkinterface.cpp
M +0 -3 NetworkManager-networkinterface_p.h
M +0 -9 NetworkManager-wirelessaccesspoint.h


--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkinterface.cpp #807887:807888
@@ -29,8 +29,6 @@

#include <solid/control/networkinterface.h>

-#include "NetworkManager-wirelessaccesspoint.h"
-
void dump(const NMDBusDeviceProperties &device)
{
kDebug(1441) << "dump(const NMDBusDeviceProperties &device):\n Object path: " << device.path.path() << "\n Interface: " << device.interface
@@ -43,14 +41,6 @@
<< device.activeNetPath << "\n Networks:" << device.networks << endl;
}

-void dump(const NMDBusAccessPointProperties & network)
-{
- kDebug(1441) << "dump(const NMDBusNetworkProperties &)\n IPV4 address: " << network.ipv4Address
- << "\n subnet mask: " << network.subnetMask << "\n Broadcast: " << network.broadcast
- << "\n route: " << network.route << "\n primary dns: " << network.primaryDNS
- << "\n secondary dns: " << network.secondaryDNS << endl;
-}
-
void deserialize(const QDBusMessage &message, NMDBusDeviceProperties & device)
{
//kDebug(1441) << /*"deserialize args: " << message.arguments() << */"signature: " << message.signature();
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkinterface_p.h #807887:807888
@@ -23,8 +23,6 @@
#include <QtCore/qstring.h>
#include <QtDBus/QDBusInterface>

-#include "NetworkManager-wirelessaccesspoint.h"
-
class NMNetworkInterface;
class NMDBusDeviceProperties;

@@ -52,7 +50,6 @@
bool carrier;
int signalStrength;
int designSpeed;
- QPair<QString, NMDBusAccessPointProperties> cachedNetworkProps;
Solid::Control::NetworkInterface::Capabilities capabilities;
QString activeNetPath;
QString interface;
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-wirelessaccesspoint.h #807887:807888
@@ -24,15 +24,6 @@

#include <solid/control/ifaces/wirelessaccesspoint.h>

-struct NMDBusAccessPointProperties {
- QString ipv4Address;
- QString subnetMask;
- QString broadcast;
- QString route;
- QHostAddress primaryDNS;
- QHostAddress secondaryDNS;
-};
-
class NMAccessPointPrivate;

/**

SVN commit 807887 by srefshauge:

Using QGraphicsItem. Now loads pixmaps to item.

M +2 -1 core/menuview.cpp
M +6 -2 plugins/ui/nuno/nunoplugin.cpp
M +10 -0 util/CMakeLists.txt
M +16 -4 util/userhelper.cpp
M +1 -1 util/userhelper.h


--- trunk/playground/base/raptormenu/core/menuview.cpp #807886:807887
@@ -83,7 +83,8 @@
}
if (d->uiplugin)
{
- d->uiplugin->ui(painter, rect);
+ QGraphicsItem* uiItem;;
+ uiItem = d->uiplugin->ui(painter, rect);
}
painter->restore();

--- trunk/playground/base/raptormenu/plugins/ui/nuno/nunoplugin.cpp #807886:807887
@@ -1,6 +1,7 @@
#include "nunoplugin.h"
#include <config-raptormenu.h>
#include "nunointerface.h"
+#include <QGraphicsPixmapItem>

NunoPlugin::NunoPlugin(QObject * object) : UserInterfacePlugin( object)
{
@@ -13,14 +14,17 @@

QGraphicsItem* NunoPlugin::ui(QPainter* p, QRectF r)
{
- UserHelper helper;
qDebug() << "Displaying Nuno User Interface.";
+ QGraphicsItem * item = new QGraphicsPixmapItem;
qreal borderWidth = -r.x(); // Depends on SVG. A lot of plugins use this, could move elsewhere.
qreal textHeight = 22; // Depends on Text that goes in it. Fix this
qreal textWidth = 200; // Depends on Text that goes in it. Fix this
qreal grayHeight = r.height() * 0.2; // Must be the same as the grayHeight used in background plugin. Fix this.
p->fillRect(QRectF(r.right() - 6*borderWidth - textWidth, r.y() + grayHeight - textHeight, textWidth, textHeight), QBrush(Qt::white));
- return 0;
+
+ UserHelper helper;
+ helper.pixmapToItem(QString("rating"), item, QPoint(r.right() - 8*borderWidth - textWidth, r.y() + grayHeight - textHeight));
+ return item;
}

#include "nunoplugin.moc"
--- trunk/playground/base/raptormenu/util/CMakeLists.txt #807886:807887
@@ -3,6 +3,11 @@
${QT_INCLUDES}
${QT_QTSVG_INCLUDE_DIR}
)
+FIND_PACKAGE(KDE4)
+if(KDE4_FOUND)
+ include_directories( ${KDE4_INCLUDES} )
+ add_definitions(-DHAVE_KDE4)
+endif(KDE4_FOUND)

if (WIN32)
SET(core_MOC
@@ -53,5 +58,10 @@
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
)
+if(KDE4_FOUND)
+ TARGET_LINK_LIBRARIES(raptorhelper
+ ${KDE4_KDEUI_LIBRARY}
+ )
+endif(KDE4_FOUND)

INSTALL(TARGETS raptorhelper DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
--- trunk/playground/base/raptormenu/util/userhelper.cpp #807886:807887
@@ -1,10 +1,22 @@
#include "userhelper.h"
+#ifdef HAVE_KDE4
+ #include <KIconLoader>
+ #include <QGraphicsPixmapItem>
+#endif

-void UserHelper::renderIcon(QPainter *p, QRectF r, QString filename)
+void UserHelper::pixmapToItem(QString filename, QGraphicsItem* item, QPointF point)
{
- // TODO : Detect what system is being used (eg. freedesktop / windows) and use that to find where icons are installed.
- QSvgRenderer *bgImage = new QSvgRenderer(RAPTORPREFIX + QString("/desktoptheme/default/raptor-menu/") + filename);
- bgImage->render(p, r); //Render changes
+ QGraphicsPixmapItem graphicsItem(item);
+ QPixmap pixmap;
+ #ifdef HAVE_KDE4
+ KIconLoader* iconLoader = new KIconLoader();
+ pixmap = iconLoader->loadIcon(filename, KIconLoader::NoGroup);
+ #endif
+ if (!pixmap.isNull())
+ {
+ graphicsItem.setPixmap(pixmap);
+ graphicsItem.mapToScene(point);
+ }
}

#include "userhelper.moc"
--- trunk/playground/base/raptormenu/util/userhelper.h #807886:807887
@@ -14,7 +14,7 @@
public:
UserHelper(QObject *object = 0) : BasePlugin(object) {}
virtual ~UserHelper() {}
- void renderIcon(QPainter *p, QRectF r, QString filename);
+ void pixmapToItem(QString filename, QGraphicsItem* item, QPointF point);
};

#endif

SVN commit 807886 by sebsauer:

and also save them ;)

M +19 -2 KoTextAnchor.cpp


--- trunk/koffice/libs/kotext/KoTextAnchor.cpp #807885:807886
@@ -181,9 +181,26 @@
}

void KoTextAnchor::saveOdf (KoShapeSavingContext & context) {
- // TODO support different types of anchors
// TODO do we really need to pass the context in here?
- shape()->setAdditionalAttribute( "text:anchor-type", "paragraph" );
+ switch(d->anchorType) {
+ case Page:
+ shape()->setAdditionalAttribute( "text:anchor-type", "page" );
+ Q_ASSERT(d->pageNumber >= 1);
+ shape()->setAdditionalAttribute( "text:anchor-page-number", QString::number(d->pageNumber) );
+ break;
+ case Frame:
+ shape()->setAdditionalAttribute( "text:anchor-type", "frame" );
+ break;
+ case Paragraph:
+ shape()->setAdditionalAttribute( "text:anchor-type", "paragraph" );
+ break;
+ case Char:
+ shape()->setAdditionalAttribute( "text:anchor-type", "char" );
+ break;
+ case AsChar:
+ shape()->setAdditionalAttribute( "text:anchor-type", "as-char" );
+ break;
+ }
shape()->saveOdf(context);
}

SVN commit 807885 by pino:

SVN_SILENT remove unneeded includes, include specific ones for QtDBus


M +3 -2 NetworkManager-networkinterface.cpp
M +0 -2 NetworkManager-networkinterface.h
M +4 -1 NetworkManager-networkmanager.cpp
M +3 -6 NetworkManager-networkmanager.h
M +0 -2 NetworkManager-wirelessnetwork.cpp
M +0 -8 NetworkManager-wirelessnetwork.h


--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkinterface.cpp #807884:807885
@@ -21,14 +21,15 @@
#include "NetworkManager-networkinterface_p.h"

#include <NetworkManager/NetworkManager.h>
-#include <QtDBus>

+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusReply>
+
#include <kdebug.h>

#include <solid/control/networkinterface.h>

#include "NetworkManager-wirelessaccesspoint.h"
-#include "NetworkManager-wirelessnetwork.h"

void dump(const NMDBusDeviceProperties &device)
{
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkinterface.h #807884:807885
@@ -20,8 +20,6 @@
#ifndef NETWORKMANAGER_NETWORKINTERFACE_H
#define NETWORKMANAGER_NETWORKINTERFACE_H

-#include <kdemacros.h>
-
#include <solid/control/ifaces/networkinterface.h>

#include <QtCore/qobject.h>
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkmanager.cpp #807884:807885
@@ -21,7 +21,10 @@

#include <NetworkManager/NetworkManager.h>

-#include <QtDBus>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusMetaType>
+#include <QtDBus/QDBusReply>

#include <kdebug.h>

--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-networkmanager.h #807884:807885
@@ -20,14 +20,11 @@
#ifndef NETWORKMANAGER_NETWORK_MANAGER_H
#define NETWORKMANAGER_NETWORK_MANAGER_H

-#include <QObject>
-#include <qdbusextratypes.h>
-#include <QStringList>
-
-#include <kdemacros.h>
-
#include <solid/control/ifaces/networkmanager.h>

+class QDBusObjectPath;
+typedef class QList<QVariant> QVariantList;
+
class NMNetworkManagerPrivate;
class KDE_EXPORT NMNetworkManager : public Solid::Control::Ifaces::NetworkManager
{
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-wirelessnetwork.cpp #807884:807885
@@ -34,9 +34,7 @@
#include <NetworkManager/NetworkManager.h>

#include <kdebug.h>
-#include <solid/control/ifaces/authentication.h>

-#include "NetworkManager-dbushelper.h"
#include "NetworkManager-wirelessaccesspoint.h"

void dump(const Solid::Control::WirelessNetworkInterface::Capabilities & cap)
--- trunk/KDE/kdebase/workspace/solid/networkmanager-0.6/NetworkManager-wirelessnetwork.h #807884:807885
@@ -20,19 +20,11 @@
#ifndef NETWORKMANAGER_WIRELESSNETWORK_H
#define NETWORKMANAGER_WIRELESSNETWORK_H

-#include <kdemacros.h>
-
-#include <QStringList>
-#include <qdbusextratypes.h>
-
#include <solid/control/ifaces/wirelessnetworkinterface.h>
#include <solid/control/wirelessnetworkinterface.h>

#include "NetworkManager-networkinterface.h"

-//typedef QString MacAddress;
-//typedef QStringList MacAddressList;
-
namespace Solid {
namespace Control {
class Authentication;

SVN commit 807884 by mpyne:

Apply patches by Linus Östberg to fix web shortcuts for CTAN and CTAN Catalogue.

BUG:128536


M +6 -6 ctan.desktop
M +3 -3 ctan_cat.desktop


--- branches/KDE/4.0/kdebase/runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop #807883:807884
@@ -44,11 +44,11 @@
Name[xh]=CTAN - Enomxholo TeX Indawo yokugcina Yomsebenzi womnatha
Name[zh_CN]=CTAN - 综合性 TeX 档案网络
Name[zh_TW]=CTAN - 全面的 Tex 收集網路
-Query=http://www.ctan.org/tools/filesearch?action=/search/&filename=\\{@}
-Query[be]=http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}
-Query[bg]=Query=http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}
-Query[csb]=http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}
-Query[eo]=http://www.ctan.org/tools/filesearch?action=/search/&=filename\\{@}
-Query[x-test]=xxhttp://www.ctan.org/tools/filesearch?action=/search/&filename=\\{@}xx
+Query=http://ctan.org/cgi-bin/filenameSearch.py?filename=\\{@}&Search=Search
+Query[be]=http://ctan.org/cgi-bin/filenameSearch.py?filename=\\{@}&Search=Search
+Query[bg]=http://ctan.org/cgi-bin/filenameSearch.py?filename=\\{@}&Search=Search
+Query[csb]=http://ctan.org/cgi-bin/filenameSearch.py?filename=\\{@}&Search=Search
+Query[eo]=http://ctan.org/cgi-bin/filenameSearch.py?filename=\\{@}&Search=Search
+Query[x-test]=xxhttp://ctan.org/cgi-bin/filenameSearch.py?filename=\\{@}&Search=Search
X-KDE-ServiceTypes=SearchProvider
Type=Service
--- branches/KDE/4.0/kdebase/runtime/kurifilter-plugins/ikws/searchproviders/ctan_cat.desktop #807883:807884
@@ -65,8 +65,8 @@
Name[x-test]=xxCTAN Catalogxx
Name[zh_CN]=CTAN 目录
Name[zh_TW]=CTAN 目錄
-Query=http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}
-Query[bg]=Query=http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}
-Query[x-test]=xxhttp://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}xx
+Query=http://tug.ctan.org/cgi-bin/search.py?metadataSearch=\\{@}&metadataSearchSubmit=Search
+Query[bg]=http://tug.ctan.org/cgi-bin/search.py?metadataSearch=\\{@}&metadataSearchSubmit=Search
+Query[x-test]=xxhttp://tug.ctan.org/cgi-bin/search.py?metadataSearch=\\{@}&metadataSearchSubmit=Search
X-KDE-ServiceTypes=SearchProvider
Type=Service