Hello community,
here is the log from the commit of package kdeplasmoids4
checked in at Wed Jul 9 21:39:30 CEST 2008.
--------
--- KDE/kdeplasmoids4/kdeplasmoids4.changes 2008-07-01 14:33:13.000000000 +0200
+++ kdeplasmoids4/kdeplasmoids4.changes 2008-07-04 00:26:57.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jul 4 00:26:53 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.85
+
+-------------------------------------------------------------------
Old:
----
kdeplasmoids-4.0.84.tar.bz2
New:
----
kdeplasmoids-4.0.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeplasmoids4.spec ++++++
--- /var/tmp/diff_new_pack.q16000/_old 2008-07-09 21:37:18.000000000 +0200
+++ /var/tmp/diff_new_pack.q16000/_new 2008-07-09 21:37:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeplasmoids4 (Version 4.0.84)
+# spec file for package kdeplasmoids4 (Version 4.0.85)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,7 +22,7 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: Additional Plasmoids
-Version: 4.0.84
+Version: 4.0.85
Release: 1
Source0: kdeplasmoids-%{version}.tar.bz2
Patch0: 4_1_BRANCH.diff
@@ -83,6 +83,8 @@
/usr/share/kde4/apps/plasma-bluemarble
%changelog
+* Fri Jul 04 2008 dmueller@suse.de
+- update to 4.0.85
* Tue Jul 01 2008 dmueller@suse.de
- branch diff update to include licensing fixes (bnc#404079)
* Thu Jun 26 2008 dmueller@suse.de
++++++ 4_1_BRANCH.diff ++++++
++++ 1338 lines (skipped)
++++ between KDE/kdeplasmoids4/4_1_BRANCH.diff
++++ and kdeplasmoids4/4_1_BRANCH.diff
++++++ kdeplasmoids-4.0.84.tar.bz2 -> kdeplasmoids-4.0.85.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/binary-clock/plasma-applet-binaryclock.desktop new/kdeplasmoids-4.0.85/applets/binary-clock/plasma-applet-binaryclock.desktop
--- old/kdeplasmoids-4.0.84/applets/binary-clock/plasma-applet-binaryclock.desktop 2008-06-26 03:32:58.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/binary-clock/plasma-applet-binaryclock.desktop 2008-07-03 07:05:06.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Binary Clock
Name[ca]=Rellotge binari
Name[el]=Δυαδικό ρολόι
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/fifteenPuzzle/plasma-applet-fifteenPuzzle.desktop new/kdeplasmoids-4.0.85/applets/fifteenPuzzle/plasma-applet-fifteenPuzzle.desktop
--- old/kdeplasmoids-4.0.84/applets/fifteenPuzzle/plasma-applet-fifteenPuzzle.desktop 2008-06-26 03:32:58.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/fifteenPuzzle/plasma-applet-fifteenPuzzle.desktop 2008-07-03 07:05:05.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Fifteen Puzzle
Name[ca]=Trencaclosques quinze
Name[cs]=Hra Patnáct
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/frame/config.ui new/kdeplasmoids-4.0.85/applets/frame/config.ui
--- old/kdeplasmoids-4.0.84/applets/frame/config.ui 2008-06-03 11:34:07.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/frame/config.ui 2008-07-03 07:05:05.000000000 +0200
@@ -268,7 +268,7 @@
<enum>QDateTimeEdit::HourSection</enum>
</property>
<property name="displayFormat" >
- <string>hh 'Hours' mm 'Mins' ss 'Secs'</string>
+ <string comment="(qtdt-format) Please do not change the quotes (') and translate only the content of the quotes.">hh 'Hours' mm 'Mins' ss 'Secs'</string>
</property>
<property name="time" >
<time>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/frame/frame.cpp new/kdeplasmoids-4.0.85/applets/frame/frame.cpp
--- old/kdeplasmoids-4.0.84/applets/frame/frame.cpp 2008-06-25 09:58:46.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/frame/frame.cpp 2008-07-03 07:05:05.000000000 +0200
@@ -363,7 +363,7 @@
-m_swOutline, -m_swOutline); //Pretty useless.
//TODO check if correct
- QImage scaledImage = m_picture.scaled(frameRect.size(), Qt::KeepAspectRatio, Qt::FastTransformation);
+ QImage scaledImage = m_picture.scaled(frameRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
frameRect = QRect(QPoint(frameRect.x() + (frameRect.width() - scaledImage.width()) / 2,
frameRect.y() + (frameRect.height() - scaledImage.height()) / 2), scaledImage.size());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/fuzzy-clock/plasma-clock-fuzzy.desktop new/kdeplasmoids-4.0.85/applets/fuzzy-clock/plasma-clock-fuzzy.desktop
--- old/kdeplasmoids-4.0.84/applets/fuzzy-clock/plasma-clock-fuzzy.desktop 2008-06-26 03:32:57.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/fuzzy-clock/plasma-clock-fuzzy.desktop 2008-07-03 07:05:05.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Fuzzy Clock
Name[ca]=Rellotge aproximat
Name[el]=Ασαφές ρολόι
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/konqprofiles/plasma-applet-konqprofiles.desktop new/kdeplasmoids-4.0.85/applets/konqprofiles/plasma-applet-konqprofiles.desktop
--- old/kdeplasmoids-4.0.84/applets/konqprofiles/plasma-applet-konqprofiles.desktop 2008-06-26 03:32:58.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/konqprofiles/plasma-applet-konqprofiles.desktop 2008-07-03 07:05:06.000000000 +0200
@@ -52,7 +52,7 @@
X-KDE-PluginInfo-Email=montel@kde.org
X-KDE-PluginInfo-Name=konqprofiles
X-KDE-PluginInfo-Version=pre0.1
-X-KDE-PluginInfo-Version=Utilities
+X-KDE-PluginInfo-Category=Utilities
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/konsoleprofiles/plasma-applet-konsoleprofiles.desktop new/kdeplasmoids-4.0.85/applets/konsoleprofiles/plasma-applet-konsoleprofiles.desktop
--- old/kdeplasmoids-4.0.84/applets/konsoleprofiles/plasma-applet-konsoleprofiles.desktop 2008-06-26 03:32:58.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/konsoleprofiles/plasma-applet-konsoleprofiles.desktop 2008-07-03 07:05:06.000000000 +0200
@@ -52,7 +52,7 @@
X-KDE-PluginInfo-Email=montel@kde.org
X-KDE-PluginInfo-Name=konsoleprofiles
X-KDE-PluginInfo-Version=pre0.1
-X-KDE-PluginInfo-Version=Utilities
+X-KDE-PluginInfo-Category=Utilities
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/CMakeLists.txt new/kdeplasmoids-4.0.85/applets/lancelot/app/CMakeLists.txt
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/CMakeLists.txt 2008-06-25 09:58:46.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/CMakeLists.txt 2008-07-03 07:05:05.000000000 +0200
@@ -1,2 +1,16 @@
+# Adds KDE definitions so that Lancelot could be built independently
+# from the rest of the kdeplasmoids module
+
+find_package(KDE4 REQUIRED)
+include (KDE4Defaults)
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+
+find_package(Plasma REQUIRED)
+
+# Finding Lancelot package needed for future - when the libLancelot
+# becomes a separate project. It is only temporarily here
+find_package(Lancelot REQUIRED)
+
add_subdirectory(themes)
add_subdirectory(src)
+add_subdirectory(icons)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/icons/CMakeLists.txt new/kdeplasmoids-4.0.85/applets/lancelot/app/icons/CMakeLists.txt
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/icons/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/icons/CMakeLists.txt 2008-07-03 07:05:05.000000000 +0200
@@ -0,0 +1 @@
+kde4_install_icons( ${ICON_INSTALL_DIR} )
Files old/kdeplasmoids-4.0.84/applets/lancelot/app/icons/hi16-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/app/icons/hi16-app-lancelot.png differ
Files old/kdeplasmoids-4.0.84/applets/lancelot/app/icons/hi22-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/app/icons/hi22-app-lancelot.png differ
Files old/kdeplasmoids-4.0.84/applets/lancelot/app/icons/hi32-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/app/icons/hi32-app-lancelot.png differ
Files old/kdeplasmoids-4.0.84/applets/lancelot/app/icons/hi48-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/app/icons/hi48-app-lancelot.png differ
Files old/kdeplasmoids-4.0.84/applets/lancelot/app/icons/hi64-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/app/icons/hi64-app-lancelot.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/CMakeLists.txt new/kdeplasmoids-4.0.85/applets/lancelot/app/src/CMakeLists.txt
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/CMakeLists.txt 2008-06-25 09:58:46.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/CMakeLists.txt 2008-07-03 07:05:05.000000000 +0200
@@ -1,6 +1,7 @@
project(LancelotMenu)
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+# Moved up level
+# add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include(PlasmaUIMacros)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/LancelotApplication.cpp new/kdeplasmoids-4.0.85/applets/lancelot/app/src/LancelotApplication.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/LancelotApplication.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/LancelotApplication.cpp 2008-07-03 07:05:05.000000000 +0200
@@ -25,7 +25,13 @@
#include <QtDBus>
#include <KAction>
+#include <KActionCollection>
#include <KStandardAction>
+#include <KAuthorized>
+//#include <KGlobalAccel>
+//#include <KGlobalSettings>
+#include <KLocale>
+
#include
#include "LancelotWindow.h"
@@ -51,6 +57,8 @@
bool LancelotApplication::event(QEvent * e)
{
+ kDebug() << (void *) e;
+ kDebug() << e;
if (e->type() == QEvent::ApplicationDeactivate) {
hide(true);
}
@@ -67,6 +75,20 @@
new AppAdaptor(this);
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject("/Lancelot", this);
+
+ m_actionCollection = new KActionCollection(this);
+ KAction * a = 0;
+
+ if ( KAuthorized::authorizeKAction("show_lancelot")) {
+ a = m_actionCollection->addAction(i18n("Lancelot"), this);
+ a->setText(i18n("Lancelot"));
+ a->setGlobalShortcut(KShortcut(Qt::ALT + Qt::Key_F5));
+ connect(
+ a, SIGNAL(triggered(bool)),
+ this, SLOT(showCentered())
+ );
+ }
+
}
LancelotApplication::~LancelotApplication()
@@ -100,6 +122,13 @@
return LancelotApplication::m_application->exec();
}
+bool LancelotApplication::showCentered()
+{
+ if (!m_application) return false;
+ LancelotApplication::m_application->window->lancelotShowCentered();
+ return true;
+}
+
bool LancelotApplication::show(int x, int y)
{
if (!m_application) return false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/LancelotApplication.h new/kdeplasmoids-4.0.85/applets/lancelot/app/src/LancelotApplication.h
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/LancelotApplication.h 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/LancelotApplication.h 2008-07-03 07:05:05.000000000 +0200
@@ -26,6 +26,7 @@
#include <QStringList>
class LancelotWindow;
+class KActionCollection;
class LancelotApplication: public KUniqueApplication
{
@@ -38,6 +39,7 @@
public Q_SLOTS:
static bool show(int x, int y);
+ static bool showCentered();
static bool showItem(int x, int y, const QString & name);
static bool hide(bool immediate = false);
@@ -68,6 +70,7 @@
int m_clientsNumber;
int m_lastID;
QSet<int> m_clients;
+ KActionCollection * m_actionCollection;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/LancelotWindow.cpp new/kdeplasmoids-4.0.85/applets/lancelot/app/src/LancelotWindow.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/LancelotWindow.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/LancelotWindow.cpp 2008-07-03 07:05:05.000000000 +0200
@@ -47,6 +47,9 @@
#include
+#include <KLineEdit>
+#include
+
#define sectionsWidth 128
#define windowHeightDefault 500
#define mainWidthDefault 422
@@ -179,7 +182,7 @@
m_mainSize(mainWidthDefault, windowHeightDefault)
{
setFocusPolicy(Qt::WheelFocus);
- setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);// | Qt::Popup);
+ setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);// | Qt::Popup);
KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::KeepAbove | NET::Sticky);
connect(& m_hideTimer, SIGNAL(timeout()), this, SLOT(hide()));
@@ -212,10 +215,17 @@
setupModels();
- /* Dirty hack to get an edit box before Qt 4.4 :: begin */
- // editSearch->setParent(this);
- // editSearch->installEventFilter(this);
- /* Dirty hack to get an edit box before Qt 4.4 :: end */
+ /* TODO: Convert this to PUCK generated code */
+ editSearch = new Plasma::LineEdit();
+ editSearch->setParentItem(m_root);
+ editSearch->nativeWidget()->setClearButtonShown(true);
+ editSearch->nativeWidget()->setClickMessage(i18n("Search"));
+ editSearch->show();
+ layoutSearch->addItem(editSearch,
+ Lancelot::NodeLayout::NodeCoordinate(0.0, 0.5, 0, 0),
+ Lancelot::NodeLayout::NodeCoordinate(1.0, 0.5, 0, INFINITY)
+ );
+ editSearch->nativeWidget()->installEventFilter(this);
instance->activateAll();
@@ -237,10 +247,10 @@
connect(buttonSystemLogout, SIGNAL(activated()), this, SLOT(systemLogout()));
connect(buttonSystemSwitchUser, SIGNAL(activated()), this, SLOT(systemSwitchUser()));
- //connect(editSearch,
- // SIGNAL(textChanged(const QString &)),
- // this, SLOT(search(const QString &))
- //);
+ connect(editSearch->widget(),
+ SIGNAL(textChanged(const QString &)),
+ this, SLOT(search(const QString &))
+ );
loadConfig();
}
@@ -263,6 +273,12 @@
showWindow(x, y);
}
+void LancelotWindow::lancelotShowCentered()
+{
+ m_showingFull = true;
+ showWindow(0, 0, true);
+}
+
void LancelotWindow::lancelotShowItem(int x, int y, const QString & name)
{
sectionActivated(name);
@@ -281,7 +297,7 @@
m_hideTimer.start();
}
-void LancelotWindow::showWindow(int x, int y)
+void LancelotWindow::showWindow(int x, int y, bool centered)
{
panelSections->setVisible(m_showingFull);
@@ -297,24 +313,35 @@
QRect screenRect = QApplication::desktop()->screenGeometry(QPoint(x, y));
- Plasma::Flip flip = Plasma::VerticalFlip;
+ Plasma::Flip flip;
- if (x < screenRect.left()) {
- x = screenRect.left();
- }
+ if (!centered) {
+ flip = Plasma::VerticalFlip;
- if (y < screenRect.top()) {
- y = screenRect.top();
- }
+ if (x < screenRect.left()) {
+ x = screenRect.left();
+ }
- if (x + width() > screenRect.right()) {
- x = screenRect.right() - width();
- flip |= Plasma::HorizontalFlip;
- }
+ if (y < screenRect.top()) {
+ y = screenRect.top();
+ }
+
+ if (x + width() > screenRect.right()) {
+ x = screenRect.right() - width();
+ flip |= Plasma::HorizontalFlip;
+ }
- if (y + height() > screenRect.bottom()) {
- y = screenRect.bottom() - height();
- flip &= ~Plasma::VerticalFlip;
+ if (y + height() > screenRect.bottom()) {
+ y = screenRect.bottom() - height();
+ flip &= ~Plasma::VerticalFlip;
+ }
+ } else {
+ flip = Plasma::NoFlip;
+
+ x = screenRect.left()
+ + (screenRect.width() - width()) / 2;
+ y = screenRect.top()
+ + (screenRect.height() - height()) / 2;
}
layoutMain->setFlip(flip);
@@ -331,7 +358,8 @@
show();
KWindowSystem::setState( winId(), NET::SkipTaskbar | NET::SkipPager | NET::KeepAbove );
KWindowSystem::forceActiveWindow(winId());
- // editSearch->setFocus();
+ editSearch->setFocus();
+ editSearch->setText(QString());
}
void LancelotWindow::resizeWindow()
@@ -401,9 +429,9 @@
void LancelotWindow::search(const QString & string)
{
- // if (editSearch->text() != string) {
- // editSearch->setText(string);
- // }
+ if (editSearch->text() != string) {
+ editSearch->setText(string);
+ }
m_searchString = string;
@@ -594,14 +622,15 @@
bool LancelotWindow::eventFilter(QObject * object, QEvent * event)
{
-// if ((object == editSearch) && (event->type() == QEvent::KeyPress)) {
-// QKeyEvent * keyEvent = static_cast(event);
-// if (keyEvent->key() == Qt::Key_Escape) {
-// lancelotHide(true);
-// return true;
-// }
-// }
- return QWidget::eventFilter(object, event);
+ kDebug() << event;
+ if (object == editSearch->nativeWidget() && event->type() == QEvent::KeyPress) {
+ QKeyEvent * keyEvent = static_cast(event);
+ if (keyEvent->key() == Qt::Key_Escape) {
+ lancelotHide(true);
+ return true;
+ }
+ }
+ return QWidget::eventFilter(object, event);
}
#include "LancelotWindow.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/LancelotWindow.h new/kdeplasmoids-4.0.85/applets/lancelot/app/src/LancelotWindow.h
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/LancelotWindow.h 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/LancelotWindow.h 2008-07-03 07:05:05.000000000 +0200
@@ -36,6 +36,11 @@
class ResizeBordersPanel;
}
+namespace Plasma
+{
+ class LineEdit;
+}
+
class LancelotWindow: public QWidget, public Ui::LancelotWindowBase
{
Q_OBJECT
@@ -46,6 +51,11 @@
public Q_SLOTS:
/**
+ * Shows full window centered on the screen.
+ */
+ void lancelotShowCentered();
+
+ /**
* Shows full window.
* @param x x coordinate of the mouse
* @param y y coordinate of the mouse
@@ -131,8 +141,9 @@
* Shows window
* @param x x coordinate of position to show at
* @param y y coordinate of position to show at
+ * @param centered override x and y and show window centered
*/
- void showWindow(int x, int y);
+ void showWindow(int x, int y, bool centered = false);
/**
* Creates and sets up data models
@@ -154,6 +165,8 @@
Plasma::Corona * m_corona;
QVBoxLayout * m_layout;
+ Plasma::LineEdit * editSearch;
+
QTimer m_hideTimer;
QString m_searchString;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/models/Applications.cpp new/kdeplasmoids-4.0.85/applets/lancelot/app/src/models/Applications.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/models/Applications.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/models/Applications.cpp 2008-07-03 07:05:05.000000000 +0200
@@ -77,6 +77,7 @@
data.name = service->name();
data.description = service->genericName();
data.desktopFile = service->entryPath();
+ kDebug() << data.desktopFile;
m_items.append(data);
} else if (p->isType(KST_KServiceGroup)) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/models/BaseModel.cpp new/kdeplasmoids-4.0.85/applets/lancelot/app/src/models/BaseModel.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/models/BaseModel.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/models/BaseModel.cpp 2008-07-03 07:05:05.000000000 +0200
@@ -28,6 +28,7 @@
#include <KGlobal>
#include <KMimeType>
#include <KUrl>
+#include <KDebug>
namespace Models {
@@ -84,8 +85,8 @@
void BaseModel::addUrl(const KUrl & url)
{
+ kDebug() << url;
if (url.isLocalFile() && QFileInfo(url.path()).suffix() == "desktop") {
-
// .desktop files may be services (type field == 'Application' or 'Service')
// or they may be other types such as links.
//
@@ -94,19 +95,24 @@
const KService::Ptr service = KService::serviceByDesktopPath(url.path());
if (service) {
+ kDebug() << "Local desktop file - Service";
return addService(service);
}
+ kDebug() << "Local desktop file - Application " << url.path();
KDesktopFile desktopFile(url.path());
KUrl desktopUrl(desktopFile.readUrl());
+ kDebug() << desktopUrl;
add(
QFileInfo(url.path()).baseName(),
desktopUrl.isLocalFile() ? desktopUrl.path() : desktopUrl.prettyUrl(),
KIcon(desktopFile.readIcon()),
- desktopFile.readUrl()
+ // url.path() //desktopFile.readUrl()
+ url.url()
);
} else {
+ kDebug() << "Normal URL";
add(
QFileInfo(url.path()).baseName(),
url.isLocalFile() ? url.path() : url.prettyUrl(),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/models/Runner.cpp new/kdeplasmoids-4.0.85/applets/lancelot/app/src/models/Runner.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/models/Runner.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/models/Runner.cpp 2008-07-03 07:05:05.000000000 +0200
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2007 Ivan Cukic
- * Copyright (C) 2006 Aaron Seigo
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser/Library General Public License version 2,
@@ -21,6 +20,7 @@
#include "Runner.h"
#include <KRun>
#include <KDebug>
+#include <KIcon>
#include <KLocalizedString>
#include
@@ -32,7 +32,12 @@
{
// m_runners = Plasma::AbstractRunner::load(this);
- load();
+ m_runnerManager = new Plasma::RunnerManager(this);
+ connect(
+ m_runnerManager, SIGNAL(matchesChanged(const QListPlasma::QueryMatch&)),
+ this, SLOT(setQueryMatches(const QListPlasma::QueryMatch&))
+ );
+ setSearchString(QString());
}
Runner::~Runner()
@@ -47,69 +52,48 @@
void Runner::setSearchString(const QString & search)
{
m_searchString = search.trimmed();
- load();
-}
-
-void Runner::load()
-{/*
- m_items.clear();
-
- int matchCount = 0;
if (m_searchString.isEmpty()) {
+ m_items.clear();
add(
- "Search string is empty",
- "Enter something to search for",
- NULL,
+ i18n("Search string is empty"),
+ i18n("Enter something to search for"),
+ KIcon("help-hint"),
QVariant()
);
- return;
+ } else {
+ m_runnerManager->launchQuery(search);
}
+}
- m_context.resetSearchTerm(m_searchString);
- //m_context.addStringCompletions(m_executions);
-
- foreach (Plasma::AbstractRunner* runner, m_runners) {
- runner->match(&m_context);
- }
+// Code taken from KRunner Runner::setQueryMatches
+void Runner::setQueryMatches(const QList< Plasma::QueryMatch > & m)
+{
+ m_items.clear();
- QList < QList < Plasma::SearchMatch * > > matchLists;
- matchLists << m_context.matches();
- // << m_context.exactMatches()
- // << m_context.possibleMatches();
-
- foreach (QList < Plasma::SearchMatch * > matchList, matchLists) {
- foreach (Plasma::SearchMatch * action, matchList) {
- add(
- action->text(),
- action->runner()->objectName(),
- action->icon(),
- qVariantFromValue((void *)action)
- );
+ QList < Plasma::QueryMatch > matches = m;
+ QMutableListIterator < Plasma::QueryMatch > newMatchIt(matches);
- ++matchCount;
- }
+ // first pass: we try and match up items with existing ids (match persisitence)
+ while (newMatchIt.hasNext()) {
+ Plasma::QueryMatch match = newMatchIt.next();
+ add(
+ match.text(),
+ match.subtext(),
+ match.icon(),
+ match.id()
+ );
}
-*/}
-
-void Runner::activate(int index)
-{/*
- Plasma::SearchMatch * action = (Plasma::SearchMatch *)
- m_items[index].data.value< void * >();
-
- Q_ASSERT(action);
+}
- if (!action->isEnabled()) {
- return;
- }
+void Runner::load()
+{
+}
- if (action->type() == Plasma::SearchMatch::InformationalMatch) {
- changeLancelotSearchString(action->data().toString());
- } else {
- action->exec(&m_context);
- hideLancelotWindow();
- }
-*/
+void Runner::activate(int index)
+{
+ m_runnerManager->run(m_items[index].data.value< QString >());
+ hideLancelotWindow();
}
} // namespace Models
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/models/Runner.h new/kdeplasmoids-4.0.85/applets/lancelot/app/src/models/Runner.h
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/models/Runner.h 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/models/Runner.h 2008-07-03 07:05:05.000000000 +0200
@@ -21,7 +21,8 @@
#define LANCELOTAPP_MODELS_RUNNER_H_
#include "BaseModel.h"
-#include
+#include
+#include
namespace Models {
@@ -35,6 +36,7 @@
public Q_SLOTS:
void setSearchString(const QString & search);
+ void setQueryMatches(const QListPlasma::QueryMatch &matches);
protected:
void activate(int index);
@@ -42,8 +44,7 @@
private:
QString m_searchString;
- Plasma::AbstractRunner::List m_runners;
- Plasma::RunnerContext m_context;
+ Plasma::RunnerManager * m_runnerManager;
};
} // namespace Models
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/app/src/ui/LancelotWindowBase.xml new/kdeplasmoids-4.0.85/applets/lancelot/app/src/ui/LancelotWindowBase.xml
--- old/kdeplasmoids-4.0.84/applets/lancelot/app/src/ui/LancelotWindowBase.xml 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/app/src/ui/LancelotWindowBase.xml 2008-07-03 07:05:05.000000000 +0200
@@ -225,7 +225,7 @@
Lancelot__CardLayout:cardName="documents"
>
-
+
-
+
instance->defaultGroup() == this) return;
+ if (d->instance->defaultGroup() == this && setDefaultGroup) return;
if (!d->widgets.contains(widget)) return;
d->widgets.removeAll(widget);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/tests/LancelotTestWindow.cpp new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/tests/LancelotTestWindow.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/tests/LancelotTestWindow.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/tests/LancelotTestWindow.cpp 2008-07-03 07:05:05.000000000 +0200
@@ -89,11 +89,14 @@
);
m_corona->addItem(button);
+ centerLayout->removeAt(centerLayout->count() - 1);
+ delete button;
// Test area - end ####################################
// Starting...
mainLayout->setGeometry(QRectF(8, 8, 400, 300));
instance->activateAll();
+
}
LancelotTestWindow::~LancelotTestWindow()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ActionListView.cpp new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ActionListView.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ActionListView.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ActionListView.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -68,6 +68,7 @@
{
setGroupByName("ActionListView");
m_itemsGroup = instance()->group("ActionListView-Items");
+ m_categoriesGroup = instance()->group("ActionListView-Categories");
setAcceptsHoverEvents(true);
@@ -87,6 +88,7 @@
{
setGroupByName("ActionListView");
m_itemsGroup = instance()->group("ActionListView-Items");
+ m_categoriesGroup = instance()->group("ActionListView-Categories");
setAcceptsHoverEvents(true);
@@ -409,7 +411,6 @@
button->setInnerOrientation(Qt::Horizontal);
button->setExtenderPosition(m_extenderPosition);
button->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
- button->setGroup(m_itemsGroup);
connect(button, SIGNAL(activated()), &m_signalMapper, SLOT(map()));
}
@@ -496,8 +497,14 @@
button->setTitle(m_model->title(itemIndex));
button->setDescription(m_model->description(itemIndex));
button->setIcon(m_model->icon(itemIndex));
+ if (m_model->isCategory(itemIndex)) {
+ button->setIconSize(QSize(m_categoryItemHeight, m_categoryItemHeight));
+ button->setGroup(m_categoriesGroup);
+ } else {
+ button->setGroup(m_itemsGroup);
+ }
button->setLayout(NULL);
- button->setEnabled(!m_model->isCategory(itemIndex));
+ // button->setEnabled(!m_model->isCategory(itemIndex));
m_signalMapper.setMapping(button, itemIndex);
int itemHeight = itemHeightFromIndex(itemIndex);
@@ -538,6 +545,7 @@
break;
}
+ button->setPreferredSize(QSizeF(width, itemHeight));
button->setGeometry(QRectF(left, buttonTop, width, itemHeight));
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ActionListView.h new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ActionListView.h
--- old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ActionListView.h 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ActionListView.h 2008-07-03 07:05:06.000000000 +0200
@@ -107,7 +107,7 @@
ActionListViewModel * m_model;
WidgetGroup * m_itemsGroup;
-
+ WidgetGroup * m_categoriesGroup;
int m_minimumItemHeight;
int m_maximumItemHeight;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ExtenderButton.cpp new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ExtenderButton.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ExtenderButton.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ExtenderButton.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -31,10 +31,11 @@
class ExtenderObject : public BasicWidget {
public:
ExtenderObject(Plasma::Svg * icon,
- ExtenderButton * parent = 0)
- : BasicWidget(icon, "", "", parent),
+ ExtenderButton * parent)
+ : BasicWidget(icon, "", ""),
m_parent(parent)
{
+ setParentItem(parent);
setInnerOrientation(Qt::Vertical);
setAlignment(Qt::AlignCenter);
}
@@ -55,7 +56,7 @@
void startTimer()
{
- timer.start(ACTIVATION_TIME, this);
+ timer.start(ACTIVATION_TIME, m_parent);
}
void stopTimer()
@@ -63,20 +64,6 @@
timer.stop();
}
- void timerEvent(QTimerEvent * event)
- {
- if (event->timerId() == timer.timerId()) {
- stopTimer();
- emit m_parent->activated();
- m_parent->toggle();
- hide();
- // Qt bug... - element is hidden but doesn't receive hoverLeaveEvent
- hoverLeaveEvent(0);
- m_parent->hoverLeaveEvent(0);
- }
- QObject::timerEvent(event);
- }
-
void paint(QPainter * painter,
const QStyleOptionGraphicsItem * option, QWidget * widget)
{
@@ -109,7 +96,7 @@
extenderIconSvg->setImagePath("lancelot/extender-button-icon");
}
- extender = new ExtenderObject(extenderIconSvg, q);
+ extender = new ExtenderObject(extenderIconSvg, parent);
extender->setVisible(false);
extender->setIconSize(QSize(16, 16));
@@ -181,6 +168,22 @@
Plasma::Svg * ExtenderButton::Private::extenderIconSvg = NULL;
QBasicTimer ExtenderObject::timer = QBasicTimer();
+void ExtenderButton::timerEvent(QTimerEvent * event)
+{
+ if (event->timerId() == ExtenderObject::timer.timerId()) {
+ d->extender->stopTimer();
+ toggle();
+ d->extender->hide();
+ // Qt bug... - element is hidden but doesn't receive hoverLeaveEvent
+ hoverLeaveEvent(0);
+ d->extender->hoverLeaveEvent(0);
+
+ // Sending the activate signal
+ activate();
+ }
+ QObject::timerEvent(event);
+}
+
ExtenderButton::ExtenderButton(QGraphicsItem * parent)
: BasicWidget(parent),
d(new Private(this))
@@ -301,13 +304,18 @@
}
}
+void ExtenderButton::activate()
+{
+ emit activated();
+ toggle();
+ update();
+}
+
void ExtenderButton::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
{
if (d->down && (event->button() == Qt::LeftButton)) {
d->down = false;
- emit activated();
- toggle();
- update();
+ activate();
emit clicked();
emit released();
} else {
@@ -348,6 +356,7 @@
void ExtenderButton::setChecked(bool checked)
{
if (!d->checkable) return;
+ if (d->checked == checked) return;
d->checked = checked;
update();
emit toggled(d->checked);
@@ -368,6 +377,7 @@
void ExtenderButton::setCheckable(bool checkable)
{
+ if (d->checkable == checkable) return;
d->checkable = checkable;
if (!checkable) {
d->checked = false;
@@ -382,6 +392,7 @@
void ExtenderButton::setDown(bool down)
{
+ if (d->down == down) return;
d->down = down;
update();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ExtenderButton.h new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ExtenderButton.h
--- old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ExtenderButton.h 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ExtenderButton.h 2008-07-03 07:05:06.000000000 +0200
@@ -147,6 +147,8 @@
L_Override virtual void paint(QPainter * painter,
const QStyleOptionGraphicsItem * option, QWidget * widget = 0);
+ L_Override virtual void timerEvent(QTimerEvent * event);
+
public slots:
/**
* Sets whether the button is checked.
@@ -172,7 +174,7 @@
* Emitted when the button is activated
* @param checked true if the button is checked
*/
- void activated(bool checked = false);
+ void activated();
/**
* Emitted when the state of a checkable button is changed
@@ -203,6 +205,7 @@
L_Override virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event);
L_Override virtual void hoverEnterEvent(QGraphicsSceneHoverEvent * event);
L_Override virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent * event);
+ void activate();
private:
class Private;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ScrollBar.cpp new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ScrollBar.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/ScrollBar.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/ScrollBar.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -44,17 +44,17 @@
downBar = new ExtenderButton("", "", parent);
handle = new ExtenderButton("", "", parent);
- kDebug() << "Connecting everything";
- kDebug() << connect(upBar, SIGNAL(clicked()), parent, SLOT(pageDecrease()));
- kDebug() << connect(downBar, SIGNAL(clicked()), parent, SLOT(pageIncrease()));
+ "Connecting everything";
+ connect(upBar, SIGNAL(clicked()), parent, SLOT(pageDecrease()));
+ connect(downBar, SIGNAL(clicked()), parent, SLOT(pageIncrease()));
upTimer.setInterval(100);
upTimer.setSingleShot(false);
- kDebug() << connect(&upTimer, SIGNAL(timeout()), parent, SLOT(stepDecrease()));
+ connect(&upTimer, SIGNAL(timeout()), parent, SLOT(stepDecrease()));
downTimer.setInterval(100);
downTimer.setSingleShot(false);
- kDebug() << connect(&downTimer, SIGNAL(timeout()), parent, SLOT(stepIncrease()));
+ connect(&downTimer, SIGNAL(timeout()), parent, SLOT(stepIncrease()));
}
~Private()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/Widget.cpp new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/Widget.cpp
--- old/kdeplasmoids-4.0.84/applets/lancelot/libs/lancelot/widgets/Widget.cpp 2008-05-29 13:20:14.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/libs/lancelot/widgets/Widget.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -45,7 +45,8 @@
d(new Private())
{
Instance::activeInstance()->addWidget(this);
- d->group = Instance::activeInstance()->defaultGroup();
+ setGroup(NULL);
+ // d->group = Instance::activeInstance()->defaultGroup();
L_WIDGET_SET_INITIALIZED;
}
@@ -102,7 +103,7 @@
if (group == d->group) return;
if (d->group != NULL) {
- d->group->removeWidget(this);
+ d->group->removeWidget(this, false);
}
d->group = group;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/lancelot/pics/CMakeLists.txt new/kdeplasmoids-4.0.85/applets/lancelot/pics/CMakeLists.txt
--- old/kdeplasmoids-4.0.84/applets/lancelot/pics/CMakeLists.txt 2008-06-25 09:58:46.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/lancelot/pics/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-kde4_install_icons( ${ICON_INSTALL_DIR} )
Files old/kdeplasmoids-4.0.84/applets/lancelot/pics/hi16-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/pics/hi16-app-lancelot.png differ
Files old/kdeplasmoids-4.0.84/applets/lancelot/pics/hi22-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/pics/hi22-app-lancelot.png differ
Files old/kdeplasmoids-4.0.84/applets/lancelot/pics/hi32-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/pics/hi32-app-lancelot.png differ
Files old/kdeplasmoids-4.0.84/applets/lancelot/pics/hi48-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/pics/hi48-app-lancelot.png differ
Files old/kdeplasmoids-4.0.84/applets/lancelot/pics/hi64-app-lancelot.png and new/kdeplasmoids-4.0.85/applets/lancelot/pics/hi64-app-lancelot.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/luna/plasma-applet-luna.desktop new/kdeplasmoids-4.0.85/applets/luna/plasma-applet-luna.desktop
--- old/kdeplasmoids-4.0.84/applets/luna/plasma-applet-luna.desktop 2008-06-26 03:32:58.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/luna/plasma-applet-luna.desktop 2008-07-03 07:05:05.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Luna
Name[fr]=Lune
Name[gl]=Lúa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/nowplaying/plasma-applet-nowplaying.desktop new/kdeplasmoids-4.0.85/applets/nowplaying/plasma-applet-nowplaying.desktop
--- old/kdeplasmoids-4.0.84/applets/nowplaying/plasma-applet-nowplaying.desktop 2008-06-26 03:32:57.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/nowplaying/plasma-applet-nowplaying.desktop 2008-07-03 07:05:05.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Now Playing
Name[ca]=Ara s'està escoltant
Name[el]=Τρέχουσα αναπαραγωγή
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/applets/showdashboard/plasma-applet-showdashboard.desktop new/kdeplasmoids-4.0.85/applets/showdashboard/plasma-applet-showdashboard.desktop
--- old/kdeplasmoids-4.0.84/applets/showdashboard/plasma-applet-showdashboard.desktop 2008-06-26 03:32:58.000000000 +0200
+++ new/kdeplasmoids-4.0.85/applets/showdashboard/plasma-applet-showdashboard.desktop 2008-07-03 07:05:05.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Show Dashboard
Name[ca]=Mostra el tauler
Name[el]=Εμφάνιση πίνακα
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/dataengines/comic/plasma-dataengine-comic.desktop new/kdeplasmoids-4.0.85/dataengines/comic/plasma-dataengine-comic.desktop
--- old/kdeplasmoids-4.0.84/dataengines/comic/plasma-dataengine-comic.desktop 2008-06-26 03:32:57.000000000 +0200
+++ new/kdeplasmoids-4.0.85/dataengines/comic/plasma-dataengine-comic.desktop 2008-07-03 07:05:05.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Comic Data Engine
Name[ca]=Motor de dades de còmics
Name[csb]=Mòtór pòdôwków kòmiksów
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/area.cpp new/kdeplasmoids-4.0.85/runners/converter/area.cpp
--- old/kdeplasmoids-4.0.84/runners/converter/area.cpp 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/area.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program 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 General Public License for more details.
*
- * This program 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 General Public License for more details
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include "area.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/area.h new/kdeplasmoids-4.0.85/runners/converter/area.h
--- old/kdeplasmoids-4.0.84/runners/converter/area.h 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/area.h 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef AREA_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/converterrunner.cpp new/kdeplasmoids-4.0.85/runners/converter/converterrunner.cpp
--- old/kdeplasmoids-4.0.84/runners/converter/converterrunner.cpp 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/converterrunner.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include "converterrunner.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/converterrunner.h new/kdeplasmoids-4.0.85/runners/converter/converterrunner.h
--- old/kdeplasmoids-4.0.84/runners/converter/converterrunner.h 2008-06-03 11:34:08.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/converterrunner.h 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef CONVERTRUNNER_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/length.cpp new/kdeplasmoids-4.0.85/runners/converter/length.cpp
--- old/kdeplasmoids-4.0.84/runners/converter/length.cpp 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/length.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,19 @@
/*
* Copyright (C) 2007 Petri Damstén
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
- *
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+
*/
#include "length.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/length.h new/kdeplasmoids-4.0.85/runners/converter/length.h
--- old/kdeplasmoids-4.0.84/runners/converter/length.h 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/length.h 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef LENGTH_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/simpleunit.cpp new/kdeplasmoids-4.0.85/runners/converter/simpleunit.cpp
--- old/kdeplasmoids-4.0.84/runners/converter/simpleunit.cpp 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/simpleunit.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include "simpleunit.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/simpleunit.h new/kdeplasmoids-4.0.85/runners/converter/simpleunit.h
--- old/kdeplasmoids-4.0.84/runners/converter/simpleunit.h 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/simpleunit.h 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef SIMPLEUNIT_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/temperature.cpp new/kdeplasmoids-4.0.85/runners/converter/temperature.cpp
--- old/kdeplasmoids-4.0.84/runners/converter/temperature.cpp 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/temperature.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include "temperature.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/temperature.h new/kdeplasmoids-4.0.85/runners/converter/temperature.h
--- old/kdeplasmoids-4.0.84/runners/converter/temperature.h 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/temperature.h 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef TEMPERATURE_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/unit.h new/kdeplasmoids-4.0.85/runners/converter/unit.h
--- old/kdeplasmoids-4.0.84/runners/converter/unit.h 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/unit.h 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
- *
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef UNIT_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/volume.cpp new/kdeplasmoids-4.0.85/runners/converter/volume.cpp
--- old/kdeplasmoids-4.0.84/runners/converter/volume.cpp 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/volume.cpp 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 3007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 3 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 03110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#include "volume.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeplasmoids-4.0.84/runners/converter/volume.h new/kdeplasmoids-4.0.85/runners/converter/volume.h
--- old/kdeplasmoids-4.0.84/runners/converter/volume.h 2008-05-29 13:20:18.000000000 +0200
+++ new/kdeplasmoids-4.0.85/runners/converter/volume.h 2008-07-03 07:05:06.000000000 +0200
@@ -1,19 +1,18 @@
/*
* Copyright (C) 2007 Petri Damstén
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License version 2 as
- * published by the Free Software Foundation
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program 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 General Public License for more details
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
#ifndef VOLUME_H
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
