You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/09/26 17:08:48 UTC
[1/2] git commit: MARMOTTA-316: added rpalmieri and ansell to the
commiter list in the installer
Updated Branches:
refs/heads/develop 7122c5150 -> 7de7ffe1e
MARMOTTA-316: added rpalmieri and ansell to the commiter list in the installer
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/67eea4b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/67eea4b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/67eea4b2
Branch: refs/heads/develop
Commit: 67eea4b2935740b90768e039c398b31bef139b75
Parents: 7122c51
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Sep 26 17:04:07 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Sep 26 17:08:21 2013 +0200
----------------------------------------------------------------------
.../marmotta-installer/src/main/resources/installer/standalone.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/67eea4b2/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
index 7bff60e..e91e0b8 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
+++ b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
@@ -37,6 +37,8 @@
<author name="Sergio Fernández" email="wikier@apache.org" />
<author name="Rupert Westenthaler" email="rwesten@apache.org" />
<author name="Dietmar Glachs" email="dglachs@apache.org" />
+ <author name="Raffaele Palmieri" email="rpalmieri@apache.org" />
+ <author name="Peter Ansell" email="ansell@apache.org" />
<author name="Andy Seaborne" email="andy@apache.org" />
<author name="Nandana Mihindukulasooriya" email="nandana@apache.org" />
<author name="Fabian Christ" email="fchrist@apache.org" />
[2/2] git commit: MARMOTTA-323: quickfix - removed version number
from the splash screen
Posted by ja...@apache.org.
MARMOTTA-323: quickfix - removed version number from the splash screen
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/7de7ffe1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/7de7ffe1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/7de7ffe1
Branch: refs/heads/develop
Commit: 7de7ffe1efc6e8de73e4c1f1273c494b95fe4eb4
Parents: 67eea4b
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Sep 26 17:07:19 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Sep 26 17:08:22 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/images/splashscreen.png | Bin 70948 -> 78597 bytes
.../src/main/resources/images/splashscreen.psd | Bin 2928232 -> 545248 bytes
.../splash/SplashScreenUpdaterBase.java | 13 +++++++------
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7de7ffe1/launchers/marmotta-installer/src/main/resources/images/splashscreen.png
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/images/splashscreen.png b/launchers/marmotta-installer/src/main/resources/images/splashscreen.png
index 1b0cc07..9bc4d6c 100644
Binary files a/launchers/marmotta-installer/src/main/resources/images/splashscreen.png and b/launchers/marmotta-installer/src/main/resources/images/splashscreen.png differ
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7de7ffe1/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd b/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd
index 4e42376..5c4efc7 100644
Binary files a/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd and b/launchers/marmotta-installer/src/main/resources/images/splashscreen.psd differ
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/7de7ffe1/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/SplashScreenUpdaterBase.java
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/SplashScreenUpdaterBase.java b/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/SplashScreenUpdaterBase.java
index 8addbb5..2a07610 100644
--- a/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/SplashScreenUpdaterBase.java
+++ b/launchers/marmotta-splash/src/main/java/org/apache/marmotta/splash/SplashScreenUpdaterBase.java
@@ -33,9 +33,10 @@ public abstract class SplashScreenUpdaterBase {
protected static Log log = LogFactory.getLog(SplashScreenUpdaterBase.class);
private static final int status_pos_x = 25;
- private static final int status_pos_y = 470;
+ private static final int status_pos_y = 467;
- private static final int progress_bar_y = 483;
+ private static final int splash_border = 3;
+ private static final int progress_bar_y = 480;
private static final int progress_bar_height = 3;
private static final Color color_background = new Color(245,244,230);
@@ -57,12 +58,12 @@ public abstract class SplashScreenUpdaterBase {
// clear existing area
Rectangle splashBounds = splash.getBounds();
g.setColor(color_background);
- g.fillRect(0,status_pos_y-40,splashBounds.width,50);
+ g.fillRect(splash_border+0,splash_border+status_pos_y-40,splashBounds.width-2*splash_border,50);
// draw string on splash screen
g.setColor(Color.GRAY);
g.setFont(new Font("ARIAL",Font.BOLD,14));
- g.drawString(text,status_pos_x,status_pos_y);
+ g.drawString(text,splash_border+status_pos_x,splash_border+status_pos_y);
splash.update();
@@ -88,11 +89,11 @@ public abstract class SplashScreenUpdaterBase {
// clear existing area
Rectangle splashBounds = splash.getBounds();
g.setColor(color_progress_bg);
- g.fillRect(0,progress_bar_y,splashBounds.width,progress_bar_height);
+ g.fillRect(splash_border+0,splash_border+progress_bar_y,splashBounds.width-2*splash_border,progress_bar_height);
// fill with new color_progress
g.setColor(color_progress_fg);
- g.fillRect(0,progress_bar_y,(int)(splashBounds.width * progress / 100),progress_bar_height);
+ g.fillRect(splash_border+0,splash_border+progress_bar_y,(int)((splashBounds.width-2*splash_border) * progress / 100),progress_bar_height);
splash.update();
}