Mainbar backgrounds right way around

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@164 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

4 files changed, 9 insertions, 9 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java
index 6924b435..9a0a659b 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java
@@ -36,10 +36,10 @@ public class Constants {
 	public static final int MAINBAR_HEIGHT = 60;
 
 	/** Main bar active background - light start of gradient */
-	public static final Color MAINBAR_ACTIVE_BACK_LIGHT = new Color(display, 0x6B, 0xA5, 0xD9);
+	public static final Color MAINBAR_ACTIVE_BACK_LIGHT = new Color(display, 0xB4, 0xCD, 0xEC);
 
 	/** Main bar active background - dark end of gradient */
-	public static final Color MAINBAR_ACTIVE_BACK_DARK = new Color(display, 0xB4, 0xCD, 0xEC);
+	public static final Color MAINBAR_ACTIVE_BACK_DARK = new Color(display, 0x6B, 0xA5, 0xD9);
 
 	/** Main bar inactive background */
 	public static final Color MAINBAR_INACTIVE_BACK = new Color(display, 0xD4, 0xE7, 0xF1);
@@ -51,7 +51,7 @@ public class Constants {
 	public static final Color MAINBAR_INACTIVE_TEXTCOLOR = new Color(display, 0x40, 0x40, 0x40);
 
 	/** Drop border color */
-	public static final Color DROP_BORDER_COLOR = MAINBAR_ACTIVE_BACK_DARK;
+	public static final Color DROP_BORDER_COLOR = MAINBAR_ACTIVE_BACK_LIGHT;
 
 	/** Normal text size */
 	public static final int TEXT_SIZE_NORMAL = 12;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
index b2df6296..8c3c1e25 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
@@ -150,10 +150,10 @@ public class DataSourceSelectComposite extends StateComposite {
 	public DataSourceSelectComposite(Composite parent, int style, State state) {
 		super(parent, style, state);
 
-		this.activeBackground = Constants.MAINBAR_ACTIVE_BACK_DARK;
+		this.activeBackground = Constants.MAINBAR_ACTIVE_BACK_LIGHT;
 		this.inactiveBackground = Constants.MAINBAR_INACTIVE_BACK;
-		this.inactiveBorder = Constants.MAINBAR_ACTIVE_BACK_DARK;
-		this.activeBorder = Constants.MAINBAR_ACTIVE_BACK_LIGHT;
+		this.inactiveBorder = Constants.MAINBAR_ACTIVE_BACK_LIGHT;
+		this.activeBorder = Constants.MAINBAR_ACTIVE_BACK_DARK;
 		this.backgroundColor = this.inactiveBackground;
 		this.borderColor = Constants.DROP_BORDER_COLOR;
 		
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
index 3cd7372f..45fd3dff 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
@@ -182,7 +182,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 				Rectangle clientArea = containerComposite.getClientArea();
 				
 				//e.gc.setForeground();
-				e.gc.setForeground(Constants.MAINBAR_ACTIVE_BACK_LIGHT);
+				e.gc.setForeground(Constants.MAINBAR_ACTIVE_BACK_DARK);
 				e.gc.setLineWidth(3);
 				e.gc.setLineStyle(SWT.LINE_SOLID);
 				e.gc.drawRoundRectangle(clientArea.x, 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java
index 531937b4..95935c89 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java
@@ -103,8 +103,8 @@ public abstract class MainBarButton extends Canvas {
 
 
 		this.inactiveBackground = Constants.MAINBAR_INACTIVE_BACK;
-		this.activeBackground1 = Constants.MAINBAR_ACTIVE_BACK_LIGHT;
-		this.activeBackground = Constants.MAINBAR_ACTIVE_BACK_DARK;
+		this.activeBackground1 = Constants.MAINBAR_ACTIVE_BACK_DARK;
+		this.activeBackground = Constants.MAINBAR_ACTIVE_BACK_LIGHT;
 		//this.textColor = this.getForeground();
 		this.textColor = Constants.MAINBAR_ACTIVE_TEXTCOLOR;
 		//this.borderColor = new Color(getDisplay(), 0xf9, 0xf9, 0xf9);