Merge branch 'master' of

https://github.com/bancika/diy-layout-creator.git

Conflicts:
	diylc/diylc-library/lib/diylc-core.jar
	diylc/diylc-swing/lib/diylc-core.jar

diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java

@@ -51,6 +51,9 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
   private OrientationHV orientation = OrientationHV.VERTICAL;
   private Size spacing = SPACING;
 
+  private Color bodyColor = BODY_COLOR;
+  private Color borderColor = BORDER_COLOR;
+
   public MiniToggleSwitch() {
     super();
     updateControlPoints();
@@ -189,15 +192,15 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
     // Reset body shape.
     body = null;
   }
-  
+
   @EditableProperty
   public Size getSpacing() {
     if (spacing == null) {
-      spacing = SPACING;      
+      spacing = SPACING;
     }
     return spacing;
   }
-  
+
   public void setSpacing(Size spacing) {
     this.spacing = spacing;
     updateControlPoints();
@@ -217,7 +220,7 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
       if (alpha < MAX_ALPHA) {
         g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
       }
-      g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR);
+      g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
       g2d.fill(body);
       g2d.setComposite(oldComposite);
       g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
@@ -229,7 +232,7 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
       } else {
         finalBorderColor =
             componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
-                : BORDER_COLOR;
+                : getBorderColor();
       }
       g2d.setColor(finalBorderColor);
       g2d.draw(body);
@@ -315,4 +318,26 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
           - 1);
     }
   }
+
+  @EditableProperty(name = "Body")
+  public Color getBodyColor() {
+    if (bodyColor == null)
+      bodyColor = BODY_COLOR;
+    return bodyColor;
+  }
+
+  public void setBodyColor(Color bodyColor) {
+    this.bodyColor = bodyColor;
+  }
+
+  @EditableProperty(name = "Border")
+  public Color getBorderColor() {
+    if (borderColor == null)
+      borderColor = BORDER_COLOR;
+    return borderColor;
+  }
+
+  public void setBorderColor(Color borderColor) {
+    this.borderColor = borderColor;
+  }
 }

diylc/diylc-swing/install.iss

@@ -9,6 +9,7 @@ SolidCompression=yes
 OutputDir=build
 OutputBaseFilename=diylc
 ChangesAssociations=yes
+AlwaysShowDirOnReadyPage=yes
 
 [Files]
 Source: "diylc.exe"; DestDir: "{app}"
@@ -20,9 +21,9 @@ Source: "diylc.ico"; DestDir: "{app}"
 Source: "build\jar\diylc.jar"; DestDir: "{app}"
 Source: "build\jar\lib\*"; DestDir: "{app}\lib"
 Source: "build\jar\library\*"; DestDir: "{app}\library"
+Source: "innosetup\donate.bmp"; DestDir: "{tmp}"; Flags: dontcopy nocompression
 
 [Registry]
-
 Root: HKCR; Subkey: ".diy"; ValueData: "DIYLC"; Flags: uninsdeletevalue; ValueType: string; ValueName: ""
 Root: HKCR; Subkey: "DIYLC"; ValueData: "Program DIYLC";  Flags: uninsdeletekey; ValueType: string; ValueName: ""
 Root: HKCR; Subkey: "DIYLC\DefaultIcon"; ValueData: "{app}\diylc.ico"; ValueType: string;  ValueName: ""
@@ -32,4 +33,31 @@ Root: HKCR; Subkey: "DIYLC\shell\open\command";  ValueData: """{app}\diylc.exe""
 Name: "{group}\DIY Layout Creator"; Filename: "{app}\diylc.exe"
 
 [Run]
-Filename: "{app}\diylc.exe"; Flags: postinstall skipifsilent
+Filename: "{app}\diylc.exe"; Description: "Launch DIYLC on exit"; Flags: postinstall skipifsilent
+
+[Code]
+  
+procedure LicenseLinkClick(Sender: TObject);
+var
+  ErrorCode: Integer;
+begin
+  ShellExec('', 'http://www.diy-fever.com/donate', '', '', SW_SHOW, ewNoWait, 
+    ErrorCode);
+end;
+
+procedure InitializeWizard;
+var donateImage: TBitmapImage;
+begin
+  ExtractTemporaryFile('donate.bmp');
+  
+  donateImage := TBitmapImage.Create(WizardForm);
+  donateImage.Parent:= WizardForm;
+  donateImage.Bitmap.LoadFromFile(ExpandConstant('{tmp}\donate.bmp'));
+  donateImage.Stretch := True;
+  donateImage.Width := 142;
+  donateImage.Height := 27;
+  donateImage.Left := 8;
+  donateImage.Top := WizardForm.InnerPage.Height + 10;
+  donateImage.Cursor := crHand;
+  donateImage.OnClick := @LicenseLinkClick;  
+end;

diylc/diylc-swing/update.xml

@@ -1785,9 +1785,13 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>DIL IC label rotates to fit the longer side of the component. Name and value are displayed in separate lines</description>
+				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Editable toggle switch color</description>
 				</org.diylc.appframework.update.Change>				
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>			
 	</a>
-</java.util.Arrays_-ArrayList>
+</java.util.Arrays_-ArrayList>