[chronojump] DB backup always backup all the data (including csv, mp4, ...)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] DB backup always backup all the data (including csv, mp4, ...)
- Date: Thu, 19 Sep 2019 11:08:16 +0000 (UTC)
commit 089742442aaf271599f148f712cc2da38bd8e757
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Sep 19 13:07:16 2019 +0200
DB backup always backup all the data (including csv, mp4, ...)
glade/preferences_win.glade | 29 +++++++----------------------
src/gui/preferences.cs | 25 +++++++++++++------------
2 files changed, 20 insertions(+), 34 deletions(-)
---
diff --git a/glade/preferences_win.glade b/glade/preferences_win.glade
index 99186602..290c1f8f 100644
--- a/glade/preferences_win.glade
+++ b/glade/preferences_win.glade
@@ -212,21 +212,6 @@
<property name="can_focus">False</property>
<property name="border_width">8</property>
<property name="spacing">20</property>
- <child>
- <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>
@@ -234,11 +219,11 @@
<property name="spacing">20</property>
<child>
<widget class="GtkButton" id="button_db_backup">
- <property name="label" translatable="yes">Backup database</property>
+ <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 the
database</property>
+ <property name="tooltip" translatable="yes">Make a copy of all the
data</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_button_db_backup_clicked" swapped="no"/>
</widget>
@@ -252,7 +237,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -297,7 +282,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -372,7 +357,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -381,7 +366,7 @@
<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="label" translatable="yes">Backup data</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -430,7 +415,7 @@
</child>
<child>
<widget class="GtkButton" id="button_db_restore">
- <property name="label" translatable="yes">Restore database</property>
+ <property name="label" translatable="yes">Restore data</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index 669cfe42..b2b3ae7f 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -56,7 +56,7 @@ public class PreferencesWindow
//database tab
[Widget] Gtk.Button button_data_folder_open;
- [Widget] Gtk.CheckButton check_backup_multimedia_and_encoder;
+ //[Widget] Gtk.CheckButton check_backup_multimedia_and_encoder;
[Widget] Gtk.Button button_db_backup;
[Widget] Gtk.HBox hbox_backup_doing;
@@ -1296,28 +1296,29 @@ public class PreferencesWindow
if (fc.Run() == (int)ResponseType.Accept)
{
//if multimedia_and_encoder, then copy the folder. If not checked, then copy only the
db file
- if(check_backup_multimedia_and_encoder.Active)
+ //if(check_backup_multimedia_and_encoder.Active)
fileCopy = fc.Filename + Path.DirectorySeparatorChar + "chronojump";
- else
- fileCopy = fc.Filename + Path.DirectorySeparatorChar + "chronojump_copy.db";
+ //else
+ // fileCopy = fc.Filename + Path.DirectorySeparatorChar + "chronojump_copy.db";
try {
fc.Hide ();
bool exists = false;
- if(check_backup_multimedia_and_encoder.Active) {
+ //if(check_backup_multimedia_and_encoder.Active) {
if(Directory.Exists(fileCopy)) {
LogB.Information(string.Format("Directory {0} exists, created
at {1}",
fileCopy,
Directory.GetCreationTime(fileCopy)));
exists = true;
}
- } else {
+ /*} else {
if (File.Exists(fileCopy)) {
LogB.Information(string.Format("File {0} exists with
attributes {1}, created at {2}",
fileCopy,
File.GetAttributes(fileCopy), File.GetCreationTime(fileCopy)));
exists = true;
}
}
+ */
if(exists) {
LogB.Information("Overwrite...");
@@ -1325,8 +1326,7 @@ public class PreferencesWindow
confirmWin.Button_accept.Clicked += new
EventHandler(on_overwrite_file_accepted);
} else {
//if multimedia_and_encoder, then copy the folder. If not checked,
then copy only the db file
- if(check_backup_multimedia_and_encoder.Active)
- {
+ //if(check_backup_multimedia_and_encoder.Active) {
uc = new UtilCopy();
thread = new Thread(new ThreadStart(copyRecursive));
GLib.Idle.Add (new GLib.IdleHandler (PulseGTK));
@@ -1335,12 +1335,13 @@ public class PreferencesWindow
LogB.ThreadStart();
thread.Start();
- } else {
+ /*} else {
File.Copy(fileDB, fileCopy);
string myString = string.Format(Catalog.GetString("Copied to
{0}"), fileCopy);
label_backup.Text = myString;
}
+ */
}
}
catch {
@@ -1399,7 +1400,7 @@ public class PreferencesWindow
{
try {
//if multimedia_and_encoder, then copy the folder. If not checked, then copy only the
db file
- if(check_backup_multimedia_and_encoder.Active) {
+ //if(check_backup_multimedia_and_encoder.Active) {
Directory.Delete(fileCopy, true);
uc = new UtilCopy();
thread = new Thread(new ThreadStart(copyRecursive));
@@ -1409,14 +1410,14 @@ public class PreferencesWindow
LogB.ThreadStart();
thread.Start();
- } else {
+ /* } else {
File.Delete(fileCopy);
File.Copy(fileDB, fileCopy);
fc.Hide ();
string myString = string.Format(Catalog.GetString("Copied to {0}"), fileCopy);
label_backup.Text = myString;
- }
+ } */
} catch {
string myString = string.Format(Catalog.GetString("Cannot copy to {0} "), fileCopy);
new DialogMessage(Constants.MessageTypes.WARNING, myString);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
