From bc80e6c62cfd9637e06fc4a78a9c6b9b2ab0552b Mon Sep 17 00:00:00 2001
From: dkuhlman <none@none>
Date: Wed, 30 Mar 2016 17:06:58 -0700
Subject: [PATCH] Minor fixes (e.g. capture CL) after Aleksandr's update
---
gui/generateds_gui.glade | 2 ++
gui/generateds_gui.py | 6 +++++-
gui/generateds_gui_ru.glade | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/gui/generateds_gui.glade b/gui/generateds_gui.glade
index 763ed91..db1fc98 100644
--- a/gui/generateds_gui.glade
+++ b/gui/generateds_gui.glade
@@ -1306,6 +1306,8 @@ Can be changed at run-time by either
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
+ <property name="min_content_width">250</property>
+ <property name="min_content_height">500</property>
<child>
<object class="GtkTextView" id="content_textview">
<property name="visible">True</property>
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index e8b9e64..1e78913 100755
--- a/gui/generateds_gui.py
+++ b/gui/generateds_gui.py
@@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.20a'
+VERSION = '2.20b'
##VERSION##
@@ -810,6 +810,8 @@ class ContentDialog(gtk.Dialog):
def show(self, content):
#Builder.connect_signals(self)
+ if isinstance(content, bytes):
+ content = content.decode('utf-8')
self.content_textview.get_buffer().set_text(content)
response = self.content_dialog.run()
self.content_dialog.hide()
@@ -2149,6 +2151,8 @@ name.</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
+ <property name="min_content_width">250</property>
+ <property name="min_content_height">500</property>
<child>
<object class="GtkTextView" id="content_textview">
<property name="visible">True</property>
diff --git a/gui/generateds_gui_ru.glade b/gui/generateds_gui_ru.glade
index cff98a3..dd4dec1 100644
--- a/gui/generateds_gui_ru.glade
+++ b/gui/generateds_gui_ru.glade
@@ -1309,6 +1309,8 @@ name</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
+ <property name="min_content_width">250</property>
+ <property name="min_content_height">500</property>
<child>
<object class="GtkTextView" id="content_textview">
<property name="visible">True</property>
--
GitLab