ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #01376
[Branch ~agateau/plasma-widget-message-indicator/trunk] Rev 134: Replace the .upd file which depends on a not-yet-validated version of
------------------------------------------------------------
revno: 134
committer: Aurelien Gateau <aurelien.gateau@xxxxxxxxxxxxx>
branch nick: plasma-widget-message-indicator
timestamp: Thu 2010-04-01 16:32:27 +0200
message:
Replace the .upd file which depends on a not-yet-validated version of
kconf_update with a transition version of
plasma-applet-indicatordisplay.desktop
removed:
upd/
upd/CMakeLists.txt
upd/message_indicator_applet_rename_plugin.py
upd/message_indicator_applet_rename_plugin.upd
upd/test-nothing-to-dorc
upd/test-one-applet-to-changerc
added:
src/plasma-applet-indicatordisplay.desktop
modified:
CMakeLists.txt
src/CMakeLists.txt
--
lp:plasma-widget-message-indicator
https://code.launchpad.net/~agateau/plasma-widget-message-indicator/trunk
Your team ayatana-commits is subscribed to branch lp:plasma-widget-message-indicator.
To unsubscribe from this branch go to https://code.launchpad.net/~agateau/plasma-widget-message-indicator/trunk/+edit-subscription
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2010-03-30 15:39:23 +0000
+++ CMakeLists.txt 2010-04-01 14:32:27 +0000
@@ -24,7 +24,6 @@
add_subdirectory(src)
add_subdirectory(tests)
-add_subdirectory(upd)
# Packaging
set(PROJECT_VERSION "0.5.3")
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2010-03-08 10:20:45 +0000
+++ src/CMakeLists.txt 2010-04-01 14:32:27 +0000
@@ -24,5 +24,7 @@
install(TARGETS plasma_applet_message_indicator
DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-applet-message-indicator.desktop
+install(FILES
+ plasma-applet-message-indicator.desktop
+ plasma-applet-indicatordisplay.desktop
DESTINATION ${SERVICES_INSTALL_DIR})
=== added file 'src/plasma-applet-indicatordisplay.desktop'
--- src/plasma-applet-indicatordisplay.desktop 1970-01-01 00:00:00 +0000
+++ src/plasma-applet-indicatordisplay.desktop 2010-04-01 14:32:27 +0000
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Name=Indicator Display
+Comment=Show new messages from various applications
+Icon=mail-message-new
+Type=Service
+X-KDE-ServiceTypes=Plasma/Applet
+
+X-KDE-Library=plasma_applet_message_indicator
+X-KDE-PluginInfo-Author=Aurélien Gâteau
+X-KDE-PluginInfo-Email=aurelien.gateau@xxxxxxxxxxxxx
+X-KDE-PluginInfo-Name=indicatordisplay
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=http://launchpad.net/plasma-indicatordisplay/
+X-KDE-PluginInfo-Category=Windows and Tasks
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
+
+X-Plasma-Requires-FileDialog=Unused
+X-Plasma-Requires-LaunchApp=Unused
+X-Plasma-NotificationArea=true
+
+# This file is only here to ease the transition from "Indicator Display" to
+# "Message Indicator"
+NoDisplay=true
=== removed directory 'upd'
=== removed file 'upd/CMakeLists.txt'
--- upd/CMakeLists.txt 2010-03-30 15:34:11 +0000
+++ upd/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-install(FILES message_indicator_applet_rename_plugin.upd
- DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
-
-install(PROGRAMS message_indicator_applet_rename_plugin.py
- DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
=== removed file 'upd/message_indicator_applet_rename_plugin.py'
--- upd/message_indicator_applet_rename_plugin.py 2010-03-30 15:34:11 +0000
+++ upd/message_indicator_applet_rename_plugin.py 1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-import sys
-from ConfigParser import ConfigParser
-from StringIO import StringIO
-
-OLD_NAME = "indicatordisplay"
-NEW_NAME = "message-indicator"
-
-PLUGIN_OPTION = "plugin"
-
-def main():
- # Get all content and turn nested sections into something ConfigParser can
- # swallow
- content = sys.stdin.read().replace("][", "///")
-
- # Parse data
- io = StringIO(content)
- parser = ConfigParser()
- parser.readfp(io)
-
- # Replace keys where necessary
- for section in parser.sections():
- if not section.startswith("Containments"):
- continue
- if parser.has_option(section, PLUGIN_OPTION) and parser.get(section, PLUGIN_OPTION) == OLD_NAME:
- print "[%s]" % section.replace("///", "][")
- print "%s=%s" % (PLUGIN_OPTION, NEW_NAME)
-
- return 0
-
-if __name__== "__main__":
- sys.exit(main())
-# vi: ts=4 sw=4 et
=== removed file 'upd/message_indicator_applet_rename_plugin.upd'
--- upd/message_indicator_applet_rename_plugin.upd 2010-03-30 15:34:11 +0000
+++ upd/message_indicator_applet_rename_plugin.upd 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Rename the applet from indicatordisplay to message-indicator
-Id=RenameMessageIndicatorApplet
-File=plasma-desktop-appletsrc
-Script=message_indicator_applet_rename_plugin.py,python
-Options=overwrite
=== removed file 'upd/test-nothing-to-dorc'
--- upd/test-nothing-to-dorc 2010-03-30 15:34:11 +0000
+++ upd/test-nothing-to-dorc 1970-01-01 00:00:00 +0000
@@ -1,201 +0,0 @@
-[AppletGlobals][plasma_applet_systemtray]
-ShowApplicationStatus=true
-ShowCommunications=true
-ShowHardware=true
-ShowJobs=false
-ShowNotifications=false
-ShowSystemServices=true
-
-[Containments]
-JauntyUpgradeScriptRun=true
-
-[Containments][1]
-activity=
-desktop=-1
-formfactor=0
-geometry=0,0,1920,1080
-immutability=1
-location=0
-plugin=desktop
-screen=0
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-zvalue=0
-
-[Containments][1][Wallpaper][image]
-slideTimer=10
-slidepaths=/usr/share/wallpapers/
-userswallpapers=
-wallpaper=/usr/share/wallpapers/Ethais
-wallpapercolor=56,111,150
-wallpaperposition=0
-
-[Containments][4]
-activity=
-desktop=-1
-formfactor=0
-geometry=1926,0,1280,1024
-immutability=1
-location=0
-plugin=desktop
-screen=1
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-zvalue=0
-
-[Containments][4][Wallpaper][image]
-slideTimer=10
-slidepaths=/usr/share/wallpapers/
-userswallpapers=
-wallpaper=/usr/share/wallpapers/Ethais
-wallpapercolor=56,111,150
-wallpaperposition=0
-
-[Containments][5]
-activity=
-desktop=-1
-formfactor=2
-geometry=0,-34,1920,28
-immutability=1
-location=4
-plugin=panel
-screen=0
-zvalue=150
-
-[Containments][5][Applets][11]
-geometry=1614,1,208,27
-immutability=1
-plugin=systemtray
-zvalue=0
-
-[Containments][5][Applets][11][Configuration]
-AutoHidePopup=true
-Share=false
-alwaysShown=
-hidden=
-
-[Containments][5][Applets][11][Configuration][Applets][2]
-geometry=168,0.5,24,24
-immutability=1
-plugin=message-indicator
-zvalue=0
-
-[Containments][5][Applets][11][Configuration][Applets][2][PopupApplet]
-DialogHeight=35
-DialogWidth=132
-
-[Containments][5][Applets][11][Configuration][Applets][3]
-geometry=0,0,250,300
-immutability=1
-plugin=notifier
-zvalue=0
-
-[Containments][5][Applets][11][Configuration][ExtenderItems][1]
-extenderIconName=
-extenderItemName=jobGroup
-extenderItemPosition=0
-isCollapsed=false
-isGroup=true
-sourceAppletId=11
-sourceAppletPluginName=systemtray
-
-[Containments][5][Applets][11][Configuration][ExtenderItems][2]
-extenderIconName=
-extenderItemName=completedJobsGroup
-extenderItemPosition=0
-extenderTitle=0 tâche récemment terminée :
-groupCollapsed=false
-isCollapsed=false
-isGroup=true
-sourceAppletId=11
-sourceAppletPluginName=systemtray
-
-[Containments][5][Applets][11][LayoutInformation]
-Order=5
-
-[Containments][5][Applets][11][PopupApplet]
-DialogHeight=14
-DialogWidth=0
-
-[Containments][5][Applets][13]
-geometry=1826,1,72,27
-immutability=1
-plugin=digital-clock
-zvalue=0
-
-[Containments][5][Applets][13][Configuration][ExtenderItems][3]
-extenderIconName=view-pim-calendar
-extenderItemName=calendar
-extenderItemPosition=0
-extenderTitle=Calendar
-isCollapsed=false
-sourceAppletId=13
-sourceAppletPluginName=digital-clock
-
-[Containments][5][Applets][13][LayoutInformation]
-Order=6
-
-[Containments][5][Applets][13][PopupApplet]
-DialogHeight=237
-DialogWidth=254
-
-[Containments][5][Applets][16]
-geometry=1583,1,27,27
-immutability=1
-plugin=pastebin
-zvalue=0
-
-[Containments][5][Applets][16][Configuration]
-History=
-
-[Containments][5][Applets][16][LayoutInformation]
-Order=4
-
-[Containments][5][Applets][6]
-geometry=0,1,27,27
-immutability=1
-plugin=launcher
-zvalue=0
-
-[Containments][5][Applets][6][LayoutInformation]
-Order=0
-
-[Containments][5][Applets][6][Shortcuts]
-global=Alt+F1
-
-[Containments][5][Applets][7]
-geometry=62,1,39,27
-immutability=1
-plugin=pager
-zvalue=0
-
-[Containments][5][Applets][7][LayoutInformation]
-Order=2
-
-[Containments][5][Applets][8]
-geometry=31,1,27,27
-immutability=1
-plugin=quickaccess
-zvalue=0
-
-[Containments][5][Applets][8][LayoutInformation]
-Order=1
-
-[Containments][5][Applets][9]
-geometry=105,1,1474,27
-immutability=1
-plugin=tasks
-zvalue=0
-
-[Containments][5][Applets][9][Configuration]
-Share=false
-groupingStrategy=0
-highlightWindows=true
-showOnlyCurrentDesktop=true
-
-[Containments][5][Applets][9][LayoutInformation]
-Order=3
-
-[Containments][5][Configuration]
-maximumSize=1920,28
-minimumSize=1920,28
=== removed file 'upd/test-one-applet-to-changerc'
--- upd/test-one-applet-to-changerc 2010-03-30 15:34:11 +0000
+++ upd/test-one-applet-to-changerc 1970-01-01 00:00:00 +0000
@@ -1,201 +0,0 @@
-[AppletGlobals][plasma_applet_systemtray]
-ShowApplicationStatus=true
-ShowCommunications=true
-ShowHardware=true
-ShowJobs=false
-ShowNotifications=false
-ShowSystemServices=true
-
-[Containments]
-JauntyUpgradeScriptRun=true
-
-[Containments][1]
-activity=
-desktop=-1
-formfactor=0
-geometry=0,0,1920,1080
-immutability=1
-location=0
-plugin=desktop
-screen=0
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-zvalue=0
-
-[Containments][1][Wallpaper][image]
-slideTimer=10
-slidepaths=/usr/share/wallpapers/
-userswallpapers=
-wallpaper=/usr/share/wallpapers/Ethais
-wallpapercolor=56,111,150
-wallpaperposition=0
-
-[Containments][4]
-activity=
-desktop=-1
-formfactor=0
-geometry=1926,0,1280,1024
-immutability=1
-location=0
-plugin=desktop
-screen=1
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-zvalue=0
-
-[Containments][4][Wallpaper][image]
-slideTimer=10
-slidepaths=/usr/share/wallpapers/
-userswallpapers=
-wallpaper=/usr/share/wallpapers/Ethais
-wallpapercolor=56,111,150
-wallpaperposition=0
-
-[Containments][5]
-activity=
-desktop=-1
-formfactor=2
-geometry=0,-34,1920,28
-immutability=1
-location=4
-plugin=panel
-screen=0
-zvalue=150
-
-[Containments][5][Applets][11]
-geometry=1614,1,208,27
-immutability=1
-plugin=systemtray
-zvalue=0
-
-[Containments][5][Applets][11][Configuration]
-AutoHidePopup=true
-Share=false
-alwaysShown=
-hidden=
-
-[Containments][5][Applets][11][Configuration][Applets][2]
-geometry=168,0.5,24,24
-immutability=1
-plugin=indicatordisplay
-zvalue=0
-
-[Containments][5][Applets][11][Configuration][Applets][2][PopupApplet]
-DialogHeight=35
-DialogWidth=132
-
-[Containments][5][Applets][11][Configuration][Applets][3]
-geometry=0,0,250,300
-immutability=1
-plugin=notifier
-zvalue=0
-
-[Containments][5][Applets][11][Configuration][ExtenderItems][1]
-extenderIconName=
-extenderItemName=jobGroup
-extenderItemPosition=0
-isCollapsed=false
-isGroup=true
-sourceAppletId=11
-sourceAppletPluginName=systemtray
-
-[Containments][5][Applets][11][Configuration][ExtenderItems][2]
-extenderIconName=
-extenderItemName=completedJobsGroup
-extenderItemPosition=0
-extenderTitle=0 tâche récemment terminée :
-groupCollapsed=false
-isCollapsed=false
-isGroup=true
-sourceAppletId=11
-sourceAppletPluginName=systemtray
-
-[Containments][5][Applets][11][LayoutInformation]
-Order=5
-
-[Containments][5][Applets][11][PopupApplet]
-DialogHeight=14
-DialogWidth=0
-
-[Containments][5][Applets][13]
-geometry=1826,1,72,27
-immutability=1
-plugin=digital-clock
-zvalue=0
-
-[Containments][5][Applets][13][Configuration][ExtenderItems][3]
-extenderIconName=view-pim-calendar
-extenderItemName=calendar
-extenderItemPosition=0
-extenderTitle=Calendar
-isCollapsed=false
-sourceAppletId=13
-sourceAppletPluginName=digital-clock
-
-[Containments][5][Applets][13][LayoutInformation]
-Order=6
-
-[Containments][5][Applets][13][PopupApplet]
-DialogHeight=237
-DialogWidth=254
-
-[Containments][5][Applets][16]
-geometry=1583,1,27,27
-immutability=1
-plugin=pastebin
-zvalue=0
-
-[Containments][5][Applets][16][Configuration]
-History=
-
-[Containments][5][Applets][16][LayoutInformation]
-Order=4
-
-[Containments][5][Applets][6]
-geometry=0,1,27,27
-immutability=1
-plugin=launcher
-zvalue=0
-
-[Containments][5][Applets][6][LayoutInformation]
-Order=0
-
-[Containments][5][Applets][6][Shortcuts]
-global=Alt+F1
-
-[Containments][5][Applets][7]
-geometry=62,1,39,27
-immutability=1
-plugin=pager
-zvalue=0
-
-[Containments][5][Applets][7][LayoutInformation]
-Order=2
-
-[Containments][5][Applets][8]
-geometry=31,1,27,27
-immutability=1
-plugin=quickaccess
-zvalue=0
-
-[Containments][5][Applets][8][LayoutInformation]
-Order=1
-
-[Containments][5][Applets][9]
-geometry=105,1,1474,27
-immutability=1
-plugin=tasks
-zvalue=0
-
-[Containments][5][Applets][9][Configuration]
-Share=false
-groupingStrategy=0
-highlightWindows=true
-showOnlyCurrentDesktop=true
-
-[Containments][5][Applets][9][LayoutInformation]
-Order=3
-
-[Containments][5][Configuration]
-maximumSize=1920,28
-minimumSize=1920,28