marinofaggiana 3 ani în urmă
părinte
comite
c5cc34f582

+ 1 - 1
iOSClient/Brand/NCBrand.swift

@@ -89,7 +89,7 @@ import UIKit
     @objc public var disable_crash_service:             Bool = false
     @objc public var disable_request_account:           Bool = false
     
-    @objc public var disable_background_color:          Bool = false
+    @objc public var disable_background_color:          Bool = true
     @objc public var disable_background_image:          Bool = true
 
     override init() {

+ 2 - 2
iOSClient/Main/NCFunctionCenter.swift

@@ -683,7 +683,7 @@ import Queuer
             self.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorPrint)
         }
         
-        let markup = UIAction(title: NSLocalizedString("_markup_", comment: ""), image: UIImage(systemName: "pencil.tip.crop.circle")) { action in
+        let modify = UIAction(title: NSLocalizedString("_modify_", comment: ""), image: UIImage(systemName: "pencil.tip.crop.circle")) { action in
             self.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorLoadFileQuickLook)
         }
         
@@ -773,7 +773,7 @@ import Queuer
         }
         
         if !isFolderEncrypted && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.typeFile == NCGlobal.shared.metadataTypeFileImage) {
-            children.insert(markup, at: children.count-1)
+            children.insert(modify, at: children.count-1)
         }
         
         if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage && viewController is NCCollectionViewCommon && !NCBrandOptions.shared.disable_background_image {

+ 2 - 2
iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -324,12 +324,12 @@ extension NCCollectionViewCommon {
         */
         
         //
-        // MARKUP
+        // MODIFY
         //
         if !isFolderEncrypted && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.typeFile == NCGlobal.shared.metadataTypeFileImage) {
             actions.append(
                 NCMenuAction(
-                    title: NSLocalizedString("_markup_", comment: ""),
+                    title: NSLocalizedString("_modify_", comment: ""),
                     icon: NCUtility.shared.loadImage(named: "pencil.tip.crop.circle"),
                     action: { menuAction in
                         NCFunctionCenter.shared.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorLoadFileQuickLook)

+ 2 - 2
iOSClient/Menu/NCViewer+Menu.swift

@@ -277,12 +277,12 @@ extension NCViewer {
         }
         
         //
-        // MARKUP
+        // MODIFY
         //
         if !isFolderEncrypted && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.typeFile == NCGlobal.shared.metadataTypeFileImage) {
             actions.append(
                 NCMenuAction(
-                    title: NSLocalizedString("_markup_", comment: ""),
+                    title: NSLocalizedString("_modify_", comment: ""),
                     icon: NCUtility.shared.loadImage(named: "pencil.tip.crop.circle"),
                     action: { menuAction in
                         NCFunctionCenter.shared.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorLoadFileQuickLook)

+ 1 - 1
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -798,7 +798,7 @@
 "Cancel"                    = "Cancel";
 "_certificate_details_"     = "Certificate details";
 "_save_as_scan_"            = "Save as scan";
-"_markup_"                  = "Markup";
+"_modify_"                  = "Modify";
 "_overwrite_original_"      = "Overwrite original";
 "_save_as_copy_"            = "Save as copy";
 "_discard_changes_"         = "Discard changes";

+ 1 - 1
iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift

@@ -67,7 +67,7 @@ import QuickLook
         super.viewDidLoad()
         
         if editingMode && metadata?.typeFile == NCGlobal.shared.metadataTypeFileImage {
-            Timer.scheduledTimer(withTimeInterval: 1, repeats: true, block: { (t) in
+            Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true, block: { (t) in
                 if self.navigationItem.rightBarButtonItems?.count ?? 0 > 1 || !(self.navigationController?.isToolbarHidden ?? false) {
                     if #available(iOS 14.0, *) {
                         if self.navigationItem.rightBarButtonItems?.count ?? 0 > 1 {