[chronojump] On import session tags are not shown



commit 5c12fa032722c44f72731fde91572a2454519f54
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Dec 7 12:02:07 2020 +0100

    On import session tags are not shown

 glade/app1.glade                      | 32 +++++++++++++++++++-------------
 src/gui/app1/session/loadAndImport.cs |  9 ++++++---
 src/gui/app1/session/main.cs          |  1 +
 3 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index d2d77c83..08b3e84b 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -23229,6 +23229,9 @@ Concentric</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -28050,18 +28053,6 @@ 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>
@@ -28098,6 +28089,18 @@ 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>
@@ -36305,6 +36308,9 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -38045,7 +38051,7 @@ then click this button.</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <widget class="GtkHBox" id="hbox342">
+                                                            <widget class="GtkHBox" id="app1s_hbox_manage">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="spacing">6</property>
diff --git a/src/gui/app1/session/loadAndImport.cs b/src/gui/app1/session/loadAndImport.cs
index b42d10f6..827efd9f 100644
--- a/src/gui/app1/session/loadAndImport.cs
+++ b/src/gui/app1/session/loadAndImport.cs
@@ -98,6 +98,7 @@ public partial class ChronoJumpWindow
                        app1s_hbox_frame_import.Visible = false;
                        app1s_notebook.CurrentPage = app1s_PAGE_SELECT_SESSION;
                        app1s_notebook_load_button_animation.CurrentPage = 0;
+                       app1s_hbox_manage.Visible = true;
                } else {
                        app1s_file_path_import.Visible = true;
                        app1s_notebook_load_button_animation.Visible = false;
@@ -108,13 +109,14 @@ public partial class ChronoJumpWindow
                        app1s_hbox_frame_import.Visible = true;
                        app1s_button_select_file_import_same_database.Visible = false; //is shown when user 
want to import a second session
                        app1s_notebook.CurrentPage = app1s_PAGE_IMPORT_START;
+                       app1s_hbox_manage.Visible = false;
                }
 
                createComboSessionLoadTags (false); //TODO: care because this is only related to load (not 
report)
                app1s_entry_search_filter.Text = "";
                app1s_button_manage_tags.Sensitive = (app1s_selected != "-1");
 
-               app1s_createTreeView(app1s_treeview_session_load, true, false, false, false);
+               app1s_createTreeView(app1s_treeview_session_load, app1s_type == 
app1s_windowType.LOAD_SESSION, false, false, false);
                app1s_store = app1s_getStore(true, false, false, false);
                app1s_treeview_session_load.Model = app1s_store;
                app1s_fillTreeView(app1s_treeview_session_load, app1s_store, false, false, false);
@@ -189,7 +191,7 @@ public partial class ChronoJumpWindow
                app1s_initializeGui();
                app1s_recreateTreeView("loaded the dialog");
        }
-       
+
        private void app1s_createTreeView (Gtk.TreeView tv, bool loadOrImport, bool showPersons, bool 
showContacts, bool showOtherTests)
        {
                tv.HeadersVisible=true;
@@ -311,7 +313,8 @@ public partial class ChronoJumpWindow
 
                UtilGtk.RemoveColumns(app1s_treeview_session_load);
                
-               app1s_createTreeView(app1s_treeview_session_load, true,
+               app1s_createTreeView(app1s_treeview_session_load,
+                               app1s_type == app1s_windowType.LOAD_SESSION,
                                app1s_checkbutton_show_data_persons.Active,
                                app1s_checkbutton_show_data_jump_run.Active,
                                app1s_checkbutton_show_data_other_tests.Active);
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index 74e2bfa0..f4e2eabb 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -53,6 +53,7 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.Button app1s_button_import;
        [Widget] Gtk.Image app1s_image_import;
        [Widget] Gtk.Entry app1s_entry_search_filter;
+       [Widget] Gtk.HBox app1s_hbox_manage;
        [Widget] Gtk.Button app1s_button_manage_tags;
        [Widget] Gtk.CheckButton app1s_checkbutton_show_data_persons;
        [Widget] Gtk.CheckButton app1s_checkbutton_show_data_jump_run;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]