|
@@ -2202,6 +2202,8 @@
|
|
|
//NSString *groupBy = [CCUtility getGroupBySettings];
|
|
|
NSString *sorted = [CCUtility getOrderSettings];
|
|
|
BOOL ascending = [CCUtility getAscendingSettings];
|
|
|
+ tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@", appDelegate.activeAccount, self.serverUrl]];
|
|
|
+ tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesWithAccount:appDelegate.activeAccount];
|
|
|
|
|
|
// ITEM SELECT ----------------------------------------------------------------------------------------------------
|
|
|
|
|
@@ -2265,6 +2267,8 @@
|
|
|
[[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
|
|
|
}];
|
|
|
|
|
|
+
|
|
|
+
|
|
|
/*
|
|
|
// ITEM GROUP ALPHABETIC -----------------------------------------------------------------------------------------------------
|
|
|
|
|
@@ -2311,12 +2315,20 @@
|
|
|
[[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"clearDateReadDataSource" object:nil];
|
|
|
}];
|
|
|
|
|
|
+ // ITEM ADD FOLDER INFO -----------------------------------------------------------------------------------------------
|
|
|
+
|
|
|
+ appDelegate.addFolderInfo = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_add_folder_info_", nil) subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"addFolderInfo"] width:50 height:50 color:NCBrandColor.sharedInstance.icon] highlightedImage:nil action:^(REMenuItem *item) {
|
|
|
+
|
|
|
+ }];
|
|
|
+
|
|
|
// REMENU --------------------------------------------------------------------------------------------------------------
|
|
|
|
|
|
- //appDelegate.reMainMenu = [[REMenu alloc] initWithItems:@[appDelegate.selezionaItem, appDelegate.sortFileNameAZItem, appDelegate.sortFileNameZAItem, appDelegate.sortDateMoreRecentItem, appDelegate.sortDateLessRecentItem, appDelegate.sortSmallestItem, appDelegate.sortLargestItem,appDelegate.alphabeticItem, appDelegate.typefileItem, appDelegate.dateItem, appDelegate.directoryOnTopItem]];
|
|
|
-
|
|
|
- appDelegate.reMainMenu = [[REMenu alloc] initWithItems:@[appDelegate.selezionaItem, appDelegate.sortFileNameAZItem, appDelegate.sortFileNameZAItem, appDelegate.sortDateMoreRecentItem, appDelegate.sortDateLessRecentItem, appDelegate.sortSmallestItem, appDelegate.sortLargestItem, appDelegate.directoryOnTopItem]];
|
|
|
-
|
|
|
+ if (capabilities.versionMajor >= k_nextcloud_version_18_0 && directory.richWorkspace.length == 0) {
|
|
|
+ appDelegate.reMainMenu = [[REMenu alloc] initWithItems:@[appDelegate.selezionaItem, appDelegate.sortFileNameAZItem, appDelegate.sortFileNameZAItem, appDelegate.sortDateMoreRecentItem, appDelegate.sortDateLessRecentItem, appDelegate.sortSmallestItem, appDelegate.sortLargestItem, appDelegate.directoryOnTopItem, appDelegate.addFolderInfo]];
|
|
|
+ } else {
|
|
|
+ appDelegate.reMainMenu = [[REMenu alloc] initWithItems:@[appDelegate.selezionaItem, appDelegate.sortFileNameAZItem, appDelegate.sortFileNameZAItem, appDelegate.sortDateMoreRecentItem, appDelegate.sortDateLessRecentItem, appDelegate.sortSmallestItem, appDelegate.sortLargestItem, appDelegate.directoryOnTopItem]];
|
|
|
+ }
|
|
|
+
|
|
|
appDelegate.reMainMenu.itemHeight = 40;
|
|
|
|
|
|
appDelegate.reMainMenu.imageOffset = CGSizeMake(5, -1);
|