Skip to content

Commit

Permalink
MCCF: added splash screen
Browse files Browse the repository at this point in the history
Firmware/Trunk/configuration_editor: updated JAR file

git-svn-id: https://repository.combo-convention.de/dualstrike@371 a2e5ad42-ccce-4154-a8df-8a7cfdfd1d97
  • Loading branch information
mephisto committed Nov 15, 2010
1 parent 8406447 commit 2c28629
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 5 deletions.
Binary file modified Firmware/Trunk/configuration_editor/mcc/mcc-1.2.0.jar
Binary file not shown.
1 change: 1 addition & 0 deletions Firmware/Trunk/configuration_editor/mcc/mcc_Readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Version History
1.2.0 - added connection help message
- small UI design changes
- added support for imports using the processing instruction mcc:include
- added splash screen for JAR file execution

1.1.1 - changed eepromProgrammerHID command to use current directory

Expand Down
4 changes: 0 additions & 4 deletions MCCF/Readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,3 @@ ATmega8 based Dual Strikes in the directory this file is residing in. To
load and save the configuration to the Dual Strike you first have to
enter the configuration mode by pressing Select on plugging in. By
pressing Start the configuration mode is left.




1 change: 1 addition & 0 deletions MCCF/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<manifest>
<attribute name="Sealed" value="true"/>
<attribute name="Main-Class" value="${pack.jar.class}"/>
<attribute name="SplashScreen-Image" value="splash.png"/>
</manifest>
<fileset dir="${src.dir}">
<include name="**/*"/>
Expand Down
12 changes: 11 additions & 1 deletion MCCF/java/mccf/Configuration.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package mccf;

import java.awt.SplashScreen;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
Expand Down Expand Up @@ -88,10 +89,19 @@ public static void main(String[] args) {
}

mode = Mode.newInstance(args, currentIndex);

if(mode != Mode.EDIT) {
SplashScreen splash;

splash = SplashScreen.getSplashScreen();

if(splash != null)
splash.close();
}

if(mode == null)
showMessage(MessageHelper.get(Configuration.class, "argSyntax", language), language, true);

switch(mode) {
case HELP:
String message;
Expand Down
Binary file added MCCF/java/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions MCCF/mcc_Readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Version History
1.2.0 - added connection help message
- small UI design changes
- added support for imports using the processing instruction mcc:include
- added splash screen for JAR file execution

1.1.1 - changed eepromProgrammerHID command to use current directory

Expand Down
Binary file added MCCF/splash.xcf
Binary file not shown.

0 comments on commit 2c28629

Please sign in to comment.