Hello community, here is the log from the commit of package kepas checked in at Wed Jul 30 01:11:43 CEST 2008. -------- --- KDE/kepas/kepas.changes 2008-04-11 11:28:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/kepas/kepas.changes 2008-07-28 16:46:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 28 16:45:29 CEST 2008 - tpatzig@suse.de + +- fixed build failures in the plasmoid, caused due Plasma api changes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kepas.spec ++++++ --- /var/tmp/diff_new_pack.C14679/_old 2008-07-30 01:11:26.000000000 +0200 +++ /var/tmp/diff_new_pack.C14679/_new 2008-07-30 01:11:26.000000000 +0200 @@ -17,7 +17,7 @@ Summary: Kepas - KDE Easy Publish and Share Url: http://kde-apps.org/content/show.php/Kepas+-+KDE+Easy+Publish+and+Share?cont... Version: 0.9 -Release: 16 +Release: 49 %define rversion 4.0.0 Requires: kepas-devel Source0: kepas-%{version}.tar.bz2 @@ -88,6 +88,8 @@ %_libdir/libkpf.so %changelog +* Mon Jul 28 2008 tpatzig@suse.de +- fixed build failures in the plasmoid, caused due Plasma api changes * Thu Apr 10 2008 tpatzig@suse.de - fixed crash on plasma startup (bnc#372669) service publishing needs to be done asyncronously ++++++ kepas-0.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kepas-0.9/src/CMakeLists.txt new/kepas-0.9/src/CMakeLists.txt --- old/kepas-0.9/src/CMakeLists.txt 2008-01-29 17:36:05.000000000 +0100 +++ new/kepas-0.9/src/CMakeLists.txt 2008-07-28 14:42:06.000000000 +0200 @@ -18,6 +18,7 @@ if(PLASMA_FOUND) + #MESSAGE(STATUS "Plasma applets was disable until it will ported to new API") add_subdirectory(plasma) endif(PLASMA_FOUND) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kepas-0.9/src/lib/buddylist.ui new/kepas-0.9/src/lib/buddylist.ui --- old/kepas-0.9/src/lib/buddylist.ui 2008-01-06 23:27:11.000000000 +0100 +++ new/kepas-0.9/src/lib/buddylist.ui 2008-06-02 13:18:14.000000000 +0200 @@ -370,9 +370,6 @@ </disabled> </palette> </property> - <property name="windowTitle" > - <string>BuddyList</string> - </property> <widget class="QWidget" name="centralwidget" > <layout class="QVBoxLayout" > <item> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kepas-0.9/src/lib/CMakeLists.txt new/kepas-0.9/src/lib/CMakeLists.txt --- old/kepas-0.9/src/lib/CMakeLists.txt 2008-01-24 01:02:31.000000000 +0100 +++ new/kepas-0.9/src/lib/CMakeLists.txt 2008-07-22 02:45:12.000000000 +0200 @@ -36,8 +36,8 @@ kde4_add_library(kepas SHARED ${libkifer_SRCS}) target_link_libraries(kepas - ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS}) + ${QT_QTNETWORK_LIBRARY} ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS}) install(TARGETS kepas - DESTINATION ${LIB_INSTALL_DIR}) + ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kepas-0.9/src/libkpf/CMakeLists.txt new/kepas-0.9/src/libkpf/CMakeLists.txt --- old/kepas-0.9/src/libkpf/CMakeLists.txt 2008-01-29 17:36:05.000000000 +0100 +++ new/kepas-0.9/src/libkpf/CMakeLists.txt 2008-05-26 22:11:02.000000000 +0200 @@ -72,5 +72,5 @@ ${QT_QT3SUPPORT_LIBRARIES} ${KDE4_KDNSSD_LIBRARY}) install(TARGETS kpf - DESTINATION ${LIB_INSTALL_DIR}) + ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kepas-0.9/src/plasma/plasma-applet-kepas.desktop new/kepas-0.9/src/plasma/plasma-applet-kepas.desktop --- old/kepas-0.9/src/plasma/plasma-applet-kepas.desktop 2008-04-03 09:06:15.000000000 +0200 +++ new/kepas-0.9/src/plasma/plasma-applet-kepas.desktop 2008-05-17 16:19:26.000000000 +0200 @@ -4,6 +4,7 @@ Comment=Kepas - KDE Easy Publish and Share Comment[es]=Kepas. Publicar y compartir fácil para KDE Comment[et]=Kepas - KDE lihtne avaldamine ja jagamine +Comment[it]=Kepas - Pubblica e condividi in maniera semplice su KDE Comment[pt]=Kepas - Publicação e Partilha Simples no KDE Comment[sv]=Kepas - publicera och dela enkelt i KDE Icon=folder-remote diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kepas-0.9/src/plasma/plasma-kifer.cpp new/kepas-0.9/src/plasma/plasma-kifer.cpp --- old/kepas-0.9/src/plasma/plasma-kifer.cpp 2008-04-10 17:46:24.000000000 +0200 +++ new/kepas-0.9/src/plasma/plasma-kifer.cpp 2008-07-28 16:19:49.000000000 +0200 @@ -36,10 +36,25 @@ PlasmaKifer::PlasmaKifer(QObject *parent, const QVariantList &args) : Plasma::Applet(parent, args), -// m_svg("widgets/background", this), -// m_size(100,100), m_icon(0) { + setHasConfigurationInterface(true); + m_dialog = 0; + publicServerWiz = 0; + configDialog = 0; + + setAspectRatioMode(Plasma::ConstrainedSquare); + setBackgroundHints(NoBackground); + m_icon = new Plasma::Icon(KIcon("folder-remote"),QString(),this); + m_icon->setNumDisplayLines(1); + m_icon->setDrawBackground(true); + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(this); + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); + + layout->addItem(m_icon); + + resize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Desktop))); } @@ -49,21 +64,13 @@ avahiClient = new ServiceLocator(this); // connect(avahiClient, SIGNAL(serviceRuns()),this, SLOT(failedToStart())); - m_icon = new Plasma::Icon(KIcon("folder-remote"),QString(),this); - createMenu(); connect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); connect(&m_menu, SIGNAL(aboutToHide()),m_icon, SLOT(setUnpressed())); - setHasConfigurationInterface(true); setAcceptDrops(true); setAcceptsHoverEvents(true); - setDrawStandardBackground(false); - setImmutable(false); - m_dialog = 0; - publicServerWiz = 0; - configDialog = 0; webServerHash = new QHash<QString, WebServer*>; webServerMenuHash = new QHash<QString, QMenu*>; actionHash = new QHash<QString, QAction*>; @@ -81,11 +88,6 @@ PlasmaKifer::~PlasmaKifer() { - if (failedToLaunch()) { - // Do some cleanup here - } else { - // Save settings - } if (m_dialog) delete m_dialog; @@ -123,29 +125,27 @@ m_menu.clear(); } -void PlasmaKifer::constraintsUpdated(Plasma::Constraints constraints) +void PlasmaKifer::constraintsEvent(Plasma::Constraints constraints) { - setDrawStandardBackground(false); - setImmutable(false); + setBackgroundHints(NoBackground); + if (constraints & Plasma::FormFactorConstraint) { - disconnect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); + disconnect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); if (formFactor() == Plasma::Planar || formFactor() == Plasma::MediaCenter) { - connect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); - + connect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); m_icon->setText(i18n("Kepas")); - setMinimumContentSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Desktop))); + m_icon->setDrawBackground(true); + setMinimumSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Desktop))); } else { connect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); m_icon->setText(QString()); // m_icon->setInfoText(QString()); - setMinimumContentSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Small))); + setMinimumSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Small))); + m_icon->setDrawBackground(false); } } - if (constraints & Plasma::SizeConstraint) { - m_icon->resize(contentSize()); - } } @@ -177,7 +177,7 @@ m_menu.hide(); return; } - +/* QPointF scenePos = mapToScene(boundingRect().topLeft()); QGraphicsView *viewWidget = view(); QDesktopWidget *desktop = QApplication::desktop(); @@ -191,14 +191,16 @@ if (globalPos.y() + size.height() + menuHeight < desktopRect.bottom()) { - globalPos.ry() += contentSize().height(); + globalPos.ry() += geometry().size().height(); }else{ globalPos.ry() -= menuHeight; } - m_menu.popup(globalPos); +// m_menu.popup(globalPos); +*/ + m_menu.popup(popupPosition(m_menu.sizeHint())); m_icon->setPressed(); - } - addClipEntries(); +// } + addClipEntries(); } void PlasmaKifer::dragEnterEvent(QGraphicsSceneDragDropEvent *event) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kepas-0.9/src/plasma/plasma-kifer.h new/kepas-0.9/src/plasma/plasma-kifer.h --- old/kepas-0.9/src/plasma/plasma-kifer.h 2008-04-10 17:46:24.000000000 +0200 +++ new/kepas-0.9/src/plasma/plasma-kifer.h 2008-07-28 16:19:49.000000000 +0200 @@ -70,7 +70,7 @@ void dragEnterEvent(QGraphicsSceneDragDropEvent *event); void dropEvent(QGraphicsSceneDragDropEvent *event); void showConfigurationInterface(); - void constraintsUpdated(Plasma::Constraints constraints); + void constraintsEvent(Plasma::Constraints constraints); private: Plasma::Svg m_svg; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org