diff options
3 files changed, 11 insertions, 24 deletions
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index c0552f230cea..95d1ef3008e1 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 39022C1D1EDC2A2C00100066 /* services in Resources */ = {isa = PBXBuildFile; fileRef = 39022C1C1EDC2A2C00100066 /* services */; }; 39022C1F1EDC2AB000100066 /* share in Resources */ = {isa = PBXBuildFile; fileRef = 39022C1E1EDC2AB000100066 /* share */; }; 39022C211EDC2D0800100066 /* icudt59l.dat in Resources */ = {isa = PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt59l.dat */; }; - 39284DB11FA5E150006F43E4 /* dummyLOkit.c in Sources */ = {isa = PBXBuildFile; fileRef = 39284DB01FA5E150006F43E4 /* dummyLOkit.c */; }; 39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39284DB21FA5F207006F43E4 /* DocumentActions.swift */; }; 392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */; }; 393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; }; @@ -259,7 +258,6 @@ 392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */, 399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */, 39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */, - 39284DB11FA5E150006F43E4 /* dummyLOkit.c in Sources */, 3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources */, 397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */, 39EF4E2F1FA500C9001914AC /* PropertiesController.swift in Sources */, diff --git a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift index 22daae15f787..e1949f4cb90c 100755 --- a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift +++ b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift @@ -55,6 +55,8 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentBrowserViewC // background really means hipernate by terminating all threads and solely keep the // data + + // Moving to hipernate public func Hipernate() -> Void { @@ -195,19 +197,16 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentBrowserViewC // *** handling of menu actions // This is the real base of the application - + var openMenu : UIDocumentBrowserViewController? = nil // Load document into LibreOfficeKit and present it internal func startOpenDocument() { - let openMenu = UIDocumentBrowserViewController() - openMenu.allowsDocumentCreation = true - - //FIXME - //UIDocumentBrowserViewController.ImportMode = UIDocumentBrowserViewController.ImportMode.none // copy, move - //openMenu.InterfaceStyle = UIDocumentPickerViewController.dark - openMenu.delegate = self - self.present(openMenu, animated: true, completion: nil) + openMenu = UIDocumentBrowserViewController() + openMenu?.allowsDocumentCreation = true + openMenu?.browserUserInterfaceStyle = UIDocumentBrowserViewController.BrowserUserInterfaceStyle.dark + openMenu?.delegate = self + self.present(openMenu!, animated: true, completion: nil) print("menu Open... to be done") } @@ -306,6 +305,8 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentBrowserViewC internal func documentBrowser(_ controller: UIDocumentBrowserViewController, didPickDocumentURLs documentURLs: [URL]) { + openMenu?.dismiss(animated: true, completion: nil) + openMenu = nil doOpen(documentURLs[0]) } @@ -319,7 +320,7 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentBrowserViewC public func doOpen(_ docURL : URL) { //FIXME - //BridgeLOkit_open(documentURLs); + BridgeLOkit_open(docURL.absoluteString); } } diff --git a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard index 338597acbbc9..e2748dad3c8c 100755 --- a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard +++ b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard @@ -252,18 +252,6 @@ </subviews> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </view> - <navigationItem key="navigationItem" title="Properties" id="9nH-at-6AF"> - <barButtonItem key="leftBarButtonItem" image="menu" id="wYo-zq-cqh"> - <connections> - <action selector="doProporties:" destination="h7c-B7-pKT" id="Yls-8o-msb"/> - </connections> - </barButtonItem> - <barButtonItem key="rightBarButtonItem" systemItem="trash" id="25I-J4-o11"> - <connections> - <action selector="doDelete:" destination="h7c-B7-pKT" id="c6k-Q0-vtQ"/> - </connections> - </barButtonItem> - </navigationItem> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="vaO-NX-hiP" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> |