[chronojump] Database backup... to session/more 30% done
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Database backup... to session/more 30% done
- Date: Thu, 14 May 2020 15:24:12 +0000 (UTC)
commit 71d58fad5325f78ada94f4525fa379e39bbf9038
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 14 17:23:31 2020 +0200
Database backup... to session/more 30% done
glade/app1.glade | 79 +++++++++++++++++++++++++++++++++++++++++---
glade/preferences_win.glade | 15 +--------
po/POTFILES.in | 3 +-
src/gui/app1/session/main.cs | 28 ++++++++++++++++
src/gui/preferences.cs | 27 ++-------------
5 files changed, 108 insertions(+), 44 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 4b2861b3..16b129b0 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -35571,7 +35571,7 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">20</property>
- <property name="spacing">40</property>
+ <property name="spacing">6</property>
<child>
<widget class="GtkFrame"
id="frame_session_more_this_session">
<property name="visible">True</property>
@@ -35924,9 +35924,48 @@ then click this button.</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <placeholder/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
+ <child>
+ <widget class="GtkFrame" id="frame21">
+ <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="GtkAlignment" id="alignment56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">16</property>
+ <property name="bottom_padding">16</property>
+ <property name="left_padding">16</property>
+ <property name="right_padding">16</property>
+ <child>
+ <widget class="GtkHBox" id="hbox421">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <child>
+ <widget class="GtkButton" id="button_db_backup">
+ <property name="label" translatable="yes">Backup
all data</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 all the data</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -35934,10 +35973,19 @@ then click this button.</property>
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton"
id="button_data_folder_open">
+ <property name="label" translatable="yes">Open
data 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_data_folder_open_clicked" swapped="no"/>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
+ <property name="padding">10</property>
<property name="position">1</property>
</packing>
</child>
@@ -35946,6 +35994,29 @@ then click this button.</property>
</widget>
</child>
<child>
+ <widget class="GtkLabel" id="label530">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">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="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
<widget class="GtkHBox" id="hbox_session_more">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index 0abcb31d..0d4fa7cd 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -927,20 +927,7 @@
<property name="border_width">8</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkButton" id="button_data_folder_open">
- <property name="label" translatable="yes">Open data 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_data_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>
+ <placeholder/>
</child>
<child>
<widget class="GtkButton" id="button_db_restore">
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3c2ccf90..b847b30b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -72,8 +72,9 @@ src/gui/app1/reactionTime.cs
src/gui/app1/run.cs
src/gui/app1/runEncoder.cs
src/gui/app1/runEncoderAnalyze.cs
-src/gui/app1/session/loadAndImport.cs
src/gui/app1/session/addEdit.cs
+src/gui/app1/session/loadAndImport.cs
+src/gui/app1/session/main.cs
src/gui/app1/shortcuts.cs
src/gui/chronopic.cs
src/gui/chronopicRegister.cs
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index 81f749d0..ce49a113 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -19,8 +19,10 @@
*/
using System;
+using System.IO;
using Gtk;
using Glade;
+using Mono.Unix;
//here using app1s_ , "s" means session
//this file has been moved from his old window to be part of app1 on Chronojump 2.0
@@ -134,4 +136,30 @@ public partial class ChronoJumpWindow
label_session_more_session_name.Text = currentSession.Name;
}
+ void on_button_data_folder_open_clicked (object o, EventArgs args)
+ {
+ string databaseURL = Util.GetDatabaseDir() + System.IO.Path.DirectorySeparatorChar +
"chronojump.db";
+ string databaseTempURL = Util.GetDatabaseTempDir() + System.IO.Path.DirectorySeparatorChar +
"chronojump.db";
+
+ System.IO.FileInfo file1 = new System.IO.FileInfo(databaseURL); //potser cal una arrobar
abans (a windows)
+ System.IO.FileInfo file2 = new System.IO.FileInfo(databaseTempURL); //potser cal una arrobar
abans (a windows)
+
+ if(! file1.Exists && ! file2.Exists)
+ new DialogMessage(Constants.MessageTypes.WARNING, Constants.DatabaseNotFoundStr());
+
+ string dir = "";
+ if(file1.Exists)
+ dir = Util.GetParentDir(false);
+ else if(file2.Exists)
+ dir = Util.GetDatabaseTempDir();
+
+ try {
+ System.Diagnostics.Process.Start(dir);
+ } catch {
+ new DialogMessage(Constants.MessageTypes.WARNING,
+ Catalog.GetString("Error. Cannot open directory.") + "\n\n" + dir);
+ return;
+ }
+ }
+
}
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index cf2465dd..5d1b26e9 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -75,7 +75,7 @@ public class PreferencesWindow
[Widget] Gtk.CheckButton check_logo_animated;
//database tab
- [Widget] Gtk.Button button_data_folder_open;
+// [Widget] Gtk.Button button_data_folder_open;
//[Widget] Gtk.CheckButton check_backup_multimedia_and_encoder;
@@ -1404,29 +1404,6 @@ public class PreferencesWindow
}
}
- void on_button_data_folder_open_clicked (object o, EventArgs args)
- {
- System.IO.FileInfo file1 = new System.IO.FileInfo(databaseURL); //potser cal una arrobar
abans (a windows)
- System.IO.FileInfo file2 = new System.IO.FileInfo(databaseTempURL); //potser cal una arrobar
abans (a windows)
-
- if(! file1.Exists && ! file2.Exists)
- new DialogMessage(Constants.MessageTypes.WARNING, Constants.DatabaseNotFoundStr());
-
- string dir = "";
- if(file1.Exists)
- dir = Util.GetParentDir(false);
- else if(file2.Exists)
- dir = Util.GetDatabaseTempDir();
-
- try {
- System.Diagnostics.Process.Start(dir);
- } catch {
- new DialogMessage(Constants.MessageTypes.WARNING,
- Catalog.GetString("Error. Cannot open directory.") + "\n\n" + dir);
- return;
- }
- }
-
void on_button_db_restore_clicked (object o, EventArgs args)
{
/*
@@ -1850,7 +1827,7 @@ public class PreferencesWindow
hbox_backup_doing.Visible = start;
button_db_backup.Sensitive = ! start;
- button_data_folder_open.Sensitive = ! start;
+// button_data_folder_open.Sensitive = ! start;
button_cancel.Sensitive = ! start;
button_accept.Sensitive = ! start;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
