[Libreoffice-commits] core.git: ios/experimental

[jan Iversen]

 ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift |   12 ++++++++--
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard    |    4 +--
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 6f968f00b1534406a2943be374fab924c3396482
Author: jan Iversen <jani at libreoffice.org>
Date:   Mon Mar 20 12:42:01 2017 +0100

    iOS LibreOfficeLight FileManager title
    
    Show current directory as title, together with info
    whether it is local or iCloud
    
    Change-Id: Icb4d68e5c21589456ea276e9e11d191dd3714d14

diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
index 03003fd699b2..49fdf41ae1ed 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/FileManagerController.swift
@@ -92,6 +92,15 @@ private class FileStorage
 
 
 
+    func getDirectory() -> String
+    {
+        let myCurDir = currentDir.path
+        let myLen    = currentDocPath!.path.endIndex
+        return (myLen == myCurDir.endIndex) ? "/" : myCurDir.substring(from: myLen)
+    }
+
+
+
     func createDirectory(_ name: String)
     {
         let newDir = currentDir.appendingPathComponent(name)
@@ -331,10 +340,9 @@ class FileManagerController : UITableViewController, FileActionsControlDelegate
     // Support function
     func reloadData()
     {
-        selectedRow = nil
+        title = (fileData.selectStorage(false) ? "Local - " : "iCloud - ") + fileData.getDirectory()
         tableView.reloadData()
     }
-
 }
 
 
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
index 01a75ba0292f..7bf3f6963421 100755
--- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
+++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard
@@ -48,7 +48,7 @@
             </objects>
             <point key="canvasLocation" x="1231" y="304"/>
         </scene>
-        <!--File Manager-->
+        <!--Local - /-->
         <scene sceneID="2JR-NV-Eo3">
             <objects>
                 <tableViewController id="cip-1Z-62J" customClass="FileManagerController" customModule="LibreOfficeLight" customModuleProvider="target" sceneMemberID="viewController">
@@ -93,7 +93,7 @@
                             <outlet property="delegate" destination="cip-1Z-62J" id="uyZ-lZ-r0j"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="File Manager" id="fBX-vO-7Rj">
+                    <navigationItem key="navigationItem" title="Local - /" id="fBX-vO-7Rj">
                         <leftBarButtonItems>
                             <barButtonItem image="back" id="q43-8I-nlC">
                                 <connections>