updates to backup/restore db

CP_Main.rc

@@ -430,7 +430,7 @@ BEGIN
         MENUITEM "Delete Clip Data",            ID_MENU_DELETECLIPDATA32934
         MENUITEM SEPARATOR
         MENUITEM "Backup Database",             ID_MENU_BACKUPDATABASE
-        MENUITEM "Restore Databsae",            ID_MENU_RESTOREDATABSAE
+        MENUITEM "Restore Database",            ID_MENU_RESTOREDATABSAE
         MENUITEM SEPARATOR
         MENUITEM "Import Clip(s)",              ID_MENU_IMPORTCLIP32935
         MENUITEM "New Clip",                    ID_MENU_NEWCLIP32937

DatabaseUtilities.cpp

@@ -443,6 +443,13 @@ BOOL ValidDB(CString csPath, BOOL bUpgrade)
 
 BOOL BackupDB(CString dbPath, CString backupPath)
 {
+	CRect r = DefaultMonitorRect();
+	CPopup status((r.right - 500), r.bottom - 100, ::GetForegroundWindow());
+
+	CString msg = theApp.m_Language.GetString("BackupDbMsg", "Backing up database");
+
+	status.Show(StrF(_T("Ditto - %s - %s"), msg, backupPath));
+
 	BOOL ret = FALSE;
 
 	Log(StrF(_T("Start backing up db, from: %s to %s"), dbPath, backupPath));
@@ -477,6 +484,8 @@ BOOL BackupDB(CString dbPath, CString backupPath)
 						{
 							percentageComplete = percent;
 							Log(StrF(_T("backing up db percent done: %d"), percentageComplete));
+
+							status.Show(StrF(_T("Ditto - %02d%% %s - %s"), percentageComplete, msg, backupPath));
 						}
 
 					}while(readBytes >= 65536);
@@ -516,6 +525,12 @@ BOOL BackupDB(CString dbPath, CString backupPath)
 
 BOOL RestoreDB(CString backupPath)
 {
+	CRect r = DefaultMonitorRect();
+	CPopup status((r.right - 500), r.bottom - 100, ::GetForegroundWindow());
+
+	CString msg = theApp.m_Language.GetString("RestoreDbMsg", "Restoring database");
+	status.Show(StrF(_T("Ditto - %s - %s"), msg, backupPath));
+
 	BOOL ret = FALSE;
 
 	Log(StrF(_T("Start restoring db, from: %s"), backupPath));
@@ -526,6 +541,7 @@ BOOL RestoreDB(CString backupPath)
 	CPath backupPathPath(backupPath);
 
 	CString tempPath = CGetSetOptions::GetPath(PATH_RESTORE_TEMP);
+	
 	tempPath += backupPathPath.GetName();
 
 	try
@@ -569,6 +585,7 @@ BOOL RestoreDB(CString backupPath)
 
 				CString path = defaultDbPathPath.GetPath();
 
+				backupPathPath.RenameExtension(_T("db"));
 				CString newFullPath = path + backupPathPath.GetName();
 
 				int i = 1;

Debug/Language/English.xml

@@ -145,6 +145,9 @@
 		<Item English_Text = "Decrease" ID = "32948"></Item>
 		<Item English_Text = "Toggle Enabled" ID = "32949"></Item>
 		
+		<Item English_Text = "Backup Database" ID = "32962"></Item>
+		<Item English_Text = "Restore Dastabase" ID = "32964"></Item>
+		
 	</Ditto_Right_Click_Menu>
 	<Ditto_Clip_Properties>
 		<Item English_Text = "Hot Key" ID = "2039"></Item>
@@ -401,9 +404,14 @@
 		<Item English_Text = "Ditto is running minimized, Ditto can be opened by hot keys or by clicking the task tray icon" ID = "StartuMsg"></Item>
 		<Item English_Text = "There are no results for" ID = "NoSearchResults"></Item>
 		<Item English_Text = "Warning this can take quite a long time and require up to double the hard drive space as your current database size, Continue?" ID = "CompactRepairWarning"></Item>
-		<Item English_Text = "Prompt For Name" ID = "prompt_for_name">tt</Item>
+		<Item English_Text = "Prompt For Name" ID = "prompt_for_name"></Item>
 		<Item English_Text = "(Follow windows light/dark themes)" ID = "FollowWindowsTheme"></Item>
 		
+		<Item English_Text = "BackupDbMsg" ID = "Backing up database"></Item>
+		<Item English_Text = "RestoreDbMsg" ID = "Restoring database"></Item>
+		
+		
+		
 	</Ditto_String_Table>
 	<Ditto_Options_Sheet>
 		<Item English_Text = "OK" ID = "1"></Item>
@@ -431,6 +439,10 @@
 		<Item English_Text = "Save Current Clipboard" ID = "32904"></Item>
 		
 		<Item English_Text = "Show Startup Message" ID = "32959"></Item>
+		
+		<Item English_Text = "Backup Database" ID = "32960"></Item>
+		<Item English_Text = "Restore Database" ID = "32961"></Item>
+		
 	</Ditto_Tray_Icon_Menu>
 
 	//Added in 9-11-09