diff --git a/Tst/codeblockreusefeature/codeblockreuse.py b/Tst/codeblockreusefeature/codeblockreuse.py
index 8f42222fa517946d4d112364c22bbce482920222..4a643bb9751b2a7758bfa0cd0c13e70554524527 100755
--- a/Tst/codeblockreusefeature/codeblockreuse.py
+++ b/Tst/codeblockreusefeature/codeblockreuse.py
@@ -447,17 +447,19 @@ class CBRSearch(Gtk.Box):
self.comment_label_box = Gtk.Box()
self.comment_label_box.set_orientation(Gtk.Orientation.HORIZONTAL)
self.comment_label = Gtk.Label()
- self.comment_label.set_text(_('Comment:'))
- self.comment_label_box.pack_start(self.comment_label, False, False, 0)
+ self.comment_label.set_markup(_('<b>Comment</b>'))
+ self.comment_label_box.pack_start(self.comment_label, False, False, 4)
self.comment_scrolled_window = Gtk.ScrolledWindow()
self.comment_code_view = GtkSource.View()
+ self.comment_code_view.set_editable(False)
+ self.comment_code_view.set_wrap_mode(Gtk.WrapMode.WORD)
self.comment_code_view_buffer = self.comment_code_view.get_buffer()
- self.comment_code_view_buffer.set_language(self.lm.get_language('json'))
- self.comment_code_view_buffer.set_style_scheme(self.style_manager.get_scheme('darcula'))
+ self.comment_code_view_buffer.set_language(self.lm.get_language('text'))
+ # self.comment_code_view_buffer.set_style_scheme(self.style_manager.get_scheme('darcula'))
self.comment_scrolled_window.add(self.comment_code_view)
- self.comment_box.pack_start(self.comment_label_box, False, False, 0)
+ self.comment_box.pack_start(self.comment_label_box, False, False, 4)
self.comment_box.pack_start(self.comment_scrolled_window, True, True, 0)
self.comment_command_paned.pack2(self.comment_box)
@@ -467,17 +469,19 @@ class CBRSearch(Gtk.Box):
self.cc_label_box = Gtk.Box()
self.cc_label_box.set_orientation(Gtk.Orientation.HORIZONTAL)
self.cc_label = Gtk.Label()
- self.cc_label.set_text(_('Command code:'))
- self.cc_label_box.pack_start(self.cc_label, False, False, 0)
+ self.cc_label.set_markup(_('<b>Command code</b>'))
+ self.cc_label_box.pack_start(self.cc_label, False, False, 4)
self.cc_scrolled_window = Gtk.ScrolledWindow()
self.cc_code_view = GtkSource.View()
+ self.cc_code_view.set_editable(False)
+ self.cc_code_view.set_wrap_mode(Gtk.WrapMode.WORD)
self.cc_code_view_buffer = self.cc_code_view.get_buffer()
- self.cc_code_view_buffer.set_language(self.lm.get_language('json'))
- self.cc_code_view_buffer.set_style_scheme(self.style_manager.get_scheme('darcula'))
+ self.cc_code_view_buffer.set_language(self.lm.get_language('python3'))
+ # self.cc_code_view_buffer.set_style_scheme(self.style_manager.get_scheme('darcula'))
self.cc_scrolled_window.add(self.cc_code_view)
- self.cc_box.pack_start(self.cc_label_box, False, False, 0)
+ self.cc_box.pack_start(self.cc_label_box, False, False, 4)
self.cc_box.pack_start(self.cc_scrolled_window, True, True, 0)
self.comment_command_paned.pack1(self.cc_box)
@@ -488,17 +492,19 @@ class CBRSearch(Gtk.Box):
self.vc_label_box = Gtk.Box()
self.vc_label_box.set_orientation(Gtk.Orientation.HORIZONTAL)
self.vc_label = Gtk.Label()
- self.vc_label.set_text(_('Verification code:'))
- self.vc_label_box.pack_start(self.vc_label, False, False, 0)
+ self.vc_label.set_markup(_('<b>Verification code</b>'))
+ self.vc_label_box.pack_start(self.vc_label, False, False, 4)
self.vc_scrolled_window = Gtk.ScrolledWindow()
self.vc_code_view = GtkSource.View()
+ self.vc_code_view.set_editable(False)
+ self.vc_code_view.set_wrap_mode(Gtk.WrapMode.WORD)
self.vc_code_view_buffer = self.vc_code_view.get_buffer()
- self.vc_code_view_buffer.set_language(self.lm.get_language('json'))
- self.vc_code_view_buffer.set_style_scheme(self.style_manager.get_scheme('darcula'))
+ self.vc_code_view_buffer.set_language(self.lm.get_language('python3'))
+ # self.vc_code_view_buffer.set_style_scheme(self.style_manager.get_scheme('darcula'))
self.vc_scrolled_window.add(self.vc_code_view)
- self.vc_box.pack_start(self.vc_label_box, False, False, 0)
+ self.vc_box.pack_start(self.vc_label_box, False, False, 4)
self.vc_box.pack_start(self.vc_scrolled_window, True, True, 0)
self.verification_paned.pack1(self.vc_box)
@@ -507,17 +513,19 @@ class CBRSearch(Gtk.Box):
self.vrc_descr_label_box = Gtk.Box()
self.vrc_descr_label_box.set_orientation(Gtk.Orientation.HORIZONTAL)
self.vrc_descr_label = Gtk.Label()
- self.vrc_descr_label.set_text(_('Verification Description:'))
- self.vrc_descr_label_box.pack_start(self.vrc_descr_label, False, False, 0)
+ self.vrc_descr_label.set_markup(_('<b>Verification description</b>'))
+ self.vrc_descr_label_box.pack_start(self.vrc_descr_label, False, False, 4)
self.vrc_descr_scrolled_window = Gtk.ScrolledWindow()
self.vrc_descr_code_view = GtkSource.View()
+ self.vrc_descr_code_view.set_editable(False)
+ self.vrc_descr_code_view.set_wrap_mode(Gtk.WrapMode.WORD)
self.vrc_descr_code_view_buffer = self.vrc_descr_code_view.get_buffer()
- self.vrc_descr_code_view_buffer.set_language(self.lm.get_language('json'))
- self.vrc_descr_code_view_buffer.set_style_scheme(self.style_manager.get_scheme('darcula'))
+ self.vrc_descr_code_view_buffer.set_language(self.lm.get_language('text'))
+ # self.vrc_descr_code_view_buffer.set_style_scheme(self.style_manager.get_scheme('darcula'))
self.vrc_descr_scrolled_window.add(self.vrc_descr_code_view)
- self.vrc_descr_box.pack_start(self.vrc_descr_label_box, False, False, 0)
+ self.vrc_descr_box.pack_start(self.vrc_descr_label_box, False, False, 4)
self.vrc_descr_box.pack_start(self.vrc_descr_scrolled_window, True, True, 0)
self.verification_paned.pack2(self.vrc_descr_box)
@@ -585,6 +593,7 @@ class CBRSearch(Gtk.Box):
model, my_iter = treeselection.get_selected()
path = model.get_path(my_iter)
# retrieve the data from the tree-view row and build a string to set into the selection data object
+ # data_type = model[path][1]
desc = model[path][2]
comment = model[path][3]
command_code = model[path][4]
@@ -631,8 +640,6 @@ class CBRSearch(Gtk.Box):
def get_comment_pane_position(self):
return self.verification_paned.get_position()
-
-
def save_panes_positions(self):
"""
save the position of the pane widgets
diff --git a/Tst/tst/tst.py b/Tst/tst/tst.py
index f6722d5cac23fb627a7608db044eb09e4c2e296b..dfe42c1bea41d07f506aadbaba22a5ab9df6e9c2 100755
--- a/Tst/tst/tst.py
+++ b/Tst/tst/tst.py
@@ -45,6 +45,7 @@ logger = logging.getLogger('tst_app_main')
log_lvl = cfg.get(section='tst-logging', option='level')
logger.setLevel(level=log_lvl)
console_hdlr = toolbox.create_console_handler(hdlr_lvl=log_lvl)
+console_hdlr.setLevel(level=logging.WARNING)
logger.addHandler(hdlr=console_hdlr)
log_file = cfg.get(section='tst-logging', option='log-file-path')
file_hdlr = toolbox.create_file_handler(file=log_file)
@@ -711,8 +712,8 @@ class TstAppWindow(Gtk.ApplicationWindow):
folder = filepath[:-len(filename)-1]
dialog = Gtk.MessageDialog()
dialog.add_buttons(Gtk.STOCK_YES, Gtk.ResponseType.YES, Gtk.STOCK_NO, Gtk.ResponseType.NO)
- dialog.set_markup('Overwrite existing File?')
- dialog.format_secondary_text('{} at {} already exists'.format(filename, folder))
+ dialog.set_title('Overwrite existing file')
+ dialog.format_secondary_text('{} at {} already exists. Overwrite?'.format(filename, folder))
response = dialog.run()
if response == Gtk.ResponseType.YES:
@@ -727,7 +728,8 @@ class TstAppWindow(Gtk.ApplicationWindow):
def existing_file_dialog(self, filepath):
dialog = Gtk.MessageDialog()
dialog.add_buttons(Gtk.STOCK_YES, Gtk.ResponseType.YES, Gtk.STOCK_NO, Gtk.ResponseType.NO)
- dialog.set_markup('Overwrite existing file?')
+ dialog.set_title('Overwrite existing file')
+ # dialog.set_markup('Overwrite existing file?')
dialog.format_secondary_text('{} already exists. Overwrite?'.format(filepath))
response = dialog.run()
if response == Gtk.ResponseType.YES:
@@ -754,6 +756,7 @@ class TstAppWindow(Gtk.ApplicationWindow):
folder = filepath[:-len(filename)-1]
dialog = Gtk.MessageDialog()
dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_YES, Gtk.ResponseType.YES, Gtk.STOCK_NO, Gtk.ResponseType.NO)
+ dialog.set_title('Unsaved Buffer')
dialog.set_markup('Unsaved changes in {}, Overwrite?'.format(filename))
dialog.format_secondary_text('{} at {} already exists'.format(filename, folder))
response = dialog.run()
@@ -777,6 +780,7 @@ class TstAppWindow(Gtk.ApplicationWindow):
filename = 'New Test'
dialog = Gtk.MessageDialog()
dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_YES, Gtk.ResponseType.YES, Gtk.STOCK_NO, Gtk.ResponseType.NO)
+ dialog.set_title('Unsaved buffer')
dialog.set_markup('Unsaved file {}, save?'.format(filename))
# dialog.format_secondary_text('{} at {} is unsaved'.format(filename, folder))
response = dialog.run()
diff --git a/Tst/tst/view.py b/Tst/tst/view.py
index 2556e4d54e31d02105ab0145e8a6878ddc6b9908..da845933c0ecd02ef924471332e5b2e9c2de54f2 100644
--- a/Tst/tst/view.py
+++ b/Tst/tst/view.py
@@ -710,7 +710,7 @@ class StepWidget(Gtk.EventBox):
self.detail_box.pack_start(self.whole_description_box, True, True, 0)
# fields for commands and verification
- lm = GtkSource.LanguageManager()
+ # lm = GtkSource.LanguageManager()
# Area for the commands
self.whole_commands_box = Gtk.Box()
@@ -1630,6 +1630,7 @@ class StepRightClickMenu(Gtk.Menu):
step_widget.model.get_sequence(step_widget.sequence).add_step_below(reference_step_position=step_clicked_on)
self.step_widget.board.update_widget_data()
+
class Edit_Pre_Post_Con_Dialog(Gtk.Dialog):
def __init__(self, parent, pre_post, selection):
#Gtk.Dialog.__init__(self, title='PRE-Conditions', transient_for=parent, flags=0)