[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-02-07 23:30:08
Message-ID: 1234049408.178744.2312.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 922976 by abizjak:

SVN_SILENT Merge upstream changes.


 M  +2 -2      animators/default/defaultAnimator.cpp  
 M  +3 -0      animators/default/plasma-animator-default.desktop  
 M  +17 -3     applets/activitybar/plasma-applet-activitybar.desktop   [TRAILING \
SPACE]  M  +4 -0      applets/analog-clock/plasma-applet-analogclock.desktop  
 M  +2 -19     applets/battery/battery.cpp  
 M  +0 -1      applets/battery/battery.h  
 M  +9 -1      applets/battery/plasma-battery-default.desktop  
 M  +15 -1     applets/calendar/plasma-applet-calendar.desktop  
 M  +13 -1     applets/devicenotifier/plasma-applet-devicenotifier.desktop   \
[TRAILING SPACE]  M  +15 -66    \
applets/devicenotifier/test-predicate-openinwindow.desktop   [TRAILING SPACE]  M  +11 \
-1     applets/digital-clock/plasma-applet-digitalclock.desktop   [TRAILING SPACE]  M \
+11 -2     applets/icon/plasma-applet-icon.desktop    M  +6 -1      \
applets/kickoff/applet/plasma-applet-launcher.desktop    M  +1 -1      \
applets/kickoff/simpleapplet/menuview.cpp    M  +4 -0      \
applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop    M  +11 -3     \
applets/lock_logout/plasma-applet-lockout.desktop    M  +8 -2      \
applets/pager/pager.cpp    M  +11 -1     applets/pager/plasma-pager-default.desktop  
 M  +17 -3     applets/quicklaunch/plasma-applet-quicklaunch.desktop  
 M  +0 -7      applets/system-monitor/cpu-config.ui  
 M  +7 -0      applets/system-monitor/cpu.cpp  
 M  +1 -0      applets/system-monitor/cpu.h  
 M  +0 -7      applets/system-monitor/hdd-config.ui  
 M  +7 -0      applets/system-monitor/hdd.cpp  
 M  +1 -0      applets/system-monitor/hdd.h  
 M  +0 -7      applets/system-monitor/net-config.ui  
 M  +7 -0      applets/system-monitor/net.cpp  
 M  +1 -0      applets/system-monitor/net.h  
 M  +12 -0     applets/system-monitor/plasma-applet-sm_cpu.desktop  
 M  +12 -0     applets/system-monitor/plasma-applet-sm_hdd.desktop  
 M  +13 -1     applets/system-monitor/plasma-applet-sm_hwinfo.desktop   [TRAILING \
SPACE]  M  +14 -0     applets/system-monitor/plasma-applet-sm_net.desktop  
 M  +11 -0     applets/system-monitor/plasma-applet-sm_temperature.desktop  
 M  +10 -2     applets/system-monitor/plasma-applet-system-monitor.desktop  
 M  +0 -7      applets/system-monitor/temperature-config.ui  
 M  +7 -0      applets/system-monitor/temperature.cpp  
 M  +1 -0      applets/system-monitor/temperature.h  
 M  +2 -2      applets/systemtray/core/manager.cpp  
 M  +9 -1      applets/systemtray/plasma-applet-systemtray.desktop  
 M  +4 -2      applets/systemtray/ui/taskarea.cpp  
 M  +8 -1      applets/tasks/plasma-tasks-default.desktop  
 M  +9 -1      applets/trash/plasma-applet-trash.desktop  
 M  +11 -3     applets/webbrowser/plasma-applet-webbrowser.desktop  
 M  +7 -0      applets/webbrowser/webbrowser.cpp  
 M  +1 -0      applets/webbrowser/webbrowser.h  
 M  +12 -22    applets/webbrowser/webbrowserconfig.ui  
 M  +5 -0      containments/desktop/desktop.cpp  
 M  +10 -3     containments/desktop/plasma-containment-desktop.desktop  
 M  +9 -3      containments/mid-panel/plasma-containment-midpanel.desktop  
 M  +4 -1      containments/panel/plasma-containment-panel.desktop  
 M  +4 -1      containments/screensaver/plasma-containment-saverdesktop.desktop  
 M  +15 -3     dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop  \
  M  +7 -0      dataengines/dict/plasma-dataengine-dict.desktop  
 M  +15 -3     dataengines/executable/plasma-dataengine-executable.desktop  
 M  +14 -4     dataengines/favicons/plasma-dataengine-favicons.desktop  
 M  +8 -1      dataengines/filebrowser/plasma-dataengine-filebrowser.desktop  
 M  +4 -0      dataengines/hotplug/plasma-dataengine-hotplug.desktop  
 M  +7 -1      dataengines/mouse/plasma-dataengine-mouse.desktop  
 M  +14 -2     dataengines/network/plasma-dataengine-network.desktop  
 M  +6 -0      dataengines/notifications/plasma-dataengine-notifications.desktop  
 M  +10 -2     dataengines/nowplaying/plasma-dataengine-nowplaying.desktop  
 M  +10 -2     dataengines/places/plasma-dataengine-places.desktop   [TRAILING SPACE]
 M  +7 -0      dataengines/powermanagement/plasma-dataengine-powermanagement.desktop  \
  M  +10 -2     dataengines/rss/plasma-dataengine-rss.desktop  
 M  +9 -0      dataengines/soliddevice/plasma-dataengine-soliddevice.desktop  
 M  +11 -3     dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop  
 M  +5 -0      dataengines/tasks/plasma-dataengine-tasks.desktop  
 M  +10 -0     dataengines/time/plasma-dataengine-time.desktop   [TRAILING SPACE]
 M  +6 -0      dataengines/weather/ions/ion-bbcukmet.desktop  
 M  +3 -0      dataengines/weather/ions/ion-envcan.desktop  
 M  +2 -0      dataengines/weather/ions/ion-noaa.desktop  
 M  +10 -15    dataengines/weather/ions/ion_bbcukmet.cpp  
 M  +19 -28    dataengines/weather/ions/ion_envcan.cpp  
 M  +6 -17     dataengines/weather/ions/ion_noaa.cpp  
 M  +224 -140  dataengines/weather/ions/weatherutils.cpp  
 M  +53 -8     dataengines/weather/ions/weatherutils.h  
 M  +14 -3     dataengines/weather/plasma-dataengine-weather.desktop   [TRAILING \
SPACE]  M  +1 -0      design/CHANGELOG  
 M  +8 -1      runners/bookmarks/plasma-runner-bookmarks.desktop  
 M  +16 -7     runners/calculator/calculatorrunner.cpp  
 M  +5 -0      runners/calculator/plasma-runner-calculator.desktop  
 M  +4 -1      runners/locations/plasma-runner-locations.desktop  
 M  +14 -4     runners/nepomuksearch/plasma-runner-nepomuksearch.desktop  
 M  +13 -2     runners/places/plasma-runner-places.desktop  
 M  +9 -1      runners/powerdevil/plasma-runner-powerdevil.desktop  
 M  +7 -0      runners/recentdocuments/recentdocuments.desktop  
 M  +9 -1      runners/services/plasma-runner-services.desktop  
 M  +3 -0      runners/sessions/plasma-runner-sessions.desktop  
 M  +6 -1      runners/shell/plasma-runner-shell.desktop  
 M  +7 -1      runners/shell/plasma-runner-shell_config.desktop  
 M  +5 -1      runners/webshortcuts/plasma-runner-webshortcuts.desktop  
 M  +12 -0     scriptengines/google_gadgets/plasma-packagestructure-googlegadgets.desktop \
  M  +11 -0     scriptengines/google_gadgets/plasma-scriptengine-googlegadgets.desktop \
  M  +6 -3      scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop \
[TRAILING SPACE]  M  +6 -4      \
scriptengines/javascript/plasma-scriptengine-runner-javascript.desktop   [TRAILING \
SPACE]  M  +4 -26     scriptengines/javascript/simplejavascriptapplet.cpp  
 M  +1 -2      scriptengines/javascript/simplejavascriptapplet.h  
 M  +38 -0     scriptengines/javascript/tests/javascript-config-test/metadata.desktop \
  M  +36 -2     scriptengines/javascript/tests/script-digital-clock/metadata.desktop  \
  M  +40 -0     scriptengines/javascript/tests/script-nowplaying/metadata.desktop  
 M  +36 -1     scriptengines/javascript/tests/tiger/metadata.desktop  
 M  +6 -0      scriptengines/python/examples/applets/pyclock/metadata.desktop  
 M  +13 -1     scriptengines/python/examples/dataengines/pytime/metadata.desktop  
 M  +13 -1     scriptengines/python/plasma-scriptengine-applet-python.desktop  
 M  +14 -3     scriptengines/python/plasma-scriptengine-dataengine-python.desktop  
 M  +7 -0      scriptengines/qedjescript/plasma-appletscript-qedje.desktop  
 M  +12 -0     scriptengines/qedjescript/plasma-packagestructure-qedje.desktop  
 M  +5 -0      scriptengines/ruby/ChangeLog  
 M  +54 -0     scriptengines/ruby/applet.rb  
 M  +8 -0      scriptengines/ruby/examples/applets/clock/metadata.desktop  
 M  +9 -1      scriptengines/ruby/examples/applets/tiger/metadata.desktop  
 M  +6 -0      scriptengines/ruby/examples/applets/webapplet/metadata.desktop  
 M  +14 -3     scriptengines/ruby/examples/dataengines/dbpedia_albums/metadata.desktop \
  M  +10 -0     scriptengines/ruby/examples/dataengines/time/metadata.desktop   \
[TRAILING SPACE]  M  +13 -0     \
scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop    M  +13 -0     \
scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop    M  +12 -3     \
scriptengines/webkit/plasma-packagestructure-dashboard.desktop    M  +12 -1     \
scriptengines/webkit/plasma-packagestructure-web.desktop    M  +5 -1      \
scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop   [TRAILING SPACE]  \
M  +6 -3      scriptengines/webkit/plasma-scriptengine-applet-web.desktop    M  +1 -1 \
shells/desktop/CMakeLists.txt    M  +1 -0      \
shells/desktop/configupdates/CMakeLists.txt    A             \
shells/desktop/configupdates/plasma-to-plasmadesktop-shortcuts.upd   \
trunk/KDE/kdebase/workspace/plasma/shells/desktop/configupdates/plasma-to-plasmadesktop-shortcuts.upd#922973
  M  +6 -2      shells/desktop/dashboardview.cpp  
 M  +4 -3      shells/desktop/dashboardview.h  
 M  +20 -9     shells/desktop/desktopview.cpp  
 M  +2 -1      shells/desktop/desktopview.h  
 M  +6 -1      shells/desktop/panelview.cpp  
 M  +6 -1      shells/desktop/plasma-desktop.desktop  
 A             shells/desktop/plasma.desktop   \
trunk/KDE/kdebase/workspace/plasma/shells/desktop/plasma.desktop#922973  M  +24 -7    \
shells/desktop/plasmaapp.cpp    M  +1 -0      shells/desktop/plasmaapp.h  
 M  +4 -3      shells/plasmoidviewer/fullview.cpp  
 M  +2 -1      shells/plasmoidviewer/fullview.h  
 M  +12 -2     tools/desktopthemedetails/desktopthemedetails.desktop  
 M  +4 -0      wallpapers/color/plasma-wallpaper-color.desktop  
 M  +1 -1      wallpapers/image/image.cpp  
 M  +17 -1     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