Minor GUI changes to MainBar Buttons

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

5 files changed, 47 insertions, 8 deletions

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 509780fb..37e4f85b 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
@@ -27,6 +27,7 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.graphics.Region;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
@@ -49,12 +50,12 @@ public abstract class MainBarButton extends Canvas {
 
 			@Override
 			public void paintControl(PaintEvent e) {
-				MainBarButton.this.paintButton(e);
+				MainBarButton.this.paintControl(e);
 			}
 		});
 
 		final Cursor hand = new Cursor(this.getDisplay(), SWT.CURSOR_HAND);
-		
+
 		this.addListener(SWT.Resize, new Listener() {
 
 			@Override
@@ -120,6 +121,7 @@ public abstract class MainBarButton extends Canvas {
 	 *            the active state
 	 */
 	public void setActive(boolean active) {
+
 		this.active = active;
 		if (this.active) {
 			this.setBackground(this.activeBackground);
@@ -158,15 +160,52 @@ public abstract class MainBarButton extends Canvas {
 	private static final Logger log = LoggerFactory
 			.getLogger(MainBarButton.class);
 
+	protected void paintBackground(PaintEvent e) {
+
+		Point size = this.getSize();
+		int height = size.y - 2;
+
+		int width = size.x;
+
+		int factor = 4;
+
+		// TOP
+		e.gc.fillGradientRectangle(0, 0, width, factor, true);
+
+		// BOTTOM
+		e.gc.fillGradientRectangle(0, height, width, -1 * (factor),
+				true);
+
+		// LEFT
+		//e.gc.fillGradientRectangle(0, 0, factor, height, false);
+
+		// RIGTH
+		//e.gc.fillGradientRectangle(width, 0, -1 * (width / factor), height,
+		//		false);
+
+	}
+
+	private void paintControl(PaintEvent e) {
+		this.paintBackground(e);
+		this.paintButton(e);
+		this.paintBorderAndText(e);
+	}
+
+	protected void paintButton(PaintEvent e) {
+		// could be overwritten by subclasses
+	}
+
 	/**
 	 * @param e
 	 */
-	protected void paintButton(PaintEvent e) {
+	protected void paintBorderAndText(PaintEvent e) {
 		Point size = this.getSize();
 		int height = size.y - 2;
 
 		int width = size.x;
 
+		// e.gc.fillGradientRectangle(0, 1, width, height / 4, true);
+
 		if (this.image == null) {
 			int textlen = 0;
 
@@ -184,6 +223,7 @@ public abstract class MainBarButton extends Canvas {
 					.scaledTo(height, height));
 			e.gc.drawImage(tmp, imgx, 0);
 		}
+
 	}
 
 	/**
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarEndButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarEndButton.java
index 2542d805..acbff332 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarEndButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarEndButton.java
@@ -62,7 +62,6 @@ public class MainBarEndButton extends MainBarButton {
 		e.gc.drawLine(0, height, 0+split, (height) / 2);
 		e.gc.drawLine(0+split, (height) / 2, 0, 0);
 
-		super.paintButton(e);
 	}
 
 	/*
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarMiddleButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarMiddleButton.java
index 5512a74e..f46e7e42 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarMiddleButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarMiddleButton.java
@@ -46,6 +46,7 @@ public class MainBarMiddleButton extends MainBarButton {
 	 */
 	@Override
 	protected void paintButton(PaintEvent e) {
+		
 		Point size = this.getSize();
 	
 		int height = size.y - 2;
@@ -60,7 +61,6 @@ public class MainBarMiddleButton extends MainBarButton {
 		e.gc.drawLine(0, height, 0+split, (height) / 2);
 		e.gc.drawLine(0+split, (height) / 2, 0, 0);
 
-		super.paintButton(e);
 	}
 
 	/* (non-Javadoc)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarRectangleButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarRectangleButton.java
index 17971982..39392307 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarRectangleButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarRectangleButton.java
@@ -48,6 +48,7 @@ public class MainBarRectangleButton extends MainBarButton {
 	 */
 	@Override
 	protected void paintButton(PaintEvent e) {
+		
 		Point size = this.getSize();
 
 		int height = size.y - 2;
@@ -59,7 +60,6 @@ public class MainBarRectangleButton extends MainBarButton {
 		e.gc.drawLine(width, height, 0, height);
 		e.gc.drawLine(0, height, 0, 0);
 		
-		super.paintButton(e);
 	}
 
 	/* (non-Javadoc)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarStartButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarStartButton.java
index d43c86de..9101e274 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarStartButton.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarStartButton.java
@@ -46,6 +46,7 @@ public class MainBarStartButton extends MainBarButton {
 	 */
 	@Override
 	protected void paintButton(PaintEvent e) {
+
 		Point size = this.getSize();
 
 		int height = size.y - 2;
@@ -58,8 +59,7 @@ public class MainBarStartButton extends MainBarButton {
 		e.gc.drawLine(width + split, (height) / 2, width, height);
 		e.gc.drawLine(width, height, 0, height);
 		e.gc.drawLine(0, height, 0, 0);
-		
-		super.paintButton(e);
+
 	}
 
 	/* (non-Javadoc)