[chronojump] Better gui on preferences first tab



commit bc09f90d8d321200ee3c74621003e69b0e5daae1
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed Mar 2 16:15:18 2016 +0100

    Better gui on preferences first tab

 glade/chronojump.glade |  306 ++++++++++++++++++++++++++---------------------
 src/gui/preferences.cs |    4 -
 2 files changed, 169 insertions(+), 141 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 9d91ce6..b68ea6b 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7876,6 +7876,9 @@ after time</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             </child>
                                                             <child>
@@ -9395,6 +9398,9 @@ after time</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="position">2</property>
@@ -10555,6 +10561,9 @@ after time</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="position">4</property>
@@ -18948,6 +18957,9 @@ on current Chronojump version.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -23526,6 +23538,9 @@ by you</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -24585,6 +24600,9 @@ by you</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -26136,6 +26154,9 @@ by you</property>
               <placeholder/>
             </child>
             <child>
+              <placeholder/>
+            </child>
+            <child>
               <widget class="GtkButton" id="button_video_url">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -26744,6 +26765,9 @@ by you</property>
             <child>
               <placeholder/>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </widget>
           <packing>
             <property name="expand">True</property>
@@ -39038,6 +39062,24 @@ options</property>
                             <child>
                               <placeholder/>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -41237,6 +41279,18 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -42603,9 +42657,6 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                                       <placeholder/>
                                     </child>
                                     <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
                                       <widget class="GtkLabel" id="label218">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
@@ -43664,6 +43715,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                                     <child>
                                       <placeholder/>
                                     </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                   </widget>
                                 </child>
                               </widget>
@@ -43790,7 +43844,7 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">16</property>
-                <property name="spacing">16</property>
+                <property name="spacing">20</property>
                 <child>
                   <widget class="GtkFrame" id="frame3">
                     <property name="visible">True</property>
@@ -43804,83 +43858,53 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                         <property name="border_width">8</property>
                         <property name="spacing">20</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox18">
+                          <widget class="GtkCheckButton" id="check_backup_multimedia_and_encoder">
+                            <property name="label" translatable="yes">Include multimedia and encoder 
tests</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>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkVButtonBox" id="vbuttonbox2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">8</property>
+                            <property name="spacing">20</property>
                             <child>
-                              <widget class="GtkTable" id="table2">
+                              <widget class="GtkButton" id="button_db_backup">
+                                <property name="label" translatable="yes">Backup database</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="n_rows">2</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">6</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <widget class="GtkCheckButton" id="check_backup_sessions">
-                                    <property name="label" translatable="yes">Sessions</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</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>
-                                </child>
-                                <child>
-                                  <widget class="GtkCheckButton" id="check_backup_multimedia_and_encoder">
-                                    <property name="label" translatable="yes">Multimedia and encoder 
tests</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="draw_indicator">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkCheckButton" id="check_backup_persons">
-                                    <property name="label" translatable="yes">Persons</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</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>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkCheckButton" id="check_backup_contact_tests">
-                                    <property name="label" translatable="yes">Contact tests</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</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>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip" translatable="yes">Make a copy of the 
database</property>
+                                <property name="use_underline">True</property>
+                                <signal name="clicked" handler="on_button_db_backup_clicked" swapped="no"/>
                               </widget>
                               <packing>
                                 <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkVBox" id="vbox18">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">8</property>
                             <child>
                               <widget class="GtkHBox" id="hbox_backup_doing">
                                 <property name="can_focus">False</property>
@@ -43912,45 +43936,76 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                           </widget>
                           <packing>
                             <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="position">0</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label18">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Backup database</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</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="GtkFrame" id="frame7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVButtonBox" id="vbuttonbox2">
+                          <widget class="GtkVButtonBox" id="vbuttonbox1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="border_width">8</property>
                             <property name="spacing">20</property>
                             <child>
-                              <widget class="GtkButton" id="button_db_backup">
-                                <property name="label" translatable="yes">Backup database</property>
+                              <widget class="GtkButton" id="button_db_folder_open">
+                                <property name="label" translatable="yes">Open database folder</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip" translatable="yes">Make a copy of the 
database</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_button_db_backup_clicked" swapped="no"/>
+                                <signal name="clicked" handler="on_button_db_folder_open_clicked" 
swapped="no"/>
                               </widget>
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">False</property>
+                                <property name="padding">10</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button_db_folder_open">
-                                <property name="label" translatable="yes">Open database folder</property>
-                                <property name="visible">True</property>
+                              <widget class="GtkButton" id="button_db_restore">
+                                <property name="label" translatable="yes">Restore database</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_button_db_folder_open_clicked" 
swapped="no"/>
+                                <signal name="clicked" handler="on_button_db_restore_clicked" swapped="no"/>
                               </widget>
                               <packing>
                                 <property name="expand">True</property>
@@ -43960,34 +44015,44 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button_db_restore">
-                                <property name="label" translatable="yes">Restore database</property>
+                              <widget class="GtkButton" id="button_logs_folder_open">
+                                <property name="label" translatable="yes">Open logs folder</property>
+                                <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_button_db_restore_clicked" swapped="no"/>
+                                <signal name="clicked" handler="on_button_logs_folder_open_clicked" 
swapped="no"/>
                               </widget>
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">False</property>
-                                <property name="padding">10</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="GtkButton" id="button_import_configuration">
+                                <property name="label" translatable="yes">Import configuration</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <signal name="clicked" handler="on_button_import_configuration_clicked" 
swapped="no"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
                           </widget>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label18">
+                      <widget class="GtkLabel" id="label36">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Database</property>
+                        <property name="label" translatable="yes">Others</property>
                         <property name="use_markup">True</property>
                       </widget>
                       <packing>
@@ -43997,49 +44062,7 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkVButtonBox" id="vbuttonbox1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">20</property>
-                    <child>
-                      <widget class="GtkButton" id="button_logs_folder_open">
-                        <property name="label" translatable="yes">Open logs folder</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <signal name="clicked" handler="on_button_logs_folder_open_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_import_configuration">
-                        <property name="label" translatable="yes">Import configuration</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <signal name="clicked" handler="on_button_import_configuration_clicked" 
swapped="no"/>
-                      </widget>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -44049,7 +44072,7 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
               <widget class="GtkLabel" id="label528">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Database</property>
+                <property name="label" translatable="yes">Main</property>
               </widget>
               <packing>
                 <property name="tab_fill">False</property>
@@ -47495,6 +47518,9 @@ It starts before and arrives there with some speed.</property>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
@@ -48218,6 +48244,9 @@ It starts before and arrives there with some speed.</property>
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
@@ -48956,6 +48985,9 @@ It starts before and arrives there with some speed.</property>
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
                 </child>
               </widget>
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index c9c96cc..aa1809e 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -40,10 +40,6 @@ public class PreferencesWindow {
        //database tab
        [Widget] Gtk.Button button_db_folder_open;
 
-       //this three are unneded because cannot be unchecked
-       //[Widget] Gtk.CheckButton check_backup_sessions;
-       //[Widget] Gtk.CheckButton check_backup_persons;
-       //[Widget] Gtk.CheckButton check_backup_contact_tests;
        [Widget] Gtk.CheckButton check_backup_multimedia_and_encoder;
        
        [Widget] Gtk.Button button_db_backup;


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