[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/plasma-desktoplayout/kdebase-workspace-plasma (silent)
From:       Ambroz Bizjak <ambrop7 () gmail ! com>
Date:       2009-01-28 1:01:57
Message-ID: 1233104517.628559.8048.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 917544 by abizjak:

SVN_SILENT Merge upstream changes.


 M  +1 -0      applets/tasks/abstracttaskitem.cpp  
 M  +4 -1      applets/tasks/tasks.cpp  
 M  +2 -0      applets/tasks/tasks.h  
 M  +0 -1      applets/webbrowser/webbrowser.cpp  
 M  +2 -0      design/CHANGELOG  
 M  +5 -14     scriptengines/python/plasma_importer.py  
 M  +6 -10     scriptengines/python/pydataengine.py  
 M  +3 -3      shells/desktop/desktopview.cpp  


--- branches/work/plasma-desktoplayout/kdebase-workspace-plasma/applets/tasks/abstracttaskitem.cpp \
#917543:917544 @@ -152,6 +152,7 @@
     if (((m_flags & TaskWantsAttention) != 0) != ((flags & TaskWantsAttention) != \
                0)) {
         //kDebug() << "task attention state changed" << m_attentionTimerId;
         if (flags & TaskWantsAttention) {
+            m_applet->needsVisualFocus();
             // start attention getting
             if (!m_attentionTimerId) {
                 m_attentionTimerId = startTimer(500);
--- branches/work/plasma-desktoplayout/kdebase-workspace-plasma/applets/tasks/tasks.cpp \
#917543:917544 @@ -392,8 +392,11 @@
     return m_showTooltip;
 }
 
+void Tasks::needsVisualFocus()
+{
+    emit activate();
+}
 
-
 void Tasks::themeRefresh()
 {
     delete m_taskItemBackground;
--- branches/work/plasma-desktoplayout/kdebase-workspace-plasma/applets/tasks/tasks.h \
#917543:917544 @@ -102,7 +102,9 @@
 
         bool showTooltip() const;
 
+        void needsVisualFocus();
 
+
 signals:
     /**
     * emitted whenever we receive a constraintsEvent
--- branches/work/plasma-desktoplayout/kdebase-workspace-plasma/applets/webbrowser/webbrowser.cpp \
#917543:917544 @@ -214,7 +214,6 @@
 WebBrowser::~WebBrowser()
 {
     delete m_completion;
-    delete m_bookmarkManager;
     delete m_bookmarkModel;
 }
 
--- branches/work/plasma-desktoplayout/kdebase-workspace-plasma/design/CHANGELOG \
#917543:917544 @@ -34,6 +34,8 @@
      * Plasmoids and Containments
          * Twitter
              * Added support for other Twitter API based services like identi.ca \
(that is based on laconi.ca). +         * File Watcher
+             * Added support for filtering (both regular expressions and exact \
matches are supported).  
 KRunner
 -------
--- branches/work/plasma-desktoplayout/kdebase-workspace-plasma/scriptengines/python/plasma_importer.py \
#917543:917544 @@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright 2008 Simon Edwards <simon@simonzone.com>
 #
@@ -25,13 +26,12 @@
     def __init__(self):
         self.toplevel = {}
         self.toplevelcount = {}
-        sys.path.append('<plasma>')
+        self.marker = '<plasma>' + str(id(self))
+        sys.path.append(self.marker)
         sys.path_hooks.append(self.hook)
-        #print("PlasmaImporter.__init__: sys.path:" + repr(sys.path))
 
     def hook(self,path):
-      if path=='<plasma>':
-          #print("plasma_thingy:"+ path)
+      if path==self.marker:
           return self
       else:
           raise ImportError()
@@ -54,11 +54,8 @@
                     del sys.modules[key]
 
     def find_module(self,fullname, path=None):
-        #print('find_module(%s,%s)' % (fullname,path) )
-
         location = self.find_pymod(fullname)
         if location is not None:
-            #print("Found in " + location[0])
             return self
         else:
             return None
@@ -91,27 +88,21 @@
         return open(location).read()
 
     def load_module(self, fullname):
-        #print('load_module fullname: '+fullname)
-
         location,ispkg = self.find_pymod(fullname)
-        #print("Location:"+location)
         if ispkg:   # Package dir.
             initlocation = os.path.join(location,'__init__.py')
             code = None
             if os.path.isfile(initlocation):
-                #code = self._get_code(initlocation)
                 code = open(initlocation)
         else:
-            #code = self._get_code(location)
             code = open(location)
 
         mod = sys.modules.setdefault(fullname, imp.new_module(fullname))
         mod.__file__ = location #"<%s>" % self.__class__.__name__
         mod.__loader__ = self
         if ispkg:
-            mod.__path__ = ["<plasma>"]
+            mod.__path__ = [self.marker]
         if code is not None:
-            #print("code is:"+code)
             try:
                 exec code in mod.__dict__
             finally:
--- branches/work/plasma-desktoplayout/kdebase-workspace-plasma/scriptengines/python/pydataengine.py \
#917543:917544 @@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # Copyright 2008 Simon Edwards <simon@simonzone.com>
 #
@@ -22,27 +23,23 @@
 import plasma_importer
 
 class PythonDataEngineScript(Plasma.DataEngineScript):
+    importer = None
+
     def __init__(self, parent):
         Plasma.DataEngineScript.__init__(self,parent)
-        self.importer = plasma_importer.PlasmaImporter()
+        if PythonDataEngineScript.importer is None:
+            PythonDataEngineScript.importer = plasma_importer.PlasmaImporter()
         self.initialized = False
 
     def init(self):
-        print("Script Name: " + self.dataEngine().name())
-
         self.m_moduleName = str(self.dataEngine().pluginName())
-        print("pluginname: " + str(self.dataEngine().pluginName()))
         self.plugin_name = str(self.dataEngine().pluginName()).replace('-','_')
 
-        self.importer.register_top_level(self.plugin_name, \
str(self.dataEngine().package().path())) +        \
PythonDataEngineScript.importer.register_top_level(self.plugin_name, \
str(self.dataEngine().package().path()))  
-        print("mainscript: " + \
                str(self.dataEngine().package().filePath("mainscript")))
-        print("package path: " + str(self.dataEngine().package().path()))
-
         # import the code at the file name reported by mainScript()
         self.module = __import__(self.plugin_name+'.main')
         self.pydataengine = self.module.main.CreateDataEngine(None)
-        #self.pydataengine.setDataEngine(self.dataEngine())
         self.pydataengine.setDataEngineScript(self)
         self.pydataengine.init()
 
@@ -50,7 +47,6 @@
         return True
 
     def __dtor__(self):
-        print("~PythonDataEngineScript()")
         PythonAppletScript.importer.unregister_top_level(self.plugin_name)
         self.pydataengine = None
 
--- branches/work/plasma-desktoplayout/kdebase-workspace-plasma/shells/desktop/desktopview.cpp \
#917543:917544 @@ -19,7 +19,7 @@
 
 #include "desktopview.h"
 
-#include <QAction>
+#include <KAction>
 #include <QFile>
 #include <QWheelEvent>
 #include <QCoreApplication>
@@ -80,12 +80,12 @@
         containment->enableAction("add sibling containment", false);
     }
     //FIXME should we have next/prev or up/down/left/right or what?
-    QAction *action = new QAction(i18n("Next Activity"), this);
+    KAction *action = new KAction(i18n("Next Activity"), this);
     action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     action->setShortcut(QKeySequence(Qt::ALT + Qt::Key_D, Qt::Key_Right));
     connect(action, SIGNAL(triggered()), this, SLOT(nextContainment()));
     addAction(action);
-    action = new QAction(i18n("Previous Activity"), this);
+    action = new KAction(i18n("Previous Activity"), this);
     action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     action->setShortcut(QKeySequence(Qt::ALT + Qt::Key_D, Qt::Key_Left));
     connect(action, SIGNAL(triggered()), this, SLOT(previousContainment()));


[prev in list] [next in list] [prev in thread] [next in thread]