commit e382695c7ec24dfdb1f97ea54673a96642748bfe
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jan 6 14:24:34 2021 +0100
Send log init screen much better
glade/app1.glade | 449 +++++++++++++++++++++++++++--------------------------
src/chronojump.cs | 2 +-
src/gui/sendLog.cs | 10 +-
3 files changed, 241 insertions(+), 220 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index dc52dc612..7f1b78d7c 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -23598,6 +23598,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -28444,6 +28447,18 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -28480,18 +28495,6 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -36756,6 +36759,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -43109,125 +43115,134 @@ then click this button.</property>
<property name="border_width">4</property>
<child>
<widget class="GtkFrame" id="frame3">
- <property name="width_request">500</property>
+ <property name="width_request">650</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="label_yalign">1</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkViewport" id="viewport14">
+ <widget class="GtkScrolledWindow" id="scrolledwindow6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">4</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
<child>
- <widget class="GtkVBox" id="vbox107">
+ <widget class="GtkViewport" id="viewport14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">20</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkAlignment" id="alignment55">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="bottom_padding">8</property>
- <child>
- <widget class="GtkLabel" id="label_send_log">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="wrap">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="border_width">4</property>
<child>
- <widget class="GtkHBox" id="hbox218">
+ <widget class="GtkVBox" id="vbox107">
+ <property name="width_request">630</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label93">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Your
email</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="border_width">20</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkEntry" id="entry_send_log">
- <property name="width_request">200</property>
+ <widget class="GtkScrolledWindow"
id="scrolledwindow20">
+ <property name="height_request">80</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkTextView" id="textview_send_log">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="cursor_visible">False</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox211">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label263">
+ <widget class="GtkHBox" id="hbox218">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Preferred
response language </property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label93">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Your
email</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_send_log">
+ <property name="width_request">200</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox215">
+ <widget class="GtkVBox" id="vbox211">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label263">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Preferred response language </property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkRadioButton"
id="radio_log_english">
+ <widget class="GtkHBox" id="hbox215">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_log_english">
<property name="label"
translatable="yes">English</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radio_log_spanish">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_log_spanish">
<property name="label"
translatable="yes">Spanish</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -43235,15 +43250,15 @@ then click this button.</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">radio_log_english</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radio_log_portuguese">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_log_portuguese">
<property name="label"
translatable="yes">Portuguese</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -43251,15 +43266,15 @@ then click this button.</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">radio_log_english</property>
- </widget>
- <packing>
+ </widget>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radio_log_catalan">
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_log_catalan">
<property name="label"
translatable="yes">Catalan</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -43267,143 +43282,104 @@ then click this button.</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">radio_log_english</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox215">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel" id="label98">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Add
comments</property>
- </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow6">
- <property name="height_request">55</property>
+ <widget class="GtkVBox" id="vbox215">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property
name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label98">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Add
comments</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkTextView" id="textview_comments">
+ <widget class="GtkScrolledWindow"
id="scrolledwindow17">
+ <property name="height_request">55</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkTextView"
id="textview_comments">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox228">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkButton" id="button_send_log">
- <property name="label" translatable="yes">Send error
log</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked"
handler="on_button_send_log_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="button_check_last_version">
- <property name="label" translatable="yes">Check last
version</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked"
handler="on_button_check_last_version_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox416">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox417">
+ <widget class="GtkHBox" id="hbox228">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">8</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkImage" id="image_send_log_no">
- <property name="can_focus">False</property>
- <property name="stock">gtk-no</property>
+ <widget class="GtkButton" id="button_send_log">
+ <property name="label" translatable="yes">Send
error log</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property
name="receives_default">False</property>
+ <signal name="clicked"
handler="on_button_send_log_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image_send_log_yes">
- <property name="can_focus">False</property>
- <property name="stock">gtk-yes</property>
+ <widget class="GtkButton"
id="button_check_last_version">
+ <property name="label" translatable="yes">Check
last version</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property
name="receives_default">False</property>
+ <signal name="clicked"
handler="on_button_check_last_version_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
@@ -43412,38 +43388,79 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow"
id="scrolledwindow18">
- <property name="height_request">60</property>
+ <widget class="GtkHBox" id="hbox416">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property
name="vscrollbar_policy">automatic</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkHBox" id="hbox417">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkImage" id="image_send_log_no">
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-no</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage" id="image_send_log_yes">
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-yes</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkTextView"
id="textview_send_log_message">
+ <widget class="GtkScrolledWindow"
id="scrolledwindow18">
+ <property name="height_request">60</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">automatic</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkTextView"
id="textview_send_log_message">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="cursor_visible">False</property>
<property name="accepts_tab">False</property>
+ </widget>
+ </child>
</widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
</child>
</widget>
</child>
@@ -43458,7 +43475,7 @@ then click this button.</property>
</widget>
<packing>
<property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/src/chronojump.cs b/src/chronojump.cs
index 0e02eab23..6dd5605fb 100644
--- a/src/chronojump.cs
+++ b/src/chronojump.cs
@@ -735,7 +735,7 @@ public class ChronoJump
string sendErrorLogStr = Catalog.GetString("Send error log");
messageCrashedBefore =
string.Format(Catalog.GetString("Chronojump {0} crashed before."),
BuildInfo.chronojumpVersion) + "\n" +
- string.Format(Catalog.GetString("Please, fill your email and click on '{0}' in order
to fix this fast and contact you if appropriate."), sendErrorLogStr) + "\n" +
+ string.Format(Catalog.GetString("Please, fill your email and click on '{0}' in order
to fix this fast and contact you if appropriate."), sendErrorLogStr) + " " +
Catalog.GetString("Your help is needed.");
diff --git a/src/gui/sendLog.cs b/src/gui/sendLog.cs
index f5fe8e6f4..0967b775a 100644
--- a/src/gui/sendLog.cs
+++ b/src/gui/sendLog.cs
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Copyright (C) 2017-2020 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2017-2021 Xavier de Blas <xaviblas gmail com>
*/
using System;
@@ -28,7 +28,7 @@ using Mono.Unix;
public partial class ChronoJumpWindow
{
[Widget] Gtk.Box hbox_send_log;
- [Widget] Gtk.Label label_send_log;
+ [Widget] Gtk.TextView textview_send_log;
[Widget] Gtk.Image image_send_log_no;
[Widget] Gtk.Image image_send_log_yes;
[Widget] Gtk.Entry entry_send_log;
@@ -43,7 +43,11 @@ public partial class ChronoJumpWindow
string emailStored;
private void show_send_log(string sendLogMessage, string logLanguage)
{
- label_send_log.Text = sendLogMessage;
+ TextBuffer tb = new TextBuffer (new TextTagTable());
+ tb.Text = sendLogMessage;
+ textview_send_log.Buffer = tb;
+ textview_send_log.WrapMode = Gtk.WrapMode.Word; //Wrap words on a TextViewiew! (cannot be
done on Glade)
+
emailStored = SqlitePreferences.Select("email");
if(emailStored != null && emailStored != "" && emailStored != "0")
entry_send_log.Text = emailStored;