Mercurial > hg > forks > multipaint-js

changeset 56:4eb9ebde8c20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some more interface cleanupping.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 04 Jul 2018 20:44:56 +0300
parents 7194cdcc9dab
children ddfcec84377f
files multipaint.pde
diffstat 1 files changed, 7 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/multipaint.pde	Wed Jul 04 20:44:31 2018 +0300
+++ b/multipaint.pde	Wed Jul 04 20:44:56 2018 +0300
@@ -482,44 +482,16 @@
 
     if (saveas) // Fileselect "event" for Save as
     {
-        String s = fileselector(path, SAVEIMG);
-        String orig = g_spare ? sfilename : filename;
-        int kuva = 0;
-
-        if (s != null) {
-            // Add extension if needed
-            if (s.length() <= 2) s += ".bin";
-            s = s + ".dummy.dummy";
-            String[] l = split(s, '.');
-            String[] m1 = match(l[1], "png");
-            String[] m2 = match(l[1], "PNG");
-            String[] m3 = match(l[1], "bin");
-            String[] m4 = match(l[1], "BIN");
-            if (m1 != null || m2 != null) kuva = 1;
-            if (m1 == null && m2 == null && m3 == null && m4 == null) l[1] = "bin";
+        mpSaveNativeImage(filename +"_"+ (g_spare ? "spare" : "main") +".mp");
 
-            if (!g_spare) {
-                filename = l[0] + "." + l[1];
-                mpSavePNGImage(filename);
-                if (kuva == 1) filename = orig;
-                mpSetTitle(filename);
-            } else {
-                sfilename = l[0] + "." + l[1];
-                mpSavePNGImage(sfilename);
-                if (kuva == 1) sfilename = orig;
-                mpSetTitle(sfilename);
-            }
-
-            message("SAVED");
-            if (kuva == 1) message("EXPORTED|PNG");
-        }
         saveas = false;
         g_shift = false;
         g_control = false;
     }
 
-    if (exporttxt) {
-        exportemuname = (g_spare ? sfilename : filename) +"." +l[1];
+    if (exporttxt)
+    {
+        exportemuname = g_spare ? sfilename : filename;
 
         machine_export(exportemuname, 1);
 
@@ -528,8 +500,9 @@
         g_control = false;
     }
 
-    if (exportemu) {
-        exportemuname = (g_spare ? sfilename : filename) +"." +l[1];
+    if (exportemu)
+    {
+        exportemuname = g_spare ? sfilename : filename;
 
         machine_export(exportemuname, 0);