From ad45f1003b4f1b2d7e2b474b19bac33fb2ecb208 Mon Sep 17 00:00:00 2001 From: jderose9 Date: Fri, 23 Dec 2016 11:32:23 -0500 Subject: [PATCH] Rename "OneBar" to "dash-to-panel" --- .gitignore | 4 +-- Makefile | 18 ++++++------ README.md | 29 ++++++++++++++++++- extension.js | 2 +- metadata.json | 12 ++++---- prefs.js | 4 +-- ...hell.extensions.dash-to-panel.gschema.xml} | 16 +++++----- 7 files changed, 56 insertions(+), 29 deletions(-) rename schemas/{org.gnome.shell.extensions.onebar.gschema.xml => org.gnome.shell.extensions.dash-to-panel.gschema.xml} (87%) diff --git a/.gitignore b/.gitignore index b9e4726..c422364 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ .~ *~ gschemas.compiled -onebar@jderose9.github.com.zip +dash-to-panel@jderose9.github.com.zip *.mo -po/onebar.pot +po/dash-to-panel.pot Settings.ui.h diff --git a/Makefile b/Makefile index ea63f76..e8c0ab7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Basic Makefile -UUID = onebar@jderose9.github.com +UUID = dash-to-panel@jderose9.github.com BASE_MODULES = extension.js stylesheet.css metadata.json COPYING README.md EXTRA_MODULES = convenience.js taskbar.js secondaryMenu.js windowPreview.js prefs.js Settings.ui #EXTRA_MEDIA = logo.svg @@ -11,7 +11,7 @@ ifeq ($(strip $(DESTDIR)),) else INSTALLBASE = $(DESTDIR)/usr/share/gnome-shell/extensions endif -INSTALLNAME = onebar@jderose9.github.com +INSTALLNAME = dash-to-panel@jderose9.github.com # The command line passed variable VERSION is used to set the version string # in the metadata and in the generated zip-file. If no VERSION is passed, the @@ -31,21 +31,21 @@ clean: extension: ./schemas/gschemas.compiled $(MSGSRC:.po=.mo) -./schemas/gschemas.compiled: ./schemas/org.gnome.shell.extensions.onebar.gschema.xml +./schemas/gschemas.compiled: ./schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml glib-compile-schemas ./schemas/ -potfile: ./po/onebar.pot +potfile: ./po/dash-to-panel.pot mergepo: potfile for l in $(MSGSRC); do \ - msgmerge -U $$l ./po/onebar.pot; \ + msgmerge -U $$l ./po/dash-to-panel.pot; \ done; -./po/onebar.pot: $(TOLOCALIZE) Settings.ui +./po/dash-to-panel.pot: $(TOLOCALIZE) Settings.ui mkdir -p po - xgettext -k_ -kN_ -o po/onebar.pot --package-name "OneBar" $(TOLOCALIZE) + xgettext -k_ -kN_ -o po/dash-to-panel.pot --package-name "Dash To Panel" $(TOLOCALIZE) intltool-extract --type=gettext/glade Settings.ui - xgettext -k_ -kN_ --join-existing -o po/onebar.pot Settings.ui.h + xgettext -k_ -kN_ --join-existing -o po/dash-to-panel.pot Settings.ui.h ./po/%.mo: ./po/%.po msgfmt -c $< -o $@ @@ -79,6 +79,6 @@ _build: all lf=_build/locale/`basename $$l .mo`; \ mkdir -p $$lf; \ mkdir -p $$lf/LC_MESSAGES; \ - cp $$l $$lf/LC_MESSAGES/onebar.mo; \ + cp $$l $$lf/LC_MESSAGES/dash-to-panel.mo; \ done; sed -i 's/"version": -1/"version": "$(VERSION)"/' _build/metadata.json; diff --git a/README.md b/README.md index a43780e..fe20e17 100644 --- a/README.md +++ b/README.md @@ -1 +1,28 @@ -# gnome-onebar \ No newline at end of file +# Dash to Panel +Screenshot forthcoming. + +## An icon-only taskbar for the GNOME Shell +An icon-only taskbar for the Gnome Shell. This extension moves the dash into the gnome main panel (top bar) to behave as an icon-only task manager similar to that found in KDE Plasma and Windows 7+. + +## Installation from source + +The extension can be installed directly from source, either for the convenience of using git or to test the latest development version. Clone the desired branch with git + +
git clone https://github.com/jderose9/dash-to-panel.git
+or download the branch from github. A simple Makefile is included. Then run +
make
+make install
+
+to install the extension in your home directory. A Shell reload is required Alt+F2 r Enter and the extension has to be enabled with *gnome-tweak-tool* or with *dconf*. + +## Bug Reporting + +Bugs should be reported to the Github bug tracker [https://github.com/jderose9/dash-to-panel/issues](https://github.com/jderose9/dash-to-panel/issues). + +## License +Dash to Panel Gnome Shell extension is distributed under the terms of the GNU General Public License, +version 2 or later. See the COPYING file for details. + +## Credits +The bulk of the code in this extension comes from [Dash-to-Dock](https://micheleg.github.io/dash-to-dock/index.html). +This extension leverages the work for [ZorinOS Taskbar](https://github.com/ZorinOS/zorin-taskbar) used in [ZorinOS](https://zorinos.com/) to allow the dash from [Dash-to-Dock](https://micheleg.github.io/dash-to-dock/index.html) to be embedded in the Gnome main panel. \ No newline at end of file diff --git a/extension.js b/extension.js index f333a2c..c8f70d5 100644 --- a/extension.js +++ b/extension.js @@ -50,7 +50,7 @@ function init() { } function enable() { - settings = Convenience.getSettings('org.gnome.shell.extensions.onebar'); + settings = Convenience.getSettings('org.gnome.shell.extensions.dash-to-panel'); panel = Main.panel; container = panel._leftBox; appMenu = panel.statusArea['appMenu']; diff --git a/metadata.json b/metadata.json index 9fa579c..50315fe 100644 --- a/metadata.json +++ b/metadata.json @@ -1,9 +1,9 @@ { -"extension-id": "onebar", -"uuid": "onebar@jderose9.github.com", -"name": "OneBar", -"description": "Win7 style taskbar", +"extension-id": "dash-to-panel", +"uuid": "dash-to-panel@jderose9.github.com", +"name": "Dash to Panel", +"description": "An icon-only taskbar for the Gnome Shell. This extension moves the dash into the gnome main panel (top bar) to behave as an icon-only task manager similar to that found in KDE Plasma and Windows 7+.", "shell-version": [ "3.20", "3.22" ], -"url": "https://github.com/jderose9/onebar", -"gettext-domain": "onebar" +"url": "https://github.com/jderose9/dash-to-panel", +"gettext-domain": "dash-to-panel" } diff --git a/prefs.js b/prefs.js index 99b5554..026b1a4 100644 --- a/prefs.js +++ b/prefs.js @@ -28,7 +28,7 @@ const Gdk = imports.gi.Gdk; const Lang = imports.lang; const Mainloop = imports.mainloop; -const Gettext = imports.gettext.domain('onebar'); +const Gettext = imports.gettext.domain('dash-to-panel'); const _ = Gettext.gettext; const N_ = function(e) { return e }; @@ -42,7 +42,7 @@ const Settings = new Lang.Class({ Name: 'TaskBar.Settings', _init: function() { - this._settings = Convenience.getSettings('org.gnome.shell.extensions.onebar'); + this._settings = Convenience.getSettings('org.gnome.shell.extensions.dash-to-panel'); this._rtl = (Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL); diff --git a/schemas/org.gnome.shell.extensions.onebar.gschema.xml b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml similarity index 87% rename from schemas/org.gnome.shell.extensions.onebar.gschema.xml rename to schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml index b3781fb..ec50c8e 100644 --- a/schemas/org.gnome.shell.extensions.onebar.gschema.xml +++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml @@ -1,6 +1,6 @@ - + @@ -9,12 +9,12 @@ - + - - + + 'BOTTOM' Panel position Panel is shown on the Bottom or Top of the screen. @@ -52,22 +52,22 @@ true Activate only one window - + 'cycle-windows' Action when clicking on a running app Set the action that is executed when clicking on the icon of a running application - + 'minimize' Action when shit+clicking on a running app Set the action that is executed when shift+clicking on the icon of a running application - + 'launch' Action when clicking on a running app Set the action that is executed when middle-clicking on the icon of a running application - + 'launch' Action when clicking on a running app Set the action that is executed when shift+middle-clicking on the icon of a running application