Graphics

iOSClient/Main/CCMain.m

@@ -102,7 +102,7 @@
         
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(initializeMain:) name:@"initializeMain" object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(clearDateReadDataSource:) name:@"clearDateReadDataSource" object:nil];
-
+        
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setTitle) name:@"setTitleMain" object:nil];
     }
     
@@ -3073,52 +3073,44 @@
 
 - (void)orderTable:(NSString *)order
 {
+    [CCUtility setOrderSettings:order];
+    
     // Clear data-read of DataSource
     [[NSNotificationCenter defaultCenter] postNotificationName:@"clearDateReadDataSource" object:nil];
     
-    [CCUtility setOrderSettings:order];
-    
-    // refresh
-    [self reloadDatasource];
     // new menu
     [self createReMainMenu];
 }
 
 - (void)ascendingTable:(BOOL)ascending
 {
+    [CCUtility setAscendingSettings:ascending];
+    
     // Clear data-read of DataSource
     [[NSNotificationCenter defaultCenter] postNotificationName:@"clearDateReadDataSource" object:nil];
     
-    [CCUtility setAscendingSettings:ascending];
-    
-    // refresh
-    [self reloadDatasource];
     // new menu
     [self createReMainMenu];
 }
 
 - (void)directoryOnTop:(BOOL)directoryOnTop
 {
+    [CCUtility setDirectoryOnTop:directoryOnTop];
+    
     // Clear data-read of DataSource
     [[NSNotificationCenter defaultCenter] postNotificationName:@"clearDateReadDataSource" object:nil];
     
-    [CCUtility setDirectoryOnTop:directoryOnTop];
-    
-    // refresh
-    [self reloadDatasource];
     // new menu
     [self createReMainMenu];
 }
 
 - (void)tableGroupBy:(NSString *)groupBy
 {
+    [CCUtility setGroupBySettings:groupBy];
+    
     // Clear data-read of DataSource
     [[NSNotificationCenter defaultCenter] postNotificationName:@"clearDateReadDataSource" object:nil];
     
-    [CCUtility setGroupBySettings:groupBy];
-    
-    // refresh
-    [self reloadDatasource];
     // new menu
     [self createReMainMenu];
 }
@@ -4658,6 +4650,7 @@
 - (void)clearDateReadDataSource:(NSNotification *)notification
 {
     _dateReadDataSource = Nil;
+    [self reloadDatasource];
 }
 
 - (void)reloadDatasource

iOSClient/Offline/CCSynchronize.m

@@ -148,6 +148,8 @@
             father = serverUrl;
         }
     }
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"clearDateReadDataSource" object:nil];
 }
 
 - (void)listingFavoritesFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
@@ -212,54 +214,6 @@
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];    
 }
 
-// Graphics Animation Offline Folders
-//
-//
-
-- (BOOL)synchronizeFolderAnimationDirectory:(NSArray *)directory setGraphicsFolder:(BOOL)setGraphicsFolder
-{
-    BOOL animation = NO;
-    BOOL isAtLeastOneInAnimation = NO;
-    NSMutableOrderedSet *serversUrlInDownload = [NSMutableOrderedSet new];
-    
-    // test
-    if ([directory count] == 0 && [self.foldersInSynchronized count] == 0)
-        return isAtLeastOneInAnimation;
-    
-    if (directory)
-        [self.foldersInSynchronized addObjectsFromArray:directory];
-    else
-        directory = [[NSArray alloc] initWithArray:self.foldersInSynchronized.array];
-    
-    // Active in download
-    NSMutableArray *metadatasNet = [app verifyExistsInQueuesDownloadSelector:selectorDownloadSynchronize];
-    
-    for (CCMetadataNet *metadataNet in metadatasNet)
-        [serversUrlInDownload addObject:metadataNet.serverUrl];
-    
-    // Animation ON/OFF
-    
-    for (NSString *serverUrl in directory) {
-        
-        animation = [serversUrlInDownload containsObject:serverUrl];
-        
-        if (animation)
-            isAtLeastOneInAnimation = YES;
-        else
-            [self.foldersInSynchronized removeObject:serverUrl];
-        
-        if (setGraphicsFolder) {
-            
-            NSString *serverUrlOffline = [CCUtility deletingLastPathComponentFromServerUrl:serverUrl];
-            CCMain *viewController = [app.listMainVC objectForKey:serverUrlOffline];
-            if (viewController)
-                [viewController synchronizeFolderGraphicsServerUrl:serverUrl animation:animation];
-        }
-    }
-    
-    return isAtLeastOneInAnimation;
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Read Folder =====
 #pragma --------------------------------------------------------------------------------------------
@@ -429,7 +383,6 @@
 #pragma mark ===== Verify Metadatas =====
 #pragma --------------------------------------------------------------------------------------------
 
-
 // MULTI THREAD
 - (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account synchronize:(BOOL)synchronize
 {
@@ -542,5 +495,53 @@
     });
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark ===== Synchronize Folder Animation =====
+#pragma --------------------------------------------------------------------------------------------
+
+- (BOOL)synchronizeFolderAnimationDirectory:(NSArray *)directory setGraphicsFolder:(BOOL)setGraphicsFolder
+{
+    BOOL animation = NO;
+    BOOL isAtLeastOneInAnimation = NO;
+    NSMutableOrderedSet *serversUrlInDownload = [NSMutableOrderedSet new];
+    
+    // test
+    if ([directory count] == 0 && [self.foldersInSynchronized count] == 0)
+        return isAtLeastOneInAnimation;
+    
+    if (directory)
+        [self.foldersInSynchronized addObjectsFromArray:directory];
+    else
+        directory = [[NSArray alloc] initWithArray:self.foldersInSynchronized.array];
+    
+    // Active in download
+    NSMutableArray *metadatasNet = [app verifyExistsInQueuesDownloadSelector:selectorDownloadSynchronize];
+    
+    for (CCMetadataNet *metadataNet in metadatasNet)
+        [serversUrlInDownload addObject:metadataNet.serverUrl];
+    
+    // Animation ON/OFF
+    
+    for (NSString *serverUrl in directory) {
+        
+        animation = [serversUrlInDownload containsObject:serverUrl];
+        
+        if (animation)
+            isAtLeastOneInAnimation = YES;
+        else
+            [self.foldersInSynchronized removeObject:serverUrl];
+        
+        if (setGraphicsFolder) {
+            
+            NSString *serverUrlOffline = [CCUtility deletingLastPathComponentFromServerUrl:serverUrl];
+            CCMain *viewController = [app.listMainVC objectForKey:serverUrlOffline];
+            if (viewController)
+                [viewController synchronizeFolderGraphicsServerUrl:serverUrl animation:animation];
+        }
+    }
+    
+    return isAtLeastOneInAnimation;
+}
+
 
 @end