- Fixed a bug that would show the previously Added data in a new Add …

…data dialog - Refactored some clearSelection code
watchmanmonitoring · Jan 19, 2013 · b88294a · b88294a
1 parent 28a5cd6
commit b88294a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 17 deletions.
diff --git a/UI/BackupMinderUI_Xcode3/Classes/AddPanelController.h b/UI/BackupMinderUI_Xcode3/Classes/AddPanelController.h
@@ -88,6 +88,9 @@ enum panelMode_t
 // Param: sender_, Id of the sender object
 - (IBAction)selectArchiveDestination:(id)sender_;
 
+// Brief: Reset the text fields
+- (void)clearSelection;
+
 @end
 
 #endif //ADD_PANEL_CONTROLLER_H
diff --git a/UI/BackupMinderUI_Xcode3/Classes/AddPanelController.m b/UI/BackupMinderUI_Xcode3/Classes/AddPanelController.m
@@ -374,20 +374,16 @@ - (IBAction)commit:(id)sender_
                                    contextInfo:nil];
         return;
     }
-
+
+	[self clearSelection];
+
     [[self window] orderOut:nil];
     [NSApp endSheet:[self window]];
 }
 
 - (IBAction)cancel:(id)sender_
-{
-    // Clear the textFields
-    [m_nameTextField setStringValue:@""];
-    [m_backupSourceTextField setStringValue:@""];  
-    [m_archiveDestinationTextField setStringValue:@""];
-    [m_nameContainsTextField setStringValue:@""];
-    [m_backupsToLeaveTextField setStringValue:kBackupsToLeaveDefault];
-    [m_warnDaysTextField setStringValue:kWarnDaysDefault];
+{	
+	[self clearSelection];
 
     [[self window] orderOut:nil];
     [NSApp endSheet:[self window]];
@@ -448,4 +444,15 @@ - (IBAction)selectArchiveDestination:(id)sender_
 	}    
 }
 
+- (void)clearSelection
+{	
+    // Clear the textFields
+    [m_nameTextField setStringValue:@""];
+    [m_backupSourceTextField setStringValue:@""];  
+    [m_archiveDestinationTextField setStringValue:@""];
+    [m_nameContainsTextField setStringValue:@""];
+    [m_backupsToLeaveTextField setStringValue:kBackupsToLeaveDefault];
+    [m_warnDaysTextField setStringValue:kWarnDaysDefault];
+}
+
 @end
diff --git a/UI/BackupMinderUI_Xcode3/Classes/MainMenuController.h b/UI/BackupMinderUI_Xcode3/Classes/MainMenuController.h
@@ -62,6 +62,9 @@
 // Param: sender_, Id of the sender object
 - (IBAction)refresh:(id)sender_;
 
+// Brief: Reset the table selection and clear the table selection
+- (void)clearSelection;
+
 @end
 
 #endif //MAIN_MENU_CONTROLLER_H
diff --git a/UI/BackupMinderUI_Xcode3/Classes/MainMenuController.m b/UI/BackupMinderUI_Xcode3/Classes/MainMenuController.m
@@ -133,6 +133,16 @@ - (IBAction)refresh:(id)sender_
     [m_backupsTableView reloadData];
 }
 
+- (void)clearSelection
+{
+	[m_backupsTableView reloadData];
+
+    // Unselect the row so that the user must click
+    // on a row again to update the information
+    // Otherwise the information displayed might be stale
+    [m_backupsTableView deselectAll:nil];
+}
+
 #pragma mark -
 #pragma mark Table Data Source Methods
 
@@ -378,7 +388,7 @@ - (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode
             return;
         }
 
-        [m_backupsTableView reloadData];
+		[self clearSelection];
     }
 }
 
@@ -387,13 +397,8 @@ - (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode
 
 - (void)sheetDidEnd:(NSWindow *)sheet_ returnCode:(NSInteger)returnCode_
         contextInfo:(void *)contextInfo_
-{    
-    [m_backupsTableView reloadData];
-
-    // Unselect the row so that the user must click
-    // on a row again to update the information
-    // Otherwise the information displayed might be stale
-    [m_backupsTableView deselectAll:nil];
+{
+	[self clearSelection];
 }
 
 @end