[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 <ambro () b4ever ! net>
Date:       2009-01-16 20:27:48
Message-ID: 1232137668.329555.9752.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 912168 by abizjak:

SVN_SILENT Merge upstream changes.


 M  +2 -0      animators/default/plasma-animator-default.desktop  
 M  +5 -5      applets/CMakeLists.txt  
 M  +16 -2     applets/activitybar/plasma-applet-activitybar.desktop   [TRAILING \
SPACE]  M  +1 -0      applets/analog-clock/clock.cpp  
 M  +4 -0      applets/analog-clock/plasma-applet-analogclock.desktop  
 M  +8 -1      applets/battery/plasma-battery-default.desktop  
 M  +7 -3      applets/calendar/calendar.cpp  
 M  +12 -1     applets/calendar/plasma-applet-calendar.desktop  
 M  +1 -1      applets/devicenotifier/notifierdialog.cpp  
 M  +3 -1      applets/devicenotifier/notifierview.cpp  
 M  +13 -1     applets/devicenotifier/plasma-applet-devicenotifier.desktop   \
[TRAILING SPACE]  M  +4 -1      \
applets/devicenotifier/test-predicate-openinwindow.desktop    M  +26 -17    \
applets/digital-clock/clock.cpp    M  +12 -3     \
applets/digital-clock/plasma-applet-digitalclock.desktop   [TRAILING SPACE]  M  +13 \
-3     applets/icon/plasma-applet-icon.desktop   [TRAILING SPACE]  M  +6 -1      \
applets/kickoff/applet/plasma-applet-launcher.desktop    M  +102 -56   \
applets/kickoff/core/applicationmodel.cpp    M  +7 -1      \
applets/kickoff/core/applicationmodel.h    M  +1 -1      \
applets/kickoff/core/org.kde.kickoff.recent.xml    M  +1 -1      \
applets/kickoff/core/recentlyusedmodel.cpp    M  +4 -0      \
applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop    M  +9 -3      \
applets/kickoff/ui/contextmenufactory.cpp    M  +11 -3     \
applets/lock_logout/plasma-applet-lockout.desktop    M  +26 -54    \
applets/pager/pager.cpp    M  +0 -1      applets/pager/pager.h  
 M  +12 -2     applets/pager/plasma-pager-default.desktop  
 M  +10 -6     applets/quicklaunch/CMakeLists.txt  
 M  +14 -3     applets/quicklaunch/plasma-applet-quicklaunch.desktop  
 M  +1 -0      applets/quicklaunch/quicklaunchApplet.cpp  
 M  +13 -0     applets/system-monitor/plasma-applet-sm_cpu.desktop  
 M  +13 -0     applets/system-monitor/plasma-applet-sm_hdd.desktop  
 M  +17 -0     applets/system-monitor/plasma-applet-sm_hwinfo.desktop   [TRAILING \
SPACE]  M  +14 -0     applets/system-monitor/plasma-applet-sm_net.desktop  
 M  +13 -0     applets/system-monitor/plasma-applet-sm_temperature.desktop  
 M  +12 -3     applets/system-monitor/plasma-applet-system-monitor.desktop  
 M  +12 -2     applets/systemtray/plasma-applet-systemtray.desktop  
 M  +1 -0      applets/systemtray/protocols/fdo/fdonotification.h  
 M  +11 -10    applets/systemtray/protocols/fdo/fdoselectionmanager.cpp  
 M  +3 -2      applets/systemtray/protocols/fdo/fdoselectionmanager.h  
 M  +3 -1      applets/systemtray/protocols/fdo/x11embedcontainer.cpp  
 M  +1 -5      applets/systemtray/ui/applet.cpp  
 M  +9 -2      applets/systemtray/ui/compactlayout.cpp  
 M  +2 -2      applets/systemtray/ui/jobwidget.cpp  
 M  +28 -1     applets/systemtray/ui/taskarea.cpp  
 M  +53 -6     applets/tasks/abstracttaskitem.cpp  
 M  +3 -1      applets/tasks/abstracttaskitem.h  
 M  +5 -1      applets/tasks/layoutwidget.cpp  
 M  +12 -3     applets/tasks/plasma-tasks-default.desktop  
 M  +43 -3     applets/tasks/taskgroupitem.cpp  
 M  +3 -1      applets/tasks/taskgroupitem.h  
 M  +4 -3      applets/tasks/tasks.cpp  
 M  +1 -0      applets/tasks/tasksmenu.cpp  
 M  +7 -18     applets/tasks/windowtaskitem.cpp  
 M  +5 -1      applets/tasks/windowtaskitem.h  
 M  +11 -2     applets/trash/plasma-applet-trash.desktop  
 M  +11 -2     applets/webbrowser/plasma-applet-webbrowser.desktop  
 M  +1 -1      applets/webbrowser/webbrowser.cpp  
 M  +13 -3     containments/desktop/plasma-containment-desktop.desktop  
 M  +10 -1     containments/mid-panel/plasma-containment-midpanel.desktop  
 M  +4 -1      containments/panel/plasma-containment-panel.desktop   [TRAILING SPACE]
 M  +6 -1      containments/screensaver/plasma-containment-saverdesktop.desktop  
 M  +1 -1      dataengines/applicationjobs/jobcontrol.cpp  
 M  +15 -2     dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop  \
  M  +10 -0     dataengines/dict/plasma-dataengine-dict.desktop   [TRAILING SPACE]
 M  +15 -1     dataengines/executable/plasma-dataengine-executable.desktop  
 M  +15 -3     dataengines/favicons/plasma-dataengine-favicons.desktop  
 M  +9 -0      dataengines/filebrowser/plasma-dataengine-filebrowser.desktop  
 M  +4 -0      dataengines/hotplug/plasma-dataengine-hotplug.desktop  
 M  +12 -2     dataengines/mouse/plasma-dataengine-mouse.desktop  
 M  +18 -1     dataengines/network/plasma-dataengine-network.desktop  
 M  +1 -41     dataengines/notifications/notificationsengine.cpp  
 M  +0 -14     dataengines/notifications/notificationsengine.h  
 M  +8 -0      dataengines/notifications/plasma-dataengine-notifications.desktop  
 M  +10 -0     dataengines/nowplaying/plasma-dataengine-nowplaying.desktop  
 M  +9 -0      dataengines/places/plasma-dataengine-places.desktop  
 M  +9 -0      dataengines/powermanagement/plasma-dataengine-powermanagement.desktop  \
  M  +8 -1      dataengines/rss/plasma-dataengine-rss.desktop  
 M  +10 -0     dataengines/soliddevice/plasma-dataengine-soliddevice.desktop  
 M  +11 -2     dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop  
 M  +7 -0      dataengines/tasks/plasma-dataengine-tasks.desktop  
 M  +12 -0     dataengines/time/plasma-dataengine-time.desktop   [TRAILING SPACE]
 M  +4 -0      dataengines/weather/ions/ion-bbcukmet.desktop  
 M  +2 -0      dataengines/weather/ions/ion-envcan.desktop  
 M  +2 -0      dataengines/weather/ions/ion-noaa.desktop  
 M  +1 -0      dataengines/weather/ions/ion.h  
 M  +3 -1      dataengines/weather/ions/ion_envcan.cpp  
 M  +3 -0      dataengines/weather/ions/weather_ion.desktop  
 M  +14 -2     dataengines/weather/plasma-dataengine-weather.desktop   [TRAILING \
SPACE]  M  +7 -0      design/CHANGELOG  
 A             design/javascript   \
trunk/KDE/kdebase/workspace/plasma/design/javascript#906699  M  +13 -3     \
runners/bookmarks/plasma-runner-bookmarks.desktop    M  +8 -0      \
runners/calculator/plasma-runner-calculator.desktop    M  +7 -0      \
runners/locations/plasma-runner-locations.desktop    M  +16 -3     \
runners/nepomuksearch/plasma-runner-nepomuksearch.desktop    M  +25 -2     \
runners/nepomuksearch/queryclientwrapper.cpp    M  +15 -1     \
runners/places/plasma-runner-places.desktop    M  +10 -1     \
runners/powerdevil/plasma-runner-powerdevil.desktop    M  +10 -1     \
runners/recentdocuments/recentdocuments.desktop    M  +11 -1     \
runners/services/plasma-runner-services.desktop    M  +8 -0      \
runners/sessions/plasma-runner-sessions.desktop    M  +8 -1      \
runners/shell/plasma-runner-shell.desktop    M  +7 -1      \
runners/shell/plasma-runner-shell_config.desktop    M  +7 -1      \
runners/webshortcuts/plasma-runner-webshortcuts.desktop    M  +1 -1      \
scriptengines/CMakeLists.txt    M  +11 -0     \
scriptengines/google_gadgets/plasma-packagestructure-googlegadgets.desktop    M  +11 \
-1     scriptengines/google_gadgets/plasma-scriptengine-googlegadgets.desktop    AM   \
scriptengines/javascript (directory)   \
trunk/KDE/kdebase/workspace/plasma/scriptengines/javascript#906699  M  +2 -6      \
scriptengines/javascript/appletinterface.cpp    M  +0 -4      \
scriptengines/javascript/appletinterface.h    M  +2 -2      \
scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop    M  \
+4 -4      scriptengines/javascript/plasma-scriptengine-runner-javascript.desktop    \
M  +0 -1      scriptengines/javascript/simplejavascriptapplet.cpp    M  +26 -0     \
scriptengines/javascript/tests/javascript-config-test/metadata.desktop    M  +21 -2   \
scriptengines/javascript/tests/script-digital-clock/metadata.desktop    M  +28 -0     \
scriptengines/javascript/tests/script-nowplaying/metadata.desktop    M  +27 -0     \
scriptengines/javascript/tests/tiger/metadata.desktop    A             \
scriptengines/python/examples (directory)   \
trunk/KDE/kdebase/workspace/plasma/scriptengines/python/examples#906699  _            \
scriptengines/python/examples/applets/pyclock (directory)    M  +3 -0      \
scriptengines/python/examples/applets/pyclock/metadata.desktop    _             \
scriptengines/python/examples/dataengines/pytime (directory)    M  +7 -1      \
scriptengines/python/examples/dataengines/pytime/metadata.desktop    M  +13 -3     \
scriptengines/python/plasma-scriptengine-applet-python.desktop    M  +13 -2     \
scriptengines/python/plasma-scriptengine-dataengine-python.desktop    M  +6 -10     \
scriptengines/python/plasma_importer.py    M  +2 -2      \
scriptengines/python/plasmascript.py    M  +9 -9      \
scriptengines/python/pyappletscript.py    D             scriptengines/python/test \
(directory)    M  +2 -0      scriptengines/qedjescript/CMakeLists.txt  
 M  +6 -0      scriptengines/qedjescript/plasma-appletscript-qedje.desktop  
 M  +13 -0     scriptengines/qedjescript/plasma-packagestructure-qedje.desktop  
 D             scriptengines/qtscript (directory)  
 M  +8 -0      scriptengines/ruby/examples/applets/clock/metadata.desktop  
 M  +13 -0     scriptengines/ruby/examples/applets/tiger/metadata.desktop  
 M  +7 -0      scriptengines/ruby/examples/applets/webapplet/metadata.desktop  
 M  +16 -2     scriptengines/ruby/examples/dataengines/dbpedia_albums/metadata.desktop \
  M  +12 -0     scriptengines/ruby/examples/dataengines/time/metadata.desktop   \
[TRAILING SPACE]  M  +12 -2     \
scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop    M  +12 -1     \
scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop    M  +6 -4      \
scriptengines/webkit/bundle.cpp    M  +11 -4     \
scriptengines/webkit/plasma-packagestructure-dashboard.desktop    M  +13 -0     \
scriptengines/webkit/plasma-packagestructure-web.desktop   [TRAILING SPACE]  M  +7 -2 \
scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop   [TRAILING SPACE]  \
M  +10 -3     scriptengines/webkit/plasma-scriptengine-applet-web.desktop    M  +3 -2 \
shells/common/appletbrowser.cpp    M  +1 -1      shells/desktop/desktopcorona.cpp  
 M  +24 -19    shells/desktop/panelappletoverlay.cpp  
 M  +9 -11     shells/desktop/panelcontroller.cpp  
 M  +4 -4      shells/desktop/panelcontroller.h  
 M  +48 -35    shells/desktop/panelview.cpp  
 M  +5 -4      shells/desktop/panelview.h  
 M  +6 -1      shells/desktop/plasma.desktop  
 M  +8 -3      shells/desktop/plasmaapp.cpp  
 M  +1 -1      shells/desktop/toolbutton.cpp  
 M  +38 -25    tools/desktopthemedetails/DesktopThemeDetails.ui  
 M  +1 -0      tools/desktopthemedetails/desktopthemedetails.cpp  
 M  +16 -1     tools/desktopthemedetails/desktopthemedetails.desktop  
 M  +9 -0      wallpapers/color/plasma-wallpaper-color.desktop  
 M  +2 -1      wallpapers/image/backgroundlistmodel.cpp  
 M  +1 -1      wallpapers/image/backgroundpackage.cpp  
 M  +2 -1      wallpapers/image/image.cpp  
 M  +25 -0     wallpapers/image/plasma-wallpaper-image.desktop  


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

Configure | About | News | Add a list | Sponsored by KoreLogic