Merge lp:~rcmorano/classicmenu-indicator/classicmenu-indicator-gnome-shell into lp:classicmenu-indicator

[Roberto C. Morano]

Hello,

I have created a gnome-shell extension for your indicator in order to place it at the left of the main bar instead of the default location (message/notifications tray).

I have added it to the source as a new package and all you have to do is installing it and enabling the extension through gnome-tweak-tool.

I hope you like the contribution :]

Kind regards.

Unmerged revisions

22. By Roberto C. Morano on 2011-11-21

updated changelog

21. By Roberto C. Morano on 2011-11-21

added gnome-shell extension and packaging

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-14 21:32:29 +0000
+++ debian/changelog	2011-11-21 16:56:30 +0000
@@ -1,3 +1,13 @@
+classicmenu-indicator (0.06rcmorano1) oneiric; urgency=low
+
+  * debian/control: 
+    - Added classicmenu-indicator-gnome-shell package
+
+  * gnome-shell-extension:
+    - Added gnome-shell extension for classicmenu-indicator
+
+ -- Roberto C. Morano <[e-mail]>  Mon, 21 Nov 2011 17:45:12 +0200
+
 classicmenu-indicator (0.06) natty; urgency=low
 
   * cmdindicator.py: 

=== added file 'debian/classicmenu-indicator-gnome-shell.install'
--- debian/classicmenu-indicator-gnome-shell.install	1970-01-01 00:00:00 +0000
+++ debian/classicmenu-indicator-gnome-shell.install	2011-11-21 16:56:30 +0000
@@ -0,0 +1,1 @@
+gnome-shell-extension/[e-mail] /usr/share/gnome-shell/extensions

=== modified file 'debian/control'
--- debian/control	2011-06-04 23:20:58 +0000
+++ debian/control	2011-11-21 16:56:30 +0000
@@ -14,3 +14,12 @@
 Description: indicator showing the main menu from Gnome Classic
  classicmenu-indicator displays the main menu from Gnome2/Gnome Classic
 Homepage: http://www.florian-diesch.de/software/classicmenu-indicator/
+
+Package: classicmenu-indicator-gnome-shell
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, gnome-shell (>= 3.2), classicmenu-indicator 
+Breaks: ${python:Breaks}
+Description: gnome-shell extension that relocates indicator
+ classicmenu-indicator-gnome-shell displays the main menu from Gnome2/Gnome
+ Classic at the left of the gnome-shell main bar.
+Homepage: http://www.florian-diesch.de/software/classicmenu-indicator/

=== added directory 'gnome-shell-extension'
=== added directory 'gnome-shell-extension/[e-mail]'
=== added file 'gnome-shell-extension/[e-mail]/extension.js'
--- gnome-shell-extension/[e-mail]/extension.js	1970-01-01 00:00:00 +0000
+++ gnome-shell-extension/[e-mail]/extension.js	2011-11-21 16:56:30 +0000
@@ -0,0 +1,80 @@
+/**
+* extension.js
+* Copyright (C) 2011, Roberto C. Morano <[e-mail]>
+* 
+* This software is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+* 
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* As a special exception, if you link this library with other files to
+* produce an executable, this library does not by itself cause the
+* resulting executable to be covered by the GNU General Public License.
+* This exception does not however invalidate any other reasons why the
+* executable file might be covered by the GNU General Public License.
+*/
+
+const StatusIconDispatcherOrig = imports.ui.statusIconDispatcher;
+const Main = imports.ui.main;
+const Signals = imports.signals;
+const PanelMenu = imports.ui.panelMenu;
+
+const STANDARD_TRAY_ICON_IMPLEMENTATIONS = imports.ui.statusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS;
+const PANEL_ICON_SIZE = imports.ui.panel.PANEL_ICON_SIZE
+
+function StatusIconDispatcher() {
+    this._init();
+}
+
+StatusIconDispatcher.prototype = {
+    _init: StatusIconDispatcherOrig.StatusIconDispatcher.prototype._init,
+
+    start: StatusIconDispatcherOrig.StatusIconDispatcher.prototype.start,
+	_onTrayIconRemoved: StatusIconDispatcherOrig.StatusIconDispatcher.prototype._onTrayIconRemoved,
+	_onTrayIconAdded: function(o, icon) {
+
+
+        let wmClass = (icon.wm_class || 'unknown').toLowerCase();
+        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
+        if (role)
+            this.emit('status-icon-added', icon, role);
+        else
+            if ( wmClass == "classicmenu-indicator" ) {
+                global.log(wmClass);
+//                Main.panel._leftBox.remove_actor(Main.panel._activitiesButton.actor);
+                icon.height = PANEL_ICON_SIZE;
+                let buttonBox = new PanelMenu.ButtonBox();
+                let box = buttonBox.actor;
+                box.add_actor(icon);
+                Main.panel._leftBox.insert_actor(box, 0);
+            }
+            this.emit('message-icon-added', icon);
+    },
+};
+
+Signals.addSignalMethods(StatusIconDispatcher.prototype);
+
+function main(meta) {
+
+	Main.statusIconDispatcher = new StatusIconDispatcher();
+	Main.statusIconDispatcher.start(Main.messageTray.actor);
+}
+
+function init() {
+}
+
+function enable(meta) {
+    main(meta);
+}
+
+function disable() {
+}

=== added file 'gnome-shell-extension/[e-mail]/metadata.json'
--- gnome-shell-extension/[e-mail]/metadata.json	1970-01-01 00:00:00 +0000
+++ gnome-shell-extension/[e-mail]/metadata.json	2011-11-21 16:56:30 +0000
@@ -0,0 +1,7 @@
+{
+	"shell-version": ["3.2"],
+	"uuid": "[e-mail]",
+	"name": "classicmenu-indicator",
+	"description": "Places the indicator at the left of the main gnome-shell bar.",
+	"url": "https://launchpad.net/classicmenu-indicator"
+}