[meld/ui-next] ui.statusbar: Fix default encoding and language display for empty files
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/ui-next] ui.statusbar: Fix default encoding and language display for empty files
- Date: Sun, 24 Mar 2019 00:03:10 +0000 (UTC)
commit b2504663edabf5439abe0029033dcfe30fe46382
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Mar 24 08:07:35 2019 +1000
ui.statusbar: Fix default encoding and language display for empty files
meld/meldbuffer.py | 2 +-
meld/ui/statusbar.py | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index d3dbd372..fdec5180 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -93,7 +93,7 @@ class MeldBufferData(GObject.GObject):
encoding = GObject.Property(
type=GtkSource.Encoding,
nick="The file encoding of the linked GtkSourceFile",
- default=None,
+ default=GtkSource.Encoding.get_utf8(),
)
def __init__(self):
diff --git a/meld/ui/statusbar.py b/meld/ui/statusbar.py
index e1158cd0..f1e065a9 100644
--- a/meld/ui/statusbar.py
+++ b/meld/ui/statusbar.py
@@ -111,7 +111,7 @@ class MeldStatusBar(Gtk.Statusbar):
source_encoding = GObject.Property(
type=GtkSource.Encoding,
nick="The file encoding displayed in the status bar",
- default=None,
+ default=GtkSource.Encoding.get_utf8(),
)
source_language = GObject.Property(
@@ -230,7 +230,8 @@ class MeldStatusBar(Gtk.Statusbar):
button = MeldStatusMenuButton()
self.bind_property(
- 'source-encoding', button, 'label', GObject.BindingFlags.DEFAULT,
+ 'source-encoding', button, 'label',
+ GObject.BindingFlags.DEFAULT | GObject.BindingFlags.SYNC_CREATE,
lambda binding, enc: selector.get_value_label(enc))
button.set_popover(pop)
button.show()
@@ -260,7 +261,8 @@ class MeldStatusBar(Gtk.Statusbar):
button = MeldStatusMenuButton()
self.bind_property(
- 'source-language', button, 'label', GObject.BindingFlags.DEFAULT,
+ 'source-language', button, 'label',
+ GObject.BindingFlags.DEFAULT | GObject.BindingFlags.SYNC_CREATE,
lambda binding, enc: selector.get_value_label(enc))
button.set_popover(pop)
button.show()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]