Merge branch 'develop'

.gitignore

@@ -0,0 +1 @@
+__pycache__/

Changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.3.2 (2018-03-13)
+* Added Ctrl-Esc to cancel tab switching, causes the initial tab (before
+  switching began) to be active again
+* Prevent all input during tab switching, if the tab switching window is
+  visible, instead of cancelling switching
+* Fixed copyright notices
+
 ## v0.3.1 (2017-10-17)
 * Show a debug message if the settings schema could not be loaded
 * Fixed division by zero error

README.md

@@ -3,7 +3,7 @@
 Switch between document tabs using Ctrl+Tab / Ctrl+Shift+Tab and
 Ctrl+PageUp / Ctrl+PageDown  
 <https://github.com/jefferyto/gedit-control-your-tabs>  
-v0.3.1
+v0.3.2
 
 All bug reports, feature requests and miscellaneous comments are welcome
 at the [project issue tracker][].
@@ -30,16 +30,19 @@ gedit 2 is [v0.1.2][].
     <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>Tab</kbd> - Switch tabs in
     most recently used order.
 *   <kbd>Ctrl</kbd>+<kbd>Page Up</kbd> /
-    <kbd>Ctrl</kbd>+<kbd>Page Down</kbd> - Switch tabs in tabbar order.
+    <kbd>Ctrl</kbd>+<kbd>Page Down</kbd> - Switch tabs in tab row order.
+
+Hold down <kbd>Ctrl</kbd> to continue tab switching. Press
+<kbd>Esc</kbd> while switching to cancel and return to the initial tab.
 
 ## Preferences
 
 In gedit 3.4 or later, the plugin supports these preferences:
 
-*   `Use tabbar order for Ctrl+Tab / Ctrl+Shift+Tab` - Change
+*   `Use tab row order for Ctrl+Tab / Ctrl+Shift+Tab` - Change
     <kbd>Ctrl</kbd>+<kbd>Tab</kbd> /
     <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>Tab</kbd> to switch tabs in
-    tabbar order instead of most recently used order.
+    tab row order instead of most recently used order.
 
 ## Development
 
@@ -57,7 +60,7 @@ Inspired by:
 
 ## License
 
-Copyright &copy; 2010-2014, 2016-2017 Jeffery To <jeffery.to@gmail.com>
+Copyright &copy; 2010-2013, 2017-2018 Jeffery To <jeffery.to@gmail.com>
 
 Available under GNU General Public License version 3
 

controlyourtabs.plugin

@@ -6,6 +6,6 @@ IAge=3
 Name=Control Your Tabs
 Description=Switch between document tabs using Ctrl+Tab / Ctrl+Shift+Tab and Ctrl+PageUp / Ctrl+PageDown
 Authors=Jeffery To <jeffery.to@gmail.com>
-Copyright=Copyright © 2010-2014, 2016-2017 Jeffery To
+Copyright=Copyright © 2010-2013, 2017-2018 Jeffery To
 Website=https://github.com/jefferyto/gedit-control-your-tabs
-Version=0.3.1
+Version=0.3.2

controlyourtabs.plugin.python2

@@ -6,6 +6,6 @@ IAge=3
 Name=Control Your Tabs
 Description=Switch between document tabs using Ctrl+Tab / Ctrl+Shift+Tab and Ctrl+PageUp / Ctrl+PageDown
 Authors=Jeffery To <jeffery.to@gmail.com>
-Copyright=Copyright © 2010-2014, 2016-2017 Jeffery To
+Copyright=Copyright © 2010-2013, 2017-2018 Jeffery To
 Website=https://github.com/jefferyto/gedit-control-your-tabs
-Version=0.3.1
+Version=0.3.2