Commit bc80e6c6 authored by dkuhlman's avatar dkuhlman
Browse files

Minor fixes (e.g. capture CL) after Aleksandr's update

parent 03071a68
No related merge requests found
Showing with 9 additions and 1 deletion
+9 -1
...@@ -1306,6 +1306,8 @@ Can be changed at run-time by either ...@@ -1306,6 +1306,8 @@ Can be changed at run-time by either
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property> <property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property>
<property name="min_content_width">250</property>
<property name="min_content_height">500</property>
<child> <child>
<object class="GtkTextView" id="content_textview"> <object class="GtkTextView" id="content_textview">
<property name="visible">True</property> <property name="visible">True</property>
......
...@@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session ...@@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session
# Do not modify the following VERSION comments. # Do not modify the following VERSION comments.
# Used by updateversion.py. # Used by updateversion.py.
##VERSION## ##VERSION##
VERSION = '2.20a' VERSION = '2.20b'
##VERSION## ##VERSION##
...@@ -810,6 +810,8 @@ class ContentDialog(gtk.Dialog): ...@@ -810,6 +810,8 @@ class ContentDialog(gtk.Dialog):
def show(self, content): def show(self, content):
#Builder.connect_signals(self) #Builder.connect_signals(self)
if isinstance(content, bytes):
content = content.decode('utf-8')
self.content_textview.get_buffer().set_text(content) self.content_textview.get_buffer().set_text(content)
response = self.content_dialog.run() response = self.content_dialog.run()
self.content_dialog.hide() self.content_dialog.hide()
...@@ -2149,6 +2151,8 @@ name.</property> ...@@ -2149,6 +2151,8 @@ name.</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property> <property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property>
<property name="min_content_width">250</property>
<property name="min_content_height">500</property>
<child> <child>
<object class="GtkTextView" id="content_textview"> <object class="GtkTextView" id="content_textview">
<property name="visible">True</property> <property name="visible">True</property>
......
...@@ -1309,6 +1309,8 @@ name</property> ...@@ -1309,6 +1309,8 @@ name</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property> <property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property>
<property name="min_content_width">250</property>
<property name="min_content_height">500</property>
<child> <child>
<object class="GtkTextView" id="content_textview"> <object class="GtkTextView" id="content_textview">
<property name="visible">True</property> <property name="visible">True</property>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment