diff --git a/.gitattributes b/.gitattributes index 65337af6a07..fa175229c2b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10854,11 +10854,11 @@ res/quest/themes/Zombies[!!-~]B.thm -text res/reprintSetInfo.py svneol=native#text/x-python res/sealed/juzamjedi.zsealed -text res/setInfoScript.py svneol=native#text/x-python -res/skins/darkascension/bg_match.jpg -text -res/skins/darkascension/bg_splash.png -text -res/skins/darkascension/bg_texture.jpg -text -res/skins/darkascension/font1.ttf -text -res/skins/darkascension/sprite_icons.png -text +res/skins/dark_ascension/bg_match.jpg -text +res/skins/dark_ascension/bg_splash.png -text +res/skins/dark_ascension/bg_texture.jpg -text +res/skins/dark_ascension/font1.ttf -text +res/skins/dark_ascension/sprite_icons.png -text res/skins/default/bg_match.jpg -text res/skins/default/bg_splash.png -text res/skins/default/bg_texture.jpg -text diff --git a/res/skins/darkascension/bg_match.jpg b/res/skins/dark_ascension/bg_match.jpg similarity index 100% rename from res/skins/darkascension/bg_match.jpg rename to res/skins/dark_ascension/bg_match.jpg diff --git a/res/skins/darkascension/bg_splash.png b/res/skins/dark_ascension/bg_splash.png similarity index 100% rename from res/skins/darkascension/bg_splash.png rename to res/skins/dark_ascension/bg_splash.png diff --git a/res/skins/darkascension/bg_texture.jpg b/res/skins/dark_ascension/bg_texture.jpg similarity index 100% rename from res/skins/darkascension/bg_texture.jpg rename to res/skins/dark_ascension/bg_texture.jpg diff --git a/res/skins/darkascension/font1.ttf b/res/skins/dark_ascension/font1.ttf similarity index 100% rename from res/skins/darkascension/font1.ttf rename to res/skins/dark_ascension/font1.ttf diff --git a/res/skins/darkascension/sprite_icons.png b/res/skins/dark_ascension/sprite_icons.png similarity index 100% rename from res/skins/darkascension/sprite_icons.png rename to res/skins/dark_ascension/sprite_icons.png diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java index 681e0626c96..0858de24f00 100644 --- a/src/main/java/forge/view/toolbox/FSkin.java +++ b/src/main/java/forge/view/toolbox/FSkin.java @@ -365,22 +365,27 @@ public enum FSkin { FSkin.colors = new HashMap(); final File f = new File(preferredDir + FILE_SPLASH); - final BufferedImage img; - try { - img = ImageIO.read(f); + if (!f.exists()) { + FSkin.loadLight("default"); + } + else { + final BufferedImage img; + try { + img = ImageIO.read(f); - final int h = img.getHeight(); - final int w = img.getWidth(); + final int h = img.getHeight(); + final int w = img.getWidth(); - FSkin.setIcon(Backgrounds.BG_SPLASH, img.getSubimage(0, 0, w, h - 100)); + FSkin.setIcon(Backgrounds.BG_SPLASH, img.getSubimage(0, 0, w, h - 100)); - UIManager.put("ProgressBar.background", FSkin.getColorFromPixel(img.getRGB(25, h - 75))); - UIManager.put("ProgressBar.selectionBackground", FSkin.getColorFromPixel(img.getRGB(75, h - 75))); - UIManager.put("ProgressBar.foreground", FSkin.getColorFromPixel(img.getRGB(25, h - 25))); - UIManager.put("ProgressBar.selectionForeground", FSkin.getColorFromPixel(img.getRGB(75, h - 25))); - UIManager.put("ProgressBar.border", new LineBorder(Color.BLACK, 0)); - } catch (final IOException e) { - e.printStackTrace(); + UIManager.put("ProgressBar.background", FSkin.getColorFromPixel(img.getRGB(25, h - 75))); + UIManager.put("ProgressBar.selectionBackground", FSkin.getColorFromPixel(img.getRGB(75, h - 75))); + UIManager.put("ProgressBar.foreground", FSkin.getColorFromPixel(img.getRGB(25, h - 25))); + UIManager.put("ProgressBar.selectionForeground", FSkin.getColorFromPixel(img.getRGB(75, h - 25))); + UIManager.put("ProgressBar.border", new LineBorder(Color.BLACK, 0)); + } catch (final IOException e) { + e.printStackTrace(); + } } }