Merge lp:~eduardo-mucelli/cairo-dock-plug-ins/DbusInterfaces into lp:~cairo-dock-team/cairo-dock-plug-ins/plug-ins

[Eduardo Mucelli Rezende Oliveira]

Dbus interfaces. Defining a constant to MAIN_MENU_ID instead of keep using the '0', and commenting what that means when building the menus

[lp:~eduardo-mucelli/cairo-dock-plug-ins/DbusInterfaces]

1870. By Eduardo Mucelli Rezende Oliveira on 2011-02-22

Defining a constant to MAIN_MENU_ID instead of keep using the '0', and commenting what that means when building the menus

[Matthieu Baerts (matttbe)]

@Eduardo: Thank you for this modification!

Just one tiny thing for your next commit: is it possible to use some tabulations instead of a lot of spaces just because we use this layout everywhere in the source code :)

[Eduardo Mucelli Rezende Oliveira (eduardo-mucelli)]

@Matttbe: Sure. I'm also confused because in Python I change the editor to use Tab, and in Ruby I change to spaces, but sometimes I forget.

=== modified file 'Dbus/interfaces/bash/CDBashApplet.sh'
--- Dbus/interfaces/bash/CDBashApplet.sh	2011-02-12 03:01:04 +0000
+++ Dbus/interfaces/bash/CDBashApplet.sh	2011-02-21 21:55:00 +0000
@@ -46,6 +46,7 @@
 MENU_SEPARATOR=2
 MENU_CHECKBOX=3
 MENU_RADIO_BUTTON=4
+MAIN_MENU_ID=0
 
 call() {  # method, args
 	method=$1

=== modified file 'Dbus/interfaces/mono/CDApplet.cs'
--- Dbus/interfaces/mono/CDApplet.cs	2011-02-12 03:01:04 +0000
+++ Dbus/interfaces/mono/CDApplet.cs	2011-02-21 21:55:00 +0000
@@ -63,12 +63,16 @@
 		MIDDLE
 	}
 	public enum MenuItemType {
-	        MENU_ENTRY = 0,
-	        MENU_SUB_MENU,
-	        MENU_SEPARATOR,
-	        MENU_CHECKBOX,
-	        MENU_RADIO_BUTTON
+        MENU_ENTRY = 0,
+        MENU_SUB_MENU,
+        MENU_SEPARATOR,
+        MENU_CHECKBOX,
+        MENU_RADIO_BUTTON
 	}
+
+    public enum MenuItemId {
+        MAIN_MENU_ID = 0
+    }
 	
 	public CDApplet()
 	{

=== modified file 'Dbus/interfaces/python/CDApplet.py'
--- Dbus/interfaces/python/CDApplet.py	2011-01-18 01:03:52 +0000
+++ Dbus/interfaces/python/CDApplet.py	2011-02-21 21:55:00 +0000
@@ -53,6 +53,8 @@
 	MENU_SEPARATOR    = 2
 	MENU_CHECKBOX     = 3
 	MENU_RADIO_BUTTON = 4
+
+    MAIN_MENU_ID = 0
 	
 	def __init__(self):
 		""" initialize the applet. Must be called by any class that inheritates from it.

=== modified file 'Dbus/interfaces/ruby/CDApplet.rb'
--- Dbus/interfaces/ruby/CDApplet.rb	2011-02-17 00:03:58 +0000
+++ Dbus/interfaces/ruby/CDApplet.rb	2011-02-21 21:55:00 +0000
@@ -47,6 +47,8 @@
 	MENU_CHECKBOX     = 3
 	MENU_RADIO_BUTTON = 4
 
+    MAIN_MENU_ID = 0
+
 	def initialize
 		#~ self.cAppletName = File.basename(Dir.getwd)
 		#~ self.cConfFile = File.expand_path("~/.config/cairo-dock/current_theme/plug-ins/#{self.cAppletName}/#{self.cAppletName}.conf")

=== modified file 'Dbus/interfaces/vala/CDApplet.vala'
--- Dbus/interfaces/vala/CDApplet.vala	2011-01-18 01:03:52 +0000
+++ Dbus/interfaces/vala/CDApplet.vala	2011-02-21 21:55:00 +0000
@@ -111,6 +111,10 @@
 		MENU_RADIO_BUTTON
 	}
 	
+    public enum MenuItemId {
+        MAIN_MENU_ID = 0
+    }
+
 	public CDApplet(string[] argv)
 	{
 		this.cAppletName = argv[0].substring(2,999);