December 2007 - openSUSE Commits - openSUSE Mailing Lists

commit kdeutils4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

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(a)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(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)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 <kdeversion.h> #include <KShortcut> #include <KComboBox> #include <KLineEdit> @@ -71,6 +70,7 @@ #include <KToggleAction> #include <KIcon> #include <kdefakes.h> +#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<Input*>(item)) { input->mouseEventMove(event); } + + if (ImageLabel *image = dynamic_cast<ImageLabel*>(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(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdetoys4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdetoys4 checked in at Sun Dec 2 15:02:43 CET 2007. -------- --- KDE/kdetoys4/kdetoys4.changes 2007-11-21 18:58:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdetoys4/kdetoys4.changes 2007-11-28 11:26:46.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:26:46 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdetoys-3.96.1.tar.bz2 New: ---- kdetoys-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdetoys4.spec ++++++ --- /var/tmp/diff_new_pack.o10056/_old 2007-12-02 15:02:31.000000000 +0100 +++ /var/tmp/diff_new_pack.o10056/_new 2007-12-02 15:02:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdetoys4 (Version 3.96.1) +# spec file for package kdetoys4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,9 +15,9 @@ Group: System/GUI/KDE Summary: Kdetoys Base Package 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: kdetoys-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -229,6 +229,8 @@ %doc COPYING COPYING-DOCS README %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdetoys-3.96.1.tar.bz2 -> kdetoys-3.96.2.tar.bz2 ++++++ Files old/kdetoys-3.96.1/doc/amor/index.cache.bz2 and new/kdetoys-3.96.2/doc/amor/index.cache.bz2 differ Files old/kdetoys-3.96.1/doc/kmoon/index.cache.bz2 and new/kdetoys-3.96.2/doc/kmoon/index.cache.bz2 differ Files old/kdetoys-3.96.1/doc/kteatime/index.cache.bz2 and new/kdetoys-3.96.2/doc/kteatime/index.cache.bz2 differ Files old/kdetoys-3.96.1/doc/kweather/index.cache.bz2 and new/kdetoys-3.96.2/doc/kweather/index.cache.bz2 differ Files old/kdetoys-3.96.1/doc/kworldclock/index.cache.bz2 and new/kdetoys-3.96.2/doc/kworldclock/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdetoys-3.96.1/kteatime/settings.cpp new/kdetoys-3.96.2/kteatime/settings.cpp --- old/kdetoys-3.96.1/kteatime/settings.cpp 2007-10-08 09:44:06.000000000 +0200 +++ new/kdetoys-3.96.2/kteatime/settings.cpp 2007-11-27 18:20:25.000000000 +0100 @@ -99,8 +99,8 @@ m_ui->upButton->setEnabled(false); m_ui->downButton->setEnabled(false); - m_ui->newButton->setIcon(KIcon("document-new")); - m_ui->removeButton->setIcon(KIcon("mail-delete")); + m_ui->newButton->setIcon(KIcon("edit-add")); + m_ui->removeButton->setIcon(KIcon("edit-delete")); m_ui->upButton->setIcon(KIcon("arrow-up")); m_ui->downButton->setIcon(KIcon("arrow-down")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdepimlibs4 checked in at Sun Dec 2 15:01:57 CET 2007. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2007-11-21 18:58:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2007-11-28 11:25:56.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:25:56 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdepimlibs-3.96.1.tar.bz2 New: ---- kdepimlibs-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.VV9110/_old 2007-12-02 15:01:46.000000000 +0100 +++ /var/tmp/diff_new_pack.VV9110/_new 2007-12-02 15:01:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 3.96.1) +# spec file for package kdepimlibs4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,9 +15,9 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries 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: kdepimlibs-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -152,6 +152,8 @@ %_kde_share_dir/config.kcfg/mailtransport.kcfg %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdepimlibs-3.96.1.tar.bz2 -> kdepimlibs-3.96.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/gpgme++/CMakeLists.txt new/kdepimlibs-3.96.2/gpgme++/CMakeLists.txt --- old/kdepimlibs-3.96.1/gpgme++/CMakeLists.txt 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/gpgme++/CMakeLists.txt 2007-11-27 18:19:52.000000000 +0100 @@ -2,6 +2,16 @@ include_directories( ${GPGME_INCLUDES} ) +if (WIN32) +# overriding LIB_INSTALL_DIR specific for win32 to archieve +# propper installation of shared library targets will also be +# used in install(FILES ...) which fails with error +# 'INSTALL FILES given unknown argument "RUNTIME".' +# There must be a way to only patch install(TARGETS) + set (LIB_INSTALL_DIR lib) +endif (WIN32) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-gpgme++.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gpgme++.h ) ## gpgme comes in three flavours on each of the platforms: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kabc/contactgroup.xsd new/kdepimlibs-3.96.2/kabc/contactgroup.xsd --- old/kdepimlibs-3.96.1/kabc/contactgroup.xsd 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-3.96.2/kabc/contactgroup.xsd 2007-11-27 18:19:53.000000000 +0100 @@ -0,0 +1,76 @@ +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + + + +  + <xsd:element name="contactgroup"> + <xsd:complexType> +  + <xsd:choice minOccurs="0" maxOccurs="unbound"> + <xsd:element name="contactData" type="contactDataType"/> + <xsd:element name="contactReference" type="contactReferenceType"/> + </xsd:choice> + +  + <xsd:attribute name="uid" type="xsd:string" use="required" /> + +  + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + +  + <xsd:complexType name="contactDataType"> + <xsd:sequence> +  + <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/> + +  + <xsd:element name="email" type="xsd:string" minOccurs="1" maxOccurs="1"/> + +  + <xsd:element name="custom" minOccurs="0" maxOccurs="unbound"> + <xsd:complexType> + <xsd:attribute name="key" type="xsd:string" use="required" /> + <xsd:attribute name="value" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="contactReferenceType"> + <xsd:sequence> +  + <xsd:element name="uid" type="xsd:string" minOccurs="1" maxOccurs="1"/> + +  + <xsd:element name="preferredEmail" type="xsd:string" minOccurs="0" maxOccurs="1"/> + +  + <xsd:element name="custom" minOccurs="0" maxOccurs="unbound"> + <xsd:complexType> + <xsd:attribute name="key" type="xsd:string" use="required" /> + <xsd:attribute name="value" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + +</xsd:schema> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kabc/formats/binary.desktop new/kdepimlibs-3.96.2/kabc/formats/binary.desktop --- old/kdepimlibs-3.96.1/kabc/formats/binary.desktop 2007-11-20 23:00:45.000000000 +0100 +++ new/kdepimlibs-3.96.2/kabc/formats/binary.desktop 2007-11-27 18:19:53.000000000 +0100 @@ -8,6 +8,7 @@ Name[el]=Δυαδικό Name[es]=Binario Name[et]=Binaar +Name[fr]=Binaire Name[ga]=Dénártha Name[hu]=Bináris Name[ja]=バイナリ @@ -16,6 +17,7 @@ Name[nl]=Binair Name[oc]=Binari Name[pa]=ਬਾਈਨਰੀ +Name[pl]=Binarny Name[pt]=Binário Name[sl]=Dvojiško Name[sv]=Binär diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kabc/kabc_manager.desktop new/kdepimlibs-3.96.2/kabc/kabc_manager.desktop --- old/kdepimlibs-3.96.1/kabc/kabc_manager.desktop 2007-11-20 23:00:45.000000000 +0100 +++ new/kdepimlibs-3.96.2/kabc/kabc_manager.desktop 2007-11-27 18:19:53.000000000 +0100 @@ -17,6 +17,7 @@ Name[nl]=Contactpersonen Name[oc]=Contactes Name[pa]=ਸੰਪਰਕ +Name[pl]=Kontakty Name[pt]=Contactos Name[sl]=Stiki Name[sv]=Kontakter diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kabc/plugins/dir/dir.desktop new/kdepimlibs-3.96.2/kabc/plugins/dir/dir.desktop --- old/kdepimlibs-3.96.1/kabc/plugins/dir/dir.desktop 2007-11-20 23:00:45.000000000 +0100 +++ new/kdepimlibs-3.96.2/kabc/plugins/dir/dir.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -8,6 +8,7 @@ Name[el]=Κατάλογος Name[es]=Directorio Name[et]=Kataloog +Name[fr]=Dossier Name[ga]=Eolaire Name[hu]=Könyvtár Name[ja]=ディレクトリ @@ -16,6 +17,7 @@ Name[nl]=Map Name[oc]=Repertòri Name[pa]=ਡਾਇਰੈਕਟਰੀ +Name[pl]=Katalog Name[pt]=Pasta Name[sl]=Imenik Name[sv]=Katalog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kabc/plugins/file/file.desktop new/kdepimlibs-3.96.2/kabc/plugins/file/file.desktop --- old/kdepimlibs-3.96.1/kabc/plugins/file/file.desktop 2007-11-20 23:00:45.000000000 +0100 +++ new/kdepimlibs-3.96.2/kabc/plugins/file/file.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -8,6 +8,7 @@ Name[el]=Αρχείο Name[es]=Archivo Name[et]=Fail +Name[fr]=Fichier Name[ga]=Comhad Name[hu]=Fájl Name[ja]=ファイル @@ -16,6 +17,7 @@ Name[nl]=Bestand Name[oc]=Fichièr Name[pa]=ਫਾਇਲ +Name[pl]=Plik Name[pt]=Ficheiro Name[sl]=Datoteka Name[sv]=Fil diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kabc/plugins/net/net.desktop new/kdepimlibs-3.96.2/kabc/plugins/net/net.desktop --- old/kdepimlibs-3.96.1/kabc/plugins/net/net.desktop 2007-11-20 23:00:45.000000000 +0100 +++ new/kdepimlibs-3.96.2/kabc/plugins/net/net.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -8,6 +8,7 @@ Name[el]=Δίκτυο Name[es]=Red Name[et]=Võrk +Name[fr]=Réseau Name[ga]=Líonra Name[hu]=Hálózat Name[ja]=ネットワーク @@ -16,6 +17,7 @@ Name[nl]=Netwerk Name[oc]=Ret Name[pa]=ਨੈੱਟਵਰ +Name[pl]=Sieć Name[pt]=Rede Name[sl]=Omrežje Name[sv]=Nätverk diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kcal/duration.cpp new/kdepimlibs-3.96.2/kcal/duration.cpp --- old/kdepimlibs-3.96.1/kcal/duration.cpp 2007-07-26 12:35:17.000000000 +0200 +++ new/kdepimlibs-3.96.2/kcal/duration.cpp 2007-11-27 18:19:52.000000000 +0100 @@ -160,6 +160,18 @@ return operator+=( -duration ); } +Duration &Duration::operator*=( int value ) +{ + d->mDuration *= value; + return *this; +} + +Duration &Duration::operator/=( int value ) +{ + d->mDuration /= value; + return *this; +} + KDateTime Duration::end( const KDateTime &start ) const { return d->mDaily ? start.addDays( d->mDuration ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kcal/duration.h new/kdepimlibs-3.96.2/kcal/duration.h --- old/kdepimlibs-3.96.1/kcal/duration.h 2007-07-26 12:35:17.000000000 +0200 +++ new/kdepimlibs-3.96.2/kcal/duration.h 2007-11-27 18:19:52.000000000 +0100 @@ -214,6 +214,36 @@ { return Duration( *this ) += other; } /** + Multiplies this duration by a value. + @param value value to multiply by + */ + Duration &operator*=( int value ); + + /** + Multiplies a duration by a value. + + @param value value to multiply by + @return resultant duration + */ + Duration operator*( int value ) const + { return Duration( *this ) *= value; } + + /** + Divides this duration by a value. + @param value value to divide by + */ + Duration &operator/=( int value ); + + /** + Divides a duration by a value. + + @param value value to divide by + @return resultant duration + */ + Duration operator/( int value ) const + { return Duration( *this ) /= value; } + + /** Computes a duration end time by adding the number of seconds or days in the duration to the specified @p start time. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kcal/kcal_manager.desktop new/kdepimlibs-3.96.2/kcal/kcal_manager.desktop --- old/kdepimlibs-3.96.1/kcal/kcal_manager.desktop 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/kcal/kcal_manager.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -17,6 +17,7 @@ Name[nl]=Agenda Name[oc]=Calendièr Name[pa]=ਕੈਲੰਡਰ +Name[pl]=Kalendarz Name[pt]=Calendário Name[sl]=Koledar Name[sv]=Kalender diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kcal/local.desktop new/kdepimlibs-3.96.2/kcal/local.desktop --- old/kdepimlibs-3.96.1/kcal/local.desktop 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/kcal/local.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -15,6 +15,7 @@ Name[nds]=Kalenner in en lokale Datei Name[nl]=Agenda in lokaal bestand Name[pa]=ਲੋਕਲ ਫਾਇਲ 'ਚ ਕੈਲੰਡਰ +Name[pl]=Kalendarz w pliku lokalnym Name[pt]=Calendário num Ficheiro Local Name[sl]=Koledar v krajevni datoteki Name[sv]=Kalender i lokal fil diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kcal/localdir.desktop new/kdepimlibs-3.96.2/kcal/localdir.desktop --- old/kdepimlibs-3.96.1/kcal/localdir.desktop 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/kcal/localdir.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -15,6 +15,7 @@ Name[nds]=Kalenner in'n lokalen Orner Name[nl]=Agenda in lokale map Name[pa]=ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ 'ਚ ਕੈਲੰਡਰ +Name[pl]=Kalendarz w katalogu lokalnym Name[pt]=Calendário numa Pasta Local Name[sl]=Koledar v krajevnem imeniku Name[sv]=Kalender i lokal katalog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kcal/tests/testduration.cpp new/kdepimlibs-3.96.2/kcal/tests/testduration.cpp --- old/kdepimlibs-3.96.1/kcal/tests/testduration.cpp 2007-07-26 12:35:17.000000000 +0200 +++ new/kdepimlibs-3.96.2/kcal/tests/testduration.cpp 2007-11-27 18:19:52.000000000 +0100 @@ -32,7 +32,9 @@ void DurationTest::testValidity() { - Duration d( KDateTime( QDate( 2006, 8, 3 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + const KDateTime firstDateTime( QDate( 2006, 8, 3 ), QTime( 7, 0, 0 ), KDateTime::UTC ); + + Duration d( firstDateTime, KDateTime( QDate( 2006, 8, 3 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); QCOMPARE( d.asSeconds(), 1*60*60 ); @@ -40,7 +42,9 @@ void DurationTest::testCompare() { - Duration d1( KDateTime( QDate( 2006, 8, 3 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + const KDateTime firstDateTime( QDate( 2006, 8, 3 ), QTime( 7, 0, 0 ), KDateTime::UTC ); + + Duration d1( firstDateTime, KDateTime( QDate( 2006, 8, 3 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); //d1 has 1hr duration diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kcal/tests/testfreebusy.cpp new/kdepimlibs-3.96.2/kcal/tests/testfreebusy.cpp --- old/kdepimlibs-3.96.1/kcal/tests/testfreebusy.cpp 2007-08-29 11:51:22.000000000 +0200 +++ new/kdepimlibs-3.96.2/kcal/tests/testfreebusy.cpp 2007-11-27 18:19:52.000000000 +0100 @@ -31,8 +31,10 @@ void FreeBusyTest::testValidity() { + const KDateTime firstDateTime( QDate( 2007, 7, 23 ), QTime( 7, 0, 0 ), KDateTime::UTC ); + FreeBusy fb1( - KDateTime( QDate( 2007, 7, 23 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + firstDateTime, KDateTime( QDate( 2007, 7, 23 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); QVERIFY( fb1.dtEnd() == @@ -42,34 +44,41 @@ void FreeBusyTest::testAddSort() { Period::List periods; + + const KDateTime firstq1DateTime( QDate( 2007, 7, 23 ), QTime( 7, 0, 0 ), KDateTime::UTC ); Period q1( - KDateTime( QDate( 2007, 7, 23 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + firstq1DateTime, KDateTime( QDate( 2007, 7, 23 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); periods.append( q1 ); + const KDateTime firstq2DateTime( QDate( 2007, 8, 23 ), QTime( 7, 0, 0 ), KDateTime::UTC ); Period q2( - KDateTime( QDate( 2007, 8, 23 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + firstq2DateTime, KDateTime( QDate( 2007, 8, 23 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); periods.append( q2 ); + const KDateTime firstq3DateTime( QDate( 2007, 9, 23 ), QTime( 7, 0, 0 ), KDateTime::UTC ); Period q3( - KDateTime( QDate( 2007, 9, 23 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + firstq3DateTime, KDateTime( QDate( 2007, 9, 23 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); periods.append( q3 ); FreeBusy fb1; fb1.addPeriods( periods ); + const KDateTime firstfb1DateTime( QDate( 2007, 10, 27 ), QTime( 7, 0, 0 ), KDateTime::UTC ); fb1.addPeriod( - KDateTime( QDate( 2007, 10, 27 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + firstfb1DateTime, KDateTime( QDate( 2007, 10, 27 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); + const KDateTime secondfb1DateTime( QDate( 2007, 8, 27 ), QTime( 7, 0, 0 ), KDateTime::UTC ); fb1.addPeriod( - KDateTime( QDate( 2007, 8, 27 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + secondfb1DateTime, KDateTime( QDate( 2007, 8, 27 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); + const KDateTime thirdfb1DateTime( QDate( 2007, 6, 27 ), QTime( 7, 0, 0 ), KDateTime::UTC ); fb1.addPeriod( - KDateTime( QDate( 2007, 6, 27 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + thirdfb1DateTime, KDateTime( QDate( 2007, 6, 27 ), QTime( 8, 0, 0 ), KDateTime::UTC ) ); QVERIFY( fb1.busyPeriods().last().end() == diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kcal/tests/testperiod.cpp new/kdepimlibs-3.96.2/kcal/tests/testperiod.cpp --- old/kdepimlibs-3.96.1/kcal/tests/testperiod.cpp 2007-07-26 12:35:17.000000000 +0200 +++ new/kdepimlibs-3.96.2/kcal/tests/testperiod.cpp 2007-11-27 18:19:52.000000000 +0100 @@ -32,7 +32,8 @@ void PeriodTest::testValidity() { - Period p1( KDateTime( QDate( 2006, 8, 30 ), QTime( 7, 0, 0 ), KDateTime::UTC ), + const KDateTime p1DateTime( QDate( 2006, 8, 30 ), QTime( 7, 0, 0 ), KDateTime::UTC ); + Period p1( p1DateTime, Duration( 60 ) ); Period p2; @@ -49,8 +50,10 @@ void PeriodTest::testCompare() { - Period p1( KDateTime( QDate( 2006, 8, 30 ) ), Duration( 24*60*60 ) ); - Period p2( KDateTime( QDate( 2006, 8, 29 ) ), Duration( 23*60*60 ) ); + const KDateTime p1DateTime( QDate( 2006, 8, 30 ) ); + Period p1( p1DateTime, Duration( 24*60*60 ) ); + const KDateTime p2DateTime( QDate( 2006, 8, 29 ) ); + Period p2( p2DateTime, Duration( 23*60*60 ) ); Period p1copy( p1 ); // test copy constructor Period p1assign = p1; // test operator= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kioslave/sieve/sieve.protocol new/kdepimlibs-3.96.2/kioslave/sieve/sieve.protocol --- old/kdepimlibs-3.96.1/kioslave/sieve/sieve.protocol 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/kioslave/sieve/sieve.protocol 2007-11-27 18:19:52.000000000 +0100 @@ -22,6 +22,7 @@ Description[hu]=KDE-protokoll a Sieve levélszűrő protokollhoz Description[ja]=Sieve メールフィルタリングプロトコルのための ioslave Description[nds]=In-/Utgaavmoduul för't Nettpostfilter-Protokoll Sieve +Description[pl]=Moduł ioslave dla protokołu filtrowania poczty Sieve Description[pt]=Um 'ioslave' para o protocolo de filtragem de correio Sieve Description[sv]=En I/O-slav för brevfiltreringsprotokollet Sieve Description[x-test]=xxAn ioslave for the Sieve mail filtering protocolxx diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kpimutils/tests/testlinklocator.cpp new/kdepimlibs-3.96.2/kpimutils/tests/testlinklocator.cpp --- old/kdepimlibs-3.96.1/kpimutils/tests/testlinklocator.cpp 2007-07-26 12:35:08.000000000 +0200 +++ new/kdepimlibs-3.96.2/kpimutils/tests/testlinklocator.cpp 2007-11-27 18:19:52.000000000 +0100 @@ -31,7 +31,8 @@ void LinkLocatorTest::testGetEmailAddress() { // empty input - LinkLocator ll1( QString(), 0 ); + const QString emptyQString; + LinkLocator ll1( emptyQString, 0 ); QVERIFY( ll1.getEmailAddress() == QString() ); // no '@' at scan position diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kresources/kresources.desktop new/kdepimlibs-3.96.2/kresources/kresources.desktop --- old/kdepimlibs-3.96.1/kresources/kresources.desktop 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/kresources/kresources.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -16,6 +16,7 @@ Name[el]=Πόροι του KDE Name[es]=Recursos KDE Name[et]=KDE ressursid +Name[fr]=Ressources KDE Name[ga]=Acmhainní KDE Name[hu]=KDE-erőforrások Name[ja]=KDE リソース @@ -23,6 +24,7 @@ Name[nds]=KDE Ressourcen Name[nl]=KDE-hulpbronnen Name[pa]=KDE ਸਰੋਤ +Name[pl]=Zasoby KDE Name[pt]=Recursos do KDE Name[sl]=Viri KDE Name[sv]=KDE-resurser @@ -39,12 +41,14 @@ Comment[el]=Ρύθμιση πόρων του KDE Comment[es]=Configurar recursos de KDE Comment[et]=KDE ressursside seadistamine +Comment[fr]=Configurer les ressources KDE Comment[ga]=Cumraigh Acmhainní KDE Comment[hu]=A KDE-erőforrások beállítása Comment[ja]=KDE リソースの設定 Comment[lt]=Konfigūruoti KDE resursus Comment[nds]=KDE Ressourcen instellen Comment[nl]=KDE-hulpbronnen instellen +Comment[pl]=Konfiguruj zasoby KDE Comment[pt]=Configurar os Recursos do KDE Comment[sl]=Nastavi vire KDE Comment[sv]=Anpassa KDE-resurser @@ -59,11 +63,13 @@ Keywords[el]=πόροι,πόροι του konnector,πόρος επαφής,πόρος ημερολογίου,πόρος σημειώσεων,πόρος ειδοποίησης,imap Keywords[es]=recursos,recursos de konnector,recursos de contacto,recursos de calendario,recursos de notas,recurso de alarma,imap Keywords[et]=ressursid,konnektori ressurss,kontakti ressurss,kalendri ressurss,märkmete ressurss,häire ressurss,imap +Keywords[fr]=ressources,konnector, ressource contact calendrier, agenda, notes resource,alarme, imap Keywords[ga]=acmhainní,acmhainn konnector,acmhainn teagmhála,acmhainn fhéilire,acmhainn nótaí,acmhainn aláraim,imap Keywords[hu]=erőforrások,Konnector-erőforrás,névjegy,naptár,feljegyzés,emlékeztető,imap Keywords[ja]=リソース,konnector resource, コネクターリソース,コンタクトリソース,カレンダーリソース, メモリソース,アラームリソースimap Keywords[nds]=Ressourcen,konnector-Ressource,Kontakt-Ressource,Kalenner-Ressource,Notiz-Ressource,Alarm-Ressource,IMAP Keywords[nl]=hulpbronnen,konnector-hulpbron,contactpersoonhulpbron,agendahulpbron,notitiehulpbron,herinneringhulpbron,imap +Keywords[pl]=zasoby,zasoby konnectora,zasoby kontaktów,zasoby kalendarza,zasoby notatek,zasoby alarmu,imap Keywords[pt]=recursos,recurso do konector,recurso de contactos,recurso de calendário,recurso de notas,recurso de alarme,imap Keywords[sv]=resurser,konnector-resurs,kontaktresurs,kalenderresurs,anteckningsresurs,alarmresurs,IMAP Keywords[uk]=resources,konnector resource,contact resource,calendar resource,notes resource,alarm resource,imap,ресурс календаря,ресурси diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kresources/kresources_manager.desktop new/kdepimlibs-3.96.2/kresources/kresources_manager.desktop --- old/kdepimlibs-3.96.1/kresources/kresources_manager.desktop 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/kresources/kresources_manager.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -8,6 +8,7 @@ Comment[el]=Διαχειριστής KResource Comment[es]=Administrador KResource Comment[et]=KDE ressursside haldur +Comment[fr]=Gestionnaire de ressources Comment[ga]=Bainisteoir KResource Comment[hu]=Erőforráskezelő Comment[ja]=K リソースマネージャ @@ -15,6 +16,7 @@ Comment[nds]=KResource-Pleger Comment[nl]=KResource-beheerder Comment[pa]=ਕੇ-ਰੀਸੋਰਸ ਮੈਨੇਜਰ +Comment[pl]=Menadżer zasobów KDE (KResource) Comment[pt]=Gestor do KResource Comment[sl]=Upravnik KResource Comment[sv]=Resurshantering diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/kresources/kresources_plugin.desktop new/kdepimlibs-3.96.2/kresources/kresources_plugin.desktop --- old/kdepimlibs-3.96.1/kresources/kresources_plugin.desktop 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/kresources/kresources_plugin.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -8,12 +8,14 @@ Comment[el]=Μικροεφαρμογή πλαισίου εργασίας του KResource Comment[es]=Extensión de estructura KResource Comment[et]=KDE ressursside raamistiku plugin +Comment[fr]=Module externe de gestion de ressources Comment[ga]=Breiseán Creatlaí KResource Comment[hu]=Modul a KResource keretrendszerhez Comment[ja]=K リソース・フレームワーク・プラグイン Comment[lt]=KResource struktūros priedas Comment[nds]=Rahmenwark-Moduul för KResource Comment[nl]=KResource-raamwerkplugin +Comment[pl]=Wtyczka KResource Comment[pt]='Plugin' da Plataforma do KResource Comment[sv]=Insticksprogram för resursramverk Comment[uk]=Втулок платформи KResource diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-3.96.1/mailtransport/kcm_mailtransport.desktop new/kdepimlibs-3.96.2/mailtransport/kcm_mailtransport.desktop --- old/kdepimlibs-3.96.1/mailtransport/kcm_mailtransport.desktop 2007-11-20 23:00:44.000000000 +0100 +++ new/kdepimlibs-3.96.2/mailtransport/kcm_mailtransport.desktop 2007-11-27 18:19:52.000000000 +0100 @@ -20,11 +20,13 @@ Name[el]=Κύριος μεταφορέας Name[es]=Transporte de correo Name[et]=Kirja saatmise viis +Name[fr]=Transport de courrier Name[ga]=Iompar Ríomhphoist Name[hu]=Levéltovábbítás Name[ja]=メール送信方法 Name[nds]=Överdreegmetood Name[nl]=E-mailtransport +Name[pl]=Przekazywanie poczty Name[pt]=Transporte de Correio Name[sl]=Prenos pošte Name[sv]=E-postöverföring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdenetwork4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdenetwork4 checked in at Sun Dec 2 15:01:39 CET 2007. -------- --- KDE/kdenetwork4/kdenetwork4.changes 2007-11-21 18:57:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2007-11-28 11:24:52.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:24:52 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdenetwork-3.96.1.tar.bz2 r738934.diff New: ---- kdenetwork-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.sa8475/_old 2007-12-02 15:01:31.000000000 +0100 +++ /var/tmp/diff_new_pack.sa8475/_new 2007-12-02 15:01:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdenetwork4 (Version 3.96.1) +# spec file for package kdenetwork4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,16 +16,15 @@ Group: Productivity/Networking/Other Summary: KDE Network Base Package 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: kdenetwork-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime Patch2: desktop-files.diff Patch4: FIXME.diff -Patch6: r738934.diff %define with_kopete 1 Suggests: kde4-kget %if %with_kopete @@ -53,7 +52,6 @@ %setup -q -n kdenetwork-%rversion %patch2 #%patch4 -%patch6 -R %build %cmake_kde4 -d build @@ -360,6 +358,8 @@ %doc COPYING COPYING-DOCS README %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdenetwork-3.96.1.tar.bz2 -> kdenetwork-3.96.2.tar.bz2 ++++++ KDE/kdenetwork4/kdenetwork-3.96.1.tar.bz2 /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork-3.96.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdemultimedia4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdemultimedia4 checked in at Sun Dec 2 15:01:23 CET 2007. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2007-11-21 18:57:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2007-11-28 11:24:31.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:24:31 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdemultimedia-3.96.1.tar.bz2 New: ---- kdemultimedia-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.NI7701/_old 2007-12-02 15:00:54.000000000 +0100 +++ /var/tmp/diff_new_pack.NI7701/_new 2007-12-02 15:00:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdemultimedia4 (Version 3.96.1) +# spec file for package kdemultimedia4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ Group: System/GUI/KDE Summary: kdemultimedia base package 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: kdemultimedia-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -318,6 +318,8 @@ %doc COPYING COPYING-DOCS README %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdemultimedia-3.96.1.tar.bz2 -> kdemultimedia-3.96.2.tar.bz2 ++++++ Files old/kdemultimedia-3.96.1/doc/juk/index.cache.bz2 and new/kdemultimedia-3.96.2/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-3.96.1/doc/kmix/index.cache.bz2 and new/kdemultimedia-3.96.2/doc/kmix/index.cache.bz2 differ Files old/kdemultimedia-3.96.1/doc/kscd/index.cache.bz2 and new/kdemultimedia-3.96.2/doc/kscd/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/juk/juk.desktop new/kdemultimedia-3.96.2/juk/juk.desktop --- old/kdemultimedia-3.96.1/juk/juk.desktop 2007-11-14 01:19:09.000000000 +0100 +++ new/kdemultimedia-3.96.2/juk/juk.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -21,7 +21,7 @@ GenericName[da]=Musikafspiller GenericName[de]=Audio-Wiedergabe GenericName[el]=Αναπαραγωγέας μουσικής -GenericName[eo]=Muzikludilo +GenericName[eo]=Muzika ludilo GenericName[es]=Reproductor de audio GenericName[et]=Muusika mängija GenericName[eu]=Musika erreproduzigailua diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-3.96.2/kioslave/audiocd/kcmaudiocd/audiocd.desktop --- old/kdemultimedia-3.96.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2007-11-14 11:30:52.000000000 +0100 +++ new/kdemultimedia-3.96.2/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2007-11-27 18:18:12.000000000 +0100 @@ -18,7 +18,7 @@ Name[da]=Lyd-cd'er Name[de]=Audio-CDs Name[el]=CD μουσικής -Name[eo]=Son-KDoj +Name[eo]=Sonaj KD Name[es]=CDs audio Name[et]=Heliplaadid Name[eu]=Audio CD-ak @@ -74,7 +74,7 @@ Comment[da]=Lyd-cd IO-slave-indstilling Comment[de]=Einrichtung des Ein-/Ausgabemoduls für Audio-CDs Comment[el]=Ρύθμιση Audiocd IO Slave -Comment[eo]=Agordo por la muzikdiska sklavo +Comment[eo]=Agordo de la son-KD-a IO-sklavo Comment[es]=Configuración del esclavo de E/S de audiocd Comment[et]=Audio CD IO mooduli seadistamine Comment[eu]=Audiocd IO mendekoaren konfigurazioa @@ -129,6 +129,7 @@ Keywords[da]=Lyd-cd,CD,Ogg,Vorbis,Indkodning,CDDA,Bitrate Keywords[de]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,MP3 Keywords[el]=CD μουσικής,CD,Ogg,Vorbis,Κωδικοποίηση,CDDA,Ρυθμός bit +Keywords[eo]=Sona KD,KD,Ogg,Vorbis,Kodado,CDDA,Bitkvanto Keywords[es]=CD de audio,CD,Ogg,Vorbis,Codificación,CDDA,Ratio de bits Keywords[et]=audio,heli,CD,Ogg,Vorbis,kodeering,CDDA,bitikiirus Keywords[eu]=Audio CD,CD,Ogg,Vorbis,Kdeketa,CDDA,bit-maiztasuna diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/guiprofile.cpp new/kdemultimedia-3.96.2/kmix/guiprofile.cpp --- old/kdemultimedia-3.96.1/kmix/guiprofile.cpp 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/guiprofile.cpp 2007-11-27 18:18:12.000000000 +0100 @@ -426,6 +426,8 @@ QString name = attributes.value("name"); QString regexp = attributes.value("pattern"); QString show = attributes.value("show"); + QString background = attributes.value("background"); + QString switchtype = attributes.value("switchtype"); if ( !id.isNull() ) { // We need at least an "id". We can set defaults for the rest, if undefined. ProfControl *profControl = new ProfControl(); @@ -438,6 +440,12 @@ if ( name.isNull() ) { // ignore. isNull() will be checked by all users. } + if ( !background.isNull() ) { + // ignore. isNull() will be checked by all users. + } + if ( !switchtype.isNull() ) { + // ignore. isNull() will be checked by all users. + } if ( regexp.isNull() ) { // !! should do a dictonary lookup here, and i18n(). For now, just take over "id" regexp = !name.isNull() ? name : id; @@ -450,6 +458,8 @@ profControl->tab = tab; if ( show.isNull() ) { show = "*"; } profControl->show = show; + profControl->backgroundColor.setNamedColor (background); + profControl->switchtype = switchtype; _guiProfile._controls.push_back(profControl); } // id != null } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/guiprofile.h new/kdemultimedia-3.96.2/kmix/guiprofile.h --- old/kdemultimedia-3.96.1/kmix/guiprofile.h 2007-06-27 12:59:22.000000000 +0200 +++ new/kdemultimedia-3.96.2/kmix/guiprofile.h 2007-11-27 18:18:12.000000000 +0100 @@ -24,6 +24,7 @@ class Mixer; #include <qxml.h> +#include <QColor> #include <QString> #include <string> #include <map> @@ -63,6 +64,10 @@ QString regexp; // show or hide (contains the GUI type: simple, extended, full) QString show; + // For applying custom colors + QColor backgroundColor; + // For defining the switch type when it is not a standard palyback or capture switch + QString switchtype; }; struct ProfTab diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmixapplet.desktop new/kdemultimedia-3.96.2/kmix/kmixapplet.desktop --- old/kdemultimedia-3.96.1/kmix/kmixapplet.desktop 2007-11-14 11:30:52.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/kmixapplet.desktop 2007-11-27 18:18:12.000000000 +0100 @@ -63,6 +63,7 @@ Comment[cs]=Zobrazuje a umožňuje měnit hlasitost Comment[de]=Zeigt Ihnen die Lautstärkeregler und lässt Sie die Lautstärke kontrollieren Comment[el]=Εμφανίζει και σας επιτρέπει να αλλάξετε την ένταση του ήχου +Comment[eo]=Montras kaj permesas kontroli al vi la sonajn laŭtecojn Comment[es]=Muestra y le deja controlar el volumen del sonido Comment[et]=Näitab ja võimaldab kontrollida helitugevust Comment[fr]=Montre et vous permet de contrôler les volumes sonores diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmix.cpp new/kdemultimedia-3.96.2/kmix/kmix.cpp --- old/kdemultimedia-3.96.1/kmix/kmix.cpp 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/kmix.cpp 2007-11-27 18:18:12.000000000 +0100 @@ -56,6 +56,7 @@ #include "kmixprefdlg.h" #include "kmixdockwidget.h" #include "kmixtoolbox.h" +#include "viewdockareapopup.h" //#include "osd.h" // Postponed to KDE4.1 @@ -70,6 +71,7 @@ // m_visibilityUpdateAllowed( true ), m_multiDriverMode (false), // -<- I never-ever want the multi-drivermode to be activated by accident m_dockWidget() + , _dockAreaPopup(0) { setObjectName("KMixWindow"); // disable delete-on-close because KMix might just sit in the background waiting for cards to be plugged in @@ -164,7 +166,7 @@ */ bool KMixWindow::updateDocking() { - if (m_showDockWidget == false) { + if (m_showDockWidget == false) { return false; // docking is disabled } @@ -174,13 +176,24 @@ delete m_dockWidget; m_dockWidget = 0L; } + if ( _dockAreaPopup ) { + delete _dockAreaPopup; + _dockAreaPopup = 0L; + } if ( Mixer::mixers().count() == 0 ) { return false; } - // create dock widget - m_dockWidget = new KMixDockWidget( this, "mainDockWidget", m_volumeWidget ); + // create dock widget and the corresponding popup + /* A GUIProfile does not make sense for the DockAreaPopup => Using (GUIProfile*)0 */ + QWidget* referenceWidgetForSystray = this; + if ( m_volumeWidget ) { + _dockAreaPopup = new ViewDockAreaPopup(0, "dockArea", Mixer::getGlobalMasterMixer(), 0, (GUIProfile*)0, this); + _dockAreaPopup->createDeviceWidgets(); + referenceWidgetForSystray = _dockAreaPopup; + } + m_dockWidget = new KMixDockWidget( referenceWidgetForSystray, "mainDockWidget", _dockAreaPopup ); m_dockWidget->show(); return true; } @@ -575,6 +588,7 @@ bool labelsHasChanged = m_showLabels ^ prefDlg->m_showLabels->isChecked(); bool ticksHasChanged = m_showTicks ^ prefDlg->m_showTicks->isChecked(); bool dockwidgetHasChanged = m_showDockWidget ^ prefDlg->m_dockingChk->isChecked(); + bool systrayPopupHasChanged = m_volumeWidget ^ prefDlg->m_volumeChk->isChecked(); bool toplevelOrientationHasChanged = ( prefDlg->_rbVertical->isChecked() && m_toplevelOrientation == Qt::Horizontal ) || ( prefDlg->_rbHorizontal->isChecked() && m_toplevelOrientation == Qt::Vertical ); @@ -591,7 +605,7 @@ m_toplevelOrientation = Qt::Horizontal; } - if ( labelsHasChanged || ticksHasChanged || dockwidgetHasChanged || toplevelOrientationHasChanged ) { + if ( labelsHasChanged || ticksHasChanged || dockwidgetHasChanged || toplevelOrientationHasChanged || systrayPopupHasChanged) { recreateGUI(); } @@ -648,4 +662,6 @@ // It would lead to unnecesary flickering of the (complete) dock area. } + + #include "kmix.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmixctrl_restore.desktop new/kdemultimedia-3.96.2/kmix/kmixctrl_restore.desktop --- old/kdemultimedia-3.96.1/kmix/kmixctrl_restore.desktop 2007-10-23 10:39:36.000000000 +0200 +++ new/kdemultimedia-3.96.2/kmix/kmixctrl_restore.desktop 2007-11-27 18:18:12.000000000 +0100 @@ -11,7 +11,7 @@ Name[da]=Genopret mikseropsætning Name[de]=Lautstärkeeinstellungen wiederherstellen Name[el]=Αποκατάσταση ρυθμίσεων μείκτη -Name[eo]=Restarigu Miksilagordon +Name[eo]=Restarigi la miksilan agordon Name[es]=Restaurar opciones del mezclador Name[et]=Mikseri seadistuste taastamine Name[eu]=Nahasgailuaren ezarpenak berreskuratu diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmix.desktop new/kdemultimedia-3.96.2/kmix/kmix.desktop --- old/kdemultimedia-3.96.1/kmix/kmix.desktop 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/kmix.desktop 2007-11-27 18:18:12.000000000 +0100 @@ -70,7 +70,6 @@ GenericName[zh_TW]=音效混音器 Name=KMix Name[af]=Kmix -Name[eo]=Miksilo Name[lv]=KMiks Name[ne]=केडीई मिक्स Name[pa]=ਕੇ-ਮਿਕਸ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmixdockwidget.cpp new/kdemultimedia-3.96.2/kmix/kmixdockwidget.cpp --- old/kdemultimedia-3.96.1/kmix/kmixdockwidget.cpp 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/kmixdockwidget.cpp 2007-11-27 18:18:12.000000000 +0100 @@ -50,7 +50,6 @@ KMixDockWidget::KMixDockWidget(QWidget *parent, const char *, bool volumePopup ) : KSystemTrayIcon( parent ), - _dockAreaPopup(0L), _audioPlayer(0L), _playBeepOnVolumeChange(false), // disabled due to triggering a "Bug" _oldToolTipValue(-1), @@ -66,7 +65,6 @@ KMixDockWidget::~KMixDockWidget() { delete _audioPlayer; - delete _dockAreaPopup; } void KMixDockWidget::createActions() @@ -114,9 +112,6 @@ } // create devices - /* A GUIProfile does not make sense for the DockAreaPopup => Using (GUIProfile*)0 */ - _dockAreaPopup = new ViewDockAreaPopup(0, "dockArea", m_mixer, 0, (GUIProfile*)0, this); - _dockAreaPopup->createDeviceWidgets(); m_mixer->readSetFromHWforceUpdate(); // after changing the master device, make sure to re-read (otherwise no "changed()" signals might get sent by the Mixer /* With the recently introduced QSocketNotifier stuff, we can't rely on regular timer updates any longer. Also the readSetFromHWforceUpdate() won't be enough. As a workaround, we trigger @@ -244,79 +239,55 @@ _oldPixmapType = newPixmapType; } -void -KMixDockWidget::mousePressEvent(QMouseEvent * /*me*/) -{ -#ifdef __GNUC__ -#warning FIXME: ksystemtray is no longer a widget -#endif -#if 0 - if ( _dockAreaPopup == 0 ) { - return KSystemTrayIcon::mousePressEvent(me); - } - - // esken: Due to overwhelming request, LeftButton shows the ViewDockAreaPopup, if configured - // to do so. Otherwise the main window will be shown. - if ( me->button() == Qt::LeftButton ) - { - if ( ! _volumePopup ) { - // Case 1: User wants to show main window => This is the KSystemTrayIcon default action - return KSystemTrayIcon::mousePressEvent(me); - } - - // Case 2: User wants to show volume popup - if ( _dockAreaPopup->justHidden() ) - return; - - if ( _dockAreaPopup->isVisible() ) - { - _dockAreaPopup->hide(); - return; - } - - int h = _dockAreaPopup->height(); - int x = this->mapToGlobal( QPoint( 0, 0 ) ).x() - this->width()/2 - _dockAreaPopup->width()/2; - int y = this->mapToGlobal( QPoint( 0, 0 ) ).y() - h; - if ( y < 0 ) - y = y + h + this->height(); - - _dockAreaPopup->move(x, y); // so that the mouse is outside of the widget - - // Now handle Multihead displays. And also make sure that the dialog is not - // moved out-of-the screen on the right (see Bug 101742). - const QDesktopWidget* vdesktop = QApplication::desktop(); - const QRect& vScreenSize = vdesktop->screenGeometry(_dockAreaPopup); -//const QRect screenGeometry(const QWidget *widget) const - if ( (x+_dockAreaPopup->width()) > (vScreenSize.width() + vScreenSize.x()) ) { - // move horizontally, so that it is completely visible - _dockAreaPopup->move(vScreenSize.width() + vScreenSize.x() - _dockAreaPopup->width() -1 , y); - } // horizontally out-of bound - else if ( x < vScreenSize.x() ) { - _dockAreaPopup->move(vScreenSize.x(), y); - } - // the above stuff could also be implemented vertically - - _dockAreaPopup->show(); - KWindowSystem::setState(_dockAreaPopup->winId(), NET::StaysOnTop | NET::SkipTaskbar | NET::SkipPager ); - - QWidget::mousePressEvent(me); // KSystemTrayIcon's shouldn't do the default action for this - return; - } // LeftMouseButton pressed - else if ( me->button() == Qt::MidButton ) { - toggleActive(); - return; - } - else { - KSystemTrayIcon::mousePressEvent(me); - } // Other MouseButton pressed -#endif -} -void -KMixDockWidget::mouseReleaseEvent( QMouseEvent * /*me*/ ) +void KMixDockWidget::moveVolumePopoup() { + ViewDockAreaPopup* dockAreaPopup = qobject_cast<ViewDockAreaPopup*>(parent()); + if ( dockAreaPopup == 0 ) { + // If the associated parent os the MainWindow (and not the ViewDockAreaPopup), we return. + return; + } - // KSystemTrayIcon::mouseReleaseEvent(me); +/* + if ( dockAreaPopup->justHidden() ) + return; + + if ( dockAreaPopup->isVisible() ) + { +// dockAreaPopup->hide(); + return; + } +*/ + + int h = dockAreaPopup->height(); + int x = geometry().x() - geometry().width()/2 - dockAreaPopup->width()/2; + int y = geometry().y() - h; + + // kDebug() << "h="<<h<< " x="<<x << " y="<<y<< "gx="<< geometry().x() << "gy="<< geometry().y(); + + if ( y < 0 ) + y = y + h + geometry().height(); + + dockAreaPopup->move(x, y); // so that the mouse is outside of the widget + + // Now handle Multihead displays. And also make sure that the dialog is not + // moved out-of-the screen on the right (see Bug 101742). + const QDesktopWidget* vdesktop = QApplication::desktop(); + const QRect& vScreenSize = vdesktop->screenGeometry(dockAreaPopup); + //const QRect screenGeometry(const QWidget *widget) const + if ( (x+dockAreaPopup->width()) > (vScreenSize.width() + vScreenSize.x()) ) { + // move horizontally, so that it is completely visible + dockAreaPopup->move(vScreenSize.width() + vScreenSize.x() - dockAreaPopup->width() -1 , y); + } // horizontally out-of bound + else if ( x < vScreenSize.x() ) { + dockAreaPopup->move(vScreenSize.x(), y); + } + // the above stuff could also be implemented vertically + +// dockAreaPopup->show(); + KWindowSystem::setState(dockAreaPopup->winId(), NET::StaysOnTop | NET::SkipTaskbar | NET::SkipPager ); + + return; } void @@ -362,15 +333,11 @@ void KMixDockWidget::dockMute() { - MixDevice *md = 0; - if ( _dockAreaPopup != 0 ) - { - md = _dockAreaPopup->dockDevice(); - if ( md != 0 ) { - md->setMuted( !md->isMuted() ); - m_mixer->commitVolumeChange( md ); - } - } + MixDevice *md = Mixer::getGlobalMasterMD(); + if ( md != 0 ) { + md->setMuted( !md->isMuted() ); + md->mixer()->commitVolumeChange( md ); + } } @@ -378,8 +345,13 @@ { kDebug(67100) << "Systray action !!! Reason=" << reason; if ( reason == QSystemTrayIcon::MiddleClick ) { - dockMute(); + dockMute(); } + else if ( reason == QSystemTrayIcon::Trigger ) { + // Move the popup to a suitable place + if (_volumePopup) + moveVolumePopoup(); + } } void @@ -399,10 +371,9 @@ } // Enable/Disable "Muted" menu item - MixDevice *md = 0; - if ( _dockAreaPopup != 0 ) - { - md = _dockAreaPopup->dockDevice(); + ViewDockAreaPopup* dockAreaPopup = qobject_cast<ViewDockAreaPopup*>(parent()); + if ( dockAreaPopup != 0 ) { + MixDevice* md = dockAreaPopup->dockDevice(); KToggleAction *dockMuteAction = static_cast<KToggleAction*>(actionCollection()->action("dock_mute")); //kDebug(67100) << "---> md=" << md << "dockMuteAction=" << dockMuteAction << "isMuted=" << md->isMuted(); if ( md != 0 && dockMuteAction != 0 ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmixdockwidget.h new/kdemultimedia-3.96.2/kmix/kmixdockwidget.h --- old/kdemultimedia-3.96.1/kmix/kmixdockwidget.h 2007-11-14 01:19:14.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/kmixdockwidget.h 2007-11-27 18:18:12.000000000 +0100 @@ -29,7 +29,7 @@ #include <ksystemtrayicon.h> class Mixer; -class ViewDockAreaPopup; +//class ViewDockAreaPopup; class Volume; namespace Phonon @@ -48,10 +48,9 @@ void setErrorPixmap(); void ignoreNextEvent(); - ViewDockAreaPopup* getDockAreaPopup(); + //ViewDockAreaPopup* getDockAreaPopup(); Mixer *m_mixer; - ViewDockAreaPopup *_dockAreaPopup; Phonon::MediaObject *_audioPlayer; public slots: @@ -61,8 +60,7 @@ protected: void createMasterVolWidget(); void createActions(); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); + void moveVolumePopoup(); void wheelEvent(QWheelEvent *); void contextMenuAboutToShow( KMenu* menu ); void toggleMinimizeRestore(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmix.h new/kdemultimedia-3.96.2/kmix/kmix.h --- old/kdemultimedia-3.96.1/kmix/kmix.h 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/kmix.h 2007-11-27 18:18:12.000000000 +0100 @@ -44,7 +44,7 @@ class KMixDockWidget; class KMixWindow; class Mixer; - +class ViewDockAreaPopup; #include "mixer.h" @@ -115,6 +115,7 @@ QString m_hwInfoString; QVBoxLayout *m_widgetsLayout; QLabel *m_errorLabel; + ViewDockAreaPopup *_dockAreaPopup; private slots: void slotHWInfo(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/kmix.notifyrc new/kdemultimedia-3.96.2/kmix/kmix.notifyrc --- old/kdemultimedia-3.96.1/kmix/kmix.notifyrc 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/kmix.notifyrc 2007-11-27 18:18:12.000000000 +0100 @@ -4,6 +4,7 @@ Comment[ca]=Mesclador de so Comment[de]=Lautstärkeregler Comment[el]=Μείκτης ήχου +Comment[eo]=Sonmiksilo Comment[es]=Mezclador de sonido Comment[et]=Helimikser Comment[fr]=Console de mixage @@ -23,6 +24,7 @@ Name[ca]=Dispositiu d'àudio alternatiu Name[de]=Sicherungs-Audiogerät Name[el]=Αναπληρωματική συσκευή ήχου +Name[eo]=Sonaparata malantaŭiro Name[es]=Dispositivo de audio alternativo Name[et]=Varuheliseade Name[fr]=Périphérique audio sur lequel se replier @@ -40,6 +42,7 @@ Comment[ca]=Notificació del funcionament automàtic del de reserva si els dispositius preferits no estan disponibles Comment[de]=Benachrichtigung bei automatischem Wechsel zu der Sicherung, wenn das bevorzugte Gerät nicht verfügbar ist Comment[el]=Ειδοποίηση αυτόματης χρήσης της αναπληρωματικής συσκευής ήχου, αν η προκαθορισμένη δεν είναι διαθέσιμη +Comment[eo]=Atentigo dum aŭtomata malantaŭiro se la preferataj aparatoj ne uzeblas Comment[es]=Notificación sobre la selección automática de un dispositivo de audio alternativo si no está disponible el dispositivo preferido Comment[et]=Automaatne varuvariant, kui eelistatud seade pole saadaval Comment[fr]=Notification sur le repli automatique si les périphériques préférés ne sont pas disponibles diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mdwslider.cpp new/kdemultimedia-3.96.2/kmix/mdwslider.cpp --- old/kdemultimedia-3.96.1/kmix/mdwslider.cpp 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/mdwslider.cpp 2007-11-27 18:18:12.000000000 +0100 @@ -66,7 +66,7 @@ QWidget* parent, ViewBase* mw) : MixDeviceWidget(md,small,orientation,parent,mw), m_linked(true), m_defaultLabelSpacer(0), m_iconLabelSimple(0), m_qcb(0), m_muteText(0), - m_iconLayout(0), m_playbackSpacer(0), _layout(0), m_extraCaptureLabel( 0 ), m_label( 0 ), + m_playbackSpacer(0), _layout(0), m_extraCaptureLabel( 0 ), m_label( 0 ), m_captureLED( 0 ), m_captureText(0), m_captureSpacer(0) { // create actions (on _mdwActions, see MixDeviceWidget) @@ -155,9 +155,11 @@ void MDWSlider::setPlaybackExtent(int extent) { if ( playbackExtentHint() < extent ) { if ( _orientation == Qt::Vertical ) - m_playbackSpacer->setFixedHeight(extent-playbackExtentHint()); + if ( playbackExtentHint() < extent ) + m_playbackSpacer->setFixedHeight(extent-playbackExtentHint()); else - m_playbackSpacer->setFixedWidth(extent-playbackExtentHint()); + if ( playbackExtentHint() < extent ) + m_playbackSpacer->setFixedWidth(extent-playbackExtentHint()); } } @@ -248,11 +250,11 @@ QBoxLayout *controlLayout; if ( _orientation == Qt::Vertical ) { controlLayout = new QVBoxLayout(); - controlLayout->setAlignment(Qt::AlignHCenter); + controlLayout->setAlignment(Qt::AlignHCenter|Qt::AlignTop); } else { controlLayout = new QHBoxLayout(); - controlLayout->setAlignment(Qt::AlignVCenter); + controlLayout->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); } _layout->addItem( controlLayout ); @@ -265,11 +267,12 @@ QBoxLayout *volLayout; if ( _orientation == Qt::Vertical ) { volLayout = new QHBoxLayout( ); - volLayout->setAlignment(Qt::AlignTop); + // we use AlignBottom, so that Switches will be aligned with the bottom of the sliders + volLayout->setAlignment(Qt::AlignHCenter|Qt::AlignBottom); } else { volLayout = new QVBoxLayout( ); - volLayout->setAlignment(Qt::AlignLeft); + volLayout->setAlignment(Qt::AlignVCenter|Qt::AlignRight); } controlLayout->addItem( volLayout ); @@ -297,13 +300,15 @@ /* Creates the top part: Icon, PlaybackSwitch (Switch + Text) */ void MDWSlider::createWidgetsTopPart(QBoxLayout *layout, bool showMuteLED) { - if ( _orientation == Qt::Vertical ) { - m_iconLayout = new QVBoxLayout( ); + QBoxLayout *m_iconLayout; + if ( _orientation == Qt::Vertical ) { + m_iconLayout = new QVBoxLayout( ); + m_iconLayout->setAlignment(Qt::AlignHCenter|Qt::AlignTop); } else { - m_iconLayout = new QHBoxLayout( ); + m_iconLayout = new QHBoxLayout( ); + m_iconLayout->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); } - m_iconLayout->setAlignment(Qt::AlignCenter); layout->addItem(m_iconLayout); m_iconLabelSimple = 0L; @@ -315,15 +320,24 @@ m_iconLabelSimple->setToolTip( muteTip ); m_iconLayout->addSpacing( 3 ); if ( m_mixdevice->playbackVolume().hasSwitch() ) { + if ( m_mixdevice->playbackVolume().switchType() == Volume::OnSwitch ) { + m_muteText = new QLabel("On", this); // l10n() this AFTER KDE4.0 !! + } + else if ( m_mixdevice->playbackVolume().switchType() == Volume::OffSwitch ) { + m_muteText = new QLabel( "Off", this); // l10n() this AFTER KDE4.0 !! + } + else { + m_muteText = new QLabel(i18n( "Mute"), this); + } + m_iconLayout->addWidget( m_muteText ); + m_muteText->installEventFilter(this); + m_qcb = new QCheckBox(this); m_iconLayout->addWidget( m_qcb ); m_qcb->installEventFilter(this); - m_muteText = new QLabel(i18n( "Mute"), this); - m_iconLayout->addWidget( m_muteText ); - m_muteText->installEventFilter(this); connect ( m_qcb, SIGNAL( toggled(bool) ), this, SLOT(toggleMuted() ) ); - QString muteTip2( i18n( "Mute/Unmute %1", m_mixdevice->readableName() ) ); - m_qcb->setToolTip( muteTip2 ); + QString muteTip( i18n( "Mute/Unmute %1", m_mixdevice->readableName() ) ); + m_qcb->setToolTip( muteTip ); } // can be muted } m_playbackSpacer = new QWidget(this); @@ -334,53 +348,38 @@ void MDWSlider::createWidgetsBottomPart(QBoxLayout *layout, bool showCaptureLED) { // --- capture SOURCE LED -------------------------- + if ( showCaptureLED ) { + layout->addSpacing( 3 ); + } - - if ( showCaptureLED ) - { - layout->addSpacing( 3 ); + QBoxLayout *reclayout; + if ( _orientation == Qt::Vertical ) { + reclayout = new QVBoxLayout( ); + reclayout->setAlignment(Qt::AlignHCenter|Qt::AlignBottom); + } + else { + reclayout = new QHBoxLayout( ); + reclayout->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + } + layout->addItem( reclayout ); - - // --- LED LAYOUT TO CENTER --- - QBoxLayout *reclayout; - if ( _orientation == Qt::Vertical ) { - reclayout = new QVBoxLayout( ); - } - else { - reclayout = new QHBoxLayout( ); - } - reclayout->setAlignment(Qt::AlignCenter); - layout->addItem( reclayout ); - reclayout->setSizeConstraint(QLayout::SetFixedSize); - - m_captureSpacer = new QWidget(this); - reclayout->addWidget( m_captureSpacer ); - m_captureSpacer->installEventFilter(this); + m_captureSpacer = new QWidget(this); + reclayout->addWidget( m_captureSpacer ); + m_captureSpacer->installEventFilter(this); - - if( m_mixdevice->captureVolume().hasSwitch() ) - { - /* - m_captureLED = new KLedButton( Qt::red, - m_mixdevice->isRecSource()?KLed::On:KLed::Off, - KLed::Sunken, KLed::Circular, this, "RecordLED" ); - m_captureLED->setFixedSize( QSize(16, 16) ); - connect(m_captureLED, SIGNAL(stateChanged(bool)), this, SLOT(setRecsrc(bool))); - */ - m_captureLED = new QCheckBox(this); - reclayout->addWidget( m_captureLED ); - connect(m_captureLED, SIGNAL(toggled(bool)), this, SLOT(setRecsrc(bool))); - m_captureLED->installEventFilter( this ); - QString muteTip( i18n( "Capture/Uncapture %1", m_mixdevice->readableName() ) ); - m_captureLED->setToolTip( muteTip ); // @todo: Whatsthis, explaining the device - - m_captureText = new QLabel(i18n("Capture"), this); - reclayout->addWidget( m_captureText ); - m_captureText->installEventFilter(this); - } // has capture LED - - } // showCaptureLED - + if ( showCaptureLED && m_mixdevice->captureVolume().hasSwitch() ) + { + m_captureLED = new QCheckBox(this); + reclayout->addWidget( m_captureLED ); + m_captureLED->installEventFilter( this ); + connect(m_captureLED, SIGNAL(toggled(bool)), this, SLOT(setRecsrc(bool))); + QString muteTip( i18n( "Capture/Uncapture %1", m_mixdevice->readableName() ) ); + m_captureLED->setToolTip( muteTip ); // @todo: Whatsthis, explaining the device + + m_captureText = new QLabel(i18n("Capture"), this); + reclayout->addWidget( m_captureText ); + m_captureText->installEventFilter(this); + } // has capture LED } void MDWSlider::addSliders( QBoxLayout *volLayout, char type, bool addLabel) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mdwslider.h new/kdemultimedia-3.96.2/kmix/mdwslider.h --- old/kdemultimedia-3.96.1/kmix/mdwslider.h 2007-11-14 01:19:14.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/mdwslider.h 2007-11-27 18:18:12.000000000 +0100 @@ -128,7 +128,6 @@ QLabel *m_iconLabelSimple; QCheckBox* m_qcb; QLabel* m_muteText; - QBoxLayout *m_iconLayout; QWidget *m_playbackSpacer; // GUI: Middle portion (Sliders , including labels) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mixdevice.cpp new/kdemultimedia-3.96.2/kmix/mixdevice.cpp --- old/kdemultimedia-3.96.1/kmix/mixdevice.cpp 2007-10-08 09:42:18.000000000 +0200 +++ new/kdemultimedia-3.96.2/kmix/mixdevice.cpp 2007-11-27 18:18:12.000000000 +0100 @@ -23,7 +23,7 @@ #include <klocale.h> #include "mixdevice.h" - +#include "volume.h" /** * Constructs a MixDevice. A MixDevice represents one channel or control of @@ -53,11 +53,13 @@ { // Hint: "_playbackVolume" gets COPIED from "playbackVol", because the copy-constructor actually copies the volume levels. _playbackVolume = playbackVol; + _playbackVolume.setSwitchType(Volume::PlaybackSwitch); } void MixDevice::addCaptureVolume (Volume &captureVol) { _captureVolume = captureVol; + _captureVolume.setSwitchType(Volume::CaptureSwitch); } void MixDevice::addEnums(QList<QString*>& ref_enumList) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mixdevice.h new/kdemultimedia-3.96.2/kmix/mixdevice.h --- old/kdemultimedia-3.96.1/kmix/mixdevice.h 2007-11-06 08:59:57.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/mixdevice.h 2007-11-27 18:18:12.000000000 +0100 @@ -64,6 +64,7 @@ VIDEO, SURROUND, HEADPHONE, DIGITAL, AC97, SURROUND_BACK, SURROUND_LFE, SURROUND_CENTERFRONT, SURROUND_CENTERBACK }; + enum SwitchType { OnOff, Mute, Capture, Activator }; /** * Constructor: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mixdevicewidget.h new/kdemultimedia-3.96.2/kmix/mixdevicewidget.h --- old/kdemultimedia-3.96.1/kmix/mixdevicewidget.h 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/mixdevicewidget.h 2007-11-27 18:18:12.000000000 +0100 @@ -63,6 +63,7 @@ virtual void setLabeled( bool ); virtual void setTicks( bool ) {} + public slots: virtual void setDisabled( bool value ); virtual void defineKeys(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/mixer.cpp new/kdemultimedia-3.96.2/kmix/mixer.cpp --- old/kdemultimedia-3.96.1/kmix/mixer.cpp 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/mixer.cpp 2007-11-27 18:18:12.000000000 +0100 @@ -328,7 +328,7 @@ { mixer = Mixer::mixers()[i]; if ( mixer != 0 && mixer->id() == _globalMasterCard ) { - kDebug() << "Mixer::masterCard() found " << _globalMasterCard; + //kDebug() << "Mixer::masterCard() found " << _globalMasterCard; break; } } @@ -338,7 +338,7 @@ _globalMasterCard = mixer->id(); kDebug() << "Mixer::masterCard() fallback to " << _globalMasterCard; } - kDebug() << "Mixer::masterCard() returns " << mixer->id(); + //kDebug() << "Mixer::masterCard() returns " << mixer->id(); return mixer; } @@ -351,15 +351,12 @@ { md = mixer->_mixerBackend->m_mixDevices[i]; if ( md->id() == _globalMasterCardDevice ) { - kDebug() << "Mixer::masterCardDevice() found " << _globalMasterCardDevice; + //kDebug() << "Mixer::masterCardDevice() found " << _globalMasterCardDevice; break; } } } - - if ( md ) - kDebug() << "Mixer::masterCardDevice() returns " << md->id(); - else + if ( ! md ) kDebug() << "Mixer::masterCardDevice() returns 0 (no globalMaster)"; return md; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/restore_kmix_volumes.desktop new/kdemultimedia-3.96.2/kmix/restore_kmix_volumes.desktop --- old/kdemultimedia-3.96.1/kmix/restore_kmix_volumes.desktop 2007-11-14 11:30:52.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/restore_kmix_volumes.desktop 2007-11-27 18:18:12.000000000 +0100 @@ -14,7 +14,7 @@ Name[da]=Genopret mikser lydstyrke Name[de]=Lautstärken wiederherstellen Name[el]=Επαναφορά των εντάσεων του μείκτη -Name[eo]=Restarigu Miksilagordon +Name[eo]=Restarigi la miksilajn laŭtecojn Name[es]=Restaurar opciones del mezclador Name[et]=Mikseri helitugevuste taastamine Name[eu]=Nahasgailuaren bolumenak berreskuratu diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/viewdockareapopup.cpp new/kdemultimedia-3.96.2/kmix/viewdockareapopup.cpp --- old/kdemultimedia-3.96.1/kmix/viewdockareapopup.cpp 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/viewdockareapopup.cpp 2007-11-27 18:18:12.000000000 +0100 @@ -38,12 +38,12 @@ // KMix #include "mdwslider.h" #include "mixer.h" -#include "kmixdockwidget.h" +#include "kmix.h" // !! Do NOT remove or mask out "WType_Popup" // Users will not be able to close the Popup without opening the KMix main window then. // See Bug #93443, #96332 and #96404 for further details. -- esken -ViewDockAreaPopup::ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixDockWidget *dockW ) +ViewDockAreaPopup::ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixWindow *dockW ) : ViewBase(parent, name, mixer, Qt::Popup | Qt::MSWindowsFixedSizeDialogHint , vflags, guiprof), _mdw(0), _dock(dockW), _hideTimer(0) { QBoxLayout *layout = new QHBoxLayout( this ); @@ -54,6 +54,7 @@ _frame->setLineWidth( 1 ); _layoutMDW = new QGridLayout( _frame ); +// layout->addLayout(_layoutMDW); _layoutMDW->setSpacing( 1 ); _layoutMDW->setMargin( 2 ); _layoutMDW->setObjectName( "KmixPopupLayout" ); @@ -175,8 +176,8 @@ } void ViewDockAreaPopup::showPanelSlot() { - _dock->toggleActive(); - _dock->_dockAreaPopup->hide(); + _dock->setVisible(_dock->isHidden()); + hide(); } #include "viewdockareapopup.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/viewdockareapopup.h new/kdemultimedia-3.96.2/kmix/viewdockareapopup.h --- old/kdemultimedia-3.96.1/kmix/viewdockareapopup.h 2007-11-14 01:19:14.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/viewdockareapopup.h 2007-11-27 18:18:12.000000000 +0100 @@ -24,22 +24,22 @@ #include "viewbase.h" class QMouseEvent; +class QFrame; class QGridLayout; -class QWidget; class QPushButton; +class QTime; +class QWidget; class Mixer; -class KMixDockWidget; class MixDeviceWidget; class MixDevice; -class QFrame; -class QTime; +class KMixWindow; class ViewDockAreaPopup : public ViewBase { Q_OBJECT public: - ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixDockWidget *dockW); + ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixWindow *dockW); ~ViewDockAreaPopup(); MixDevice* dockDevice(); @@ -54,7 +54,7 @@ protected: MixDeviceWidget *_mdw; - KMixDockWidget *_dock; + KMixWindow *_dock; MixDevice *_dockDevice; QPushButton *_showPanelBox; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/viewsliders.cpp new/kdemultimedia-3.96.2/kmix/viewsliders.cpp --- old/kdemultimedia-3.96.1/kmix/viewsliders.cpp 2007-11-21 11:48:15.000000000 +0100 +++ new/kdemultimedia-3.96.2/kmix/viewsliders.cpp 2007-11-27 18:18:12.000000000 +0100 @@ -108,6 +108,11 @@ this, // parent this ); // View widget _layoutSliders->addWidget(mdw); + QHBoxLayout* lay = ::qobject_cast<QHBoxLayout*>(_layoutSliders); + if ( lay ) + lay->addSpacing(2); + else + qobject_cast<QVBoxLayout*>(_layoutSliders)->addSpacing(2); } @@ -149,6 +154,12 @@ // Apply the custom name from the profile md->setReadableName(control->name); // @todo: This is the wrong place. It only applies to controls in THIS type of view } + if ( !control->switchtype.isNull() ) { + if ( control->switchtype == "On" ) + md->playbackVolume().setSwitchType(Volume::OnSwitch); + else if ( control->switchtype == "Off" ) + md->playbackVolume().setSwitchType(Volume::OffSwitch); + } _mixSet->append(md); isUsed = true; // We use no "break;" ,as multiple devices could match diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kmix/volume.h new/kdemultimedia-3.96.2/kmix/volume.h --- old/kdemultimedia-3.96.1/kmix/volume.h 2007-06-27 12:59:22.000000000 +0200 +++ new/kdemultimedia-3.96.2/kmix/volume.h 2007-11-27 18:18:12.000000000 +0100 @@ -96,6 +96,14 @@ bool hasVolume() { return (_maxVolume != _minVolume); } bool isCapture() { return _isCapture; } // -<- Query thsi, to find out whether this is a capture or a playback volume + // Some playback switches control playback, and some are special. + // ALSA doesn't differentiate between playback, OnOff and special, so users can add this information in the profile. + // It is only used for GUI things, like showing a "Mute" text or tooltip + // Capture is not really used, and has only been added for completeness and future extensibility. + enum SwitchType { PlaybackSwitch, CaptureSwitch, OnSwitch, OffSwitch, SpecialSwitch }; + void setSwitchType(SwitchType type) { _switchType = type; } + Volume::SwitchType switchType() { return _switchType; } + friend std::ostream& operator<<(std::ostream& os, const Volume& vol); friend kdbgstream& operator<<(kdbgstream& os, const Volume& vol); @@ -108,7 +116,6 @@ long _maxVolume; long _minVolume; - protected: // setSwitch() and isSwitchActivated() are tricky. No regular class (incuding the Backends) shall use // these functions. Our friend class MixDevice will handle that gracefully for us. @@ -124,6 +131,7 @@ bool _hasSwitch; bool _switchActivated; + SwitchType _switchType; bool _isCapture; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/kscd/kscd.desktop new/kdemultimedia-3.96.2/kscd/kscd.desktop --- old/kdemultimedia-3.96.1/kscd/kscd.desktop 2007-10-03 13:47:39.000000000 +0200 +++ new/kdemultimedia-3.96.2/kscd/kscd.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -10,7 +10,7 @@ GenericName[da]=Cd-afspiller GenericName[de]=CD-Wiedergabe GenericName[el]=Αναπαραγωγέας CD -GenericName[eo]=Ludilo por muzikaj lumdiskoj +GenericName[eo]=KD-ludilo GenericName[es]=Reproductor de CDs GenericName[et]=CD mängija GenericName[eu]=CD erreproduzigailua @@ -61,7 +61,6 @@ GenericName[zh_TW]=CD 播放器 Name=KsCD Name[af]=Kscd -Name[eo]=Lumdiskludilo Name[sv]=Kscd Name[ta]=Ksகுறுந்தகடு Name[tg]=KsДиски Фишурда diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/libkcddb/kcmcddb/libkcddb.desktop new/kdemultimedia-3.96.2/libkcddb/kcmcddb/libkcddb.desktop --- old/kdemultimedia-3.96.1/libkcddb/kcmcddb/libkcddb.desktop 2007-11-14 01:19:09.000000000 +0100 +++ new/kdemultimedia-3.96.2/libkcddb/kcmcddb/libkcddb.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -72,7 +72,7 @@ GenericName[da]=CDDB-Indstilling GenericName[de]=CDDB-Einrichtung GenericName[el]=Ρύθμιση CDDB -GenericName[eo]=LDDB-agordo +GenericName[eo]=CDDB-agordo GenericName[es]=Configuración de CDDB GenericName[et]=CDDB seadistamine GenericName[eu]=CDDB konfigurazioa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/avi/kfile_avi.desktop new/kdemultimedia-3.96.2/strigi-analyzer/avi/kfile_avi.desktop --- old/kdemultimedia-3.96.1/strigi-analyzer/avi/kfile_avi.desktop 2007-11-06 08:59:56.000000000 +0100 +++ new/kdemultimedia-3.96.2/strigi-analyzer/avi/kfile_avi.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -11,7 +11,7 @@ Name[da]=AVI-info Name[de]=AVI-Info Name[el]=Πληροφορίες AVI -Name[eo]=AVI-informo +Name[eo]=AVI informo Name[es]=Info AVI Name[et]=AVI info Name[eu]=AVI informazioa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/flac/kfile_flac.desktop new/kdemultimedia-3.96.2/strigi-analyzer/flac/kfile_flac.desktop --- old/kdemultimedia-3.96.1/strigi-analyzer/flac/kfile_flac.desktop 2007-11-06 08:59:56.000000000 +0100 +++ new/kdemultimedia-3.96.2/strigi-analyzer/flac/kfile_flac.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -10,6 +10,7 @@ Name[da]=FLAC-Info Name[de]=FLAC-Info Name[el]=Πληροφορίες FLAC +Name[eo]=FLAC informo Name[es]=Info FLAC Name[et]=FLAC info Name[eu]=FLAC Informazioa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/mp3/kfile_mp3.desktop new/kdemultimedia-3.96.2/strigi-analyzer/mp3/kfile_mp3.desktop --- old/kdemultimedia-3.96.1/strigi-analyzer/mp3/kfile_mp3.desktop 2007-11-06 08:59:56.000000000 +0100 +++ new/kdemultimedia-3.96.2/strigi-analyzer/mp3/kfile_mp3.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -11,7 +11,7 @@ Name[da]=MP3-info Name[de]=MP3-Info Name[el]=Πληροφορίες MP3 -Name[eo]=MP3-informo +Name[eo]=MP3 informo Name[es]=Info MP3 Name[et]=MP3 info Name[eu]=MP3 informazioa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/mpc/kfile_mpc.desktop new/kdemultimedia-3.96.2/strigi-analyzer/mpc/kfile_mpc.desktop --- old/kdemultimedia-3.96.1/strigi-analyzer/mpc/kfile_mpc.desktop 2007-11-14 01:19:03.000000000 +0100 +++ new/kdemultimedia-3.96.2/strigi-analyzer/mpc/kfile_mpc.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -8,7 +8,7 @@ Name[cs]=Musepack info Name[de]=Musepack-Info Name[el]=Πληροφορίες Musepack -Name[eo]=epack-informo +Name[eo]=Musepack informo Name[es]=Info Musepack Name[et]=Musepacki info Name[eu]=Musepack informazioa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/ogg/kfile_ogg.desktop new/kdemultimedia-3.96.2/strigi-analyzer/ogg/kfile_ogg.desktop --- old/kdemultimedia-3.96.1/strigi-analyzer/ogg/kfile_ogg.desktop 2007-11-06 08:59:56.000000000 +0100 +++ new/kdemultimedia-3.96.2/strigi-analyzer/ogg/kfile_ogg.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -11,7 +11,7 @@ Name[da]=OGG-info Name[de]=OGG-Info Name[el]=Πληροφορίες OGG -Name[eo]=OGG-informo +Name[eo]=OGG informo Name[es]=Info OGG Name[et]=OGG info Name[eu]=OGG informazioa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/sid/kfile_sid.desktop new/kdemultimedia-3.96.2/strigi-analyzer/sid/kfile_sid.desktop --- old/kdemultimedia-3.96.1/strigi-analyzer/sid/kfile_sid.desktop 2007-11-14 01:19:04.000000000 +0100 +++ new/kdemultimedia-3.96.2/strigi-analyzer/sid/kfile_sid.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -10,7 +10,7 @@ Name[da]=SID-info Name[de]=SID-Info Name[el]=Πληροφορίες SID -Name[eo]=SID-informo +Name[eo]=SID informo Name[es]=Info SID Name[et]=SID info Name[eu]=SID informazioa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/theora/kfile_theora.desktop new/kdemultimedia-3.96.2/strigi-analyzer/theora/kfile_theora.desktop --- old/kdemultimedia-3.96.1/strigi-analyzer/theora/kfile_theora.desktop 2007-11-14 01:19:04.000000000 +0100 +++ new/kdemultimedia-3.96.2/strigi-analyzer/theora/kfile_theora.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -8,7 +8,7 @@ Name[cs]=theora info Name[de]=Theora-Info Name[el]=Πληροφορίες theora -Name[eo]=theora-informo +Name[eo]=theora informo Name[es]=Info Theora Name[et]=Theora info Name[eu]=theora informazioa diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-3.96.1/strigi-analyzer/wav/kfile_wav.desktop new/kdemultimedia-3.96.2/strigi-analyzer/wav/kfile_wav.desktop --- old/kdemultimedia-3.96.1/strigi-analyzer/wav/kfile_wav.desktop 2007-11-06 08:59:56.000000000 +0100 +++ new/kdemultimedia-3.96.2/strigi-analyzer/wav/kfile_wav.desktop 2007-11-27 18:18:11.000000000 +0100 @@ -11,7 +11,7 @@ Name[da]=WAV-info Name[de]=WAV-Info Name[el]=Πληροφορίες WAV -Name[eo]=WAV-informo +Name[eo]=WAV informo Name[es]=Info WAV Name[et]=WAV info Name[eu]=WAV informazioa ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdelibs4 checked in at Sun Dec 2 15:00:46 CET 2007. -------- --- KDE/kdelibs4/kdelibs4.changes 2007-11-21 18:57:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2007-11-28 11:24:02.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:24:02 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdelibs-3.96.1.tar.bz2 New: ---- fix-version.diff kdelibs-3.96.2.tar.bz2 r742999.diff r743254.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.dHN792/_old 2007-12-02 14:55:37.000000000 +0100 +++ /var/tmp/diff_new_pack.dHN792/_new 2007-12-02 14:55:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 3.96.1) +# spec file for package kdelibs4 (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: System/GUI/KDE Summary: KDE Base Libraries 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 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) Requires: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi`) Requires: kdelibs4-core >= %version @@ -32,6 +32,9 @@ Source1: _upstream Patch0: dotkde4.diff Patch1: kde3-applications.diff +Patch2: fix-version.diff +Patch3: r742999.diff +Patch4: r743254.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,6 +54,9 @@ %setup -q -n kdelibs-%rversion %patch %patch1 +%patch2 +%patch3 +%patch4 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -313,6 +319,8 @@ %dir /usr/share/kde4/servicetypes %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ fix-version.diff ++++++ --- CMakeLists.txt 2007/11/28 22:17:21 1.1 +++ CMakeLists.txt 2007/11/28 22:17:40 @@ -3,9 +3,9 @@ # set version set (KDE_VERSION_MAJOR 3) set (KDE_VERSION_MINOR 96) -set (KDE_VERSION_RELEASE 1) +set (KDE_VERSION_RELEASE 2) set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" ) -set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.0 >= 20071120)") +set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.0 >= 20071128)") # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") ++++++ kdelibs-3.96.1.tar.bz2 -> kdelibs-3.96.2.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-3.96.1.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-3.96.2.tar.bz2 differ: byte 11, line 1 ++++++ r742999.diff ++++++ ------------------------------------------------------------------------ r742999 | wstephens | 2007-11-29 16:54:38 +0100 (Thu, 29 Nov 2007) | 3 lines Add PKGCONFIG_VERSION macro that determines the version of a package using pkg-config too. ------------------------------------------------------------------------ --- cmake/modules/UsePkgConfig.cmake +++ cmake/modules/UsePkgConfig.cmake @@ -37,9 +37,9 @@ MACRO(PKGCONFIG _package _include_DIR _l EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} ) ELSE( NOT _return_VALUE) - - MESSAGE(STATUS "PKGCONFIG macro signal that ${_package} is not installed on your computer.") - MESSAGE(STATUS "Install package which contains ${_package}.pc if you want to support this feature.") + + MESSAGE(STATUS "KDE CMake PKGCONFIG macro indicates that ${_package} is not installed on your computer.") + MESSAGE(STATUS "Install the package which contains ${_package}.pc if you want to support this feature.") ENDIF(NOT _return_VALUE) @@ -47,4 +47,19 @@ MACRO(PKGCONFIG _package _include_DIR _l ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags) +MACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version) + #reset variable + SET(${_found_version}) + IF(PKGCONFIG_EXECUTABLE) + #call PKGCONFIG + PKGCONFIG(${_package} ${_include_DIR} ${_link_DIR} ${_link_FLAGS} ${_cflags}) + IF(${_include_DIR}) + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --modversion OUTPUT_VARIABLE ${_found_version}) + IF(NOT ${_found_version}) + MESSAGE(FATAL_ERROR "UsePkgConfig.cmake: No version found for ${_package}") + ENDIF(NOT ${_found_version}) + ENDIF(${_include_DIR}) + ENDIF(PKGCONFIG_EXECUTABLE) +ENDMACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version) + MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE) ++++++ r743254.diff ++++++ ------------------------------------------------------------------------ r743254 | mueller | 2007-11-30 11:39:36 +0100 (Fri, 30 Nov 2007) | 3 lines merge in the whitespace handling fixes from cmake 2.4.7 to make extragear-graphics work ------------------------------------------------------------------------ Index: cmake/modules/FindKexiv2.cmake =================================================================== --- cmake/modules/FindKexiv2.cmake (revision 743253) +++ cmake/modules/FindKexiv2.cmake (revision 743254) @@ -30,7 +30,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBR else (KEXIV2_LOCAL_FOUND_IN_LIBS) set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) endif (KEXIV2_LOCAL_FOUND_IN_LIBS) - set(KEXIV2_DEFINITIONS -I${KEXIV2_INCLUDE_DIR}) + set(KEXIV2_DEFINITIONS "-I${KEXIV2_INCLUDE_DIR}") set(KEXIV2_LIBRARIES kexiv2) message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}") set(KEXIV2_FOUND TRUE) @@ -66,7 +66,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBR endif(NOT WIN32) if(KEXIV2_VERSION_GOOD_FOUND) - set(KEXIV2_DEFINITIONS ${_KEXIV2Cflags}) + set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h ${_KEXIV2IncDir} Index: cmake/modules/FindKdcraw.cmake =================================================================== --- cmake/modules/FindKdcraw.cmake (revision 743253) +++ cmake/modules/FindKdcraw.cmake (revision 743254) @@ -31,7 +31,7 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBR else (KDCRAW_LOCAL_FOUND_IN_LIBS) set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkdcraw) endif (KDCRAW_LOCAL_FOUND_IN_LIBS) - set(KDCRAW_DEFINITIONS -I${KDCRAW_INCLUDE_DIR}) + set(KDCRAW_DEFINITIONS "-I${KDCRAW_INCLUDE_DIR}") set(KDCRAW_LIBRARIES kdcraw) message(STATUS "Found Kdcraw library in local sub-folder: ${KDCRAW_INCLUDE_DIR}") set(KDCRAW_FOUND TRUE) @@ -67,7 +67,7 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBR ENDif(NOT WIN32) if(KDCRAW_VERSION_GOOD_FOUND) - set(KDCRAW_DEFINITIONS ${_KDCRAWCflags}) + set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}") FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h ${_KDCRAWIncDir} Index: cmake/modules/UsePkgConfig.cmake =================================================================== --- cmake/modules/UsePkgConfig.cmake (revision 743253) +++ cmake/modules/UsePkgConfig.cmake (revision 743254) @@ -1,3 +1,6 @@ + +# THIS IS A SLIGHTLY ENHANCED COPY OVER THE ONE OF CMAKE 2.4.7. DO NOT MODIFY IT FURTHER + # - pkg-config module for CMake # # Defines the following macros: @@ -10,9 +13,7 @@ # variable will be empty when the function returns, otherwise they will contain the respective information # - - -FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config ) +FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin ) MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags) # reset the variables at the beginning @@ -20,6 +21,7 @@ MACRO(PKGCONFIG _package _include_DIR _l SET(${_link_DIR}) SET(${_link_FLAGS}) SET(${_cflags}) + # if pkg-config has been found IF(PKGCONFIG_EXECUTABLE) @@ -28,13 +30,22 @@ MACRO(PKGCONFIG _package _include_DIR _l # and if the package of interest also exists for pkg-config, then get the information IF(NOT _return_VALUE) - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} ) - - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR} ) - - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS} ) - - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} ) + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir + OUTPUT_VARIABLE ${_include_DIR} ) + string(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}") + + + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir + OUTPUT_VARIABLE ${_link_DIR} ) + string(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}") + + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs + OUTPUT_VARIABLE ${_link_FLAGS} ) + string(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}") + + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags + OUTPUT_VARIABLE ${_cflags} ) + string(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}") ELSE( NOT _return_VALUE) @@ -47,19 +58,4 @@ MACRO(PKGCONFIG _package _include_DIR _l ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags) -MACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version) - #reset variable - SET(${_found_version}) - IF(PKGCONFIG_EXECUTABLE) - #call PKGCONFIG - PKGCONFIG(${_package} ${_include_DIR} ${_link_DIR} ${_link_FLAGS} ${_cflags}) - IF(${_include_DIR}) - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --modversion OUTPUT_VARIABLE ${_found_version}) - IF(NOT ${_found_version}) - MESSAGE(FATAL_ERROR "UsePkgConfig.cmake: No version found for ${_package}") - ENDIF(NOT ${_found_version}) - ENDIF(${_include_DIR}) - ENDIF(PKGCONFIG_EXECUTABLE) -ENDMACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version) - MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE) Index: cmake/modules/PkgConfigVersion.cmake =================================================================== --- cmake/modules/PkgConfigVersion.cmake (revision 0) +++ cmake/modules/PkgConfigVersion.cmake (revision 743254) @@ -0,0 +1,34 @@ +# - pkg-config module for CMake + +# Copyright (c) 2007 Will Stephenson <wstephenson(a)kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +# +# Defines the following macros: +# +# PKGCONFIG_VERSION(package includedir libdir linkflags cflags) +# +# ### ADD DOCUMENTATION! +# + +include(UsePkgConfig) + +MACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version) + #reset variable + SET(${_found_version}) + IF(PKGCONFIG_EXECUTABLE) + #call PKGCONFIG + PKGCONFIG(${_package} ${_include_DIR} ${_link_DIR} ${_link_FLAGS} ${_cflags}) + IF(${_include_DIR}) + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --modversion OUTPUT_VARIABLE ${_found_version}) + IF(NOT ${_found_version}) + MESSAGE(FATAL_ERROR "UsePkgConfig.cmake: No version found for ${_package}") + ENDIF(NOT ${_found_version}) + ENDIF(${_include_DIR}) + ENDIF(PKGCONFIG_EXECUTABLE) +ENDMACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version) + +MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE) Property changes on: cmake/modules/PkgConfigVersion.cmake ___________________________________________________________________ Added: svn:mergeinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdegraphics4 checked in at Sun Dec 2 14:55:29 CET 2007. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2007-11-21 18:57:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2007-11-28 11:23:38.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:23:38 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdegraphics-3.96.1.tar.bz2 New: ---- kdegraphics-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.t31481/_old 2007-12-02 14:54:29.000000000 +0100 +++ /var/tmp/diff_new_pack.t31481/_new 2007-12-02 14:54:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 3.96.1) +# spec file for package kdegraphics4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -29,9 +29,9 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package 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: kdegraphics-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -315,12 +315,17 @@ %files -f filelists/exclude %defattr(-,root,root) %doc COPYING COPYING-DOCS README +/usr/%_lib/kde4/svgpart.so /usr/%_lib/kde4/gsthumbnail.so /usr/%_lib/strigi/strigita_dvi.so /usr/%_lib/strigi/strigita_ico.so %_kde_share_dir/services/gsthumbnail.desktop +%_kde_share_dir/apps/svgpart/svgpart.rc +%_kde_share_dir/services/svgpart.desktop %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdegraphics-3.96.1.tar.bz2 -> kdegraphics-3.96.2.tar.bz2 ++++++ ++++ 4126 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegames4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdegames4 checked in at Sun Dec 2 14:54:21 CET 2007. -------- --- KDE/kdegames4/kdegames4-carddecks.changes 2007-11-28 23:22:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdegames4/kdegames4-carddecks.changes 2007-12-02 14:53:43.283386000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:23:31 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- kdegames4.changes: same change Old: ---- kdegames-3.96.1.tar.bz2 New: ---- kdegames-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegames4-carddecks.spec ++++++ --- /var/tmp/diff_new_pack.h30569/_old 2007-12-02 14:53:52.000000000 +0100 +++ /var/tmp/diff_new_pack.h30569/_new 2007-12-02 14:53:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4-carddecks (Version 3.96.1) +# spec file for package kdegames4-carddecks (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ Group: System/GUI/KDE Summary: Default Card Decks for KDE Games Url: http://www.kde.org -Version: 3.96.1 +Version: 3.96.2 Release: 1 Source0: kdegames-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -92,6 +92,8 @@ %_kde_share_dir/apps/carddecks/svg-oxygen %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdegames4.spec ++++++ --- /var/tmp/diff_new_pack.h30569/_old 2007-12-02 14:53:52.000000000 +0100 +++ /var/tmp/diff_new_pack.h30569/_new 2007-12-02 14:53:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdegames4 (Version 3.96.1) +# spec file for package kdegames4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,9 +18,9 @@ Group: System/GUI/KDE Summary: General Data for KDE Games 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: kdegames-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -833,6 +833,8 @@ #%doc %lang(en) /usr/share/doc/kde/HTML/en/kbackgammon %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdegames-3.96.1.tar.bz2 -> kdegames-3.96.2.tar.bz2 ++++++ KDE/kdegames4/kdegames-3.96.1.tar.bz2 /mounts/work_src_done/STABLE/kdegames4/kdegames-3.96.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdebase4-workspace checked in at Sun Dec 2 14:53:42 CET 2007. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2007-11-21 18:22:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2007-12-02 14:52:27.099917000 +0100 @@ -1,0 +2,5 @@ +Sat Dec 1 01:52:13 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- kdebase-workspace-3.96.0.tar.bz2 r739332.diff r739357.diff New: ---- kdebase-workspace-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.y28284/_old 2007-12-02 14:53:10.000000000 +0100 +++ /var/tmp/diff_new_pack.y28284/_new 2007-12-02 14:53:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 3.96.0) +# spec file for package kdebase4-wallpapers (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,7 +20,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 3.96.0 +Version: 3.96.2 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +47,7 @@ %install cd build/wallpapers %makeinstall + rm $RPM_BUILD_ROOT/usr/share/wallpapers/plasma-default.* %kde_post_install %clean @@ -56,7 +57,10 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/share/wallpapers + %changelog +* Sat Dec 01 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - reenable OpenGL support * Tue Nov 20 2007 - dmueller(a)suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.y28284/_old 2007-12-02 14:53:10.000000000 +0100 +++ /var/tmp/diff_new_pack.y28284/_new 2007-12-02 14:53:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 3.96.0) +# spec file for package kdebase4-workspace (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: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 3.96.0 +Version: 3.96.2 Release: 1 -%define rversion 3.96.0 +%define rversion 3.96.2 Source0: kdebase-workspace-%rversion.tar.bz2 Source90: _upstream Source91: kdebase4-workspace-rpmlintrc @@ -31,9 +31,7 @@ Patch1: dotkde4.diff Patch3: show-runtime-only-in-kde.diff Patch4: plasma-pager.diff -Patch5: r739332.diff -Patch6: r739357.diff -Requires: kdebase4-runtime +%kde4_runtime_requires Conflicts: yast2-theme-NLD Suggests: kdebase4-ksysguardd Suggests: kde4-kdm @@ -54,8 +52,6 @@ %setup -q -n kdebase-workspace-%rversion %patch1 %patch3 -%patch5 -%patch6 #%patch4 %build @@ -65,9 +61,14 @@ %install cd build %makeinstall -# rm -rf $RPM_BUILD_ROOT/usr/share/icons/hicolor/index.theme -# rm -rf $RPM_BUILD_ROOT/usr/share/icons/oxygen - rm -rf $RPM_BUILD_ROOT/usr/share/wallpapers + %create_subdir_filelist -d kdm + %create_subdir_filelist -d kwin + cd .. + sed -ri s,.*/etc/kde4/kdm/README.*,, filelists/kdm + %create_exclude_filelist + mv $RPM_BUILD_ROOT/usr/share/wallpapers/plasma-default.* $RPM_BUILD_ROOT/usr/share/ + rm $RPM_BUILD_ROOT/usr/share/wallpapers/* + mv $RPM_BUILD_ROOT/usr/share/plasma-default.* $RPM_BUILD_ROOT/usr/share/wallpapers/ mkdir -p $RPM_BUILD_ROOT/etc mv $RPM_BUILD_ROOT/usr/etc/ksysguarddrc $RPM_BUILD_ROOT/etc/ mv $RPM_BUILD_ROOT/usr/etc/systemsettingsrc $RPM_BUILD_ROOT/etc/ @@ -93,6 +94,7 @@ %clean rm -rf $RPM_BUILD_ROOT + rm -rf filelists %package ksysguardd Group: System/GUI/KDE @@ -124,7 +126,7 @@ %package -n kde4-kwin Group: System/GUI/KDE Summary: KDE Window Manager -Requires: kdebase4-runtime +%kde4_runtime_requires %description -n kde4-kwin KWin is the window manager of the K desktop environment. @@ -141,64 +143,10 @@ %postun -n kde4-kwin %run_ldconfig -%files -n kde4-kwin +%files -n kde4-kwin -f filelists/kwin %defattr(-,root,root) %doc COPYING COPYING-DOCS README -/usr/bin/kwin -/usr/bin/kwin_killer_helper -/usr/bin/kwin_rules_dialog -/usr/%_lib/kconf_update_bin/kwin_update_default_rules -/usr/%_lib/kconf_update_bin/kwin_update_window_settings -/usr/%_lib/kde4/kcm_kwindecoration.so -/usr/%_lib/kde4/kcm_kwindesktop.so -/usr/%_lib/kde4/kcm_kwinoptions.so -/usr/%_lib/kde4/kcm_kwinrules.so -/usr/%_lib/kde4/kwin3_b2.so -/usr/%_lib/kde4/kwin3_keramik.so -/usr/%_lib/kde4/kwin3_plastik.so -/usr/%_lib/kde4/kwin3_modernsys.so -/usr/%_lib/kde4/kwin3_redmond.so -/usr/%_lib/kde4/kwin3_quartz.so -/usr/%_lib/kde4/kwin3_web.so -/usr/%_lib/kde4/kwin3_laptop.so -/usr/%_lib/kde4/kwin3_oxygen.so -/usr/%_lib/kde4/kwin_b2_config.so -/usr/%_lib/kde4/kwin_keramik_config.so -/usr/%_lib/kde4/kwin_plastik_config.so -/usr/%_lib/kde4/kwin_quartz_config.so -/usr/%_lib/kde4/kwin_modernsys_config.so -/usr/%_lib/kde4/kwin3_kde2.so -/usr/%_lib/kde4/kwin_kde2_config.so -/usr/%_lib/kde4/kcm_kwin4_effect_builtins.so -/usr/%_lib/libkdeinit4_kwin_rules_dialog.so -/usr/%_lib/libkdeinit4_kwin.so -%_kde_share_dir/apps/kconf_update/kwin3_plugin.pl -%_kde_share_dir/apps/kconf_update/kwin_focus1.sh -%_kde_share_dir/apps/kconf_update/kwin_focus2.sh -/usr/share/kde4/apps/kconf_update/kwin_on_off.upd -/usr/share/kde4/apps/kconf_update/on-off_to_true-false.sh -%_kde_share_dir/apps/kwin -%_kde_share_dir/services/kwin -%_kde_share_dir/servicetypes/kwineffect.desktop -%_kde_share_dir/config.kcfg/kwin.kcfg -/usr/share/dbus-1/interfaces/org.kde.KWin.xml -/usr/share/icons/crystalsvg/*/apps/kwin.* -/usr/share/icons/crystalsvg/*/apps/kcmkwm.* -%_kde_share_dir/services/kwinactions.desktop -%_kde_share_dir/services/kwinadvanced.desktop -%_kde_share_dir/services/kwindecoration.desktop -%_kde_share_dir/services/kwinfocus.desktop -%_kde_share_dir/services/kwinmoving.desktop -%_kde_share_dir/services/kwinoptions.desktop -%_kde_share_dir/services/kwinrules.desktop -%_kde_share_dir/apps/kconf_update/kwin.upd -%_kde_share_dir/apps/kconf_update/kwin3_plugin.upd -%_kde_share_dir/apps/kconf_update/kwin_focus1.upd -%_kde_share_dir/apps/kconf_update/kwin_focus2.upd -%_kde_share_dir/apps/kconf_update/kwin_fsp_workarounds_1.upd -%_kde_share_dir/apps/kconf_update/kwiniconify.upd -%_kde_share_dir/apps/kconf_update/kwinsticky.upd -%_kde_share_dir/apps/kconf_update/kwinupdatewindowsettings.upd +%dir /usr/share/kde4/services/kwin %package devel Requires: libkdepimlibs4-devel @@ -216,8 +164,7 @@ -------- The KDE Team <kde(a)kde.org> - -%files devel +%files devel -f filelists/exclude %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/include/* @@ -238,7 +185,7 @@ %package -n kde4-kdm Group: System/GUI/KDE Summary: KDE login and display manager -Requires: kdebase4-runtime +%kde4_runtime_requires %description -n kde4-kdm This package contains kdm, the login and session manager for KDE. @@ -269,36 +216,21 @@ %postun -n kde4-kdm %run_ldconfig -%files -n kde4-kdm +%files -n kde4-kdm -f filelists/kdm %defattr(-,root,root) %doc COPYING COPYING-DOCS README %doc %lang(en) /usr/share/doc/kde/HTML/en/kdm -/usr/bin/genkdmconf -/usr/bin/kdm -%_kde4_modules/libexec/kdm_config -/usr/bin/kdmctl -%_kde4_modules/libexec/kdm_greet -%_kde4_modules/libexec/krootimage /usr/%_lib/kde4/kgreet_classic.so /usr/%_lib/kde4/kgreet_winbind.so /usr/%_lib/kde4/kcm_kdm.so -%dir %_kde_share_dir/apps/doc -%dir %_kde_share_dir/apps/doc/kdm %dir /etc/kde4/kdm -/etc/kde4/kdm/Xaccess -/etc/kde4/kdm/Xreset -/etc/kde4/kdm/Xsession -/etc/kde4/kdm/Xsetup -/etc/kde4/kdm/Xstartup -/etc/kde4/kdm/Xwilling -/etc/kde4/kdm/backgroundrc %config /etc/kde4/kdm/kdmrc -%_kde_share_dir/apps/doc/kdm/README -%_kde_share_dir/apps/kdm %_kde_share_dir/services/kdm.desktop %config %_kde_config_dir/kdm.knsrc +%dir /usr/share/kde4/apps/doc +%dir /usr/share/kde4/apps/doc/kdm -%files +%files -f filelists/exclude %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/bin/kaccess @@ -409,12 +341,14 @@ /usr/%_lib/kde4/plugins/designer/ksysguardwidgets.so /usr/%_lib/libkdecorations.so.* /usr/%_lib/libkdeinit4_kaccess.so +/usr/%_lib/libkdeinit_plasma.so /usr/%_lib/libkdeinit4_kcminit.so /usr/%_lib/libkdeinit4_kcminit_startup.so /usr/%_lib/libkdeinit4_kcontroledit.so /usr/%_lib/libkdeinit4_khotkeys.so /usr/%_lib/libkdeinit4_klipper.so /usr/%_lib/libkdeinit4_kmenuedit.so +/usr/%_lib/libkdeinit4_krunner.so /usr/%_lib/libkdeinit4_ksmserver.so /usr/%_lib/libkdeinit4_ksysguard.so /usr/%_lib/libkdeinit4_kxkb.so @@ -477,7 +411,6 @@ /usr/share/icons/hicolor/*/apps/ktip.* /usr/share/icons/hicolor/*/apps/kxkb.* %_kde_share_dir/services/accessibility.desktop -%_kde_share_dir/services/background.desktop %_kde_share_dir/services/bell.desktop %_kde_share_dir/services/clock.desktop %_kde_share_dir/services/devices.desktop @@ -519,6 +452,7 @@ %_kde_share_dir/services/xserver.desktop %_kde_share_dir/servicetypes/plasma-runner.desktop %_kde_share_dir/servicetypes/screensaver.desktop +/usr/share/wallpapers /usr/share/sounds/pop.wav /etc/systemsettingsrc /usr/bin/solidshell @@ -537,7 +471,6 @@ #/usr/share/kde4/services/kxkb_part.desktop /usr/share/kde4/apps/solid /usr/share/applications/kde4/systemsettings.desktop -/usr/share/icons/crystalsvg/*/apps/networkmanager.* /usr/share/icons/hicolor/*/apps/systemsettings.* /usr/share/kde4/apps/solidfakebluetoothbackend /usr/share/kde4/apps/solidfakenetbackend @@ -573,6 +506,7 @@ /usr/share/icons/oxygen/*/apps/kdeapp.* /usr/share/icons/oxygen/*/apps/kernel.* /usr/share/icons/oxygen/*/apps/ksysguardd.* +/usr/share/icons/oxygen/*/apps/networkmanager.* /usr/share/icons/oxygen/*/apps/running.* /usr/share/icons/oxygen/*/apps/shell.* /usr/share/icons/oxygen/*/apps/unknownapp.* @@ -591,7 +525,11 @@ %doc %lang(en) /usr/share/doc/kde/HTML/en/kmenuedit %doc %lang(en) /usr/share/doc/kde/HTML/en/ksysguard %doc %lang(en) /usr/share/doc/kde/HTML/en/kxkb +%doc %lang(en) /usr/share/doc/kde/HTML/en/plasma + %changelog +* Sat Dec 01 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - reenable OpenGL support * Tue Nov 20 2007 - dmueller(a)suse.de ++++++ kdebase-workspace-3.96.0.tar.bz2 -> kdebase-workspace-3.96.2.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-3.96.0.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-3.96.2.tar.bz2 differ: byte 11, line 1 ++++++ show-runtime-only-in-kde.diff ++++++ --- /var/tmp/diff_new_pack.y28284/_old 2007-12-02 14:53:10.000000000 +0100 +++ /var/tmp/diff_new_pack.y28284/_new 2007-12-02 14:53:10.000000000 +0100 @@ -3,5 +3,5 @@ @@ -21,3 +21,4 @@ X-DCOP-ServiceType=Unique - Categories=Qt;KDE;Core; + Categories=Qt;KDE;Settings; +OnlyShowIn=KDE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdebase4-runtime checked in at Sun Dec 2 14:52:26 CET 2007. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2007-11-28 10:51:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2007-12-01 01:53:40.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Dec 1 01:53:34 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- --- KDE/kdebase4-runtime/oxygen-icon-theme.changes 2007-11-21 09:04:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/oxygen-icon-theme.changes 2007-12-01 01:54:10.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Dec 1 01:54:06 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdebase-runtime-3.96.1.tar.bz2 New: ---- kdebase-runtime-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.b27321/_old 2007-12-02 14:52:05.000000000 +0100 +++ /var/tmp/diff_new_pack.b27321/_new 2007-12-02 14:52:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-runtime (Version 3.96.1) +# spec file for package kdebase4-runtime (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: System/GUI/KDE Summary: The KDE Runtime Components 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: kdebase-runtime-%rversion.tar.bz2 #Source1: _upstream #Source2: rpmlintrc @@ -156,6 +156,7 @@ /usr/share/applications/kde4/Help.desktop /usr/share/applications/kde4/knetattach.desktop %_kde_share_dir/apps/drkonqi +%_kde_share_dir/apps/kio_thumbnail %_kde_share_dir/apps/kcm_componentchooser %_kde_share_dir/apps/kcmlocale %_kde_share_dir/apps/kconf_update/kuriikwsfilter.upd @@ -182,7 +183,6 @@ /usr/share/desktop-directories/kde-information.directory /usr/share/icons/hicolor/*/apps/khelpcenter.* /usr/share/icons/hicolor/*/apps/knetattach.* -/usr/share/icons/crystalsvg/*/apps/hwinfo.* %_kde_share_dir/services/kcm_phononxine.desktop %_kde_share_dir/services/phononbackends/xine.desktop %_kde_share_dir/services/about.protocol @@ -278,6 +278,8 @@ /usr/share/kde4/man %changelog +* Sat Dec 01 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 28 2007 - dmueller(a)suse.de - update to 3.96.1 * Thu Nov 15 2007 - wstephenson(a)suse.de ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.b27321/_old 2007-12-02 14:52:05.000000000 +0100 +++ /var/tmp/diff_new_pack.b27321/_new 2007-12-02 14:52:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package oxygen-icon-theme (Version 3.96.1) +# spec file for package oxygen-icon-theme (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ Group: System/GUI/KDE Summary: Oxygen Icon Theme Url: http://www.kde.org -Version: 3.96.1 +Version: 3.96.2 Release: 1 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable @@ -91,6 +91,8 @@ /usr/share/icons/oxygen %changelog +* Sat Dec 01 2007 - dmueller(a)suse.de +- update to 3.96.2 * Thu Nov 15 2007 - wstephenson(a)suse.de - update to 3.96.0 * Mon Oct 08 2007 - dmueller(a)suse.de ++++++ kdebase-runtime-3.96.1.tar.bz2 -> kdebase-runtime-3.96.2.tar.bz2 ++++++ KDE/kdebase4-runtime/kdebase-runtime-3.96.1.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase-runtime-3.96.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0