From 91689b22bde8954ffb45555c859e1a29e12d26aa Mon Sep 17 00:00:00 2001 From: davidnilssonart Date: Tue, 6 Dec 2016 22:48:13 +0100 Subject: [PATCH 1/2] Artkal palettes Added palettes for four of Artkals lines of beads that loads when Perler is started. --- src/resource/artkal-serie-a-2.6mm-soft.xml | 92 ++++++++++++++++++ src/resource/artkal-serie-c-2.6mm-hard.xml | 92 ++++++++++++++++++ src/resource/artkal-serie-r-5mm-soft.xml | 93 +++++++++++++++++++ src/resource/artkal-serie-s-5mm-hard.xml | 91 ++++++++++++++++++ .../gui/configuration/PaletteSettings.java | 2 +- 5 files changed, 369 insertions(+), 1 deletion(-) create mode 100644 src/resource/artkal-serie-a-2.6mm-soft.xml create mode 100644 src/resource/artkal-serie-c-2.6mm-hard.xml create mode 100644 src/resource/artkal-serie-r-5mm-soft.xml create mode 100644 src/resource/artkal-serie-s-5mm-hard.xml diff --git a/src/resource/artkal-serie-a-2.6mm-soft.xml b/src/resource/artkal-serie-a-2.6mm-soft.xml new file mode 100644 index 0000000..fb9c8f3 --- /dev/null +++ b/src/resource/artkal-serie-a-2.6mm-soft.xml @@ -0,0 +1,92 @@ + + + 255255255A01 White + 000A02 Black + 25518173A03 Tangerine + 2371390A04 Yellow Orange + 22560A05 Tall Poppy + 1861247A06 Red + 241167220A07 Carnation Pink + 23360172A08 Hot Pink + 23056136A09 Magenta + 242240161A10 Picasso + 2552090A11 Yellow + 173220145A12 Pistachio + 124204108A13 Pastel Green + 36158107A14 Green + 012488A15 Green Tea + 25510619A16 Bright Carrot + 25510331A17 Orange + 141200232A18 Sky Blue + 65182230A19 Baby Blue + 0144218A20 Light Blue + 075135A21 Dark Blue + 244205212A22 Bubble Gun + 221188176A23 Sand + 253208134A24 Beeswax + 167123202A25 Lavender + 16094181A26 Pastel Lavender + 510114A27 Purple + 1801260A28 Marigold + 1647361A29 Buccaneer + 1347451A30 Redwood + 1237753A31 Light Brown + 927156A32 Brown + 167168170A33 Gray2 + 136139141A34 Gray3 + 201128158A36 Old Pink + 20123209A37 True Blue + 105179231A38 Turquoise + 153214234A39 Shadow Green + 2062200A40 Key Lomen Pie + 24623597A41 Pastel Yellow + 25022483A42 Sandstorm + 165052A43 Paprika + 255163139A44 Burning Sand + 121217124A45 Spring Green + 24323493A46 Canary + 243207179A47 Vanilla + 25519944A48 Corn + 236134208A49 Raspberry Pink + 197180227A50 Maverick + 245225164A51 Spring Sun + 8973167A52 Butterfly Bush + 16421494A53 Bright Green + 0178169A54 Medium Turquoise + 10819474A55 Conifer + 136139141A56 Gray + 228043A57 Fresh Red + 4445101A58 Black Rock + 1573453A59 Scarlett + 185220210A60 Sea Mist + 241235156A61 Feta + 255109106A62 Carnation + 234190219A63 Pink Pearl + 165080A64 Rose + 23211934A65 Mango Tango + 13431124A66 Wild Watermelon + 17778181A67 Pink Flamingo + 141200232A68 Toothpaste Blue + 516372A69 Mine Shaft + 244840A70 Brunswick Green + 25518428A71 Goldenrod + 255197110A72 Pastel Orange + 1849737A73 Sienna + 205160119A74 Deer + 18112980A75 Clay + 255109106A76 Coral Red + 207111119A77 Deep Chestnut + 1662546A78 Red Wine + 120213225A79 Light Sea Blue + 0174199A80 Sea Blue + 72169197A81 Steel Blue + 0174214A82 Azure + 0133173A83 Dark Steel Blue + 1681730A84 Drark Algae + 15315548A85 Dark Olive + 013334A86 Jade Green + 217217214A87 Ghost While + 200201199A88 Ash Grey + 187188188A89 Gray1 + 99102106A90 Gray4 + \ No newline at end of file diff --git a/src/resource/artkal-serie-c-2.6mm-hard.xml b/src/resource/artkal-serie-c-2.6mm-hard.xml new file mode 100644 index 0000000..d2cbbe8 --- /dev/null +++ b/src/resource/artkal-serie-c-2.6mm-hard.xml @@ -0,0 +1,92 @@ + + + 255255255C01 White + 000C02 Black + 25518173C03 Tangerine + 2371390C04 Yellow Orange + 22560C05 Tall Poppy + 1861247C06 Red + 241167220C07 Carnation Pink + 23360172C08 Hot Pink + 23056136C09 Magenta + 242240161C10 Picasso + 2552090C11 Yellow + 173220145C12 Pistachio + 124204108C13 Pastel Green + 36158107C14 Green + 012488C15 Green Tea + 25510619C16 Bright Carrot + 25510331C17 Orange + 141200232C18 Sky Blue + 65182230C19 Baby Blue + 0144218C20 Light Blue + 075135C21 Dark Blue + 244205212C22 Bubble Gun + 221188176C23 Sand + 253208134C24 Beeswax + 167123202C25 Lavender + 16094181C26 Pastel Lavender + 510114C27 Purple + 1801260C28 Marigold + 1647361C29 Buccaneer + 1347451C30 Redwood + 1237753C31 Light Brown + 927156C32 Brown + 167168170C33 Gray2 + 136139141C34 Gray3 + 201128158C36 Old Pink + 20123209C37 True Blue + 105179231C38 Turquoise + 153214234C39 Shadow Green + 2062200C40 Key Lomen Pie + 24623597C41 Pastel Yellow + 25022483C42 Sandstorm + 165052C43 Paprika + 255163139C44 Burning Sand + 121217124C45 Spring Green + 24323493C46 Canary + 243207179C47 Vanilla + 25519944C48 Corn + 236134208C49 Raspberry Pink + 197180227C50 Maverick + 245225164C51 Spring Sun + 8973167C52 Butterfly Bush + 16421494C53 Bright Green + 0178169C54 Medium Turquoise + 10819474C55 Conifer + 136139141C56 Gray + 228043C57 Fresh Red + 4445101C58 Black Rock + 1573453C59 Scarlett + 185220210C60 Sea Mist + 241235156C61 Feta + 255109106C62 Carnation + 234190219C63 Pink Pearl + 165080C64 Rose + 23211934C65 Mango Tango + 13431124C66 Wild Watermelon + 17778181C67 Pink Flamingo + 141200232C68 Toothpaste Blue + 516372C69 Mine Shaft + 244840C70 Brunswick Green + 25518428C71 Goldenrod + 255197110C72 Pastel Orange + 1849737C73 Sienna + 205160119C74 Deer + 18112980C75 Clay + 255109106C76 Coral Red + 207111119C77 Deep Chestnut + 1662546C78 Red Wine + 120213225C79 Light Sea Blue + 0174199C80 Sea Blue + 72169197C81 Steel Blue + 0174214C82 Azure + 0133173C83 Dark Steel Blue + 1681730C84 Drark Algae + 15315548C85 Dark Olive + 013334C86 Jade Green + 217217214C87 Ghost While + 200201199C88 Ash Grey + 187188188C89 Gray1 + 99102106C90 Gray4 + \ No newline at end of file diff --git a/src/resource/artkal-serie-r-5mm-soft.xml b/src/resource/artkal-serie-r-5mm-soft.xml new file mode 100644 index 0000000..dbd62c6 --- /dev/null +++ b/src/resource/artkal-serie-r-5mm-soft.xml @@ -0,0 +1,93 @@ + + + 255255255R01 White + 255163139R02 Burning Sand + 25518173R03 Tangerine + 25510331R04 Orange + 22560R05 Tall Poppy + 236134208R06 Raspberry Pink + 167168170R07 Gray2 + 38208124R08 Emerald + 010494R09 Dark Green + 65182230R10 Baby Blue + 075135R11 Dark Blue + 16094181R12 Pastel Lavender + 000R13 Black + 25022483R14 Sandstorm + 1347451R15 Redwood + 927156R16 Brown + 1237753R17 Light Brown + 221188176R18 Sand + 244205212R19 Bubble Gun + 36158107R20 Green + 124204108R21 Pastel Green + 510114R22 Purple + 12585199R23 Royal Purple + 20123209R24 True Blue + 23360172R25 Hot Pink + 23056136R26 Magenta + 2552090R27 Yellow + 234184228R28 Lily Pink + 24623597R29 Pastel Yellow + 153214234R30 Shadow Green + 185220210R31 Sea Mist + 253208134R32 Beeswax + 197180227R33 Maverick + 1861247R34 Red + 247206215R35 Mona Lisa + 201128158R36 Old Pink + 100204201R37 Blue-Green + 15330102R38 Burgundy + 2371390R39 Yellow Orange + 241167220R40 Carnation Pink + 136139141R43 Gray3 + 141200232R44 Sky Blue + 0178169R45 Medium Turquoise + 16421494R46 Bright Green + 1801260R47 Marigold + 25519944R48 Corn + 13759103R49 Mulberry Wood + 250170141R50 Mandys Pink + 245225164R51 Spring Sun + 242240161R52 Picasso + 105179231R53 Turquoise + 0144218R54 Light Blue + 4445101R55 Black Rock + 121217124R56 Spring Green + 173220145R57 Pistachio + 24323493R58 Canary + 25510619R59 Bright Carrot + 2449958R60 Blaze Orange + 243207179R61 Vanilla + 1573453R62 Scarlett + 1647361R63 Buccaneer + 165052R64 Paprika + 228043R65 Fresh Red + 167123202R66 Lavender + 255197110R67 Yolk Yellow + 2062200R68 Key Lomen Pie + 012488R69 Green Tea + 225184127R71 Tan + 516372R72 Mine Shaft + 013334R73 Jade Green + 120213225R74 Light Sea Blue + 0174214R75 Azure + 0174199R76 Sea Blue + 217217214R77 Ghost While + 200201199R78 Ash Grey + 187188188R79 Gray1 + 255197110R80 Pastel Orange + 205160119R81 Deer + 18112980R82 Clay + 1849737R83 Sienna + 207111119R84 Deep Chestnut + 1662546R85 Red Wine + 25518428R86 Goldenrod + 255109106R87 Coral Red + 99102106R88 Gray4 + 1681730R89 Drark Algae + 15315548R90 Dark Olive + 72169197R91 Steel Blue + 0133173R92 Dark Steel Blue + 244840R93 Brunswick Green + \ No newline at end of file diff --git a/src/resource/artkal-serie-s-5mm-hard.xml b/src/resource/artkal-serie-s-5mm-hard.xml new file mode 100644 index 0000000..aa393ad --- /dev/null +++ b/src/resource/artkal-serie-s-5mm-hard.xml @@ -0,0 +1,91 @@ + + + 255255255S01 White + 255163139S02 Burning Sand + 25518173S03 Tangerine + 25510331S04 Orange + 22560S05 Tall Poppy + 236134208S06 Raspberry Pink + 167168170S07 Gray2 + 38208124S08 Emerald + 010494S09 Dark Green + 65182230S10 Baby Blue + 075135S11 Dark Blue + 16094181S12 Pastel Lavender + 000S13 Black + 25022483S14 Sandstorm + 1347451S15 Redwood + 927156S16 Brown + 1237753S17 Light Brown + 221188176S18 Sand + 244205212S19 Bubble Gun + 36158107S20 Green + 124204108S21 Pastel Green + 510114S22 Purple + 12585199S23 Royal Purple + 20123209S24 True Blue + 23360172S25 Hot Pink + 23056136S26 Magenta + 2552090S27 Yellow + 234184228S28 Lily Pink + 24623597S29 Pastel Yellow + 153214234S30 Shadow Green + 185220210S31 Sea Mist + 253208134S32 Beeswax + 197180227S33 Maverick + 1861247S34 Red + 247206215S35 Mona Lisa + 201128158S36 Old Pink + 100204201S37 Blue-Green + 15330102S38 Burgundy + 2371390S39 Yellow Orange + 241167220S40 Carnation Pink + 136139141S43 Gray3 + 141200232S44 Sky Blue + 0178169S45 Medium Turquoise + 16421494S46 Bright Green + 1801260S47 Marigold + 25519944S48 Corn + 13759103S49 Mulberry Wood + 250170141S50 Mandys Pink + 245225164S51 Spring Sun + 242240161S52 Picasso + 105179231S53 Turquoise + 0144218S54 Light Blue + 173220145S55 Pistachio + 25510619S56 Bright Carrot + 1647361S57 Buccaneer + 165052S58 Paprika + 8973167S59 Butterfly Bush + 167123202S60 Lavender + 2062200S61 Key Lomen Pie + 012488S62 Green Tea + 4445101S64 Black Rock + 24323493S65 Canary + 2449958S66 Blaze Orange + 243207179S67 Vanilla + 225184127S68 Tan + 516372S69 Mine Shaft + 1681730S70 Drark Algae + 013334S71 Jade Green + 120213225S72 Light Sea Blue + 72169197S73 Steel Blue + 0174214S74 Azure + 0133173S75 Dark Steel Blue + 0174199S76 Sea Blue + 217217214S77 Ghost While + 200201199S78 Ash Grey + 187188188S79 Gray1 + 15315548S80 Dark Olive + 205160119S81 Deer + 18112980S82 Clay + 1849737S83 Sienna + 207111119S84 Deep Chestnut + 1662546S85 Red Wine + 25518428S86 Goldenrod + 255109106S87 Coral Red + 21824132S88 Dark Pink + 99102106S89 Gray4 + 255197110S90 Pastel Orange + 244840S91 Brunswick Green + \ No newline at end of file diff --git a/src/se/dolkow/imagefiltering/app/gui/configuration/PaletteSettings.java b/src/se/dolkow/imagefiltering/app/gui/configuration/PaletteSettings.java index 026fd82..28e4927 100644 --- a/src/se/dolkow/imagefiltering/app/gui/configuration/PaletteSettings.java +++ b/src/se/dolkow/imagefiltering/app/gui/configuration/PaletteSettings.java @@ -71,7 +71,7 @@ public PaletteSettings(AbstractReduceColorsFilter f) throws XMLParserException, } XMLParser xmlp = XMLParser.getInstance(); - for (String s : new String[]{"hama-builtin.xml", "nabbi-builtin.xml", "perlerbeads-builtin.xml"}) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + for (String s : new String[]{"hama-builtin.xml", "nabbi-builtin.xml", "perlerbeads-builtin.xml", "artkal-serie-s-5mm-hard.xml", "artkal-serie-r-5mm-soft.xml", "artkal-serie-c-2.6mm-hard.xml", "artkal-serie-a-2.6mm-soft.xml"}) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ String path = "/resource/" + s; //$NON-NLS-1$ URL url = getClass().getResource(path); if (url == null) { From e517bf46f8e99e994c4c4932db734ef6e66ca1a7 Mon Sep 17 00:00:00 2001 From: davidnilssonart Date: Fri, 9 Dec 2016 01:25:40 +0100 Subject: [PATCH 2/2] Added NON-NLS Added NON-NLS. Also, the added Artkal palettes are only for solid colors, not neon, translucent and others. --- .../imagefiltering/app/gui/configuration/PaletteSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/se/dolkow/imagefiltering/app/gui/configuration/PaletteSettings.java b/src/se/dolkow/imagefiltering/app/gui/configuration/PaletteSettings.java index 28e4927..a43a2e3 100644 --- a/src/se/dolkow/imagefiltering/app/gui/configuration/PaletteSettings.java +++ b/src/se/dolkow/imagefiltering/app/gui/configuration/PaletteSettings.java @@ -71,7 +71,7 @@ public PaletteSettings(AbstractReduceColorsFilter f) throws XMLParserException, } XMLParser xmlp = XMLParser.getInstance(); - for (String s : new String[]{"hama-builtin.xml", "nabbi-builtin.xml", "perlerbeads-builtin.xml", "artkal-serie-s-5mm-hard.xml", "artkal-serie-r-5mm-soft.xml", "artkal-serie-c-2.6mm-hard.xml", "artkal-serie-a-2.6mm-soft.xml"}) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + for (String s : new String[]{"hama-builtin.xml", "nabbi-builtin.xml", "perlerbeads-builtin.xml", "artkal-serie-s-5mm-hard.xml", "artkal-serie-r-5mm-soft.xml", "artkal-serie-c-2.6mm-hard.xml", "artkal-serie-a-2.6mm-soft.xml"}) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ String path = "/resource/" + s; //$NON-NLS-1$ URL url = getClass().getResource(path); if (url == null) {