Hello community,
here is the log from the commit of package kdeutils4
checked in at Sun Dec 2 15:03:09 CET 2007.
--------
--- KDE/kdeutils4/kdeutils4.changes 2007-11-21 18:58:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2007-11-28 11:27:07.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 28 11:27:07 CET 2007 - dmueller@suse.de
+
+- update to 3.96.2
+
+-------------------------------------------------------------------
Old:
----
kdeutils-3.96.1.tar.bz2
New:
----
kdeutils-3.96.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.V10793/_old 2007-12-02 15:02:50.000000000 +0100
+++ /var/tmp/diff_new_pack.V10793/_new 2007-12-02 15:02:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 3.96.1)
+# spec file for package kdeutils4 (Version 3.96.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,9 +21,9 @@
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 3.96.1
+Version: 3.96.2
Release: 1
-%define rversion 3.96.1
+%define rversion 3.96.2
Source0: kdeutils-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -512,6 +512,8 @@
%doc AUTHORS COPYING COPYING-DOCS README
%changelog
+* Wed Nov 28 2007 - dmueller@suse.de
+- update to 3.96.2
* Wed Nov 21 2007 - dmueller@suse.de
- update to 3.96.1
* Wed Nov 14 2007 - dmueller@suse.de
++++++ kdeutils-3.96.1.tar.bz2 -> kdeutils-3.96.2.tar.bz2 ++++++
Files old/kdeutils-3.96.1/doc/ark/index.cache.bz2 and new/kdeutils-3.96.2/doc/ark/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kcalc/index.cache.bz2 and new/kdeutils-3.96.2/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kcharselect/index.cache.bz2 and new/kdeutils-3.96.2/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kdelirc/irkick/index.cache.bz2 and new/kdeutils-3.96.2/doc/kdelirc/irkick/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kdelirc/kcmlirc/index.cache.bz2 and new/kdeutils-3.96.2/doc/kdelirc/kcmlirc/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kdf/index.cache.bz2 and new/kdeutils-3.96.2/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kfloppy/index.cache.bz2 and new/kdeutils-3.96.2/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kgpg/index.cache.bz2 and new/kdeutils-3.96.2/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/khexedit/index.cache.bz2 and new/kdeutils-3.96.2/doc/khexedit/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kinfocenter/blockdevices/index.cache.bz2 and new/kdeutils-3.96.2/doc/kinfocenter/blockdevices/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kjots/index.cache.bz2 and new/kdeutils-3.96.2/doc/kjots/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/KRegExpEditor/index.cache.bz2 and new/kdeutils-3.96.2/doc/KRegExpEditor/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/ksim/index.cache.bz2 and new/kdeutils-3.96.2/doc/ksim/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/ktimer/index.cache.bz2 and new/kdeutils-3.96.2/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/kwallet/index.cache.bz2 and new/kdeutils-3.96.2/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-3.96.1/doc/superkaramba/index.cache.bz2 and new/kdeutils-3.96.2/doc/superkaramba/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kcalc/knumber/knumber.cpp new/kdeutils-3.96.2/kcalc/knumber/knumber.cpp
--- old/kdeutils-3.96.1/kcalc/knumber/knumber.cpp 2007-10-03 13:47:49.000000000 +0200
+++ new/kdeutils-3.96.2/kcalc/knumber/knumber.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -660,22 +660,22 @@
KNumber::operator qint32(void) const
{
- return static_cast<qint32>(*_num);
+ return static_cast<long int>(*_num);
}
KNumber::operator quint32(void) const
{
- return static_cast<quint32>(*_num);
+ return static_cast<unsigned long int>(*_num);
}
KNumber::operator quint64(void) const
{
#if SIZEOF_UNSIGNED_LONG == 8
- return static_cast<quint64>(*this);
+ return static_cast<unsigned long int>(*_num);
#elif SIZEOF_UNSIGNED_LONG == 4
KNumber tmp_num1 = this->abs().integerPart();
- quint64 tmp_num2 = static_cast<quint32>(tmp_num1) +
- (static_cast<quint64>(static_cast<quint32>(tmp_num1 >> KNumber("32"))) << 32) ;
+ quint64 tmp_num2 = static_cast<unsigned long int>(tmp_num1) +
+ (static_cast<quint64>(static_cast<unsigned long int>(tmp_num1 >> KNumber("32"))) << 32) ;
#ifdef __GNUC__
#warning "the cast operator from KNumber to quint64 is probably buggy, when a sign is involved"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kcalc/knumber/knumber_priv.cpp new/kdeutils-3.96.2/kcalc/knumber/knumber_priv.cpp
--- old/kdeutils-3.96.1/kcalc/knumber/knumber_priv.cpp 2007-10-03 13:47:49.000000000 +0200
+++ new/kdeutils-3.96.2/kcalc/knumber/knumber_priv.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -939,7 +939,7 @@
-_knumerror::operator qint32 (void) const
+_knumerror::operator long int (void) const
{
// what would be the correct return values here?
if (_error == Infinity)
@@ -950,7 +950,7 @@
return 0;
}
-_knumerror::operator quint32 (void) const
+_knumerror::operator unsigned long int (void) const
{
// what would be the correct return values here?
if (_error == Infinity)
@@ -962,32 +962,32 @@
}
-_knuminteger::operator qint32 (void) const
+_knuminteger::operator long int (void) const
{
return mpz_get_si(_mpz);
}
-_knumfraction::operator qint32 (void) const
+_knumfraction::operator long int (void) const
{
- return static_cast<qint32>(mpq_get_d(_mpq));
+ return static_cast<long int>(mpq_get_d(_mpq));
}
-_knumfloat::operator qint32 (void) const
+_knumfloat::operator long int (void) const
{
return mpf_get_si(_mpf);
}
-_knuminteger::operator quint32 (void) const
+_knuminteger::operator unsigned long int (void) const
{
return mpz_get_ui(_mpz);
}
-_knumfraction::operator quint32 (void) const
+_knumfraction::operator unsigned long int (void) const
{
- return static_cast<quint32>(mpq_get_d(_mpq));
+ return static_cast<unsigned long int>(mpq_get_d(_mpq));
}
-_knumfloat::operator quint32 (void) const
+_knumfloat::operator unsigned long int (void) const
{
return mpf_get_ui(_mpf);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kcalc/knumber/knumber_priv.h new/kdeutils-3.96.2/kcalc/knumber/knumber_priv.h
--- old/kdeutils-3.96.1/kcalc/knumber/knumber_priv.h 2007-10-03 13:47:49.000000000 +0200
+++ new/kdeutils-3.96.2/kcalc/knumber/knumber_priv.h 2007-11-27 18:20:33.000000000 +0100
@@ -63,8 +63,8 @@
virtual int compare(_knumber const &arg2) const = 0;
- virtual operator qint32(void) const = 0;
- virtual operator quint32(void) const = 0;
+ virtual operator long int(void) const = 0;
+ virtual operator unsigned long int(void) const = 0;
virtual operator double (void) const = 0;
};
@@ -107,8 +107,8 @@
virtual int compare(_knumber const &arg2) const;
- virtual operator qint32(void) const;
- virtual operator quint32(void) const;
+ virtual operator long int(void) const;
+ virtual operator unsigned long int(void) const;
virtual operator double (void) const;
private:
@@ -171,8 +171,8 @@
virtual _knumber * power(_knumber const & exponent) const;
- virtual operator qint32 (void) const;
- virtual operator quint32 (void) const;
+ virtual operator long int (void) const;
+ virtual operator unsigned long int (void) const;
virtual operator double (void) const;
_knuminteger * intAnd(_knuminteger const &arg2) const;
@@ -234,8 +234,8 @@
virtual int compare(_knumber const &arg2) const;
- virtual operator qint32 (void) const;
- virtual operator quint32 (void) const;
+ virtual operator long int (void) const;
+ virtual operator unsigned long int (void) const;
virtual operator double (void) const;
private:
@@ -287,8 +287,8 @@
virtual int compare(_knumber const &arg2) const;
- virtual operator qint32 (void) const;
- virtual operator quint32 (void) const;
+ virtual operator long int (void) const;
+ virtual operator unsigned long int (void) const;
virtual operator double (void) const;
private:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kgpg/keyinfodialog.cpp new/kdeutils-3.96.2/kgpg/keyinfodialog.cpp
--- old/kdeutils-3.96.1/kgpg/keyinfodialog.cpp 2007-10-31 21:44:50.000000000 +0100
+++ new/kdeutils-3.96.2/kgpg/keyinfodialog.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -11,7 +11,7 @@
* 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 gpgOutpution) any later version. *
+ * (at your option) any later version. *
* *
***************************************************************************/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kgpg/kgpg.cpp new/kdeutils-3.96.2/kgpg/kgpg.cpp
--- old/kdeutils-3.96.1/kgpg/kgpg.cpp 2007-11-06 09:01:38.000000000 +0100
+++ new/kdeutils-3.96.2/kgpg/kgpg.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -49,7 +49,6 @@
#include <KCmdLineArgs>
#include <KMessageBox>
#include <KFileDialog>
-#include
#include <KShortcut>
#include <KComboBox>
#include <KLineEdit>
@@ -71,6 +70,7 @@
#include <KToggleAction>
#include <KIcon>
#include
+#include <KHBox>
#include "images.h"
#include "selectsecretkey.h"
@@ -251,7 +251,7 @@
// TODO !!! CHANGE dialog, remove connect
dialog = new KgpgSelectPublicKeyDlg(0, droppedUrls.first().fileName(), true, goDefaultKey);
- QGroupBox *bGroup = new QGroupBox(dialog->mainWidget());
+ KHBox *bGroup = new KHBox(dialog->optionsbox);
(void) new QLabel(i18n("Compression method for archive:"),bGroup);
@@ -260,7 +260,6 @@
optionbx->addItem(i18n("Gzip"));
optionbx->addItem(i18n("Bzip2"));
- bGroup->show();
connect(optionbx,SIGNAL(activated (int)),this,SLOT(slotSetCompression(int)));
connect(dialog,SIGNAL(selectedKey(QStringList,QStringList,bool,bool)),this,SLOT(startFolderEncode(QStringList,QStringList,bool,bool)));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kgpg/kgpglibrary.cpp new/kdeutils-3.96.2/kgpg/kgpglibrary.cpp
--- old/kdeutils-3.96.1/kgpg/kgpglibrary.cpp 2007-10-23 10:37:04.000000000 +0200
+++ new/kdeutils-3.96.2/kgpg/kgpglibrary.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -174,7 +174,7 @@
KgpgInterface *decryptFileProcess = new KgpgInterface();
decryptFileProcess->decryptFile(src, dest, customDecryptOption);
connect(decryptFileProcess, SIGNAL(decryptFileStarted(KUrl)), this, SLOT(processEncPopup(KUrl)));
- connect(decryptFileProcess, SIGNAL(decryptFileFinished(int, KgpgInterface*)), this, SLOT(processdecover(int, KgpgInterface*)));
+ connect(decryptFileProcess, SIGNAL(decryptFileFinished(int, KgpgInterface*)), this, SLOT(processDecOver()));
}
void KgpgLibrary::processDecOver()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kgpg/selectpublickeydialog.cpp new/kdeutils-3.96.2/kgpg/selectpublickeydialog.cpp
--- old/kdeutils-3.96.1/kgpg/selectpublickeydialog.cpp 2007-10-23 10:37:04.000000000 +0200
+++ new/kdeutils-3.96.2/kgpg/selectpublickeydialog.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -152,7 +152,7 @@
m_keyslist->setWhatsThis(i18n("<b>Public keys list</b>: select the key that will be used for encryption."));
m_searchlineedit->setListView(m_keyslist);
- KVBox *optionsbox = new KVBox();
+ optionsbox = new KVBox();
optionsbox->setFrameShape(QFrame::StyledPanel);
setDetailsWidget(optionsbox);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kgpg/selectpublickeydialog.h new/kdeutils-3.96.2/kgpg/selectpublickeydialog.h
--- old/kdeutils-3.96.1/kgpg/selectpublickeydialog.h 2007-10-23 10:37:04.000000000 +0200
+++ new/kdeutils-3.96.2/kgpg/selectpublickeydialog.h 2007-11-27 18:20:33.000000000 +0100
@@ -22,6 +22,7 @@
#include <KShortcut>
#include <KDialog>
+#include <KVBox>
#include "kgpgkey.h"
@@ -51,6 +52,8 @@
bool getHideId() const;
bool getArmor() const;
+ KVBox *optionsbox;
+
private slots:
void slotOk();
void slotFillKeysList();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kregexpeditor/gen_qregexplexer.cpp new/kdeutils-3.96.2/kregexpeditor/gen_qregexplexer.cpp
--- old/kdeutils-3.96.1/kregexpeditor/gen_qregexplexer.cpp 2007-10-31 21:44:51.000000000 +0100
+++ new/kdeutils-3.96.2/kregexpeditor/gen_qregexplexer.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -1966,9 +1966,11 @@
charPending = true;
}
}
+ if ( i == txt.length() )
+ break;
ch = txt.at(i++);
}
- while ( ch != QChar(']') && i <= txt.length() );
+ while ( ch != QChar(']') );
if ( charPending )
res->addCharacter( pendingChar );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kregexpeditor/qregexpparser.l new/kdeutils-3.96.2/kregexpeditor/qregexpparser.l
--- old/kdeutils-3.96.1/kregexpeditor/qregexpparser.l 2007-10-31 21:44:51.000000000 +0100
+++ new/kdeutils-3.96.2/kregexpeditor/qregexpparser.l 2007-11-27 18:20:33.000000000 +0100
@@ -304,9 +304,11 @@
charPending = true;
}
}
+ if ( i == txt.length() )
+ break;
ch = txt.at(i++);
}
- while ( ch != QChar(']') && i <= txt.length() );
+ while ( ch != QChar(']') );
if ( charPending )
res->addCharacter( pendingChar );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/kregexpeditor/repeatwidget.cpp new/kdeutils-3.96.2/kregexpeditor/repeatwidget.cpp
--- old/kdeutils-3.96.1/kregexpeditor/repeatwidget.cpp 2007-10-03 13:47:48.000000000 +0200
+++ new/kdeutils-3.96.2/kregexpeditor/repeatwidget.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -182,6 +182,7 @@
setSpacing( 6 );
_group = new Q3VButtonGroup( i18n("Times to Match"), this, "groupbox" );
+ _group->setExclusive(true);
// Any number of times
QRadioButton* radioBut = new QRadioButton(i18n("Any number of times (including zero times)"),
Files old/kdeutils-3.96.1/superkaramba/icons/ox128-mime-superkaramba_theme.png and new/kdeutils-3.96.2/superkaramba/icons/ox128-mime-superkaramba_theme.png differ
Files old/kdeutils-3.96.1/superkaramba/icons/ox16-mime-superkaramba_theme.png and new/kdeutils-3.96.2/superkaramba/icons/ox16-mime-superkaramba_theme.png differ
Files old/kdeutils-3.96.1/superkaramba/icons/ox22-mime-superkaramba_theme.png and new/kdeutils-3.96.2/superkaramba/icons/ox22-mime-superkaramba_theme.png differ
Files old/kdeutils-3.96.1/superkaramba/icons/ox32-mime-superkaramba_theme.png and new/kdeutils-3.96.2/superkaramba/icons/ox32-mime-superkaramba_theme.png differ
Files old/kdeutils-3.96.1/superkaramba/icons/ox48-mime-superkaramba_theme.png and new/kdeutils-3.96.2/superkaramba/icons/ox48-mime-superkaramba_theme.png differ
Files old/kdeutils-3.96.1/superkaramba/icons/ox64-mime-superkaramba_theme.png and new/kdeutils-3.96.2/superkaramba/icons/ox64-mime-superkaramba_theme.png differ
Files old/kdeutils-3.96.1/superkaramba/icons/oxsc-mime-superkaramba_theme.svgz and new/kdeutils-3.96.2/superkaramba/icons/oxsc-mime-superkaramba_theme.svgz differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/superkaramba/src/karamba.cpp new/kdeutils-3.96.2/superkaramba/src/karamba.cpp
--- old/kdeutils-3.96.1/superkaramba/src/karamba.cpp 2007-11-22 18:16:34.000000000 +0100
+++ new/kdeutils-3.96.2/superkaramba/src/karamba.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -1979,6 +1979,10 @@
if (Input *input = dynamic_cast(item)) {
input->mouseEventMove(event);
}
+
+ if (ImageLabel *image = dynamic_cast(item)) {
+ image->rolloverImage(event);
+ }
}
#ifdef PYTHON_INCLUDE_PATH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/superkaramba/src/meters/imagelabel.cpp new/kdeutils-3.96.2/superkaramba/src/meters/imagelabel.cpp
--- old/kdeutils-3.96.1/superkaramba/src/meters/imagelabel.cpp 2007-10-08 09:44:21.000000000 +0200
+++ new/kdeutils-3.96.2/superkaramba/src/meters/imagelabel.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -516,7 +516,7 @@
background = b;
}
-void ImageLabel::rolloverImage(QMouseEvent *e)
+void ImageLabel::rolloverImage(QGraphicsSceneHoverEvent *e)
{
if (!rollover)
return;
@@ -524,7 +524,7 @@
prepareGeometryChange();
if (zoomed) {
- if (!rect_off.contains(e->pos())) {
+ if (!rect_off.contains(e->pos().toPoint())) {
// rollover the image to the zoomed image
//setValue(fn_roll);
setX(xoff);
@@ -535,7 +535,7 @@
zoomed = false;
}
} else {
- if (rect_off.contains(e->pos())) {
+ if (rect_off.contains(e->pos().toPoint())) {
// rollover the image to the zoomed image
//setValue(fn_roll);
setX(xon);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/superkaramba/src/meters/imagelabel.h new/kdeutils-3.96.2/superkaramba/src/meters/imagelabel.h
--- old/kdeutils-3.96.1/superkaramba/src/meters/imagelabel.h 2007-10-03 13:47:50.000000000 +0200
+++ new/kdeutils-3.96.2/superkaramba/src/meters/imagelabel.h 2007-11-27 18:20:33.000000000 +0100
@@ -130,7 +130,7 @@
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
- void rolloverImage(QMouseEvent *e);
+ void rolloverImage(QGraphicsSceneHoverEvent *e);
void parseImages(const QString &fn, const QString &fn_roll, int, int, int, int);
virtual void show();
virtual void hide();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/superkaramba/src/meters/textlabel.cpp new/kdeutils-3.96.2/superkaramba/src/meters/textlabel.cpp
--- old/kdeutils-3.96.1/superkaramba/src/meters/textlabel.cpp 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.2/superkaramba/src/meters/textlabel.cpp 2007-11-27 18:20:33.000000000 +0100
@@ -118,11 +118,11 @@
++it;
}
- if (getWidth() <= 0) {
+ if ((getWidth() <= 0) || !m_sizeGiven) {
setWidth(textSize.width());
}
- if (getHeight() <= 0) {
+ if ((getHeight() <= 0) || !m_sizeGiven) {
setHeight(textSize.height());
}
@@ -354,8 +354,8 @@
if (!m_hidden) {
int i = 0; // lineHeight;
int row = 1;
- int width = getWidth();
- int height = getHeight();
+ int width = Meter::getWidth();
+ int height = Meter::getHeight();
QRect meterRect(0, 0, width, height);
QRect textRect;
QPoint next;
@@ -453,11 +453,45 @@
return fm.width(value[0]);
}
+int TextLabel::getX() const
+{
+ return origPoint.x();
+}
+
+int TextLabel::getY() const
+{
+ return origPoint.y();
+}
+
+int TextLabel::getWidth() const
+{
+ if (!m_sizeGiven) {
+ return -1;
+ } else {
+ return Meter::getWidth();
+ }
+}
+
+int TextLabel::getHeight() const
+{
+ if (!m_sizeGiven) {
+ return -1;
+ } else {
+ return Meter::getHeight();
+ }
+}
+
void TextLabel::setSize(int x, int y, int width, int height)
{
origPoint = QPoint(x, y);
- setWidth(width);
- setHeight(height);
+
+ if (height <= 0 || width <= 0) {
+ m_sizeGiven = false;
+ } else {
+ m_sizeGiven = true;
+ }
+
+ Meter::setSize(x, y, width, height);
calculateTextSize();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-3.96.1/superkaramba/src/meters/textlabel.h new/kdeutils-3.96.2/superkaramba/src/meters/textlabel.h
--- old/kdeutils-3.96.1/superkaramba/src/meters/textlabel.h 2007-11-06 09:01:40.000000000 +0100
+++ new/kdeutils-3.96.2/superkaramba/src/meters/textlabel.h 2007-11-27 18:20:33.000000000 +0100
@@ -69,6 +69,12 @@
int getTextWidth() const;
void setSize(int x, int y, int width, int height);
+ int getX() const;
+ int getY() const;
+
+ int getWidth() const;
+ int getHeight() const;
+
private:
int alignment;
int clip;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org