diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2021-08-17 06:41:54 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2021-08-17 06:41:54 +0200 |
commit | e605fe5dffe686241847c67166fe2414b48ee2a8 (patch) | |
tree | 5b506de0a4faa0506d0cf053af8e9d7184aa59bf /src | |
parent | 6617f5ee51c94d05028ebceb3177ec0e3a87e78d (diff) | |
parent | 6a2a889a6de6b45fcc21e0050763858768610952 (diff) |
Merge branch 'release/debian/0.7.3-1'debian/0.7.3-1
Diffstat (limited to 'src')
64 files changed, 102 insertions, 88 deletions
diff --git a/src/actionGroups/actionGroup.vala b/src/actionGroups/actionGroup.vala index 37319d7..e617165 100644 --- a/src/actionGroups/actionGroup.vala +++ b/src/actionGroups/actionGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/bookmarkGroup.vala b/src/actionGroups/bookmarkGroup.vala index 43a5a79..89cd16d 100644 --- a/src/actionGroups/bookmarkGroup.vala +++ b/src/actionGroups/bookmarkGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/clipboardGroup.vala b/src/actionGroups/clipboardGroup.vala index 817efd2..3007376 100644 --- a/src/actionGroups/clipboardGroup.vala +++ b/src/actionGroups/clipboardGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/devicesGroup.vala b/src/actionGroups/devicesGroup.vala index 76d783f..1a6af09 100644 --- a/src/actionGroups/devicesGroup.vala +++ b/src/actionGroups/devicesGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/groupRegistry.vala b/src/actionGroups/groupRegistry.vala index 95f3790..6344884 100644 --- a/src/actionGroups/groupRegistry.vala +++ b/src/actionGroups/groupRegistry.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/menuGroup.vala b/src/actionGroups/menuGroup.vala index 88ff2ed..d4c720d 100644 --- a/src/actionGroups/menuGroup.vala +++ b/src/actionGroups/menuGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/sessionGroup.vala b/src/actionGroups/sessionGroup.vala index f176745..8bc26cb 100644 --- a/src/actionGroups/sessionGroup.vala +++ b/src/actionGroups/sessionGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actionGroups/windowListGroup.vala b/src/actionGroups/windowListGroup.vala index ba5ea2b..34ada18 100644 --- a/src/actionGroups/windowListGroup.vala +++ b/src/actionGroups/windowListGroup.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -176,6 +176,9 @@ public class WindowListGroup : ActionGroup { string icon_name = ""; #if HAVE_BAMF + + // bamf is not supported on wayland + if (GLib.Environment.get_variable("XDG_SESSION_TYPE") == "x11") { var xid = (uint32) window.get_xid(); Bamf.Matcher bamf_matcher = Bamf.Matcher.get_default(); Bamf.Application app = bamf_matcher.get_application_for_xid(xid); @@ -202,14 +205,14 @@ public class WindowListGroup : ActionGroup { error("%s", e.message); } } - } else { - var application = window.get_application(); - icon_name = application.get_icon_name().down(); } - #else + } + #endif + + if (icon_name == "") { var application = window.get_application(); icon_name = application.get_icon_name().down(); - #endif + } return icon_name; } diff --git a/src/actions/action.vala b/src/actions/action.vala index ee13b39..d90c408 100644 --- a/src/actions/action.vala +++ b/src/actions/action.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -69,7 +69,7 @@ public abstract class Action : GLib.Object { /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// - public Action(string name, string icon, bool is_quickaction) { + private Action(string name, string icon, bool is_quickaction) { GLib.Object(name : name, icon : icon, is_quickaction : is_quickaction); } diff --git a/src/actions/actionRegistry.vala b/src/actions/actionRegistry.vala index b5831c0..42366c7 100644 --- a/src/actions/actionRegistry.vala +++ b/src/actions/actionRegistry.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actions/appAction.vala b/src/actions/appAction.vala index b376796..e35dccb 100644 --- a/src/actions/appAction.vala +++ b/src/actions/appAction.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actions/keyAction.vala b/src/actions/keyAction.vala index 36d9707..96a90b4 100644 --- a/src/actions/keyAction.vala +++ b/src/actions/keyAction.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actions/pieAction.vala b/src/actions/pieAction.vala index 919ea81..c100243 100644 --- a/src/actions/pieAction.vala +++ b/src/actions/pieAction.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actions/sigAction.vala b/src/actions/sigAction.vala index 4469a16..16ee64b 100644 --- a/src/actions/sigAction.vala +++ b/src/actions/sigAction.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/actions/uriAction.vala b/src/actions/uriAction.vala index 731de73..1d007d5 100644 --- a/src/actions/uriAction.vala +++ b/src/actions/uriAction.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/daemon.vala b/src/daemon.vala index ba3ae91..6bdf2d5 100644 --- a/src/daemon.vala +++ b/src/daemon.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -32,13 +32,13 @@ namespace GnomePie { public class Daemon : GLib.Application { ///////////////////////////////////////////////////////////////////// - /// The current version of Gnome-Pie + /// The current version of Gnome-Pie. ///////////////////////////////////////////////////////////////////// public static string version; ///////////////////////////////////////////////////////////////////// - /// Varaibles set by the commend line parser. + /// Variables set by the command line parser. ///////////////////////////////////////////////////////////////////// public static bool disable_header_bar = false; @@ -46,7 +46,7 @@ public class Daemon : GLib.Application { ///////////////////////////////////////////////////////////////////// - /// true if init_pies() has been called already + /// true if init_pies() has been called already. ///////////////////////////////////////////////////////////////////// private bool initialized = false; @@ -55,7 +55,7 @@ public class Daemon : GLib.Application { ///////////////////////////////////////////////////////////////////// public static int main(string[] args) { - version = "0.7.2"; + version = "0.7.3"; // disable overlay scrollbar --- hacky workaround for black / // transparent background @@ -81,7 +81,7 @@ public class Daemon : GLib.Application { private Indicator indicator = null; ///////////////////////////////////////////////////////////////////// - /// Varaibles set by the commend line parser. + /// Variables set by the command line parser. ///////////////////////////////////////////////////////////////////// private static string open_pie = null; @@ -139,6 +139,10 @@ public class Daemon : GLib.Application { message("Welcome to Gnome-Pie " + version + "!"); + if (GLib.Environment.get_variable("XDG_SESSION_TYPE") == "wayland") { + warning("Running on Wayland - running with limited options."); + } + this.init_pies(); // launch the indicator diff --git a/src/gui/aboutWindow.vala b/src/gui/aboutWindow.vala index 054d1ee..31719b8 100644 --- a/src/gui/aboutWindow.vala +++ b/src/gui/aboutWindow.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -38,6 +38,7 @@ public class AboutWindow: Gtk.AboutDialog { string[] devs = { "Simon Schneegans <code@simonschneegans.de>", "Gabriel Dubatti <gdubatti@gmail.com>", + "Glitsj16 <glitsj16@riseup.net>", "Francesco Piccinno <stack.box@gmail.com>", "György Balló <ballogyor@gmail.com>", "Tiago de Oliveira Corrêa <tcorreabr@gmail.com>" @@ -80,10 +81,10 @@ public class AboutWindow: Gtk.AboutDialog { artists : artists, authors : devs, translator_credits : translator_string, - copyright : "Copyright 2011-2018 Simon Schneegans <code@simonschneegans.de>", + copyright : "Copyright 2011-2021 Simon Schneegans <code@simonschneegans.de>", program_name: "Gnome-Pie", logo_icon_name: "gnome-pie", - website: "http://simmesimme.github.io/gnome-pie.html", + website: "http://schneegans.github.io/gnome-pie.html", website_label: "Homepage", version: Daemon.version ); diff --git a/src/gui/commandComboList.vala b/src/gui/commandComboList.vala index ee03aa7..130c526 100644 --- a/src/gui/commandComboList.vala +++ b/src/gui/commandComboList.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/iconSelectWindow.vala b/src/gui/iconSelectWindow.vala index 1c312f8..e3326c6 100644 --- a/src/gui/iconSelectWindow.vala +++ b/src/gui/iconSelectWindow.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/indicator.vala b/src/gui/indicator.vala index 9d39b00..8866167 100644 --- a/src/gui/indicator.vala +++ b/src/gui/indicator.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/newSliceWindow.vala b/src/gui/newSliceWindow.vala index 026a0ac..79c35c8 100644 --- a/src/gui/newSliceWindow.vala +++ b/src/gui/newSliceWindow.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/newsWindow.vala b/src/gui/newsWindow.vala index b646208..644d8a3 100644 --- a/src/gui/newsWindow.vala +++ b/src/gui/newsWindow.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/pieComboList.vala b/src/gui/pieComboList.vala index 87694d7..1cdb6b6 100644 --- a/src/gui/pieComboList.vala +++ b/src/gui/pieComboList.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/pieList.vala b/src/gui/pieList.vala index 78d96cf..313fe15 100644 --- a/src/gui/pieList.vala +++ b/src/gui/pieList.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/pieOptionsWindow.vala b/src/gui/pieOptionsWindow.vala index a4a12cb..86e8465 100644 --- a/src/gui/pieOptionsWindow.vala +++ b/src/gui/pieOptionsWindow.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/piePreview.vala b/src/gui/piePreview.vala index 0c4907c..318123c 100644 --- a/src/gui/piePreview.vala +++ b/src/gui/piePreview.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/piePreviewAddSign.vala b/src/gui/piePreviewAddSign.vala index aa29f3a..53705c5 100644 --- a/src/gui/piePreviewAddSign.vala +++ b/src/gui/piePreviewAddSign.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/piePreviewCenter.vala b/src/gui/piePreviewCenter.vala index 0b5d5a7..86f7dc9 100644 --- a/src/gui/piePreviewCenter.vala +++ b/src/gui/piePreviewCenter.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/piePreviewDeleteSign.vala b/src/gui/piePreviewDeleteSign.vala index 03ccc16..2ffa8be 100644 --- a/src/gui/piePreviewDeleteSign.vala +++ b/src/gui/piePreviewDeleteSign.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/piePreviewRenderer.vala b/src/gui/piePreviewRenderer.vala index f7c4675..517f12c 100644 --- a/src/gui/piePreviewRenderer.vala +++ b/src/gui/piePreviewRenderer.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/piePreviewSliceRenderer.vala b/src/gui/piePreviewSliceRenderer.vala index 69d8229..c966257 100644 --- a/src/gui/piePreviewSliceRenderer.vala +++ b/src/gui/piePreviewSliceRenderer.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/preferencesWindow.vala b/src/gui/preferencesWindow.vala index 259a3a4..f86a634 100644 --- a/src/gui/preferencesWindow.vala +++ b/src/gui/preferencesWindow.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -169,7 +169,7 @@ public class PreferencesWindow : GLib.Object { (builder.get_object("theme-help-button") as Gtk.Button).clicked.connect(() => { try{ - GLib.AppInfo.launch_default_for_uri("http://simmesimme.github.io/lessons/2015/04/26/themes-for-gnome-pie", null); + GLib.AppInfo.launch_default_for_uri("http://schneegans.github.io/lessons/2015/04/26/themes-for-gnome-pie", null); } catch (Error e) { warning(e.message); } @@ -242,16 +242,16 @@ public class PreferencesWindow : GLib.Object { // info label var info_label = new TipViewer({ _("Pies can be opened with the terminal command \"gnome-pie --open=ID\"."), - _("Feel free to visit Gnome-Pie's homepage at %s!").printf("<a href='http://simmesimme.github.io/gnome-pie.html'>gnome-pie.simonschneegans.de</a>"), + _("Feel free to visit Gnome-Pie's homepage at %s!").printf("<a href='http://schneegans.github.io/gnome-pie.html'>gnome-pie.simonschneegans.de</a>"), _("If you want to give some feedback, please write an e-mail to %s!").printf("<a href='mailto:code@simonschneegans.de'>code@simonschneegans.de</a>"), _("You can support the development of Gnome-Pie by donating via %s.").printf("<a href='https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X65SUVC4ZTQSC'>Paypal</a>"), _("Translating Gnome-Pie to your language is easy. Translations are managed at %s.").printf("<a href='https://translate.zanata.org/zanata/iteration/view/gnome-pie/develop'>Zanata</a>"), - _("It's easy to create new themes for Gnome-Pie. Read the <a href='%s'>Tutorial</a> online.").printf("http://simmesimme.github.io/lessons/2015/04/26/themes-for-gnome-pie/"), + _("It's easy to create new themes for Gnome-Pie. Read the <a href='%s'>Tutorial</a> online.").printf("http://schneegans.github.io/lessons/2015/04/26/themes-for-gnome-pie/"), _("It's usually a good practice to have at most twelve slices per pie."), _("You can export themes you created and share them with the community!"), - _("The source code of Gnome-Pie is available on %s.").printf("<a href='https://github.com/Simmesimme/Gnome-Pie'>Github</a>"), - _("Bugs can be reported at %s!").printf("<a href='https://github.com/Simmesimme/Gnome-Pie/issues'>Github</a>"), - _("Suggestions can be posted on %s!").printf("<a href='https://github.com/Simmesimme/Gnome-Pie/issues'>Github</a>"), + _("The source code of Gnome-Pie is available on %s.").printf("<a href='https://github.com/schneegans/Gnome-Pie'>Github</a>"), + _("Bugs can be reported at %s!").printf("<a href='https://github.com/schneegans/gnome-pie/issues'>Github</a>"), + _("Suggestions can be posted on %s!").printf("<a href='https://github.com/schneegans/gnome-pie/issues'>Github</a>"), _("An awesome companion of Gnome-Pie is %s. It will make using your computer feel like magic!").printf("<a href='https://github.com/thjaeger/easystroke/wiki'>Easystroke</a>"), _("You can drag'n'drop applications from your main menu to the pie above."), _("You may drag'n'drop URLs and bookmarks from your internet browser to the pie above."), diff --git a/src/gui/sliceTypeList.vala b/src/gui/sliceTypeList.vala index aad4992..2c4bc06 100644 --- a/src/gui/sliceTypeList.vala +++ b/src/gui/sliceTypeList.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/themeList.vala b/src/gui/themeList.vala index c3c161e..64e7fe8 100644 --- a/src/gui/themeList.vala +++ b/src/gui/themeList.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/tipViewer.vala b/src/gui/tipViewer.vala index 2fbca32..e950e5e 100644 --- a/src/gui/tipViewer.vala +++ b/src/gui/tipViewer.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/gui/triggerSelectButton.vala b/src/gui/triggerSelectButton.vala index 0a88244..15d0d38 100644 --- a/src/gui/triggerSelectButton.vala +++ b/src/gui/triggerSelectButton.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/images/icon.vala b/src/images/icon.vala index 110436f..e3526e2 100644 --- a/src/images/icon.vala +++ b/src/images/icon.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/images/image.vala b/src/images/image.vala index a489d88..5000b52 100644 --- a/src/images/image.vala +++ b/src/images/image.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/images/renderedText.vala b/src/images/renderedText.vala index 0c45c02..13477bd 100644 --- a/src/images/renderedText.vala +++ b/src/images/renderedText.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/images/themedIcon.vala b/src/images/themedIcon.vala index e057f47..beb729c 100644 --- a/src/images/themedIcon.vala +++ b/src/images/themedIcon.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/pies/defaultConfig.vala b/src/pies/defaultConfig.vala index 8d815e0..205329f 100644 --- a/src/pies/defaultConfig.vala +++ b/src/pies/defaultConfig.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/pies/load.vala b/src/pies/load.vala index 8c4d9e4..2591286 100644 --- a/src/pies/load.vala +++ b/src/pies/load.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/pies/pie.vala b/src/pies/pie.vala index 2945ec2..e3caea7 100644 --- a/src/pies/pie.vala +++ b/src/pies/pie.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/pies/pieManager.vala b/src/pies/pieManager.vala index 960ab7e..f990039 100644 --- a/src/pies/pieManager.vala +++ b/src/pies/pieManager.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/pies/save.vala b/src/pies/save.vala index b544493..5c2e67c 100644 --- a/src/pies/save.vala +++ b/src/pies/save.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/renderers/centerRenderer.vala b/src/renderers/centerRenderer.vala index c28d7d4..2e528e9 100644 --- a/src/renderers/centerRenderer.vala +++ b/src/renderers/centerRenderer.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/renderers/pieRenderer.vala b/src/renderers/pieRenderer.vala index 2f8aaf4..af5d5a3 100644 --- a/src/renderers/pieRenderer.vala +++ b/src/renderers/pieRenderer.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -378,7 +378,7 @@ public class PieRenderer : GLib.Object { szy = 2; //half height, center to the bottom break; - //cuarter pie + //quarter pie case ShowPieMode.CPIE_TOP_LEFT: szx = 0; //half width, center to the left szy = 0; //half height, center to the top @@ -395,6 +395,8 @@ public class PieRenderer : GLib.Object { szx = 2; //half width, center to the right szy = 2; //half height, center to the bottom break; + + default: break; } if (reduce_szx == 0) szx = 1; //don't reduce width diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala index 6d258d8..554fb15 100644 --- a/src/renderers/pieWindow.vala +++ b/src/renderers/pieWindow.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -124,11 +124,12 @@ public class PieWindow : Gtk.Window { this.set_skip_taskbar_hint(true); this.set_skip_pager_hint(true); this.set_keep_above(true); - this.set_type_hint(Gdk.WindowTypeHint.DOCK); + this.set_type_hint(Gdk.WindowTypeHint.DIALOG); this.set_decorated(false); this.set_resizable(false); this.icon_name = "gnome-pie"; - this.set_accept_focus(false); + this.set_accept_focus(true); + this.set_focus_on_map(true); this.app_paintable = true; // check for compositing @@ -182,7 +183,9 @@ public class PieWindow : Gtk.Window { }); this.focus_out_event.connect((w, e) => { - this.cancel(); + if (this.is_active) { + this.cancel(); + } return true; }); diff --git a/src/renderers/sliceRenderer.vala b/src/renderers/sliceRenderer.vala index 1041b7a..06b5775 100644 --- a/src/renderers/sliceRenderer.vala +++ b/src/renderers/sliceRenderer.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/themes/centerLayer.vala b/src/themes/centerLayer.vala index b71ed86..d5068ad 100644 --- a/src/themes/centerLayer.vala +++ b/src/themes/centerLayer.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/themes/sliceLayer.vala b/src/themes/sliceLayer.vala index d3f8cfd..60d46fc 100644 --- a/src/themes/sliceLayer.vala +++ b/src/themes/sliceLayer.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/themes/theme.vala b/src/themes/theme.vala index f9a9cdd..7b3c183 100644 --- a/src/themes/theme.vala +++ b/src/themes/theme.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/themes/themeImporter.vala b/src/themes/themeImporter.vala index e6c9e64..895e21e 100644 --- a/src/themes/themeImporter.vala +++ b/src/themes/themeImporter.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/animatedValue.vala b/src/utilities/animatedValue.vala index 975b7c3..19c4fdc 100644 --- a/src/utilities/animatedValue.vala +++ b/src/utilities/animatedValue.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/archiveReader.vala b/src/utilities/archiveReader.vala index 0200c8a..82f067f 100644 --- a/src/utilities/archiveReader.vala +++ b/src/utilities/archiveReader.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -89,12 +89,13 @@ public class ArchiveReader : GLib.Object { if (entry.size() > 0) { while (true) { - size_t offset, size; #if VALA_0_42 + size_t offset; uint8[] buff; r = this.archive.read_data_block(out buff, out offset); #else + size_t offset, size; void* buff; r = this.archive.read_data_block(out buff, out size, out offset); #endif diff --git a/src/utilities/archiveWriter.vala b/src/utilities/archiveWriter.vala index 2244fd1..4a67c83 100644 --- a/src/utilities/archiveWriter.vala +++ b/src/utilities/archiveWriter.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/bindingManager.vala b/src/utilities/bindingManager.vala index 832fb88..447e96f 100644 --- a/src/utilities/bindingManager.vala +++ b/src/utilities/bindingManager.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/color.vala b/src/utilities/color.vala index fca8a57..aa70c33 100644 --- a/src/utilities/color.vala +++ b/src/utilities/color.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/config.vala b/src/utilities/config.vala index 642eb52..26c2c2c 100644 --- a/src/utilities/config.vala +++ b/src/utilities/config.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/focusGrabber.vala b/src/utilities/focusGrabber.vala index 34a0d0b..c63e966 100644 --- a/src/utilities/focusGrabber.vala +++ b/src/utilities/focusGrabber.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/key.vala b/src/utilities/key.vala index c831b99..99517a7 100644 --- a/src/utilities/key.vala +++ b/src/utilities/key.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/logger.vala b/src/utilities/logger.vala index 2696224..2e918e7 100644 --- a/src/utilities/logger.vala +++ b/src/utilities/logger.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/paths.vala b/src/utilities/paths.vala index a6e01ef..5940354 100644 --- a/src/utilities/paths.vala +++ b/src/utilities/paths.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the diff --git a/src/utilities/trigger.vala b/src/utilities/trigger.vala index 71defdf..fef0892 100644 --- a/src/utilities/trigger.vala +++ b/src/utilities/trigger.vala @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright 2011-2018 Simon Schneegans +// Copyright 2011-2021 Simon Schneegans // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the |