Merge branch 'feature/mpl_version' of https://github.com/SMU-SIS/kske…

…tch2 into feature/mpl_version Conflicts: KSKInterface/src/sg/edu/smu/ksketch2/canvas/components/popup/KSketch_SaveOptions.mxml KSKInterface/src/sg/edu/smu/ksketch2/canvas/components/view/KSketch_HomeView_IconItemRenderer.mxml
SMU-SIS · Jul 27, 2015 · c29ff7d · c29ff7d
2 parents 7c17e7b + 16e5c1a
commit c29ff7d
Show file tree

Hide file tree

Showing 35 changed files with 544 additions and 949 deletions.
diff --git a/KSKApp_Air/src/OverrideRuntimeDPIProvider.as b/KSKApp_Air/src/OverrideRuntimeDPIProvider.as
@@ -3,7 +3,7 @@ package
 	import flash.system.Capabilities;
 
 	import mx.core.RuntimeDPIProvider;
-	import sg.edu.smu.ksketch2.KSketchStyleSheet;
+	import sg.edu.smu.ksketch2.KSketchStyles;
 
 	public class OverrideRuntimeDPIProvider extends RuntimeDPIProvider
 	{
@@ -14,15 +14,15 @@ package
 
 			if(Capabilities.screenResolutionX > 1280 && Capabilities.screenResolutionY > 1500)
 			{
-				KSketchStyleSheet.scaleHome(2);	
-				KSketchStyleSheet.scaleCanvas(1.8);
-				KSketchStyleSheet.scaleFont(2);	
+				//KSketchStyles.scaleHome(2);	
+				//KSketchStyles.scaleCanvas(1.8);
+				//KSketchStyles.scaleFont(2);	
 			}
 			else if(Capabilities.screenResolutionX > 1280 && Capabilities.screenResolutionY < 1500)
 			{
-				KSketchStyleSheet.scaleHome(2);
-				KSketchStyleSheet.scaleCanvas(1.4);
-				KSketchStyleSheet.scaleFont(2);	
+				//KSketchStyles.scaleHome(2);
+				//KSketchStyles.scaleCanvas(1.4);
+				//KSketchStyles.scaleFont(2);	
 			}
 
 			return super.runtimeDPI;

diff --git a/KSKApp_Air/src/document/previewer/KTouchDocumentPreviewer.mxml b/KSKApp_Air/src/document/previewer/KTouchDocumentPreviewer.mxml
@@ -5,6 +5,7 @@
 		<![CDATA[
 			import sg.edu.smu.ksketch2.KSketch2;
 			import sg.edu.smu.ksketch2.utils.ExportUtil;
+			import sg.edu.smu.ksketch2.KSketchStyles;
 			
 			import sg.edu.smu.ksketch2.utils.KSketchDocument;
 			
@@ -57,7 +58,7 @@
 	</s:Line>
 	<s:Group width="100%">
 		<s:layout>
-			<s:VerticalLayout paddingTop="15" paddingLeft="5"/>
+			<s:VerticalLayout paddingTop="KSketchStyles.PADDING_05" paddingLeft="KSketchStyles.PADDING_05"/>
 		</s:layout>
 		<s:Label color="0x9F9F9F" width="{width*0.95}" id="currentDocDescription" fontSize="24"/>
 	</s:Group>

diff --git a/KSKApp_Air/src/document/previewer/KTouchPreviewerButtonSkin.mxml b/KSKApp_Air/src/document/previewer/KTouchPreviewerButtonSkin.mxml
@@ -7,6 +7,11 @@
 		[HostComponent("spark.components.Button")]
 	</fx:Metadata>
 
+	<fx:Script>
+		<![CDATA[
+			import sg.edu.smu.ksketch2.KSketchStyles;
+			]]>
+	</fx:Script>
 	<!-- states -->
 	<s:states>
 		<s:State name="disabled" />
@@ -32,7 +37,7 @@
 	</s:Rect>
 	<s:Group width="100%" height="100%">
 		<s:layout>
-			<s:HorizontalLayout paddingLeft="10" paddingRight="10" paddingTop="10" paddingBottom="10"/>
+			<s:HorizontalLayout paddingLeft="KSketchStyles.PADDING_10" paddingRight="KSketchStyles.PADDING_10" paddingTop="KSketchStyles.PADDING_10" paddingBottom="KSketchStyles.PADDING_10"/>
 		</s:layout>
 		<s:Label id="labelDisplay" fontSize="{24}" fontFamily="_sans" color="0xA8A8A8"/>
 	</s:Group>

diff --git a/KSKInterface/src/sg/edu/smu/ksketch2/KSketchStyleSheet.as b/KSKInterface/src/sg/edu/smu/ksketch2/KSketchStyleSheet.as