Sfoglia il codice sorgente

添加Create PO按钮图标

Pen Li 9 anni fa
parent
commit
f5695a7870

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1903,7 +1903,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
 
 - (IBAction)editOrderListButtonClick:(UIBarButtonItem *)sender {
 
-    UIImage *gray = [UIImage imageNamed:@"Combine"];
+    UIImage *gray = [UIImage imageNamed:@"Combinegray"];
     UIImage *green = [[UIImage imageNamed:@"Combinegreen"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
     
     if (self.table_order.isEditing) {

+ 6 - 6
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -2130,7 +2130,7 @@
                                         <rect key="frame" x="0.0" y="88" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pol-lE-P45" id="FAm-1c-nX0">
-                                            <frame key="frameInset" width="702" height="44"/>
+                                            <frame key="frameInset" width="730" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clean Cache" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AHm-p1-51h">
@@ -2999,7 +2999,7 @@
                                         </searchBar>
                                     </barButtonItem>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="VhY-Il-XfG"/>
-                                    <barButtonItem title="Item" image="Combine" id="Q7S-7Q-MQM">
+                                    <barButtonItem image="Combinegray" id="Q7S-7Q-MQM">
                                         <connections>
                                             <action selector="editOrderListButtonClick:" destination="Jst-hh-WTF" id="12x-HB-TA6"/>
                                         </connections>
@@ -6404,11 +6404,11 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="22" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Vyi-Ez-P2a" id="LVn-pY-YDc">
-                                            <frame key="frameInset" width="768" height="44"/>
+                                            <frame key="frameInset" width="768" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="N1s-I8-bJv" customClass="RTLabel">
-                                                    <frame key="frameInset" minX="15" minY="8" maxX="59" maxY="8"/>
+                                                    <frame key="frameInset" minX="15" minY="8" maxX="59" maxY="7.5"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </view>
@@ -7882,7 +7882,7 @@ Email: redantsupport@united-us.net</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HwF-54-hzr">
-                                                    <frame key="frameInset" minX="28" width="672" height="43.5"/>
+                                                    <frame key="frameInset" minX="15" width="698" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -8632,7 +8632,7 @@ Email: redantsupport@united-us.net</string>
         </scene>
     </scenes>
     <resources>
-        <image name="Combine" width="40" height="40"/>
+        <image name="Combinegray" width="40" height="40"/>
         <image name="about" width="96" height="96"/>
         <image name="add_180" width="180" height="180"/>
         <image name="album" width="48" height="48"/>

BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Combinegray.imageset/Combinegray.png


BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Combinegray.imageset/Combinegray@2x.png


BIN
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Combinegray.imageset/Combinegray@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Combinegray.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Combinegray.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Combinegray@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Combinegray@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}