From 19b9523d4ec1c596652774106f5b85754450fbd3 Mon Sep 17 00:00:00 2001 From: zpydr Date: Thu, 5 Apr 2018 20:10:44 +0100 Subject: [PATCH] v57 --- README | 7 +-- README.md | 6 +-- TaskBar.pot | 4 +- extension.js | 4 +- images/README | 28 +++++----- lib.js | 4 +- locale/cs_CZ/LC_MESSAGES/TaskBar.po | 4 +- locale/de/LC_MESSAGES/TaskBar.po | 4 +- locale/es/LC_MESSAGES/TaskBar.po | 4 +- locale/fr/LC_MESSAGES/TaskBar.po | 4 +- locale/ru_RU/LC_MESSAGES/TaskBar.po | 4 +- locale/zh_CN/LC_MESSAGES/TaskBar.po | 4 +- metadata.json | 8 +-- prefs.js | 51 +++++++++++-------- ...gnome.shell.extensions.TaskBar.gschema.xml | 4 +- scripts/export.sh | 4 +- scripts/import.sh | 4 +- stylesheet.css | 4 +- windows.js | 4 +- 19 files changed, 85 insertions(+), 71 deletions(-) diff --git a/README b/README index 612e993..afc54c8 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ GNOME Shell Extension TaskBar -Copyright (C) 2013-2017 zpydr +Copyright (C) 2013-2018 zpydr This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program. If not, see https://www.gnu.org/licenses/. zpydr@openmailbox.org -Version 56 for GNOME 3.10 - 3.26 +Version 57 for GNOME 3.10 - 3.28 https://extensions.gnome.org/extension/584/taskbar/ https://github.com/zpydr/gnome-shell-extension-taskbar/ @@ -72,4 +72,5 @@ Spanish by Testoriano Credit to Xes, flubshi, rogst, Baltix, boennhoff, skoslowski, rgeary1, hkskoglund, Michal Růžička, -skochxxl, tuhaihe, to-ba, tobimensch, navarrano +skochxxl, tuhaihe, to-ba, tobimensch, navarrano, +unixfox, jkosecki, Taz8du29, diegosanz diff --git a/README.md b/README.md index 6b0d426..ace8ba6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![TaskBar Icon](https://extensions.gnome.org/extension-data/icons/icon_584_ZS33QUn.png) **GNOME Shell Extension TaskBar** -Copyright (C) 2013-2017 zpydr +Copyright (C) 2013-2018 zpydr This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ zpydr@openmailbox.org ![TaskBar Image](https://github.com/zpydr/gnome-shell-extension-taskbar-content/blob/master/taskbar_v56.gif) - **Version 56 for GNOME 3.10 - 3.26** + **Version 57 for GNOME 3.10 - 3.28** https://extensions.gnome.org/extension/584/taskbar/ https://github.com/zpydr/gnome-shell-extension-taskbar/ @@ -75,5 +75,5 @@ German by jonnius Russian by dersteinkauz Spanish by Testoriano -Credit to Xes, flubshi, rogst, Baltix, boennhoff, skoslowski, rgeary1, hkskoglund, Michal Růžička, skochxxl, tuhaihe, to-ba, tobimensch, navarrano         +Credit to Xes, flubshi, rogst, Baltix, boennhoff, skoslowski, rgeary1, hkskoglund, Michal Růžička, skochxxl, tuhaihe, to-ba, tobimensch, navarrano, unixfox, jkosecki, Taz8du29, diegosanz         diff --git a/TaskBar.pot b/TaskBar.pot index c202889..08dad5c 100644 --- a/TaskBar.pot +++ b/TaskBar.pot @@ -1,7 +1,7 @@ # GNOME Shell Extension TaskBar -# Copyright (C) 2013-2017 zpydr +# Copyright (C) 2013-2018 zpydr # -# Version 56 +# Version 57 # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/extension.js b/extension.js index 0bd5dfd..e448f51 100644 --- a/extension.js +++ b/extension.js @@ -1,7 +1,7 @@ // GNOME Shell Extension TaskBar -// Copyright (C) 2013-2017 zpydr +// Copyright (C) 2013-2018 zpydr // -// Version 56 +// Version 57 // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/images/README b/images/README index 1789571..e8f5f6a 100644 --- a/images/README +++ b/images/README @@ -1,5 +1,5 @@ GNOME Shell Extension TaskBar -Copyright (C) 2013-2017 zpydr +Copyright (C) 2013-2018 zpydr This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,16 +17,16 @@ along with this program. If not, see https://www.gnu.org/licenses/. zpydr@openmailbox.org Icons: -active-task-background.svg - Copyright (C) 2013-2017 zpydr - GPLv3+ -appview-button-default.svg - Copyright (C) 2013-2017 GNOME Project - GPLv2+ -bottom-panel-tray-button.svg - Copyright (C) 2013-2017 GNOME Project - GPLv2+ -desktop-button-dark.png - Copyright (C) 2013-2017 GNOME Project - GPLv2+ -desktop-button-default.png - Copyright (C) 2013-2017 zpydr - GPLv3+ -desktop-button-gnome.png - Copyright (C) 2013-2017 GNOME Project - GPLv2+ -settings-1px.png - Copyright (C) 2013-2017 zpydr - GPLv3+ -settings-fsf.png - Copyright (C) 2013-2017 GNU Project - GPLv3+ -settings-gnome.png - Copyright (C) 2013-2017 GNOME Project - GPLv2+ -settings-gpl.png - Copyright (C) 2013-2017 GNU Project - GPLv3+ -settings-home.png - Copyright (C) 2013-2017 GNOME Project - GPLv2+ -settings-mail.png - Copyright (C) 2013-2017 GNOME Project - GPLv2+ -transparent-icon.svg - Copyright (C) 2013-2017 zpydr - GPLv3+ +active-task-background.svg - Copyright (C) 2013-2018 zpydr - GPLv3+ +appview-button-default.svg - Copyright (C) 2013-2018 GNOME Project - GPLv2+ +bottom-panel-tray-button.svg - Copyright (C) 2013-2018 GNOME Project - GPLv2+ +desktop-button-dark.png - Copyright (C) 2013-2018 GNOME Project - GPLv2+ +desktop-button-default.png - Copyright (C) 2013-2018 zpydr - GPLv3+ +desktop-button-gnome.png - Copyright (C) 2013-2018 GNOME Project - GPLv2+ +settings-1px.png - Copyright (C) 2013-2018 zpydr - GPLv3+ +settings-fsf.png - Copyright (C) 2013-2018 GNU Project - GPLv3+ +settings-gnome.png - Copyright (C) 2013-2018 GNOME Project - GPLv2+ +settings-gpl.png - Copyright (C) 2013-2018 GNU Project - GPLv3+ +settings-home.png - Copyright (C) 2013-2018 GNOME Project - GPLv2+ +settings-mail.png - Copyright (C) 2013-2018 GNOME Project - GPLv2+ +transparent-icon.svg - Copyright (C) 2013-2018 zpydr - GPLv3+ diff --git a/lib.js b/lib.js index f355e9d..8f6a141 100644 --- a/lib.js +++ b/lib.js @@ -1,7 +1,7 @@ // GNOME Shell Extension TaskBar -// Copyright (C) 2013-2017 zpydr +// Copyright (C) 2013-2018 zpydr // -// Version 56 +// Version 57 // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/locale/cs_CZ/LC_MESSAGES/TaskBar.po b/locale/cs_CZ/LC_MESSAGES/TaskBar.po index 3c54954..ae9e1a8 100644 --- a/locale/cs_CZ/LC_MESSAGES/TaskBar.po +++ b/locale/cs_CZ/LC_MESSAGES/TaskBar.po @@ -1,6 +1,6 @@ # GNOME Shell Extension TaskBar -# Copyright (C) 2013-2017 zpydr -# Copyright (C) 2013-2017 michal-ruzicka (Czech translation) +# Copyright (C) 2013-2018 zpydr +# Copyright (C) 2013-2018 michal-ruzicka (Czech translation) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/locale/de/LC_MESSAGES/TaskBar.po b/locale/de/LC_MESSAGES/TaskBar.po index 7272dcf..fcb4a97 100644 --- a/locale/de/LC_MESSAGES/TaskBar.po +++ b/locale/de/LC_MESSAGES/TaskBar.po @@ -1,6 +1,6 @@ # GNOME Shell Extension TaskBar -# Copyright (C) 2013-2017 zpydr -# Copyright (C) 2013-2017 jonnius (German translation) +# Copyright (C) 2013-2018 zpydr +# Copyright (C) 2013-2018 jonnius (German translation) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/locale/es/LC_MESSAGES/TaskBar.po b/locale/es/LC_MESSAGES/TaskBar.po index f368d46..db47d01 100644 --- a/locale/es/LC_MESSAGES/TaskBar.po +++ b/locale/es/LC_MESSAGES/TaskBar.po @@ -1,6 +1,6 @@ # GNOME Shell Extension TaskBar -# Copyright (C) 2013-2017 zpydr -# Copyright (C) 2013-2017 Testoriano (Spanish translation) +# Copyright (C) 2013-2018 zpydr +# Copyright (C) 2013-2018 Testoriano (Spanish translation) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/locale/fr/LC_MESSAGES/TaskBar.po b/locale/fr/LC_MESSAGES/TaskBar.po index a3187d0..519bf50 100644 --- a/locale/fr/LC_MESSAGES/TaskBar.po +++ b/locale/fr/LC_MESSAGES/TaskBar.po @@ -1,6 +1,6 @@ # GNOME Shell Extension TaskBar -# Copyright (C) 2013-2017 zpydr -# Copyright (C) 2013-2017 narzb (French translation) +# Copyright (C) 2013-2018 zpydr +# Copyright (C) 2013-2018 narzb (French translation) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/locale/ru_RU/LC_MESSAGES/TaskBar.po b/locale/ru_RU/LC_MESSAGES/TaskBar.po index f70d65a..8839112 100644 --- a/locale/ru_RU/LC_MESSAGES/TaskBar.po +++ b/locale/ru_RU/LC_MESSAGES/TaskBar.po @@ -1,6 +1,6 @@ # GNOME Shell Extension TaskBar -# Copyright (C) 2013-2017 zpydr -# Copyright (C) 2013-2017 dersteinkauz (Russian translation) +# Copyright (C) 2013-2018 zpydr +# Copyright (C) 2013-2018 dersteinkauz (Russian translation) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/locale/zh_CN/LC_MESSAGES/TaskBar.po b/locale/zh_CN/LC_MESSAGES/TaskBar.po index cf45c65..f7e2112 100644 --- a/locale/zh_CN/LC_MESSAGES/TaskBar.po +++ b/locale/zh_CN/LC_MESSAGES/TaskBar.po @@ -1,6 +1,6 @@ # GNOME Shell Extension TaskBar -# Copyright (C) 2013-2017 zpydr -# Copyright (C) 2016-2017 wsxy162 (Chinese translation) +# Copyright (C) 2013-2018 zpydr +# Copyright (C) 2016-2018 wsxy162 (Chinese translation) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/metadata.json b/metadata.json index fe681a7..894ad84 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "_generated": "Generated by SweetTooth, do not edit", - "description": "TaskBar displays icons of running applications on the top panel or alternatively on a new bottom panel. Activate, minimize or close tasks with a simple click.\nTaskBar is a dock-like windows list on the top/bottom bar.\n\nOptions:\nDesktop button - toggle desktop view\nWorkspace button - switch workspaces left/right-click: cycle forward/backwards\nAppview button - left/right-click: toggle appview/overview\nFavorites - add from dash\nAlign position\nResize panels + adjust icon, label and content sizes\nTop/bottom panel background color + opacity\nBottom panel tray button - activate the message tray\nTasks on all workspaces\nGroup/sort tasks\nTasks label\nTasks application menu\nClose tasks with a right/middle click\nActivate tasks on hover\nScroll tasks/workspaces\nSeparators\nThumbnail/label-preview\nPreview color + opacity\nKeybindings\nColor or hide menu buttons\nDisable hot corner\nExport/import settings\n\nVersion 56 for GNOME 3.10 - 3.26\nzpydr@openmailbox.org\n\nTranslation:\nChinese by wsxy162\nCzech by Michal Růžička\nFrench by narzb\nGerman by jonnius\nRussian by dersteinkauz\nSpanish by Testoriano\n\nCredit to Xes, flubshi, rogst, Baltix, boennhoff, skoslowski, rgeary1, hkskoglund, Michal Růžička, skochxxl, tuhaihe, to-ba, tobimensch, navarrano", + "description": "TaskBar displays icons of running applications on the top panel or alternatively on a new bottom panel. Activate, minimize or close tasks with a simple click.\nTaskBar is a dock-like windows list on the top/bottom bar.\n\nOptions:\nDesktop button - toggle desktop view\nWorkspace button - switch workspaces left/right-click: cycle forward/backwards\nAppview button - left/right-click: toggle appview/overview\nFavorites - add from dash\nAlign position\nResize panels + adjust icon, label and content sizes\nTop/bottom panel background color + opacity\nBottom panel tray button - activate the message tray\nTasks on all workspaces\nGroup/sort tasks\nTasks label\nTasks application menu\nClose tasks with a right/middle click\nActivate tasks on hover\nScroll tasks/workspaces\nSeparators\nThumbnail/label-preview\nPreview color + opacity\nKeybindings\nColor or hide menu buttons\nDisable hot corner\nExport/import settings\n\nVersion 57 for GNOME 3.10 - 3.28\nzpydr@openmailbox.org\n\nTranslation:\nChinese by wsxy162\nCzech by Michal Růžička\nFrench by narzb\nGerman by jonnius\nRussian by dersteinkauz\nSpanish by Testoriano\n\nCredit to Xes, flubshi, rogst, Baltix, boennhoff, skoslowski, rgeary1, hkskoglund, Michal Růžička, skochxxl, tuhaihe, to-ba, tobimensch, navarrano, unixfox, jkosecki, Taz8du29, diegosanz", "name": "TaskBar", "shell-version": [ "3.10", @@ -24,9 +24,11 @@ "3.28", "3.29", "3.30", - "3.31" + "3.31", + "3.32", + "3.33" ], "url": "https://github.com/zpydr/gnome-shell-extension-taskbar", "uuid": "TaskBar@zpydr", - "version": 56 + "version": 57 } diff --git a/prefs.js b/prefs.js index 4418b8a..73816da 100644 --- a/prefs.js +++ b/prefs.js @@ -1,7 +1,7 @@ // GNOME Shell Extension TaskBar -// Copyright (C) 2013-2017 zpydr +// Copyright (C) 2013-2018 zpydr // -// Version 56 +// Version 57 // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -149,9 +149,12 @@ Prefs.prototype = { let linkImage8 = new Gtk.Image({ file: SPACERICON }); + let linkImage9 = new Gtk.Image({ + file: HOMEICON + }); let labelVersion1 = new Gtk.Label({ - label: _("Version") + " 56" + label: _("Version") + " 57" }); this.gridTaskBar.attach(labelVersion1, 0, 1, 5, 1); let labelVersion2 = new Gtk.Label({ @@ -181,14 +184,14 @@ Prefs.prototype = { }); labelLink2.set_always_show_image(true); this.gridTaskBar.attach(labelLink2, 1, 5, 1, 1); - let bugReport = new Gtk.LinkButton({ - image: linkImage4, - label: _("Report a Bug"), - uri: "mailto:zpydr@openmailbox.org?subject=TaskBar Bug Report&Body=TaskBar Bug Report%0D%0A%0D%0ATaskBar Version: 56%0D%0AGNOME Shell Version: %0D%0AOperating System: %0D%0AOS Version: %0D%0A%0D%0ABug Description: %0D%0A%0D%0A", + let labelLink7 = new Gtk.LinkButton({ + image: linkImage9, + label: " TaskBar Wiki", + uri: "https://github.com/zpydr/gnome-shell-extension-taskbar/wiki", xalign: 0 }); - bugReport.set_always_show_image(true); - this.gridTaskBar.attach(bugReport, 1, 6, 1, 1); + labelLink7.set_always_show_image(true); + this.gridTaskBar.attach(labelLink7, 1, 6, 1, 1); let labelLink4 = new Gtk.LinkButton({ image: linkImage5, label: " " + _("Donate for TaskBar"), @@ -213,20 +216,28 @@ Prefs.prototype = { }); labelLink6.set_always_show_image(true); this.gridTaskBar.attach(labelLink6, 3, 6, 1, 1); + let bugReport = new Gtk.LinkButton({ + image: linkImage4, + label: _("Report a Bug"), + uri: "mailto:zpydr@openmailbox.org?subject=TaskBar Bug Report&Body=TaskBar Bug Report%0D%0A%0D%0ATaskBar Version: 57%0D%0AGNOME Shell Version: %0D%0AOperating System: %0D%0AOS Version: %0D%0A%0D%0ABug Description: %0D%0A%0D%0A", + xalign: 0 + }); + bugReport.set_always_show_image(true); + this.gridTaskBar.attach(bugReport, 1, 7, 1, 1); let exportButton = new Gtk.Button({ label: _("Export Settings") }); exportButton.connect('clicked', Lang.bind(this, this.exportSettings)); exportButton.set_tooltip_text(_("Export All TaskBar Settings. This will create a taskbar.dconf file in your home folder.")); - this.gridTaskBar.attach(exportButton, 1, 8, 1, 1); + this.gridTaskBar.attach(exportButton, 1, 9, 1, 1); let importButton = new Gtk.Button({ label: _("Import Settings") }); importButton.connect('clicked', Lang.bind(this, this.importSettings)); importButton.set_tooltip_text(_("Import All TaskBar Settings. This will import the taskbar.dconf file located in your home folder.")); - this.gridTaskBar.attach(importButton, 3, 8, 1, 1); + this.gridTaskBar.attach(importButton, 3, 9, 1, 1); let resetAllButton = new Gtk.Button({ label: _("RESET ALL !") @@ -238,19 +249,19 @@ Prefs.prototype = { })); resetAllButton.connect('clicked', Lang.bind(this, this.resetAll)); resetAllButton.set_tooltip_text(_("Reset All TaskBar Settings to the Original TaskBar Settings")); - this.gridTaskBar.attach(resetAllButton, 1, 10, 1, 1); + this.gridTaskBar.attach(resetAllButton, 1, 11, 1, 1); let labelSpaceTaskBar1 = new Gtk.Label({ label: "\t", xalign: 0 }); - this.gridTaskBar.attach(labelSpaceTaskBar1, 0, 11, 1, 1); + this.gridTaskBar.attach(labelSpaceTaskBar1, 0, 12, 1, 1); let labelSpaceTaskBar2 = new Gtk.Label({ label: "\t", xalign: 0, hexpand: true }); - this.gridTaskBar.attach(labelSpaceTaskBar2, 2, 9, 1, 1); + this.gridTaskBar.attach(labelSpaceTaskBar2, 2, 10, 1, 1); let labelSpaceTaskBar3 = new Gtk.Label({ label: "" + _("TaskBar") + "", hexpand: true @@ -261,7 +272,7 @@ Prefs.prototype = { label: "\t", xalign: 0 }); - this.gridTaskBar.attach(labelSpaceTaskBar4, 4, 7, 1, 1); + this.gridTaskBar.attach(labelSpaceTaskBar4, 4, 8, 1, 1); this.gridComponents = new Gtk.Grid(); this.gridComponents.margin = this.gridComponents.row_spacing = 10; @@ -861,7 +872,7 @@ Prefs.prototype = { }); this.gridTasks.attach(labelSpaceTasks2, 2, 10, 1, 1); let labelSpaceTasks3 = new Gtk.Label({ - label: "\t", + label: "\t\t", xalign: 0 }); this.gridTasks.attach(labelSpaceTasks3, 3, 0, 1, 1); @@ -2317,7 +2328,7 @@ Prefs.prototype = { }); let labelGPL = new Gtk.Label({ - label: "GNOME Shell Extension TaskBar\nCopyright (C) 2013-2017 zpydr\n\nThis program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program. If not, see", + label: "GNOME Shell Extension TaskBar\nCopyright (C) 2013-2018 zpydr\n\nThis program is free software: you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program. If not, see", xalign: 0 }); let labelLinkGPL = new Gtk.LinkButton({ @@ -3280,9 +3291,9 @@ Prefs.prototype = { this.valueTasksLabelWidth.set_value(150); this.valueTasksContainerWidth.set_value(0); this.valueTasksSpaces.set_value(4); - this.valueTasksLeftClickMenu.set_value(1); - this.valueTasksMiddleClickMenu.set_value(0); - this.valueTasksRightClickMenu.set_value(2); + this.valueTasksLeftClickMenu.set_active(1); + this.valueTasksMiddleClickMenu.set_active(0); + this.valueTasksRightClickMenu.set_active(2); this.settings.set_boolean("reset-flag", false); }, diff --git a/schemas/org.gnome.shell.extensions.TaskBar.gschema.xml b/schemas/org.gnome.shell.extensions.TaskBar.gschema.xml index 4328846..ab940bd 100644 --- a/schemas/org.gnome.shell.extensions.TaskBar.gschema.xml +++ b/schemas/org.gnome.shell.extensions.TaskBar.gschema.xml @@ -1,9 +1,9 @@