ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 14 ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift | 6 ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/Contents.json | 23 + ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iCloudDrive.png |binary ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@2x.png |binary ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@3x.png |binary ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/Contents.json | 23 + ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iPhone.png |binary ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@2x.png |binary ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@3x.png |binary ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift | 44 +- ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard | 173 +++++++--- 12 files changed, 209 insertions(+), 74 deletions(-)
New commits: commit fb62c2c5252a0b25d22ceccbb07747048923a44a Author: jan Iversen <j...@libreoffice.org> Date: Thu Oct 26 18:54:25 2017 +0200 iOS added menu entries Added Copy/Move/Delete since this is the only way to access the local storage. Change-Id: I9b054a4f23d32d5220ae500a37b52cb7e7a8587c diff --git a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift index b28a3620d4c6..1d02c01bb364 100755 --- a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift +++ b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift @@ -35,7 +35,7 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentPickerDelega // Show sidemenu (part of documentcontroller) @IBAction func doMenu(_ sender: UIBarButtonItem) { - if (sender.tag == 10) { + if (sender.tag == 99) { sender.tag = 0; let viewMenuBack : UIView = view.subviews.last! @@ -53,7 +53,7 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentPickerDelega } sender.isEnabled = false - sender.tag = 10 + sender.tag = 99 let sidebar : SidebarController = self.storyboard!.instantiateViewController(withIdentifier: "SidebarController") as! SidebarController view.addSubview(sidebar.view) @@ -129,14 +129,23 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentPickerDelega popover.sourceView = janTest popover.sourceRect = janTest.bounds present(vc, animated: true, completion: nil) - print("menu Save as... to be done") + case 5: // Save as PDF... print("menu Save as PDF... to be done") case 6: // Print... print("menu Print... to be done") + case 7: // Copy... + print("menu Copy... to be done") + + case 8: // Move... + print("menu Move... to be done") + + case 9: // Delete... + print("menu Delete... to be done") + default: // should not happen print("unknown menu" + String(tag)) } @@ -180,21 +189,21 @@ class DocumentActions: UITableViewController var isDocActive : Bool = false // Calling class might enable/disable each button - @IBOutlet weak var buttonNew: UIButton! - @IBOutlet weak var buttonOpen: UIButton! - @IBOutlet weak var buttonSave: UIButton! - @IBOutlet weak var buttonSaveAs: UIButton! - @IBOutlet weak var buttonSaveAsPDF: UIButton! - @IBOutlet weak var buttonPrint: UIButton! - - - @IBAction func actionMenuSelect(_ sender: UIButton) { dismiss(animated: false) delegate?.actionMenuSelected(sender.tag) } + @IBOutlet weak var buttonNew: UIButton! + @IBOutlet weak var buttonOpen: UIButton! + @IBOutlet weak var buttonSave: UIButton! + @IBOutlet weak var buttonSaveAs: UIButton! + @IBOutlet weak var buttonSaveAsPDF: UIButton! + @IBOutlet weak var buttonPrint: UIButton! + @IBOutlet weak var buttonCopy: UIButton! + @IBOutlet weak var buttonMove: UIButton! + @IBOutlet weak var buttonDelete: UIButton! override func viewDidLoad() { diff --git a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard index 918081f812fe..299547157e8c 100755 --- a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard +++ b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard @@ -354,7 +354,7 @@ <objects> <tableViewController autoresizesArchivedViewToFullSize="NO" title="Document Actions" automaticallyAdjustsScrollViewInsets="NO" modalTransitionStyle="crossDissolve" modalPresentationStyle="overCurrentContext" clearsSelectionOnViewWillAppear="NO" id="IER-X5-Ax8" customClass="DocumentActions" customModule="LibreOfficeLight" customModuleProvider="target" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="30" sectionHeaderHeight="28" sectionFooterHeight="28" id="RqF-IL-YJc"> - <rect key="frame" x="0.0" y="0.0" width="134" height="180"/> + <rect key="frame" x="0.0" y="0.0" width="134" height="270"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <sections> @@ -370,6 +370,9 @@ <button opaque="NO" tag="1" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mCx-kB-iUI"> <rect key="frame" x="8" y="0.0" width="118" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <accessibility key="accessibilityConfiguration"> + <bool key="isElement" value="NO"/> + </accessibility> <state key="normal" title="New"/> <connections> <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="0gI-or-ji1"/> @@ -386,9 +389,11 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" tag="2" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="myk-zs-md7"> - <rect key="frame" x="8" y="2" width="118" height="30"/> + <rect key="frame" x="8" y="0.0" width="118" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <accessibility key="accessibilityConfiguration" identifier="actionOpen"/> + <accessibility key="accessibilityConfiguration"> + <bool key="isElement" value="NO"/> + </accessibility> <state key="normal" title="Open..."/> <connections> <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="0gI-or-ji2"/> @@ -405,9 +410,11 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" tag="3" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b90-ja-Wm0"> - <rect key="frame" x="8" y="-2" width="118" height="30"/> + <rect key="frame" x="8" y="0.0" width="118" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <accessibility key="accessibilityConfiguration" identifier="actionSave"/> + <accessibility key="accessibilityConfiguration" identifier="actionSave"> + <bool key="isElement" value="NO"/> + </accessibility> <state key="normal" title="Save"/> <connections> <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="0gI-or-ji3"/> @@ -424,9 +431,11 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" tag="4" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6vH-aM-aYe"> - <rect key="frame" x="8" y="-2" width="118" height="30"/> + <rect key="frame" x="8" y="0.0" width="118" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <accessibility key="accessibilityConfiguration" identifier="actionSaveAs"/> + <accessibility key="accessibilityConfiguration"> + <bool key="isElement" value="NO"/> + </accessibility> <state key="normal" title="Save as..."/> <connections> <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="0gI-or-ji4"/> @@ -442,9 +451,12 @@ <rect key="frame" x="0.0" y="0.0" width="134" height="29.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <button opaque="NO" tag="5" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="apE-3B-lUt"> - <rect key="frame" x="8" y="-1" width="118" height="30"/> + <button opaque="NO" tag="5" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="apE-3B-lUt" userLabel="Button Save As PDF"> + <rect key="frame" x="8" y="0.0" width="118" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <accessibility key="accessibilityConfiguration" identifier="actionSaveAsPDF"> + <bool key="isElement" value="NO"/> + </accessibility> <state key="normal" title="Save as PDF"/> <connections> <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="0gI-or-ji5"/> @@ -453,20 +465,85 @@ </subviews> </tableViewCellContentView> </tableViewCell> - <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="1ly-sz-g0x"> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="diN-3v-tgm"> <rect key="frame" x="0.0" y="150" width="134" height="30"/> <autoresizingMask key="autoresizingMask"/> - <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1ly-sz-g0x" id="wVi-tX-eKD"> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="diN-3v-tgm" id="24s-fs-4cw"> <rect key="frame" x="0.0" y="0.0" width="134" height="29.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <button opaque="NO" tag="6" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="516-b0-K4N" userLabel="Button Print"> - <rect key="frame" x="8" y="-1" width="118" height="30"/> + <button opaque="NO" tag="6" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tvH-WR-c61" userLabel="Button Print"> + <rect key="frame" x="8" y="0.0" width="118" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <accessibility key="accessibilityConfiguration" identifier="actionPrint"/> + <accessibility key="accessibilityConfiguration"> + <bool key="isElement" value="NO"/> + </accessibility> <state key="normal" title="Print..."/> <connections> - <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="0gI-or-ji6"/> + <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="saH-6n-BkX"/> + </connections> + </button> + </subviews> + </tableViewCellContentView> + </tableViewCell> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="0Cu-Xh-XUR"> + <rect key="frame" x="0.0" y="180" width="134" height="30"/> + <autoresizingMask key="autoresizingMask"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0Cu-Xh-XUR" id="MHs-m1-fPx"> + <rect key="frame" x="0.0" y="0.0" width="134" height="29.5"/> + <autoresizingMask key="autoresizingMask"/> + <subviews> + <button opaque="NO" tag="7" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aLF-gf-Qy7" userLabel="Button Copy"> + <rect key="frame" x="8" y="0.0" width="118" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <accessibility key="accessibilityConfiguration" identifier="actionCopy"> + <bool key="isElement" value="NO"/> + </accessibility> + <state key="normal" title="Copy..."/> + <connections> + <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="ga5-sF-FC6"/> + </connections> + </button> + </subviews> + </tableViewCellContentView> + </tableViewCell> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="Tos-KD-TOY"> + <rect key="frame" x="0.0" y="210" width="134" height="30"/> + <autoresizingMask key="autoresizingMask"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Tos-KD-TOY" id="wXd-3T-jNF"> + <rect key="frame" x="0.0" y="0.0" width="134" height="29.5"/> + <autoresizingMask key="autoresizingMask"/> + <subviews> + <button opaque="NO" tag="8" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DaU-7Y-QN0" userLabel="Button Move"> + <rect key="frame" x="8" y="0.0" width="118" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <accessibility key="accessibilityConfiguration"> + <bool key="isElement" value="NO"/> + </accessibility> + <state key="normal" title="Move..."/> + <connections> + <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="fdk-gZ-5BR"/> + </connections> + </button> + </subviews> + </tableViewCellContentView> + </tableViewCell> + <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="1ly-sz-g0x"> + <rect key="frame" x="0.0" y="240" width="134" height="30"/> + <autoresizingMask key="autoresizingMask"/> + <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1ly-sz-g0x" id="wVi-tX-eKD"> + <rect key="frame" x="0.0" y="0.0" width="134" height="29.5"/> + <autoresizingMask key="autoresizingMask"/> + <subviews> + <button opaque="NO" tag="9" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="516-b0-K4N" userLabel="Button Delete"> + <rect key="frame" x="8" y="0.0" width="118" height="30"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <accessibility key="accessibilityConfiguration" identifier="actionDelete"> + <bool key="isElement" value="NO"/> + </accessibility> + <state key="normal" title="Delete..."/> + <connections> + <action selector="actionMenuSelect:" destination="IER-X5-Ax8" eventType="touchUpInside" id="YLz-aP-Poo"/> </connections> </button> </subviews> @@ -481,19 +558,22 @@ </connections> </tableView> <extendedEdge key="edgesForExtendedLayout"/> - <value key="contentSizeForViewInPopover" type="size" width="134" height="210"/> + <value key="contentSizeForViewInPopover" type="size" width="134" height="300"/> <nil key="simulatedStatusBarMetrics"/> <nil key="simulatedTopBarMetrics"/> <nil key="simulatedBottomBarMetrics"/> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> - <size key="freeformSize" width="134" height="180"/> + <size key="freeformSize" width="134" height="270"/> <connections> - <outlet property="buttonNew" destination="mCx-kB-iUI" id="Bxx-gc-1KK"/> - <outlet property="buttonOpen" destination="myk-zs-md7" id="CST-dF-vGl"/> - <outlet property="buttonPrint" destination="516-b0-K4N" id="kok-Tt-Y8w"/> - <outlet property="buttonSave" destination="b90-ja-Wm0" id="tlk-Ku-xp6"/> - <outlet property="buttonSaveAs" destination="6vH-aM-aYe" id="BMc-YI-Ssc"/> - <outlet property="buttonSaveAsPDF" destination="apE-3B-lUt" id="r3J-xa-Syi"/> + <outlet property="buttonCopy" destination="aLF-gf-Qy7" id="czl-bI-0Qu"/> + <outlet property="buttonDelete" destination="516-b0-K4N" id="Zvb-8p-qrj"/> + <outlet property="buttonMove" destination="DaU-7Y-QN0" id="QRd-c8-teO"/> + <outlet property="buttonNew" destination="mCx-kB-iUI" id="E2p-ip-Slc"/> + <outlet property="buttonOpen" destination="myk-zs-md7" id="xQK-I1-pDl"/> + <outlet property="buttonPrint" destination="tvH-WR-c61" id="4YU-p2-Fim"/> + <outlet property="buttonSave" destination="b90-ja-Wm0" id="Sdz-lq-s3S"/> + <outlet property="buttonSaveAs" destination="6vH-aM-aYe" id="4KY-Zi-iH4"/> + <outlet property="buttonSaveAsPDF" destination="apE-3B-lUt" id="AZL-ON-v2Y"/> </connections> </tableViewController> <placeholder placeholderIdentifier="IBFirstResponder" id="D6j-Ov-CSK" userLabel="First Responder" sceneMemberID="firstResponder"/> commit 79821193345d6d113eea0950f9ef0a335470219b Author: jan Iversen <j...@libreoffice.org> Date: Thu Oct 26 14:05:03 2017 +0200 iOS added select local/iCloud storage Added button in Document window, to signal if working local or in iCloud Change-Id: Ib33b67c95dfad466664e2289390ea577ba5e3391 diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index 527961f92bee..d1541cc35d0d 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -39,14 +39,11 @@ 39022C1E1EDC2AB000100066 /* share */ = {isa = PBXFileReference; lastKnownFileType = folder; name = share; path = ../generated/resources/share; sourceTree = "<group>"; }; 39022C201EDC2D0800100066 /* icudt59l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt59l.dat; path = ../generated/resources/icudt59l.dat; sourceTree = "<group>"; }; 39022C231EDC303200100066 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; - 3913F8FE1F9E36A600F7E0C8 /* xmlreader.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmlreader.cxx; path = ../../../xmlreader/source/xmlreader.cxx; sourceTree = "<group>"; }; 392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; sourceTree = SOURCE_ROOT; }; 393975771F8BECB0002DC80B /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; 393975791F8BECC1002DC80B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "lokit-Bridging-Header.h"; sourceTree = "<group>"; }; 39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; - 3950BAE31F9CB680001A4E96 /* syslocaleoptions.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = syslocaleoptions.cxx; path = ../../../unotools/source/config/syslocaleoptions.cxx; sourceTree = "<group>"; }; - 3950BAE51F9D0C32001A4E96 /* init.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = init.cxx; path = ../../../desktop/source/lib/init.cxx; sourceTree = "<group>"; }; 396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; }; 397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LibreOfficeLight.entitlements; sourceTree = "<group>"; }; 397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; sourceTree = "<group>"; }; @@ -96,16 +93,6 @@ path = LibreOfficeLight; sourceTree = SOURCE_ROOT; }; - 3950BAE21F9CB63F001A4E96 /* extra */ = { - isa = PBXGroup; - children = ( - 3913F8FE1F9E36A600F7E0C8 /* xmlreader.cxx */, - 3950BAE51F9D0C32001A4E96 /* init.cxx */, - 3950BAE31F9CB680001A4E96 /* syslocaleoptions.cxx */, - ); - path = extra; - sourceTree = "<group>"; - }; 3972753A1E77D9F7006ACDCC /* Frameworks */ = { isa = PBXGroup; children = ( @@ -119,7 +106,6 @@ 397E08F11E597BD8001374E0 = { isa = PBXGroup; children = ( - 3950BAE21F9CB63F001A4E96 /* extra */, 39B084E41E5F0B5200682A59 /* Resources */, 3911D89F1E5993600050D6BC /* Support files */, 397E08FC1E597BD8001374E0 /* LibreOfficeLight */, diff --git a/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift b/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift index 466881aded13..b77f53ece586 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift +++ b/ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift @@ -37,9 +37,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate defaults.synchronize() // start LibreOfficeKit - BridgeLOkit_Init(Bundle.main.bundlePath) - BridgeLOkit_open("jan"); - BridgeLOkit_ClientCommand("jan"); + //FIX BridgeLOkit_Init(Bundle.main.bundlePath) + //FIX BridgeLOkit_open("jan"); + //FIX BridgeLOkit_ClientCommand("jan"); // Override point for customization after application launch. return true diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/Contents.json b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/Contents.json new file mode 100644 index 000000000000..cd69f7f90c00 --- /dev/null +++ b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "iCloudDrive.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "iclouddr...@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "iclouddr...@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iCloudDrive.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iCloudDrive.png new file mode 100644 index 000000000000..d213949b467f Binary files /dev/null and b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iCloudDrive.png differ diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@2x.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@2x.png new file mode 100644 index 000000000000..ba486fbbe6ae Binary files /dev/null and b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@2x.png differ diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@3x.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@3x.png new file mode 100644 index 000000000000..28c41597cf0f Binary files /dev/null and b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iCloudDrive.imageset/iclouddr...@3x.png differ diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/Contents.json b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/Contents.json new file mode 100644 index 000000000000..2d0a29db946a --- /dev/null +++ b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "iPhone.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "iph...@2x.png" + }, + { + "idiom" : "universal", + "scale" : "3x", + "filename" : "iph...@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iPhone.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iPhone.png new file mode 100644 index 000000000000..defe533b489a Binary files /dev/null and b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iPhone.png differ diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@2x.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@2x.png new file mode 100644 index 000000000000..da7dcbff0dc4 Binary files /dev/null and b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@2x.png differ diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@3x.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@3x.png new file mode 100644 index 000000000000..1c827c89af6f Binary files /dev/null and b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/iPhone.imageset/iph...@3x.png differ diff --git a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift index b9cdc1e12e55..b28a3620d4c6 100755 --- a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift +++ b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift @@ -13,6 +13,7 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentPickerDelega { var currentDocumentName : String? var currentCloudUrl : URL? + var currentStorageLocal : Bool = false public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentAt url: URL) @@ -69,6 +70,16 @@ class DocumentController: UIViewController, MenuDelegate, UIDocumentPickerDelega } + @IBOutlet weak var buttonSelectStorage: UIBarButtonItem! + + + @IBAction func doSelectStorage(_ sender: UIBarButtonItem) + { + currentStorageLocal = !currentStorageLocal + sender.image = currentStorageLocal ? #imageLiteral(resourceName: "iCloudDrive") : #imageLiteral(resourceName: "iPhone") + self.presentedViewController?.dismiss(animated: true, completion: nil) + } + // Last stop before displaying popover override func prepare(for segue: UIStoryboardSegue, sender: Any?) diff --git a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard index bbf37da7894d..918081f812fe 100755 --- a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard +++ b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="DGj-7d-jfR"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="DGj-7d-jfR"> <device id="ipad9_7" orientation="portrait"> <adaptation id="fullscreen"/> </device> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/> <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> @@ -34,11 +35,18 @@ </view> <toolbarItems/> <navigationItem key="navigationItem" title="Document" id="5c6-32-T4J"> - <barButtonItem key="leftBarButtonItem" image="menu" id="fdq-Uw-536"> - <connections> - <action selector="doMenu:" destination="vXZ-lx-hvc" id="mHw-Uf-vh2"/> - </connections> - </barButtonItem> + <leftBarButtonItems> + <barButtonItem image="menu" id="fdq-Uw-536" userLabel="Button Side Menu"> + <connections> + <action selector="doMenu:" destination="vXZ-lx-hvc" id="mHw-Uf-vh2"/> + </connections> + </barButtonItem> + <barButtonItem image="iCloudDrive" id="BNN-MQ-25d" userLabel="Button Select Storage"> + <connections> + <action selector="doSelectStorage:" destination="vXZ-lx-hvc" id="77L-yW-vcR"/> + </connections> + </barButtonItem> + </leftBarButtonItems> <barButtonItem key="rightBarButtonItem" systemItem="action" id="BNq-ol-ZVK"> <connections> <segue destination="IER-X5-Ax8" kind="popoverPresentation" identifier="showActions" popoverAnchorBarButtonItem="BNq-ol-ZVK" id="xmZ-1A-ZrW"> @@ -49,6 +57,7 @@ </navigationItem> <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/> <connections> + <outlet property="buttonSelectStorage" destination="BNN-MQ-25d" id="c5F-NA-mbv"/> <outlet property="janTest" destination="D1P-q2-3PT" id="ERV-pa-Fs9"/> </connections> </viewController> @@ -154,7 +163,7 @@ <navigationController automaticallyAdjustsScrollViewInsets="NO" id="DGj-7d-jfR" sceneMemberID="viewController"> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" id="mjw-Ry-qIh"> - <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> + <rect key="frame" x="0.0" y="20" width="768" height="44"/> <autoresizingMask key="autoresizingMask"/> <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="barTintColor" red="0.0" green="0.58367598684210531" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -187,10 +196,9 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K3a-CQ-sBC"> - <rect key="frame" x="20" y="359" width="150" height="45"/> + <rect key="frame" x="20" y="359" width="72" height="45"/> <constraints> <constraint firstAttribute="height" constant="45" id="Rg4-bW-MQk"/> - <constraint firstAttribute="width" constant="150" id="y0o-Nq-4z4"/> </constraints> <inset key="titleEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Style6" image="document"> @@ -201,9 +209,8 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hk4-yl-lM9"> - <rect key="frame" x="20" y="304" width="150" height="45"/> + <rect key="frame" x="20" y="304" width="72" height="45"/> <constraints> - <constraint firstAttribute="width" constant="150" id="UL6-xy-1qB"/> <constraint firstAttribute="height" constant="45" id="hty-y5-gVo"/> </constraints> <inset key="titleEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/> @@ -215,9 +222,8 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CBj-V3-BKJ"> - <rect key="frame" x="20" y="249" width="150" height="45"/> + <rect key="frame" x="20" y="249" width="72" height="45"/> <constraints> - <constraint firstAttribute="width" constant="150" id="U6W-G1-H2J"/> <constraint firstAttribute="height" constant="45" id="wOH-9b-B8P"/> </constraints> <inset key="titleEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/> @@ -229,10 +235,9 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eZV-Rh-hCf"> - <rect key="frame" x="20" y="194" width="150" height="45"/> + <rect key="frame" x="20" y="194" width="72" height="45"/> <constraints> <constraint firstAttribute="height" constant="45" id="N7I-YK-5uo"/> - <constraint firstAttribute="width" constant="150" id="eLW-p8-QBZ"/> </constraints> <inset key="titleEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Style3" image="document"> @@ -243,10 +248,9 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YTV-Y5-L8R"> - <rect key="frame" x="20" y="139" width="150" height="45"/> + <rect key="frame" x="20" y="139" width="71" height="45"/> <constraints> <constraint firstAttribute="height" constant="45" id="4H0-0k-rm5"/> - <constraint firstAttribute="width" constant="150" id="Q1z-1N-WMF"/> </constraints> <inset key="titleEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Style2" image="document"> @@ -257,10 +261,9 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Mv-7b-xjF"> - <rect key="frame" x="20" y="414" width="150" height="45"/> + <rect key="frame" x="20" y="414" width="70" height="45"/> <constraints> <constraint firstAttribute="height" constant="45" id="Fyt-Iq-YWv"/> - <constraint firstAttribute="width" constant="150" id="eFy-qB-RER"/> </constraints> <inset key="titleEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/> <state key="normal" title="Style7" image="document"> @@ -271,9 +274,8 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g5y-SJ-jU1"> - <rect key="frame" x="20" y="84" width="150" height="45"/> + <rect key="frame" x="20" y="84" width="69" height="45"/> <constraints> - <constraint firstAttribute="width" constant="150" id="Uuo-01-tfU"/> <constraint firstAttribute="height" constant="45" id="v75-o1-ii6"/> </constraints> <inset key="titleEdgeInsets" minX="10" minY="0.0" maxX="0.0" maxY="0.0"/> @@ -501,6 +503,7 @@ </scenes> <resources> <image name="document" width="20" height="20"/> + <image name="iCloudDrive" width="22" height="22"/> <image name="menu" width="22" height="22"/> </resources> </document> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits