Merge lp:~mconley/globalmenu-extension/add_globalmenu_dummy into lp:~chrisccoulson/globalmenu-extension/trunk

[Mike Conley]

Instead of simply skipping over XUL tags that we don't recognize within a menubar, we now associate them with uGlobalMenuDummy objects, which are registered as invisible elements within the Unity menubar.

=== modified file 'extensions/globalmenu/components/src/Makefile.in'
--- extensions/globalmenu/components/src/Makefile.in	2011-01-19 23:33:32 +0000
+++ extensions/globalmenu/components/src/Makefile.in	2011-02-03 18:23:11 +0000
@@ -58,6 +58,7 @@
 		  uGlobalMenuBar.cpp \
 		  uGlobalMenuSeparator.cpp \
 		  uGlobalMenuItem.cpp \
+                  uGlobalMenuDummy.cpp \
 		  uGlobalMenu.cpp \
 		  uGlobalMenuDocListener.cpp \
 		  uGlobalMenuObject.cpp \

=== modified file 'extensions/globalmenu/components/src/uGlobalMenu.cpp'
--- extensions/globalmenu/components/src/uGlobalMenu.cpp	2011-01-21 01:45:13 +0000
+++ extensions/globalmenu/components/src/uGlobalMenu.cpp	2011-02-03 18:23:11 +0000
@@ -54,6 +54,7 @@
 #include <glib-object.h>
 
 #include "uGlobalMenu.h"
+#include "uGlobalMenuDummy.h"
 #include "uGlobalMenuItem.h"
 #include "uGlobalMenuSeparator.h"
 #include "uWidgetAtoms.h"
@@ -430,6 +431,18 @@
                        mListener,
                        child);
         newItem = static_cast<uGlobalMenuObject *>(sep);
+      } else {
+        // We didn't recognize the tag.  We'll insert an invisible
+        // dummy node so that the indices between the hidden XUL menu
+        // and the GlobalMenu stay in sync.
+        uGlobalMenuDummy *dummy = new uGlobalMenuDummy();
+        if(!dummy)
+          return NS_ERROR_OUT_OF_MEMORY;
+
+        rv = dummy->Init(static_cast<uGlobalMenuObject *>(this),
+                         mListener,
+                         child);
+        newItem = static_cast<uGlobalMenuObject *>(dummy);
       }
 
       AppendMenuObject(newItem);

=== added file 'extensions/globalmenu/components/src/uGlobalMenuDummy.cpp'
--- extensions/globalmenu/components/src/uGlobalMenuDummy.cpp	1970-01-01 00:00:00 +0000
+++ extensions/globalmenu/components/src/uGlobalMenuDummy.cpp	2011-02-03 18:23:11 +0000
@@ -0,0 +1,118 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ *	 Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is globalmenu-extension.
+ *
+ * The Initial Developer of the Original Code is
+ * Canonical Ltd.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Chris Coulson <[e-mail]>
+ * Mike Conley <[e-mail]>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ * 
+ * ***** END LICENSE BLOCK ***** */
+
+#include <nsIAtom.h>
+#include <nsDebug.h>
+#include <nsIContent.h>
+
+#include <glib-object.h>
+#include <libdbusmenu-glib/server.h>
+
+#include "uGlobalMenuDummy.h"
+#include "uWidgetAtoms.h"
+
+
+nsresult
+uGlobalMenuDummy::ConstructDbusMenuItem()
+{
+  mDbusMenuItem = dbusmenu_menuitem_new();
+  if(!mDbusMenuItem)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  dbusmenu_menuitem_property_set(mDbusMenuItem,
+                                 DBUSMENU_MENUITEM_PROP_VISIBLE,
+                                 FALSE);
+
+  return NS_OK;
+}
+
+uGlobalMenuDummy::~uGlobalMenuDummy()
+{
+
+  if(mDbusMenuItem)
+    g_object_unref(mDbusMenuItem);
+}
+
+nsresult
+uGlobalMenuDummy::Init(uGlobalMenuObject *aParent,
+                           uGlobalMenuDocListener *aListener,
+                           nsIContent *aContent)
+{
+  NS_ENSURE_ARG(aParent);
+  NS_ENSURE_ARG(aListener);
+  NS_ENSURE_ARG(aContent);
+
+  mParent = aParent;
+  mListener = aListener;
+  mContent = aContent;
+
+  nsresult rv = ConstructDbusMenuItem();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+// GlobalMenuDummy is inert, and does not observe/react to content
+// changes.  The following methods are included simply to fill out
+// the interface.
+void
+uGlobalMenuDummy::ObserveAttributeChanged(nsIDocument *aDocument,
+                                              nsIContent *aContent,
+                                              nsIAtom *aAttribute)
+{
+
+}
+
+void
+uGlobalMenuDummy::ObserveContentRemoved(nsIDocument *aDocument,
+                                            nsIContent *aContainer,
+                                            nsIContent *aChild,
+                                            PRInt32 aIndexInContainer)
+{
+
+}
+
+void
+uGlobalMenuDummy::ObserveContentInserted(nsIDocument *aDocument,
+                                             nsIContent *aContainer,
+                                             nsIContent *aChild,
+                                             PRInt32 aIndexInContainer)
+{
+
+}

=== added file 'extensions/globalmenu/components/src/uGlobalMenuDummy.h'
--- extensions/globalmenu/components/src/uGlobalMenuDummy.h	1970-01-01 00:00:00 +0000
+++ extensions/globalmenu/components/src/uGlobalMenuDummy.h	2011-02-03 18:23:11 +0000
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ *	 Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is globalmenu-extension.
+ *
+ * The Initial Developer of the Original Code is
+ * Canonical Ltd.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Chris Coulson <[e-mail]>
+ * Mike Conley <[e-mail]>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ * 
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _U_GLOBALMENUDUMMY_H
+#define _U_GLOBALMENUDUMMY_H
+
+#include "uGlobalMenuObject.h"
+#include "uMenuChangeObserver.h"
+
+class nsIContent;
+class uGlobalMenuDocListener;
+
+class uGlobalMenuDummy: public uGlobalMenuObject,
+                        public uMenuChangeObserver
+{
+public:
+  NS_DECL_UMENUCHANGEOBSERVER
+  uGlobalMenuDummy (): uGlobalMenuObject(MenuDummy) { };
+
+  nsresult Init (uGlobalMenuObject *aParent,
+                 uGlobalMenuDocListener *aListener,
+                 nsIContent *aContent);
+private:
+  ~uGlobalMenuDummy ();
+
+  nsresult ConstructDbusMenuItem (); 
+};
+
+
+#endif

=== modified file 'extensions/globalmenu/components/src/uGlobalMenuObject.h'
--- extensions/globalmenu/components/src/uGlobalMenuObject.h	2011-01-21 01:31:20 +0000
+++ extensions/globalmenu/components/src/uGlobalMenuObject.h	2011-02-03 18:23:11 +0000
@@ -55,7 +55,8 @@
   MenuBar,
   Menu,
   MenuItem,
-  MenuSeparator
+  MenuSeparator,
+  MenuDummy
 };
 
 class uGlobalMenuObject;