[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma
From: Ambroz Bizjak <ambrop7 () gmail ! com>
Date: 2009-01-30 21:38:36
Message-ID: 1233351516.518641.433.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 918867 by abizjak:
SVN_SILENT Merge upstream changes.
M +0 -1 applets/webbrowser/webbrowser.cpp
M +1 -0 dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop
M +1 -0 dataengines/time/plasma-dataengine-time.desktop
M +1 -0 scriptengines/javascript/tests/script-digital-clock/metadata.desktop
M +1 -0 scriptengines/python/examples/applets/pyclock/metadata.desktop
M +1 -0 scriptengines/python/examples/dataengines/pytime/metadata.desktop
M +5 -14 scriptengines/python/plasma_importer.py
M +6 -10 scriptengines/python/pydataengine.py
M +1 -0 scriptengines/qedjescript/plasma-appletscript-qedje.desktop
M +2 -0 scriptengines/qedjescript/plasma-packagestructure-qedje.desktop
M +1 -0 scriptengines/ruby/examples/applets/clock/metadata.desktop
M +1 -0 scriptengines/ruby/examples/applets/webapplet/metadata.desktop
M +1 -0 scriptengines/ruby/examples/dataengines/dbpedia_albums/metadata.desktop \
M +1 -0 scriptengines/ruby/examples/dataengines/time/metadata.desktop
M +2 -0 scriptengines/webkit/plasma-packagestructure-web.desktop
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/applets/webbrowser/webbrowser.cpp \
#918866:918867 @@ -214,7 +214,6 @@
WebBrowser::~WebBrowser()
{
delete m_completion;
- delete m_bookmarkManager;
delete m_bookmarkModel;
}
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop \
#918866:918867 @@ -87,6 +87,7 @@
Comment[eu]=Sistemari buruzko informazioa Plasmoidentzako
Comment[fr]=Informations système pour les plasmoïdes
Comment[fy]=Systeem ynformaasje foar Plasmoids
+Comment[ga]=Eolas faoin Chóras le haghaidh Plasmoids
Comment[gl]=Información do sistema para os Plasmoides
Comment[gu]=પ્લાઝમોઇડ માટે સિસ્ટમ \
માહિતી Comment[he]=מידע של המערכת עבור \
פלסמואידים
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/dataengines/time/plasma-dataengine-time.desktop \
#918866:918867 @@ -18,6 +18,7 @@
Name[fi]=Päivämäärä ja aika
Name[fr]=Date et Heure
Name[fy]=Datum en tiid
+Name[ga]=Dáta agus Am
Name[gl]=Data e hora
Name[gu]=તારીખ અને સમય
Name[he]=תאריך ושעה
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/javascript/tests/script-digital-clock/metadata.desktop \
#918866:918867 @@ -19,6 +19,7 @@
Comment[es]=Reloj javascript digital
Comment[et]=Javascripti digikell
Comment[fr]=Horloge numérique JavaScript
+Comment[ga]=Clog digiteach Javascript
Comment[gl]=Reloxo dixital escrito en JavaScript
Comment[is]=JavaScript stafræn klukka
Comment[it]=Orologio digitale JavaScript
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/python/examples/applets/pyclock/metadata.desktop \
#918866:918867 @@ -17,6 +17,7 @@
Name[fi]=Python-kello
Name[fr]=Horloge Python
Name[fy]=Python klok
+Name[ga]=Clog Python
Name[gl]=Reloxo en Python
Name[gu]=પાયથોન ઘડિયાળ
Name[he]=שעון של פייתון
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/python/examples/dataengines/pytime/metadata.desktop \
#918866:918867 @@ -16,6 +16,7 @@
Name[fi]=Päivämäärä ja aika Pythonilla
Name[fr]=Date et heure Python
Name[fy]=Python Datum en tiid
+Name[ga]=Dáta agus Am Python
Name[gl]=Data e hora en Python
Name[gu]=પાયથોન તારીખ અને સમય
Name[he]=תאריך ושעה של פייתון
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/python/plasma_importer.py \
#918866:918867 @@ -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-4.2/kdebase-workspace-plasma/scriptengines/python/pydataengine.py \
#918866:918867 @@ -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-4.2/kdebase-workspace-plasma/scriptengines/qedjescript/plasma-appletscript-qedje.desktop \
#918866:918867 @@ -14,6 +14,7 @@
Comment[eu]=QEdje gadget-ak
Comment[fi]=QEdje-sovelmat
Comment[fr]=Gadgets QEdje
+Comment[ga]=Giuirléidí QEdje
Comment[gl]=Gadgets de QEdje
Comment[gu]=QEdje ગેજેટ્સ
Comment[hi]=क्यूईडीजेई गज़ेट
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/qedjescript/plasma-packagestructure-qedje.desktop \
#918866:918867 @@ -10,6 +10,7 @@
Name[eu]=QEdje gadget-ak
Name[fi]=QEdje-sovelmat
Name[fr]=Gadgets QEdje
+Name[ga]=Giuirléidí QEdje
Name[gl]=Gadgets de QEdje
Name[gu]=QEdje ગેજેટ્સ
Name[hi]=क्यूईडीजेई गज़ेट
@@ -53,6 +54,7 @@
Comment[eu]=QEdje gadget-a
Comment[fi]=QEdje-sovelma
Comment[fr]=Gadget QEdje
+Comment[ga]=Giuirléid QEdje
Comment[gl]=Gadget de QEdje
Comment[gu]=QEdje ગેજેટ
Comment[hi]=क्यूईडीजेई गज़ेट
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/ruby/examples/applets/clock/metadata.desktop \
#918866:918867 @@ -13,6 +13,7 @@
Name[eu]=Ruby erloju analogikoa
Name[fr]=Horloge analogique Ruby
Name[fy]=Ruby analoge klok
+Name[ga]=Clog Analógach Ruby
Name[gl]=Reloxo analóxico escrito en Ruby
Name[gu]=રૂબી સાદી ઘડિયાળ
Name[he]=שעון א לוגי ברובי
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/ruby/examples/applets/webapplet/metadata.desktop \
#918866:918867 @@ -15,6 +15,7 @@
Name[eu]=Ruby web arakatzailea
Name[fr]=Navigateur Web Ruby
Name[fy]=Ruby webblêder
+Name[ga]=Brabhsálaí Gréasáin Ruby
Name[gl]=Navegador web escrito en Ruby
Name[gu]=રૂબી વેબ બ્રાઉઝર
Name[he]=דפדפן רשת הכתוב ב־Ruby
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/ruby/examples/dataengines/dbpedia_albums/metadata.desktop \
#918866:918867 @@ -11,6 +11,7 @@
Name[et]=DBpedia päringud
Name[eu]=DBpedia kontsultak
Name[fr]=Requêtes DBpedia
+Name[ga]=Iarratais DBpedia
Name[gl]=Procuras na DBpedia
Name[gu]=DBpedia પ્રશ્નો
Name[hi]=डीबीपीडिया क्वैरी
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/ruby/examples/dataengines/time/metadata.desktop \
#918866:918867 @@ -18,6 +18,7 @@
Name[fi]=Päivämäärä ja aika
Name[fr]=Date et Heure
Name[fy]=Datum en tiid
+Name[ga]=Dáta agus Am
Name[gl]=Data e hora
Name[gu]=તારીખ અને સમય
Name[he]=תאריך ושעה
--- branches/work/plasma-desktoplayout-4.2/kdebase-workspace-plasma/scriptengines/webkit/plasma-packagestructure-web.desktop \
#918866:918867 @@ -16,6 +16,7 @@
Name[eu]=Web widget-ak
Name[fi]=Web-sovelmat
Name[fr]=Plasmoïdes Web
+Name[ga]=Giuirléidí Gréasáin
Name[gl]=Widgets web
Name[gu]=વેબ વિજેટ્સ
Name[he]=וידג'טים אי טר טיים
@@ -68,6 +69,7 @@
Comment[eu]=HTML widget-a
Comment[fi]=HTML-sovelma
Comment[fr]=Plasmoïde HTML
+Comment[ga]=Giuirléid HTML
Comment[gl]=Widget HTML
Comment[gu]=HTML વિજેટ
Comment[hi]=एचटीएमएल विज़ेट
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic