Fixed an issue with backup device mounting; Backup device combo will be refreshed after selection to display disk usage

This commit is contained in:
Tony George 2014-09-13 20:23:15 +05:30
parent 829b6c364b
commit 483f33aa7e
3 changed files with 92 additions and 82 deletions

View File

@ -2256,11 +2256,13 @@ public class Main : GLib.Object{
return false;
}
else{
if (get_device_mount_point(backup_device.uuid) != mount_point_backup){
if ((mount_point_backup.length == 0) || (get_device_mount_point(backup_device.uuid) != mount_point_backup)){
unmount_backup_device(false);
/* Note: Unmount errors can be ignored.
* The old device will be hidden completely after the new device is mounted at the mount_point
* Old device will be hidden if new device is mounted successfully
* */
mount_point_backup = automount(backup_device.device,"", mount_point_app);
log_msg("Backup path changed to '%s/timeshift'".printf((mount_point_backup == "/") ? "" : mount_point_backup));
}

View File

@ -737,14 +737,14 @@ class MainWindow : Gtk.Window{
store.set (iter, 0, pi);
index++;
if ((App.root_device != null) && (pi.device == App.root_device.device)){
if ((App.root_device != null) && (pi.uuid == App.root_device.uuid)){
cmb_backup_device_index_default = index;
}
if ((App.snapshot_device != null) && (pi.device == App.snapshot_device.device)){
if ((App.snapshot_device != null) && (pi.uuid == App.snapshot_device.uuid)){
index_selected = index;
}
}
if (index_selected > -1){
//ok
}
@ -764,7 +764,6 @@ class MainWindow : Gtk.Window{
if (combo.model == null) { return; }
string txt;
if (combo.active < 0) {
txt = "<b>" + _("WARNING:") + "</b>\n";
txt += "Ø " + _("Please select a device for saving snapshots.") + "\n";
@ -785,11 +784,11 @@ class MainWindow : Gtk.Window{
//try changing backup device ------------------
App.snapshot_device = pi;
bool refresh_combobox_after_mounting = (pi.size_mb == 0);
bool status = App.mount_backup_device();
if (status == false){
string msg = _("Failed to mount device") + ": %s".printf(App.snapshot_device.device);
var dlg = new Gtk.MessageDialog.with_markup(null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, msg);
dlg.set_title(_("Error"));
@ -798,15 +797,24 @@ class MainWindow : Gtk.Window{
dlg.set_modal(true);
dlg.run();
dlg.destroy();
refresh_combobox_after_mounting = false;
cmb_backup_device.active = cmb_backup_device_index_default;
gtk_set_busy(false, this);
return;
}
App.update_partition_list(); //refresh free space on device
gtk_set_busy(false, this);
App.update_partition_list(); //refresh disk space info
timer_backup_device_init = Timeout.add(100, initialize_backup_device);
gtk_set_busy(false, this);
if (refresh_combobox_after_mounting){
refresh_combobox_after_mounting = false;
refresh_cmb_backup_device();
}
else{
timer_backup_device_init = Timeout.add(100, initialize_backup_device);
}
}
private void btn_backup_clicked(){

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: timeshift 1.2\n"
"Report-Msgid-Bugs-To: teejee2008@gmail.com\n"
"POT-Creation-Date: 2014-09-13 11:12+0530\n"
"POT-Creation-Date: 2014-09-13 20:19+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -21,7 +21,7 @@ msgstr ""
msgid "** Advanced Users **"
msgstr ""
#: MainWindow.vala:1229
#: MainWindow.vala:1245
msgid "A System Restore Utility for Linux"
msgstr ""
@ -61,7 +61,7 @@ msgstr ""
msgid "Any exclude patterns in the current exclude list will also be excluded."
msgstr ""
#: Main.vala:2120
#: Main.vala:2122
msgid "App config loaded"
msgstr ""
@ -77,7 +77,7 @@ msgstr ""
msgid "Application Info"
msgstr ""
#: Main.vala:2374
#: Main.vala:2378
msgid "Application will exit"
msgstr ""
@ -119,27 +119,27 @@ msgstr ""
msgid "Backup Level"
msgstr ""
#: MainWindow.vala:825
#: MainWindow.vala:841
msgid "Backup device does not have enough space"
msgstr ""
#: Main.vala:2552 MainWindow.vala:1370 MainWindow.vala:1378
#: Main.vala:2556 MainWindow.vala:1386 MainWindow.vala:1394
msgid "Backup device does not have enough space!"
msgstr ""
#: MainWindow.vala:1337 RestoreWindow.vala:1208
#: MainWindow.vala:1353 RestoreWindow.vala:1208
msgid "Backup device is not available"
msgstr ""
#: MainWindow.vala:1362
#: MainWindow.vala:1378
msgid "Backup device is not mounted!"
msgstr ""
#: Main.vala:2544
#: Main.vala:2548
msgid "Backup device not available"
msgstr ""
#: MainWindow.vala:1058
#: MainWindow.vala:1074
msgid "Before restoring"
msgstr ""
@ -201,11 +201,11 @@ msgstr ""
msgid "Clone the current system on another device"
msgstr ""
#: MainWindow.vala:1105
#: MainWindow.vala:1121
msgid "Cloning Failed!"
msgstr ""
#: Main.vala:1791 MainWindow.vala:1077
#: Main.vala:1791 MainWindow.vala:1093
msgid "Cloning system..."
msgstr ""
@ -229,15 +229,15 @@ msgstr ""
msgid "Credits"
msgstr ""
#: Main.vala:2373
#: Main.vala:2377
msgid "Critical Error"
msgstr ""
#: Main.vala:2494
#: Main.vala:2498
msgid "Cron job added"
msgstr ""
#: Main.vala:2507
#: Main.vala:2511
msgid "Cron job removed"
msgstr ""
@ -277,7 +277,7 @@ msgstr ""
msgid "Deleted incomplete snapshot"
msgstr ""
#: MainWindow.vala:921 MainWindow.vala:936
#: MainWindow.vala:937 MainWindow.vala:952
msgid "Deleting snapshot"
msgstr ""
@ -290,7 +290,7 @@ msgstr ""
msgid "Device"
msgstr ""
#: MainWindow.vala:1337 RestoreWindow.vala:1208
#: MainWindow.vala:1353 RestoreWindow.vala:1208
msgid "Device Offline"
msgstr ""
@ -329,7 +329,7 @@ msgstr ""
msgid "Disable Scheduled Snapshots"
msgstr ""
#: MainWindow.vala:1418
#: MainWindow.vala:1434
msgid "Disabled"
msgstr ""
@ -345,7 +345,7 @@ msgstr ""
msgid "Do you want to select another device?"
msgstr ""
#: MainWindow.vala:1036
#: MainWindow.vala:1052
msgid ""
"Do you want to take a snapshot of the current system before restoring the "
"selected snapshot?"
@ -383,20 +383,20 @@ msgstr ""
msgid "Enable"
msgstr ""
#: MainWindow.vala:1414
#: MainWindow.vala:1430
msgid "Enabled"
msgstr ""
#: Main.vala:250 Main.vala:1778 MainWindow.vala:795 MainWindow.vala:1114
#: Main.vala:250 Main.vala:1778 MainWindow.vala:802 MainWindow.vala:1130
#: RestoreWindow.vala:1307 RestoreWindow.vala:1324 Utility.vala:101
msgid "Error"
msgstr ""
#: MainWindow.vala:926
#: MainWindow.vala:942
msgid "Error: Unable to delete snapshot"
msgstr ""
#: MainWindow.vala:848
#: MainWindow.vala:864
msgid "Error: Unable to save snapshot"
msgstr ""
@ -429,7 +429,7 @@ msgstr ""
msgid "Excluded Directories"
msgstr ""
#: Main.vala:2498
#: Main.vala:2502
msgid "Failed to add cron job"
msgstr ""
@ -449,7 +449,7 @@ msgstr ""
msgid "Failed to delete symlinks"
msgstr ""
#: Main.vala:2666 Main.vala:2672
#: Main.vala:2672 Main.vala:2678
msgid "Failed to estimate system size"
msgstr ""
@ -457,7 +457,7 @@ msgstr ""
msgid "Failed to find a terminal emulator on this system!"
msgstr ""
#: Main.vala:2196
#: Main.vala:2198
msgid "Failed to get partition list."
msgstr ""
@ -465,15 +465,15 @@ msgstr ""
msgid "Failed to hard-link last snapshot"
msgstr ""
#: Main.vala:2307 Main.vala:2315
#: Main.vala:2311 Main.vala:2319
msgid "Failed to mount BTRFS subvolume"
msgstr ""
#: MainWindow.vala:793 RestoreWindow.vala:1308 RestoreWindow.vala:1325
#: MainWindow.vala:800 RestoreWindow.vala:1308 RestoreWindow.vala:1325
msgid "Failed to mount device"
msgstr ""
#: Main.vala:2511
#: Main.vala:2515
msgid "Failed to remove cron job"
msgstr ""
@ -493,7 +493,7 @@ msgstr ""
msgid "Failed to unmount"
msgstr ""
#: Main.vala:2374
#: Main.vala:2378
msgid "Failed to unmount device!"
msgstr ""
@ -514,7 +514,7 @@ msgstr ""
msgid "Files will be overwritten on the target device!"
msgstr ""
#: MainWindow.vala:1097
#: MainWindow.vala:1113
msgid "Finished"
msgstr ""
@ -522,7 +522,7 @@ msgstr ""
msgid "First Snapshot"
msgstr ""
#: Main.vala:2558 MainWindow.vala:1379
#: Main.vala:2562 MainWindow.vala:1395
msgid "First snapshot needs"
msgstr ""
@ -669,11 +669,11 @@ msgstr ""
msgid "Last monthly snapshot not found"
msgstr ""
#: MainWindow.vala:1440 MainWindow.vala:1444
#: MainWindow.vala:1456 MainWindow.vala:1460
msgid "Last snapshot is"
msgstr ""
#: MainWindow.vala:1448
#: MainWindow.vala:1464
msgid "Last snapshot is less than 1 hour old"
msgstr ""
@ -702,7 +702,7 @@ msgstr ""
msgid "Log"
msgstr ""
#: MainWindow.vala:825
#: MainWindow.vala:841
msgid "Low Disk Space"
msgstr ""
@ -738,11 +738,11 @@ msgstr ""
msgid "Mount"
msgstr ""
#: MainWindow.vala:983
#: MainWindow.vala:999
msgid "Multiple Snapshots Selected"
msgstr ""
#: MainWindow.vala:874 MainWindow.vala:979
#: MainWindow.vala:890 MainWindow.vala:995
msgid "No Snapshots Selected"
msgstr ""
@ -750,7 +750,7 @@ msgstr ""
msgid "No changes were made to system."
msgstr ""
#: MainWindow.vala:1432
#: MainWindow.vala:1448
msgid "No snapshots on device"
msgstr ""
@ -766,7 +766,7 @@ msgstr ""
msgid "Nothing to do!"
msgstr ""
#: Main.vala:2724
#: Main.vala:2730
msgid "Older log files removed"
msgstr ""
@ -774,7 +774,7 @@ msgstr ""
msgid "On-demand snapshot failed!"
msgstr ""
#: Main.vala:320 Main.vala:2285 RestoreWindow.vala:1298
#: Main.vala:320 Main.vala:2289 RestoreWindow.vala:1298
msgid ""
"Only ubuntu-type layouts with @ and @home subvolumes are currently supported."
msgstr ""
@ -813,19 +813,19 @@ msgstr ""
msgid "Please save your work and close all applications."
msgstr ""
#: MainWindow.vala:770
#: MainWindow.vala:777
msgid "Please select a device for saving snapshots."
msgstr ""
#: MainWindow.vala:983
#: MainWindow.vala:999
msgid "Please select a single snapshot"
msgstr ""
#: MainWindow.vala:1178
#: MainWindow.vala:1194
msgid "Please select a snapshot to view the log!"
msgstr ""
#: Main.vala:2541 MainWindow.vala:1359
#: Main.vala:2545 MainWindow.vala:1375
msgid "Please select the backup device"
msgstr ""
@ -837,11 +837,11 @@ msgstr ""
msgid "Please select the root device (/)"
msgstr ""
#: MainWindow.vala:979
#: MainWindow.vala:995
msgid "Please select the snapshot to restore"
msgstr ""
#: MainWindow.vala:874
#: MainWindow.vala:890
msgid "Please select the snapshots to delete"
msgstr ""
@ -885,7 +885,7 @@ msgstr ""
msgid "Remove selected items"
msgstr ""
#: Main.vala:2347
#: Main.vala:2351 Main.vala:2589
#, c-format
msgid "Removed mount directory: '%s'"
msgstr ""
@ -898,7 +898,7 @@ msgstr ""
msgid "Removing older backups to free disk space"
msgstr ""
#: MainWindow.vala:882
#: MainWindow.vala:898
msgid "Removing selected snapshots..."
msgstr ""
@ -919,7 +919,7 @@ msgstr ""
msgid "Restore"
msgstr ""
#: MainWindow.vala:1108
#: MainWindow.vala:1124
msgid "Restore Failed!"
msgstr ""
@ -935,7 +935,7 @@ msgstr ""
msgid "Restore failed with exit code"
msgstr ""
#: Main.vala:1788 MainWindow.vala:1073
#: Main.vala:1788 MainWindow.vala:1089
msgid "Restoring snapshot..."
msgstr ""
@ -943,7 +943,7 @@ msgstr ""
msgid "Rule"
msgstr ""
#: MainWindow.vala:1408
#: MainWindow.vala:1424
msgid "Running from Live CD/USB"
msgstr ""
@ -963,7 +963,7 @@ msgstr ""
msgid "Scheduled jobs will be enabled only after the first snapshot is taken."
msgstr ""
#: MainWindow.vala:1414 MainWindow.vala:1418
#: MainWindow.vala:1430 MainWindow.vala:1434
msgid "Scheduled snapshots"
msgstr ""
@ -987,7 +987,7 @@ msgstr ""
msgid "Select Root Device"
msgstr ""
#: MainWindow.vala:1178
#: MainWindow.vala:1194
msgid "Select Snapshot"
msgstr ""
@ -1059,7 +1059,7 @@ msgstr ""
msgid "Snapshot deleted"
msgstr ""
#: Main.vala:1209 MainWindow.vala:845
#: Main.vala:1209 MainWindow.vala:861
msgid "Snapshot saved successfully"
msgstr ""
@ -1067,7 +1067,7 @@ msgstr ""
msgid "Snapshot to restore not specified!"
msgstr ""
#: MainWindow.vala:1092
#: MainWindow.vala:1108
msgid "Snapshot was restored successfully on target device"
msgstr ""
@ -1075,7 +1075,7 @@ msgstr ""
msgid "Snapshots"
msgstr ""
#: MainWindow.vala:941
#: MainWindow.vala:957
msgid "Snapshots deleted successfully"
msgstr ""
@ -1112,11 +1112,11 @@ msgstr ""
msgid "System"
msgstr ""
#: MainWindow.vala:1415
#: MainWindow.vala:1431
msgid "System snapshots will be taken at regular intervals"
msgstr ""
#: MainWindow.vala:1089
#: MainWindow.vala:1105
msgid "System was cloned successfully on target device"
msgstr ""
@ -1132,7 +1132,7 @@ msgstr ""
msgid "Tags"
msgstr ""
#: MainWindow.vala:1039
#: MainWindow.vala:1055
msgid "Take Snapshot"
msgstr ""
@ -1148,7 +1148,7 @@ msgstr ""
msgid "Take scheduled backup"
msgstr ""
#: MainWindow.vala:834 MainWindow.vala:1047
#: MainWindow.vala:850 MainWindow.vala:1063
msgid "Taking snapshot..."
msgstr ""
@ -1156,7 +1156,7 @@ msgstr ""
msgid "Target"
msgstr ""
#: Main.vala:2766
#: Main.vala:2772
msgid "Terminating rsync process"
msgstr ""
@ -1168,7 +1168,7 @@ msgstr ""
msgid "The system partition has an unsupported subvolume layout."
msgstr ""
#: Main.vala:2284 RestoreWindow.vala:1297
#: Main.vala:2288 RestoreWindow.vala:1297
msgid "The target partition has an unsupported subvolume layout."
msgstr ""
@ -1182,7 +1182,7 @@ msgstr ""
msgid "TimeShift Logs"
msgstr ""
#: MainWindow.vala:1409
#: MainWindow.vala:1425
msgid "TimeShift is running in a live system"
msgstr ""
@ -1223,7 +1223,7 @@ msgstr ""
msgid "Unmounting from"
msgstr ""
#: Main.vala:2288 RestoreWindow.vala:1296
#: Main.vala:2292 RestoreWindow.vala:1296
msgid "Unsupported Subvolume Layout"
msgstr ""
@ -1260,7 +1260,7 @@ msgstr ""
msgid "WARNING"
msgstr ""
#: MainWindow.vala:769
#: MainWindow.vala:776
msgid "WARNING:"
msgstr ""
@ -1269,7 +1269,7 @@ msgstr ""
msgid "Warning"
msgstr ""
#: Main.vala:2082
#: Main.vala:2083
msgid "Warning: Backup device not set! Defaulting to system device"
msgstr ""
@ -1293,7 +1293,7 @@ msgstr ""
msgid "When free space less than"
msgstr ""
#: MainWindow.vala:1440
#: MainWindow.vala:1456
msgid "days old"
msgstr ""
@ -1301,11 +1301,11 @@ msgstr ""
msgid "days..."
msgstr ""
#: Main.vala:2530
#: Main.vala:2534
msgid "free"
msgstr ""
#: MainWindow.vala:1444
#: MainWindow.vala:1460
msgid "hours old"
msgstr ""