Mailinglist Archive: opensuse-commit (1083 mails)

< Previous Next >
commit kdeaddons4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 04 Sep 2007 01:33:18 +0200
  • Message-id: <20070903233318.EA8296781B8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdeaddons4
checked in at Tue Sep 4 01:33:18 CEST 2007.

--------
--- KDE/kdeaddons4/kdeaddons4.changes   2007-09-02 17:15:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeaddons4/kdeaddons4.changes  2007-09-04 00:51:37.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep  4 00:51:32 CEST 2007 - dmueller@xxxxxxx
+
+- disable kicker subpackage 
+
+-------------------------------------------------------------------

New:
----
  disable-kicker.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdeaddons4.spec ++++++
--- /var/tmp/diff_new_pack.uz5584/_old  2007-09-04 01:33:09.000000000 +0200
+++ /var/tmp/diff_new_pack.uz5584/_new  2007-09-04 01:33:09.000000000 +0200
@@ -10,19 +10,20 @@
 
 
 Name:           kdeaddons4
-BuildRequires:  SDL-devel db-devel gtk-devel kdebase4-devel kdebase4-workspace-devel kdepim4-devel libkdegames4-devel libkonq4-devel libqca2-devel
+BuildRequires:  SDL-devel db-devel gtk-devel kdebase4-devel kdepim4-devel
+BuildRequires:  libkdegames4-devel libkonq4-devel libqca2-devel
 License:        GPL v2 or later, LGPL v2 or later
 Group:          System/GUI/KDE
 Summary:        kdeaddons base package
 URL:            http://www.kde.org
 Version:        3.93.0
-Release:        2
+Release:        4
 Source0:        kdeaddons-%version.tar.bz2
 Source1:        _upstream
+Patch0:         disable-kicker.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       kdebase4-runtime
 Suggests:       kdeaddons4-konqueror
-Suggests:       kdeaddons4-kicker
 Suggests:       kde4-ksig
 Suggests:       kde4-fsview
 Suggests:       kdeaddons4-renamedlgplugins
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q -n kdeaddons-%version
+%patch0
 
 %build
   %cmake_kde4 -d build
@@ -128,43 +130,6 @@
 %_kde_share_dir/apps/microformat
 %config %_kde_config_dir/translaterc
 /usr/bin/kio_media_realfolder
-%package kicker
-Group:          System/GUI/KDE
-Summary:        KDE Panel Applets
-Requires:       kdebase4-runtime
-
-%description kicker
-This package contains applets for the KDE panel which originate from
-the kdeaddons module.
-
-
-
-Authors:
---------
-    The KDE Team <kde@xxxxxxx>
-
-
-%post kicker
-%run_ldconfig
-
-%postun kicker
-%run_ldconfig
-
-%files kicker
-%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
-/usr/%_lib/kde4/kbinaryclock_panelapplet.so
-/usr/%_lib/kde4/kolourpicker_panelapplet.so
-/usr/%_lib/kde4/ktimemon_panelapplet.so
-/usr/%_lib/kde4/math_panelapplet.so
-
-%_kde_share_dir/apps/kicker/applets
-%doc %lang(en) /usr/share/doc/kde/HTML/en/kicker-applets
-/usr/share/icons/oxygen/*/apps/kbinaryclock.*
-/usr/share/icons/oxygen/*/apps/ktimemon.*
-
-%_kde_share_dir/config.kcfg/kbinaryclock.kcfg
-/usr/share/icons/locolor/*/apps/ktimemon.*
 %package -n kde4-ksig
 Group:          Productivity/Networking/Email/Utilities
 Summary:        Signatur Editor
@@ -282,6 +247,8 @@
 /usr/%_lib/strigi/strigita_mhtml.so
 
 %changelog
+* Tue Sep 04 2007 - dmueller@xxxxxxx
+- disable kicker subpackage
 * Sun Sep 02 2007 - stbinner@xxxxxxx
 - update to 3.93.0.svn707651
 * Sat Sep 01 2007 - stbinner@xxxxxxx

++++++ disable-kicker.diff ++++++
--- doc/CMakeLists.txt.sav
+++ doc/CMakeLists.txt
@@ -1,5 +1,5 @@
 if ( Q_WS_X11 )
-       add_subdirectory(kicker-applets)
+   #   add_subdirectory(kicker-applets)
 endif ( Q_WS_X11 )
 add_subdirectory(konq-plugins)
 add_subdirectory(ksig)
++++++ kdeaddons-3.93.0.tar.bz2 ++++++
Files old/kdeaddons-3.93.0/doc/kicker-applets/index.cache.bz2 and new/kdeaddons-3.93.0/doc/kicker-applets/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/babel/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/babel/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/crashes/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/crashes/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/dirfilter/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/dirfilter/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/domtreeviewer/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/domtreeviewer/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/fsview/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/fsview/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/imgallery/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/imgallery/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/khtmlsettings/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/khtmlsettings/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/mediaplayer/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/mediaplayer/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/uachanger/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/uachanger/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/validators/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/validators/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/konq-plugins/webarchiver/index.cache.bz2 and new/kdeaddons-3.93.0/doc/konq-plugins/webarchiver/index.cache.bz2 differ
Files old/kdeaddons-3.93.0/doc/ksig/index.cache.bz2 and new/kdeaddons-3.93.0/doc/ksig/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/kbinaryclock/CMakeLists.txt new/kdeaddons-3.93.0/kicker-applets/kbinaryclock/CMakeLists.txt
--- old/kdeaddons-3.93.0/kicker-applets/kbinaryclock/CMakeLists.txt     2007-08-31 12:20:18.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/kbinaryclock/CMakeLists.txt     2007-07-26 12:35:55.000000000 +0200
@@ -14,7 +14,7 @@
 
 
 
-target_link_libraries(kbinaryclock_panelapplet  ${KDE4_KDE3SUPPORT_LIBS} )
+target_link_libraries(kbinaryclock_panelapplet  ${KDE4_KDE3SUPPORT_LIBS} kickermain )
 
 install(TARGETS kbinaryclock_panelapplet  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/kolourpicker/CMakeLists.txt new/kdeaddons-3.93.0/kicker-applets/kolourpicker/CMakeLists.txt
--- old/kdeaddons-3.93.0/kicker-applets/kolourpicker/CMakeLists.txt     2007-08-29 22:57:21.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/kolourpicker/CMakeLists.txt     2007-07-26 12:35:55.000000000 +0200
@@ -8,7 +8,7 @@
 
 
 
-target_link_libraries(kolourpicker_panelapplet  ${KDE4_KDE3SUPPORT_LIBS})
+target_link_libraries(kolourpicker_panelapplet  ${KDE4_KDE3SUPPORT_LIBS} kickermain )
 
 install(TARGETS kolourpicker_panelapplet  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/kolourpicker/kolourpicker.cpp new/kdeaddons-3.93.0/kicker-applets/kolourpicker/kolourpicker.cpp
--- old/kdeaddons-3.93.0/kicker-applets/kolourpicker/kolourpicker.cpp   2007-08-29 22:57:21.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/kolourpicker/kolourpicker.cpp   2007-07-26 12:35:55.000000000 +0200
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 
-$Id: kolourpicker.cpp 706281 2007-08-29 20:57:21Z mueller $
+$Id: kolourpicker.cpp 682260 2007-07-02 08:52:55Z ilic $
 */
 
 #include <qfile.h>
@@ -56,18 +56,18 @@
 // Applet initialization function
 extern "C"
 {
-       KDE_EXPORT K3PanelApplet* init(QWidget *parent, const QString& configFile)
+       KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
        {
                KGlobal::locale()->insertCatalog("kolourpicker");
-               return new KolourPicker(configFile, K3PanelApplet::Normal,
-                       K3PanelApplet::About | K3PanelApplet::Help,
+               return new KolourPicker(configFile, Plasma::Normal,
+                       Plasma::About | Plasma::Help,
                        parent, "kolourpicker");
        }
 }
 
-KolourPicker::KolourPicker(const QString& configFile, K3PanelApplet::Type type,
+KolourPicker::KolourPicker(const QString& configFile, Plasma::Type type,
        int actions, QWidget *parent, const char *name)
-       : K3PanelApplet(configFile, type, actions, parent),
+       : KPanelApplet(configFile, type, actions, parent),
          m_picking(0)
 {
        KAboutData *about = new KAboutData("kolourpicker", 0,
@@ -210,7 +210,7 @@
                delete popup;
        }
        else
-               K3PanelApplet::mouseReleaseEvent(e);
+               KPanelApplet::mouseReleaseEvent(e);
 }
 
 // set both clipboard and selection
@@ -234,7 +234,7 @@
                e->accept();
                return;
        }
-       K3PanelApplet::keyPressEvent(e);
+       KPanelApplet::keyPressEvent(e);
 }
 
 void KolourPicker::resizeEvent(QResizeEvent *)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/kolourpicker/kolourpicker.h new/kdeaddons-3.93.0/kicker-applets/kolourpicker/kolourpicker.h
--- old/kdeaddons-3.93.0/kicker-applets/kolourpicker/kolourpicker.h     2007-08-29 22:57:21.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/kolourpicker/kolourpicker.h     2007-02-19 10:49:36.000000000 +0100
@@ -28,17 +28,17 @@
 #include <QKeyEvent>
 #include <QResizeEvent>
 
-#include <k3panelapplet.h>
+#include <plasma/kpanelapplet.h>
 #include <kcomponentdata.h>
 
 class KComponentData;
 class QPushButton;
 
-class KolourPicker : public K3PanelApplet
+class KolourPicker : public KPanelApplet
 {
        Q_OBJECT
 public:
-       explicit KolourPicker(const QString& configFile, K3PanelApplet::Type t = K3PanelApplet::Normal, int actions = 0,
+       explicit KolourPicker(const QString& configFile, Plasma::Type t = Plasma::Normal, int actions = 0,
                QWidget *parent = 0, const char *name = 0);
     ~KolourPicker();
        virtual int heightForWidth(int) const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/ktimemon/CMakeLists.txt new/kdeaddons-3.93.0/kicker-applets/ktimemon/CMakeLists.txt
--- old/kdeaddons-3.93.0/kicker-applets/ktimemon/CMakeLists.txt 2007-08-29 22:59:25.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/ktimemon/CMakeLists.txt 2007-07-26 12:35:55.000000000 +0200
@@ -6,7 +6,7 @@
 
 
 
-target_link_libraries(ktimemon_panelapplet  ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
+target_link_libraries(ktimemon_panelapplet  ${KDE4_KIO_LIBS} kickermain ${QT_QT3SUPPORT_LIBRARY} )
 
 install(TARGETS ktimemon_panelapplet  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/ktimemon/confdlg.cc new/kdeaddons-3.93.0/kicker-applets/ktimemon/confdlg.cc
--- old/kdeaddons-3.93.0/kicker-applets/ktimemon/confdlg.cc     2007-08-29 22:59:25.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/ktimemon/confdlg.cc     2007-02-19 10:49:36.000000000 +0100
@@ -74,15 +74,15 @@
     autoScaleBox = new QCheckBox(i18n("&Automatic"), b);
     connect(autoScaleBox, SIGNAL(toggled(bool)), this, SLOT(toggle(bool)));
 
-    pageScaleEdit = new KIntNumInput(1000, b);
+    pageScaleEdit = new KIntNumInput(intervalEdit, 1000, b);
     pageScaleEdit->setRange(10, 10000, 10);
     pageScaleEdit->setLabel(i18n("&Paging:"), Qt::AlignVCenter | Qt::AlignLeft);
 
-    swapScaleEdit = new KIntNumInput(1000, b);
+    swapScaleEdit = new KIntNumInput(pageScaleEdit, 1000, b);
     swapScaleEdit->setRange(1, 10000, 5);
     swapScaleEdit->setLabel(i18n("&Swapping:"), Qt::AlignVCenter | Qt::AlignLeft);
 
-    ctxScaleEdit  = new KIntNumInput(10000, b);
+    ctxScaleEdit  = new KIntNumInput(swapScaleEdit, 10000, b);
     ctxScaleEdit->setLabel(i18n("&Context switch:"), Qt::AlignVCenter | Qt::AlignLeft);
     ctxScaleEdit->setRange(1, 10000, 30);
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/ktimemon/timemon.cc new/kdeaddons-3.93.0/kicker-applets/ktimemon/timemon.cc
--- old/kdeaddons-3.93.0/kicker-applets/ktimemon/timemon.cc     2007-08-29 22:59:25.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/ktimemon/timemon.cc     2007-05-03 10:37:24.000000000 +0200
@@ -36,11 +36,11 @@
 
 extern "C"
 {
-    KDE_EXPORT K3PanelApplet* init(QWidget *parent, const QString& configFile)
+    KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
     {
         KGlobal::locale()->insertCatalog("ktimemon");
-        KTimeMon *mon = new KTimeMon(configFile, K3PanelApplet::Normal,
-                                     K3PanelApplet::Preferences, parent, "ktimemon");
+        KTimeMon *mon = new KTimeMon(configFile, Plasma::Normal,
+                                     Plasma::Preferences, parent, "ktimemon");
         return mon;
     }
 }
@@ -61,7 +61,7 @@
 }
 
 // -----------------------------------------------------------------------------
-// some K3PanelApplet API functions
+// some KPanelApplet API functions
 
 int KTimeMon::widthForHeight(int height) const
 {
@@ -166,8 +166,8 @@
 {
     if (event->type() == QEvent::ToolTip) {
         QPoint p(static_cast<QHelpEvent*>(event)->pos());
-       if (sample == 0) return K3PanelApplet::event(event);
-       if(!rect().contains(p)) return K3PanelApplet::event(event);
+       if (sample == 0) return KPanelApplet::event(event);
+       if(!rect().contains(p)) return KPanelApplet::event(event);
 
        KSample::Sample s = sample->getSample(100); // scale to 100(%)
        int idle = 100 - s.kernel - s.user - s.nice;
@@ -183,16 +183,16 @@
        QToolTip::showText(static_cast<QHelpEvent*>(event)->globalPos(), str);
     }
 
-    return K3PanelApplet::event(event);
+    return KPanelApplet::event(event);
 }
 
 // -- KTimeMon definition ------------------------------------------------
 
 // Initialise the member variables, read the configuration data base,
 // set up the widget, and start the timer.
-KTimeMon::KTimeMon(const QString& configFile, K3PanelApplet::Type type, int actions,
+KTimeMon::KTimeMon(const QString& configFile, Plasma::Type type, int actions,
                QWidget *parent, const char *name)
-    : K3PanelApplet(configFile, type, actions, parent, Qt::WNoAutoErase),
+    : KPanelApplet(configFile, type, actions, parent, Qt::WNoAutoErase),
     configDialog(0), bgProcess(0),
     kernelColour("red1"), userColour("blue"),
     niceColour("yellow"), iowaitColour("darkgreen"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/ktimemon/timemon.h new/kdeaddons-3.93.0/kicker-applets/ktimemon/timemon.h
--- old/kdeaddons-3.93.0/kicker-applets/ktimemon/timemon.h      2007-08-29 22:59:25.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/ktimemon/timemon.h      2007-05-03 10:37:24.000000000 +0200
@@ -20,7 +20,7 @@
 #include <QMouseEvent>
 #include <QPaintEvent>
 #include <kiconloader.h>
-#include <k3panelapplet.h>
+#include <plasma/kpanelapplet.h>
 
 // -- global constants ---------------------------------------------------
 
@@ -47,12 +47,12 @@
  * case it hides itself).
  */
 
-class KTimeMon : public K3PanelApplet {
+class KTimeMon : public KPanelApplet {
     Q_OBJECT
 public:
     enum MouseAction { NOTHING, SWITCH, MENU, COMMAND };
 
-    explicit KTimeMon(const QString& configFile, K3PanelApplet::Type t = K3PanelApplet::Normal, int actions = 0,
+    explicit KTimeMon(const QString& configFile, Plasma::Type t = Plasma::Normal, int actions = 0,
              QWidget *parent = 0, const char *name = 0);
     virtual ~KTimeMon();
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/math/CMakeLists.txt new/kdeaddons-3.93.0/kicker-applets/math/CMakeLists.txt
--- old/kdeaddons-3.93.0/kicker-applets/math/CMakeLists.txt     2007-08-30 09:31:48.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/math/CMakeLists.txt     2007-07-26 12:35:55.000000000 +0200
@@ -8,7 +8,7 @@
 
 
 
-target_link_libraries(math_panelapplet  ${KDE4_KDE3SUPPORT_LIBS} kworkspace )
+target_link_libraries(math_panelapplet  ${KDE4_KDE3SUPPORT_LIBS} kworkspace kickermain )
 
 install(TARGETS math_panelapplet  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/math/mathapplet.cpp new/kdeaddons-3.93.0/kicker-applets/math/mathapplet.cpp
--- old/kdeaddons-3.93.0/kicker-applets/math/mathapplet.cpp     2007-08-30 09:31:48.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/math/mathapplet.cpp     2007-05-03 10:37:24.000000000 +0200
@@ -32,7 +32,6 @@
 #include <QMouseEvent>
 #include <QResizeEvent>
 #include <libworkspace/kworkspace.h>
-#include <k3panelapplet.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kconfig.h>
@@ -52,16 +51,16 @@
 
 extern "C"
 {
-  KDE_EXPORT K3PanelApplet* init(QWidget *parent, const QString& configFile)
+  KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
   {
     KGlobal::locale()->insertCatalog("kmathapplet");
-    return new MathApplet(configFile, K3PanelApplet::Stretch, 0, parent, "kmathapplet");
+    return new MathApplet(configFile, Plasma::Stretch, 0, parent, "kmathapplet");
   }
 }
 
-MathApplet::MathApplet(const QString& configFile, K3PanelApplet::Type type, int actions,
+MathApplet::MathApplet(const QString& configFile, Plasma::Type type, int actions,
                              QWidget *parent, const char *name)
-  : K3PanelApplet(configFile, type, actions, parent),
+  : KPanelApplet(configFile, type, actions, parent),
     m_hasFocus(false)
 {
   //  setBackgroundMode(X11ParentRelative);
@@ -194,7 +193,7 @@
     setButtonText();
 }
 
-void MathApplet::positionChange(K3PanelApplet::Position)
+void MathApplet::positionChange(Plasma::Position)
 {
     setButtonText();
 }
@@ -203,7 +202,7 @@
 {
     QString t;
 
-    if (position() == K3PanelApplet::Left)
+    if (position() == Plasma::Left)
        {
            if (width() >= 42)
                t = i18n("< Eval");
@@ -234,7 +233,7 @@
 void MathApplet::popup_combo()
 {
     QPoint p;
-    if (position() == K3PanelApplet::Left)
+    if (position() == Plasma::Left)
        p = mapToGlobal(QPoint(-_input->width()-1, 0));
     else
        p = mapToGlobal(QPoint(width()+1, 0));
@@ -280,7 +279,7 @@
 {
     if ( e->button() != Qt::RightButton )
     {
-        K3PanelApplet::mousePressEvent( e );
+        KPanelApplet::mousePressEvent( e );
         return;
     }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/kicker-applets/math/mathapplet.h new/kdeaddons-3.93.0/kicker-applets/math/mathapplet.h
--- old/kdeaddons-3.93.0/kicker-applets/math/mathapplet.h       2007-08-30 09:31:48.000000000 +0200
+++ new/kdeaddons-3.93.0/kicker-applets/math/mathapplet.h       2007-05-03 10:37:24.000000000 +0200
@@ -31,20 +31,20 @@
 #include <QMouseEvent>
 #include <QLabel>
 #include <QResizeEvent>
+#include <plasma/kpanelapplet.h>
 
 class QLabel;
 class KHBox;
 class QPushButton;
 class KHistoryComboBox;
 class KMenu;
-class K3PanelApplet;
 
-class MathApplet : public K3PanelApplet
+class MathApplet : public KPanelApplet
 {
     Q_OBJECT
 
 public:
-    explicit MathApplet(const QString& configFile, K3PanelApplet::Type t = K3PanelApplet::Stretch, int actions = 0,
+    explicit MathApplet(const QString& configFile, Plasma::Type t = Plasma::Stretch, int actions = 0,
              QWidget *parent = 0, const char *name = 0);
     virtual ~MathApplet();
 
@@ -53,7 +53,7 @@
 
 protected:
     void resizeEvent(QResizeEvent*);
-    void positionChange(K3PanelApplet::Position);
+    void positionChange(Plasma::Position);
 
 protected slots:
     void evaluate(const QString&);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/konq-plugins/sidebar/metabar/src/metabar_add.desktop new/kdeaddons-3.93.0/konq-plugins/sidebar/metabar/src/metabar_add.desktop
--- old/kdeaddons-3.93.0/konq-plugins/sidebar/metabar/src/metabar_add.desktop   2007-08-31 10:00:52.000000000 +0200
+++ new/kdeaddons-3.93.0/konq-plugins/sidebar/metabar/src/metabar_add.desktop   2007-08-29 11:52:00.000000000 +0200
@@ -1,19 +1,19 @@
 [Desktop Entry]
 Comment=A Konqueror navigation panel
-Comment[bg]=Навигационен панел за плеър за мултимедийни файлове
-Comment[ca]=Un plafó de navegació del Konqueror
+Comment[bg]=Приставка за навигация в браузъра Konqueror
+Comment[ca]=Un plafó de navegació del konqueror
 Comment[de]=Ein Navigationsbereich für Konqueror
-Comment[el]=Πρόσθετο πλαισίου πλοήγησης του Konqueror
+Comment[el]=Ένα πρόσθετο πίνακα πλοήγησης του konqueror
 Comment[es]=Un panel de navegación de Konqueror
-Comment[fa]=تابلوی ناوش Konqueror
-Comment[ga]=Painéal Nascleanúna Konqueror
+Comment[fa]=تابلوی ناوش konqueror
+Comment[ga]=Painéal nascleanúna Konqueror
 Comment[ja]=Konqueror のナビゲーションパネルの一つ
 Comment[nds]=En Sietpaneel för Konqueror
-Comment[ne]=कन्क्वेररको नेभिगेसन प्यानल
+Comment[ne]=कन्क्वेरर नेभिगेसन प्यानल
 Comment[nl]=Een navigatiepaneel voor Konqueror
 Comment[pa]=ਇੱਕ ਕੋਨਕਿਊਰੋਰ ਨੇਵੀਗੇਸ਼ਨ ਪੈਨਲ
-Comment[pt]=Um 'plugin' de reprodução multimédia no painel de navegação do Konqueror
-Comment[pt_BR]=Um 'plugin' de reprodução multimédia no painel de navegação do Konqueror
+Comment[pt]=Um 'plugin' de navegação do konqueror
+Comment[pt_BR]=Um 'plugin' de navegação do konqueror
 Comment[sv]=En navigeringspanel för Konqueror
 Comment[zh_TW]=Konqueror 導覽面板
 Encoding=UTF-8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeaddons-3.93.0/konq-plugins/sidebar/metabar/src/metabar.desktop new/kdeaddons-3.93.0/konq-plugins/sidebar/metabar/src/metabar.desktop
--- old/kdeaddons-3.93.0/konq-plugins/sidebar/metabar/src/metabar.desktop       2007-08-31 10:00:52.000000000 +0200
+++ new/kdeaddons-3.93.0/konq-plugins/sidebar/metabar/src/metabar.desktop       2007-08-29 11:52:00.000000000 +0200
@@ -21,23 +21,30 @@
 Comment[sv]=En navigeringspanel för Konqueror
 Comment[zh_TW]=Konqueror 導覽面板
 Name=Metabar
+Name[de]=Metabar
 Name[el]=Γραμμή μεταδεδομένων
-Name[es]=Metabarra
+Name[es]=metabarra
+Name[et]=Metabar
 Name[fa]=فرامیله
-Name[fy]=Metabalke
+Name[fi]=metapalkki
+Name[fr]=Metabar
+Name[fy]=metabalke
+Name[hu]=Metabar
 Name[ja]=メタバー
 Name[km]=របារ​មេតា
 Name[lt]=Meta juosta
 Name[ne]=मेटाबार
-Name[nl]=Metabalk
+Name[nl]=metabalk
 Name[pa]=ਮੈਟਾ-ਪੱਟੀ
+Name[pl]=Metabar
 Name[pt_BR]=MetaBar
 Name[ru]=Сведения
-Name[sr]=Метапалета
-Name[sr@latin]=Metapaleta
+Name[sl]=Metabar
+Name[sr]=метапалета
+Name[sr@latin]=metapaleta
 Name[sv]=Metarad
-Name[vi]=Siêu Thanh
-Name[x-test]=xxMetabarxx
+Name[vi]=siêu thanh
+Name[x-test]=xxmetabarxx
 
 Open=false
 X-KDE-KonqSidebarModule=konqsidebar_metabar



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread