Merge lp:~stan/pasaffe/window_title_and_escaping into lp:~mdeslaur/pasaffe/trunk

[Tristan Hill]

* set window title based on current loaded file
* escape text e.g. in case of & in entry name

[Marc Deslauriers (mdeslaur)]

Hi! Thanks for the merge proposal.

ACK on the text escaping.

What's the use case on having the filename in the window title though? I feel that is a detail most users don't need to know when they're using the default database location. Could you perhaps make it only display the filename if it isn't the default file location?

review: Needs Fixing

[lp:~stan/pasaffe/window_title_and_escaping]

692. By Tristan Hill on 2017-12-13

only display file basename when not the default

[Tristan Hill (stan)]

Yes I mainly use with a arbitrary database files and it is difficult to otherwise tell between different windows.

[Marc Deslauriers (mdeslaur)]

Looks good, thanks!

review: Approve

=== modified file 'pasaffe/PasaffeWindow.py'
--- pasaffe/PasaffeWindow.py	2016-10-27 13:00:56 +0000
+++ pasaffe/PasaffeWindow.py	2017-12-13 23:36:32 +0000
@@ -83,7 +83,6 @@
         self.ui.textview1.connect("motion-notify-event",
                                   self.textview_event_handler)
 
-        self.set_save_status(False)
         self.passfile = None
         self.is_locked = False
         self.idle_id = None
@@ -94,6 +93,9 @@
             self.database = self.settings.get_string('database-path')
         else:
             self.database = database
+        self.default_database = database is None
+        
+        self.set_save_status(False)
 
         self.settings = Gio.Settings.new("net.launchpad.pasaffe")
         self.settings.connect('changed', self.on_preferences_changed)
@@ -851,7 +853,8 @@
 
             information = \
                 _('<big><b>Are you sure you wish to'
-                  ' remove "%s"?</b></big>\n\n') % entry_name
+                  ' remove "%s"?</b></big>\n\n') % \
+                    GLib.markup_escape_text(entry_name)
             information += _('Contents of the entry will be lost.\n')
 
             info_dialog = Gtk.MessageDialog(
@@ -873,7 +876,8 @@
 
             information = \
                 _('<big><b>Are you sure you wish'
-                  ' to remove folder "%s"?</b></big>\n\n') % folder_name
+                  ' to remove folder "%s"?</b></big>\n\n') % \
+                    GLib.markup_escape_text(folder_name)
             information += _('All entries in this folder will be lost.\n')
 
             info_dialog = Gtk.MessageDialog(
@@ -1371,6 +1375,7 @@
                 self.passfile.get_saved_application()
         information += '\n'
         information += _('Database location:\n%s\n') % self.database
+        information = GLib.markup_escape_text(information)
 
         info_dialog = Gtk.MessageDialog(transient_for=self,
                                         modal=True,
@@ -1656,16 +1661,19 @@
             self.ui.mnu_display_secrets.set_sensitive(True)
             self.ui.display_secrets.set_sensitive(True)
 
-    def set_save_status(self, needed=False):
+    def _set_title(self):
+        prefix = ""
+        if not self.default_database:
+            prefix = "%s - " % os.path.basename(self.database)
+        self.set_title("%s%sPasaffe" % (
+            prefix,
+            "*" if self.needs_saving else ""))
+
+    def set_save_status(self, needed):
         self.needs_saving = needed
-        if needed is True:
-            self.set_title("*Pasaffe")
-            self.ui.save.set_sensitive(True)
-            self.ui.mnu_save.set_sensitive(True)
-        else:
-            self.set_title("Pasaffe")
-            self.ui.save.set_sensitive(False)
-            self.ui.mnu_save.set_sensitive(False)
+        self.ui.save.set_sensitive(needed)
+        self.ui.mnu_save.set_sensitive(needed)
+        self._set_title()
 
     def get_save_status(self):
         return self.needs_saving