Merge branch 'Gio'

Author: kaiw

data/org.gnome.meld.gschema.xml

@@ -53,9 +53,9 @@
 
       <!-- File loading settings -->
       <key name="detect-encodings" type="as">
-          <default>["utf8"]</default>
-          <summary>Automatically detected text encodings</summary>
-          <description>These text encodings will be automatically used (in order) to try to decode loaded text files.</description>
+          <default>[]</default>
+          <summary>Additional automatically detected text encodings</summary>
+          <description>Meld will use these text encodings to try to decode loaded text files before trying any other encodings. In addition to the encodings in this list, UTF-8 and the current locale-default encoding will always be used; other encodings may also be tried, depending on the user's locale.</description>
       </key>
 
 

data/ui/filediff.ui

@@ -326,17 +326,16 @@
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">This file can not be written to. You may click here to unlock this file and make changes anyway, but these changes must be saved to a new file.</property>
-                    <property name="icon_name">emblem-readonly</property>
+                    <property name="icon_name">changes-prevent-symbolic</property>
                     <signal name="toggled" handler="on_readonly_button_toggled" swapped="no"/>
                   </object>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="file_save_button2">
-                    <property name="stock-id">gtk-save</property>
+                    <property name="icon-name">document-save</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_file_save_button_clicked" swapped="no"/>
                   </object>
                 </child>
@@ -403,11 +402,10 @@
                 </child>
                 <child>
                   <object class="GtkToolButton" id="file_save_button1">
-                    <property name="stock-id">gtk-save</property>
+                    <property name="icon-name">document-save-symbolic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_file_save_button_clicked" swapped="no"/>
                   </object>
                 </child>
@@ -474,11 +472,10 @@
                 </child>
                 <child>
                   <object class="GtkToolButton" id="file_save_button0">
-                    <property name="stock-id">gtk-save</property>
+                    <property name="icon-name">document-save-symbolic</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
                     <signal name="clicked" handler="on_file_save_button_clicked" swapped="no"/>
                   </object>
                 </child>

meld/const.py

@@ -1,4 +1,6 @@
 
+from gi.repository import GtkSource
+
 from meld.conf import _
 
 # Chunk action mode, set by filediff and used in gutterrendererchunk
@@ -7,7 +9,7 @@
 MODE_INSERT = 2
 
 NEWLINES = {
-    '\n': _("UNIX (LF)"),
-    '\r\n': _("DOS/Windows (CR-LF)"),
-    '\r': _("Mac OS (CR)"),
+    GtkSource.NewlineType.LF: ('\n', _("UNIX (LF)")),
+    GtkSource.NewlineType.CR_LF: ('\r\n', _("DOS/Windows (CR-LF)")),
+    GtkSource.NewlineType.CR: ('\r', _("Mac OS (CR)")),
 }

meld/dirdiff.py

@@ -852,7 +852,7 @@ def _show_identical_status(self):
 
         for pane in range(self.num_panes):
             msgarea = self.msgarea_mgr[pane].new_from_text_and_icon(
-                Gtk.STOCK_INFO, primary, secondary)
+                'dialog-information-symbolic', primary, secondary)
             button = msgarea.add_button(_("Hide"), Gtk.ResponseType.CLOSE)
             if pane == 0:
                 button.props.label = _("Hi_de")
@@ -902,17 +902,8 @@ def _show_tree_wide_errors(self, invalid_filenames, shadowed_entries):
                 else:
                     continue
                 secondary = "\n".join(messages)
-                self.add_dismissable_msg(pane, Gtk.STOCK_DIALOG_ERROR, header,
-                                         secondary)
-
-    def add_dismissable_msg(self, pane, icon, primary, secondary):
-        msgarea = self.msgarea_mgr[pane].new_from_text_and_icon(
-                        icon, primary, secondary)
-        msgarea.add_button(_("Hi_de"), Gtk.ResponseType.CLOSE)
-        msgarea.connect("response",
-                        lambda *args: self.msgarea_mgr[pane].clear())
-        msgarea.show_all()
-        return msgarea
+                self.msgarea_mgr[pane].add_dismissable_msg(
+                    'dialog-error-symbolic', header, secondary)
 
     def copy_selected(self, direction):
         assert direction in (-1, 1)
@@ -1571,7 +1562,7 @@ def next_diff(self, direction):
     def on_refresh_activate(self, *extra):
         self.on_fileentry_file_set(None)
 
-    def on_delete_event(self, appquit=0):
+    def on_delete_event(self):
         for h in self.settings_handlers:
             meldsettings.disconnect(h)
         self.emit('close', 0)