[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-26 14:41:20
Message-ID: 1232980880.240541.5314.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 916950 by abizjak:

SVN_SILENT: Merge upstream changes.


 M  +1 -0      animators/default/plasma-animator-default.desktop  
 M  +5 -5      applets/CMakeLists.txt  
 M  +6 -3      applets/activitybar/activitybar.cpp  
 M  +8 -1      applets/activitybar/plasma-applet-activitybar.desktop   [TRAILING \
SPACE]  M  +1 -0      applets/analog-clock/clock.cpp  
 M  +2 -0      applets/analog-clock/plasma-applet-analogclock.desktop  
 M  +47 -19    applets/battery/battery.cpp  
 M  +2 -0      applets/battery/battery.h  
 M  +95 -3     applets/battery/batteryConfig.ui  
 M  +3 -0      applets/battery/plasma-battery-default.desktop  
 M  +6 -3      applets/calendar/calendar.cpp  
 M  +5 -0      applets/calendar/plasma-applet-calendar.desktop  
 M  +3 -3      applets/devicenotifier/devicenotifier.cpp  
 M  +4 -4      applets/devicenotifier/notifierdialog.cpp  
 M  +3 -1      applets/devicenotifier/notifierview.cpp  
 M  +5 -0      applets/devicenotifier/plasma-applet-devicenotifier.desktop   \
[TRAILING SPACE]  M  +2 -1      \
applets/devicenotifier/test-predicate-openinwindow.desktop    M  +26 -17    \
applets/digital-clock/clock.cpp    M  +5 -2      \
applets/digital-clock/plasma-applet-digitalclock.desktop    M  +6 -1      \
applets/icon/plasma-applet-icon.desktop   [TRAILING SPACE]  M  +60 -54    \
applets/kickoff/CMakeLists.txt    M  +14 -14    applets/kickoff/applet/applet.cpp  
 M  +2 -0      applets/kickoff/applet/plasma-applet-launcher.desktop  
 M  +111 -58   applets/kickoff/core/applicationmodel.cpp  
 M  +9 -2      applets/kickoff/core/applicationmodel.h  
 M  +2 -2      applets/kickoff/core/favoritesmodel.h  
 M  +11 -0     applets/kickoff/core/itemhandlers.cpp  
 M  +4 -2      applets/kickoff/core/itemhandlers.h  
 A             applets/kickoff/core/kickoff_export.h   \
trunk/KDE/kdebase/workspace/plasma/applets/kickoff/core/kickoff_export.h#916949 \
[License: LGPL (v2+)]  M  +3 -1      applets/kickoff/core/kickoffabstractmodel.h  
 M  +3 -1      applets/kickoff/core/kickoffmodel.h  
 M  +3 -1      applets/kickoff/core/kickoffproxymodel.h  
 M  +3 -3      applets/kickoff/core/leavemodel.cpp  
 M  +3 -2      applets/kickoff/core/leavemodel.h  
 M  +1 -1      applets/kickoff/core/org.kde.kickoff.recent.xml  
 M  +18 -14    applets/kickoff/core/recentapplications.cpp  
 M  +6 -1      applets/kickoff/core/recentapplications.h  
 M  +45 -23    applets/kickoff/core/recentlyusedmodel.cpp  
 M  +11 -2     applets/kickoff/core/recentlyusedmodel.h  
 M  +2 -2      applets/kickoff/core/searchmodel.h  
 M  +2 -1      applets/kickoff/core/systemmodel.h  
 M  +3 -1      applets/kickoff/core/urlitemlauncher.h  
 M  +4 -5      applets/kickoff/simpleapplet/menuview.cpp  
 M  +3 -3      applets/kickoff/simpleapplet/menuview.h  
 M  +2 -0      applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop  
 M  +153 -27   applets/kickoff/simpleapplet/simpleapplet.cpp  
 M  +2 -0      applets/kickoff/simpleapplet/simpleapplet.h  
 M  +9 -3      applets/kickoff/ui/contextmenufactory.cpp  
 M  +12 -4     applets/lock_logout/lockout.cpp  
 M  +3 -0      applets/lock_logout/plasma-applet-lockout.desktop  
 M  +51 -67    applets/pager/pager.cpp  
 M  +1 -1      applets/pager/pager.h  
 M  +4 -1      applets/pager/plasma-pager-default.desktop  
 M  +10 -6     applets/quicklaunch/CMakeLists.txt  
 M  +5 -1      applets/quicklaunch/plasma-applet-quicklaunch.desktop  
 M  +1 -0      applets/quicklaunch/quicklaunchApplet.cpp  
 M  +0 -1      applets/system-monitor/hwinfo.cpp  
 M  +8 -0      applets/system-monitor/plasma-applet-sm_cpu.desktop  
 M  +8 -0      applets/system-monitor/plasma-applet-sm_hdd.desktop  
 M  +11 -0     applets/system-monitor/plasma-applet-sm_hwinfo.desktop  
 M  +8 -0      applets/system-monitor/plasma-applet-sm_net.desktop  
 M  +8 -0      applets/system-monitor/plasma-applet-sm_temperature.desktop  
 M  +6 -1      applets/system-monitor/plasma-applet-system-monitor.desktop  
 M  +1 -0      applets/systemtray/core/job.cpp  
 M  +16 -1     applets/systemtray/core/manager.cpp  
 M  +10 -0     applets/systemtray/core/manager.h   [POSSIBLY UNSAFE: system]
 M  +6 -1      applets/systemtray/plasma-applet-systemtray.desktop  
 M  +1 -0      applets/systemtray/protocols/fdo/fdographicswidget.cpp  
 M  +1 -0      applets/systemtray/protocols/fdo/fdonotification.h  
 M  +27 -22    applets/systemtray/protocols/fdo/fdoselectionmanager.cpp  
 M  +3 -2      applets/systemtray/protocols/fdo/fdoselectionmanager.h  
 M  +3 -5      applets/systemtray/protocols/fdo/x11embedcontainer.cpp  
 M  +58 -10    applets/systemtray/ui/applet.cpp  
 M  +9 -2      applets/systemtray/ui/compactlayout.cpp  
 M  +1 -2      applets/systemtray/ui/extendertask.cpp  
 M  +2 -2      applets/systemtray/ui/jobwidget.cpp  
 M  +28 -1     applets/systemtray/ui/taskarea.cpp  
 M  +60 -8     applets/tasks/abstracttaskitem.cpp  
 M  +3 -1      applets/tasks/abstracttaskitem.h  
 M  +5 -1      applets/tasks/layoutwidget.cpp  
 M  +7 -2      applets/tasks/plasma-tasks-default.desktop  
 M  +43 -3     applets/tasks/taskgroupitem.cpp  
 M  +3 -1      applets/tasks/taskgroupitem.h  
 M  +2 -1      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  +5 -1      applets/trash/plasma-applet-trash.desktop  
 M  +5 -0      applets/webbrowser/plasma-applet-webbrowser.desktop  
 M  +1 -1      applets/webbrowser/webbrowser.cpp  
 M  +2 -0      containments/desktop/desktop.cpp  
 M  +6 -0      containments/desktop/plasma-containment-desktop.desktop  
 M  +6 -0      containments/mid-panel/plasma-containment-midpanel.desktop  
 M  +1 -1      containments/panel/panel.cpp  
 M  +3 -1      containments/panel/plasma-containment-panel.desktop   [TRAILING SPACE]
 M  +4 -4      containments/screensaver/desktop.cpp  
 M  +2 -0      containments/screensaver/plasma-containment-saverdesktop.desktop  
 M  +1 -1      dataengines/applicationjobs/jobcontrol.cpp  
 M  +6 -0      dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop  \
  M  +7 -0      dataengines/dict/plasma-dataengine-dict.desktop   [TRAILING SPACE]
 M  +8 -0      dataengines/executable/plasma-dataengine-executable.desktop  
 M  +6 -0      dataengines/favicons/plasma-dataengine-favicons.desktop  
 M  +6 -0      dataengines/filebrowser/plasma-dataengine-filebrowser.desktop  
 M  +2 -0      dataengines/hotplug/plasma-dataengine-hotplug.desktop  
 M  +8 -1      dataengines/mouse/plasma-dataengine-mouse.desktop  
 M  +10 -0     dataengines/network/plasma-dataengine-network.desktop  
 M  +1 -41     dataengines/notifications/notificationsengine.cpp  
 M  +0 -14     dataengines/notifications/notificationsengine.h  
 M  +5 -0      dataengines/notifications/plasma-dataengine-notifications.desktop  
 M  +6 -0      dataengines/nowplaying/plasma-dataengine-nowplaying.desktop  
 M  +4 -0      dataengines/places/plasma-dataengine-places.desktop  
 M  +5 -0      dataengines/powermanagement/plasma-dataengine-powermanagement.desktop  \
  M  +2 -0      dataengines/rss/plasma-dataengine-rss.desktop  
 M  +5 -0      dataengines/soliddevice/plasma-dataengine-soliddevice.desktop  
 M  +5 -0      dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop  
 M  +4 -0      dataengines/tasks/plasma-dataengine-tasks.desktop  
 M  +6 -0      dataengines/time/plasma-dataengine-time.desktop   [TRAILING SPACE]
 M  +0 -3      dataengines/weather/ions/CMakeLists.txt  
 M  +5 -2      dataengines/weather/ions/ion-bbcukmet.desktop  
 M  +5 -2      dataengines/weather/ions/ion-envcan.desktop  
 M  +5 -2      dataengines/weather/ions/ion-noaa.desktop  
 M  +2 -3      dataengines/weather/ions/ion.h  
 M  +10 -10    dataengines/weather/ions/ion_bbcukmet.cpp  
 M  +1 -1      dataengines/weather/ions/ion_bbcukmet.h  
 M  +13 -11    dataengines/weather/ions/ion_envcan.cpp  
 M  +1 -1      dataengines/weather/ions/ion_envcan.h  
 M  +1 -1      dataengines/weather/ions/ion_noaa.cpp  
 M  +1 -1      dataengines/weather/ions/ion_noaa.h  
 D             dataengines/weather/ions/weather_ion.desktop  
 M  +5 -0      dataengines/weather/plasma-dataengine-weather.desktop   [TRAILING \
SPACE]  M  +26 -91    dataengines/weather/weatherengine.cpp  
 M  +5 -12     dataengines/weather/weatherengine.h  
 M  +53 -1     design/CHANGELOG  
 A             design/javascript   \
trunk/KDE/kdebase/workspace/plasma/design/javascript#916949  M  +8 -2      \
runners/bookmarks/plasma-runner-bookmarks.desktop    M  +5 -0      \
runners/calculator/plasma-runner-calculator.desktop    M  +1 -1      \
runners/locations/Messages.sh    M  +0 -1      runners/locations/locationrunner.cpp  
 M  +6 -0      runners/locations/plasma-runner-locations.desktop  
 M  +1 -1      runners/nepomuksearch/Messages.sh  
 M  +8 -1      runners/nepomuksearch/plasma-runner-nepomuksearch.desktop  
 M  +25 -2     runners/nepomuksearch/queryclientwrapper.cpp  
 M  +1 -1      runners/places/Messages.sh  
 M  +1 -1      runners/places/placesrunner.h  
 M  +7 -0      runners/places/plasma-runner-places.desktop  
 M  +1 -1      runners/powerdevil/Messages.sh  
 M  +4 -2      runners/powerdevil/PowerDevilRunner.cpp  
 M  +4 -0      runners/powerdevil/plasma-runner-powerdevil.desktop  
 M  +1 -1      runners/recentdocuments/Messages.sh  
 M  +0 -1      runners/recentdocuments/recentdocuments.cpp  
 M  +5 -1      runners/recentdocuments/recentdocuments.desktop  
 M  +5 -0      runners/services/plasma-runner-services.desktop  
 M  +1 -1      runners/sessions/Messages.sh  
 M  +7 -0      runners/sessions/plasma-runner-sessions.desktop  
 M  +0 -1      runners/sessions/sessionrunner.cpp  
 M  +1 -1      runners/shell/Messages.sh  
 M  +5 -0      runners/shell/plasma-runner-shell.desktop  
 M  +2 -0      runners/shell/plasma-runner-shell_config.desktop  
 M  +0 -1      runners/shell/shellrunner.cpp  
 M  +1 -1      runners/webshortcuts/Messages.sh  
 M  +4 -0      runners/webshortcuts/plasma-runner-webshortcuts.desktop  
 M  +0 -1      runners/webshortcuts/webshortcutrunner.cpp  
 M  +1 -1      scriptengines/CMakeLists.txt  
 M  +4 -0      scriptengines/google_gadgets/plasma-packagestructure-googlegadgets.desktop \
  M  +4 -1      scriptengines/google_gadgets/plasma-scriptengine-googlegadgets.desktop \
  AM            scriptengines/javascript (directory)   \
trunk/KDE/kdebase/workspace/plasma/scriptengines/javascript#916949  A             \
scriptengines/python/examples (directory)   \
trunk/KDE/kdebase/workspace/plasma/scriptengines/python/examples#916949  _            \
scriptengines/python/examples/applets/pyclock (directory)    _             \
scriptengines/python/examples/dataengines/pytime (directory)    M  +7 -2      \
scriptengines/python/plasma-scriptengine-applet-python.desktop    M  +6 -0      \
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  +1 -0      scriptengines/qedjescript/plasma-appletscript-qedje.desktop  
 M  +5 -0      scriptengines/qedjescript/plasma-packagestructure-qedje.desktop  
 M  +21 -2     scriptengines/qedjescript/qedje_applet.cpp  
 M  +23 -2     scriptengines/qedjescript/qedje_applet.h  
 M  +22 -3     scriptengines/qedjescript/qedje_package.cpp  
 M  +19 -0     scriptengines/qedjescript/qedje_package.h  
 D             scriptengines/qtscript (directory)  
 M  +4 -0      scriptengines/ruby/examples/applets/clock/metadata.desktop  
 M  +6 -0      scriptengines/ruby/examples/applets/tiger/metadata.desktop  
 M  +4 -0      scriptengines/ruby/examples/applets/webapplet/metadata.desktop  
 M  +8 -0      scriptengines/ruby/examples/dataengines/dbpedia_albums/metadata.desktop \
  M  +6 -0      scriptengines/ruby/examples/dataengines/time/metadata.desktop   \
[TRAILING SPACE]  M  +7 -2      \
scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop    M  +7 -1      \
scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop    M  +6 -4      \
scriptengines/webkit/bundle.cpp    M  +6 -2      \
scriptengines/webkit/plasma-packagestructure-dashboard.desktop    M  +7 -0      \
scriptengines/webkit/plasma-packagestructure-web.desktop   [TRAILING SPACE]  M  +6 -2 \
scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop    M  +6 -0      \
scriptengines/webkit/plasma-scriptengine-applet-web.desktop    M  +3 -2      \
shells/common/appletbrowser.cpp    M  +8 -11     shells/desktop/CMakeLists.txt  
 M  +1 -1      shells/desktop/Messages.sh  
 M  +9 -3      shells/desktop/backgrounddialog.cpp  
 M  +4 -3      shells/desktop/backgrounddialog.h  
 M  +6 -0      shells/desktop/configupdates/CMakeLists.txt  
 A             shells/desktop/configupdates/plasma-to-plasma-desktop.cpp   \
trunk/KDE/kdebase/workspace/plasma/shells/desktop/configupdates/plasma-to-plasma-desktop.cpp#916949 \
[License: LGPL]  A             \
shells/desktop/configupdates/plasmarc-to-plasmadesktoprc.upd   \
trunk/KDE/kdebase/workspace/plasma/shells/desktop/configupdates/plasmarc-to-plasmadesktoprc.upd#916949
  M  +1 -1      shells/desktop/desktopcorona.cpp  
 M  +9 -6      shells/desktop/desktopview.cpp  
 M  +2 -6      shells/desktop/main.cpp  
 M  +24 -19    shells/desktop/panelappletoverlay.cpp  
 M  +9 -11     shells/desktop/panelcontroller.cpp  
 M  +4 -4      shells/desktop/panelcontroller.h  
 M  +94 -58    shells/desktop/panelview.cpp  
 M  +13 -4     shells/desktop/panelview.h  
 A             shells/desktop/plasma-desktop.desktop   \
trunk/KDE/kdebase/workspace/plasma/shells/desktop/plasma-desktop.desktop#916949  D    \
shells/desktop/plasma.desktop    M  +52 -58    shells/desktop/plasmaapp.cpp  
 M  +2 -2      shells/desktop/plasmaapp.h  
 M  +1 -1      shells/desktop/toolbutton.cpp  
 M  +2 -2      shells/screensaver/plasmaapp.cpp  
 M  +38 -25    tools/desktopthemedetails/DesktopThemeDetails.ui  
 M  +4 -3      tools/desktopthemedetails/desktopthemedetails.cpp  
 M  +9 -0      tools/desktopthemedetails/desktopthemedetails.desktop  
 M  +0 -8      tools/desktopthemedetails/desktopthemedetails.h  
 M  +10 -1     tools/engineexplorer/engineexplorer.cpp  
 M  +2 -0      tools/engineexplorer/engineexplorer.h  
 M  +7 -1      tools/engineexplorer/main.cpp  
 M  +1 -1      tools/engineexplorer/serviceviewer.cpp  
 M  +1 -1      tools/engineexplorer/serviceviewer.ui  
 M  +6 -0      wallpapers/color/plasma-wallpaper-color.desktop  
 M  +13 -2     wallpapers/image/backgrounddelegate.cpp  
 M  +2 -1      wallpapers/image/backgrounddelegate.h  
 M  +20 -1     wallpapers/image/backgroundlistmodel.cpp  
 M  +8 -0      wallpapers/image/backgroundlistmodel.h  
 M  +63 -16    wallpapers/image/backgroundpackage.cpp  
 M  +7 -0      wallpapers/image/backgroundpackage.h  
 M  +15 -1     wallpapers/image/image.cpp  
 M  +15 -0     wallpapers/image/plasma-wallpaper-image.desktop  
 M  +56 -22    wallpapers/image/slideshowconfig.ui  


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