Merge branch 'develop'

Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.2 (2018-03-13)
+* Fixed auto-closing gedit if there are no windows to restore (#1)
+* Fixed (potentially) affecting the translations of other plugins
+
 ## 0.1.1 (2017-10-13)
 * Added .pot file
 

README.md

@@ -2,7 +2,7 @@
 
 Reopen closed windows and optionally restore windows between sessions  
 <https://github.com/jefferyto/gedit-ex-mortis>  
-0.1.1
+0.1.2
 
 All bug reports, feature requests and miscellaneous comments are welcome
 at the [project issue tracker][].
@@ -62,7 +62,7 @@ Inspired by:
 
 ## License
 
-Copyright &copy; 2017 Jeffery To <jeffery.to@gmail.com>
+Copyright &copy; 2017-2018 Jeffery To <jeffery.to@gmail.com>
 
 Available under GNU General Public License version 3
 

ex-mortis.plugin

@@ -6,6 +6,6 @@ Name=Ex-Mortis
 Description=Reopen closed windows and optionally restore windows between sessions
 Icon=window-new
 Authors=Jeffery To <jeffery.to@gmail.com>
-Copyright=Copyright © 2017 Jeffery To
+Copyright=Copyright © 2017-2018 Jeffery To
 Website=https://github.com/jefferyto/gedit-ex-mortis
-Version=0.1.1
+Version=0.1.2

ex-mortis/__init__.py

@@ -3,7 +3,7 @@
 # __init__.py
 # This file is part of Ex-Mortis, a plugin for gedit
 #
-# Copyright (C) 2017 Jeffery To <jeffery.to@gmail.com>
+# Copyright (C) 2017-2018 Jeffery To <jeffery.to@gmail.com>
 # https://github.com/jefferyto/gedit-ex-mortis
 #
 # This program is free software: you can redistribute it and/or modify
@@ -39,8 +39,7 @@
 try:
 	import gettext
 	gettext.bindtextdomain('gedit-ex-mortis', LOCALE_PATH)
-	gettext.textdomain('gedit-ex-mortis')
-	_ = gettext.gettext
+	_ = lambda s: gettext.dgettext('gedit-ex-mortis', s)
 except:
 	_ = lambda s: s
 
@@ -434,6 +433,7 @@ class ExMortisConfigurable(GObject.Object, PeasGtk.Configurable):
 
 	__gtype_name__ = 'ExMortisConfigurable'
 
+
 	def do_create_configure_widget(self):
 		if log.query(log.INFO):
 			Gedit.debug_plugin_message(log.format(""))
@@ -452,14 +452,14 @@ def do_create_configure_widget(self):
 			)
 
 			widget.set_active(settings.restore_between_sessions)
+			widget._settings = settings
 
 		else:
-			widget = Gtk.Box()
-			widget.add(Gtk.Label.new(_("Could not load settings schema")))
-
-		widget.set_border_width(5)
+			widget = Gtk.Label.new(_("Could not load settings schema"))
 
-		widget._settings = settings
+		box = Gtk.Box.new(Gtk.Orientation.VERTICAL, 0)
+		box.set_border_width(5)
+		box.add(widget)
 
-		return widget
+		return box
 

ex-mortis/closingmixin.py

@@ -3,7 +3,7 @@
 # closingmixin.py
 # This file is part of Ex-Mortis, a plugin for gedit
 #
-# Copyright (C) 2017 Jeffery To <jeffery.to@gmail.com>
+# Copyright (C) 2017-2018 Jeffery To <jeffery.to@gmail.com>
 # https://github.com/jefferyto/gedit-ex-mortis
 #
 # This program is free software: you can redistribute it and/or modify

ex-mortis/existingmixin.py

@@ -3,7 +3,7 @@
 # existingmixin.py
 # This file is part of Ex-Mortis, a plugin for gedit
 #
-# Copyright (C) 2017 Jeffery To <jeffery.to@gmail.com>
+# Copyright (C) 2017-2018 Jeffery To <jeffery.to@gmail.com>
 # https://github.com/jefferyto/gedit-ex-mortis
 #
 # This program is free software: you can redistribute it and/or modify
@@ -29,8 +29,7 @@
 try:
 	import gettext
 	gettext.bindtextdomain('gedit-ex-mortis', LOCALE_PATH)
-	gettext.textdomain('gedit-ex-mortis')
-	_ = gettext.gettext
+	_ = lambda s: gettext.dgettext('gedit-ex-mortis', s)
 except:
 	_ = lambda s: s
 

ex-mortis/locale/gedit-ex-mortis.pot

@@ -1,7 +1,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gedit-ex-mortis 0.1.1\n"
+"Project-Id-Version: gedit-ex-mortis 0.1.2\n"
 "POT-Creation-Date: 2017-10-13 22:50+0800\n"
 "PO-Revision-Date: 2017-10-13 22:50+0800\n"
 "Last-Translator: Jeffery To <jeffery.to@gmail.com>\n"

ex-mortis/log.py

@@ -3,7 +3,7 @@
 # log.py
 # This file is part of Ex-Mortis, a plugin for gedit
 #
-# Copyright (C) 2017 Jeffery To <jeffery.to@gmail.com>
+# Copyright (C) 2017-2018 Jeffery To <jeffery.to@gmail.com>
 # https://github.com/jefferyto/gedit-ex-mortis
 #
 # This program is free software: you can redistribute it and/or modify
@@ -97,14 +97,13 @@ def query(log_level):
 
 	return highest(log_level) <= output_level
 
-def prefix(log_level=None):
+def name(log_level=None):
 	if log_level is None:
 		log_level = last_queried_level
 
-	name = LEVELS_TO_NAMES[highest(log_level)] if log_level is not None else 'unknown'
-
-	return '[' + name + '] '
+	return LEVELS_TO_NAMES[highest(log_level)] if log_level is not None else 'unknown'
 
 def format(message, *args):
-	return prefix() + (message % tuple(debug_str(arg) for arg in args))
+	msg = message % tuple(debug_str(arg) for arg in args)
+	return "[%s] %s" % (name(), msg)
 

ex-mortis/quittingmixin.py

@@ -3,7 +3,7 @@
 # quittingmixin.py
 # This file is part of Ex-Mortis, a plugin for gedit
 #
-# Copyright (C) 2017 Jeffery To <jeffery.to@gmail.com>
+# Copyright (C) 2017-2018 Jeffery To <jeffery.to@gmail.com>
 # https://github.com/jefferyto/gedit-ex-mortis
 #
 # This program is free software: you can redistribute it and/or modify
@@ -339,7 +339,7 @@ def restore_windows(self, window_manager, settings, do_restore):
 
 			settings.remove_window(window_id)
 
-		if do_restore:
+		if do_restore and states:
 			if log.query(log.MESSAGE):
 				Gedit.debug_plugin_message(log.format("restoring %s windows", len(states)))
 
@@ -372,10 +372,14 @@ def restore_windows(self, window_manager, settings, do_restore):
 			for window, state in zip(windows, states):
 				self.setup_restore_window(window, state)
 
-		else:
+		elif not do_restore:
 			if log.query(log.MESSAGE):
 				Gedit.debug_plugin_message(log.format("not restoring windows"))
 
+		else:
+			if log.query(log.MESSAGE):
+				Gedit.debug_plugin_message(log.format("no windows to restore"))
+
 	def setup_restore_window(self, window, state=None):
 		if log.query(log.INFO):
 			Gedit.debug_plugin_message(log.format("%s", window))

ex-mortis/settings.py

@@ -3,7 +3,7 @@
 # settings.py
 # This file is part of Ex-Mortis, a plugin for gedit
 #
-# Copyright (C) 2017 Jeffery To <jeffery.to@gmail.com>
+# Copyright (C) 2017-2018 Jeffery To <jeffery.to@gmail.com>
 # https://github.com/jefferyto/gedit-ex-mortis
 #
 # This program is free software: you can redistribute it and/or modify

ex-mortis/windowmanager.py

@@ -3,7 +3,7 @@
 # windowmanager.py
 # This file is part of Ex-Mortis, a plugin for gedit
 #
-# Copyright (C) 2017 Jeffery To <jeffery.to@gmail.com>
+# Copyright (C) 2017-2018 Jeffery To <jeffery.to@gmail.com>
 # https://github.com/jefferyto/gedit-ex-mortis
 #
 # This program is free software: you can redistribute it and/or modify

ex-mortis/windowstate.py

@@ -3,7 +3,7 @@
 # windowstate.py
 # This file is part of Ex-Mortis, a plugin for gedit
 #
-# Copyright (C) 2017 Jeffery To <jeffery.to@gmail.com>
+# Copyright (C) 2017-2018 Jeffery To <jeffery.to@gmail.com>
 # https://github.com/jefferyto/gedit-ex-mortis
 #
 # This program is free software: you can redistribute it and/or modify