# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1536139841 -10800
# Node ID 17f635da5180b7fbb2c4e1890e17d9114a2e49f9
# Parent  6db5defacbb387f8ffb046de2e689d090440e934# Parent  2e077cfc4f38ce19e185c80516d23743443de448
Merge.

diff -r 6db5defacbb3 -r 17f635da5180 events.pde
--- a/events.pde	Tue Sep 04 15:44:13 2018 +0300
+++ b/events.pde	Wed Sep 05 12:30:41 2018 +0300
@@ -704,6 +704,7 @@
     {
         g_repanel = -2;
         g_data[ckey]++;
+
         if (g_data[ckey] > 1)
         {
             if (ckey == 'm' || ckey == 'M')
diff -r 6db5defacbb3 -r 17f635da5180 interface.pde
--- a/interface.pde	Tue Sep 04 15:44:13 2018 +0300
+++ b/interface.pde	Wed Sep 05 12:30:41 2018 +0300
@@ -653,18 +653,11 @@
         case '0':
             teks = "Magnifier|m=direct";
             break;
-        case 'a':
-            teks = "Bitmap only|on/off";
-            break;
-        case 'A':
-            teks = "Export as|" + g_exportext;
-            break;
         case 'b':
             teks = "A.I.|Behavior|on/off";
             break;
         case 'B':
-            teks = "Set border|[Export=N]";
-            if (g_data[int('Q')] == 1) teks = "Set border|[Export=Y]";
+            teks = "Set border|[Export="+ (g_data[int('Q')] ? "Y" : "N") +"]";
             break;
         case 'C':
             teks = "Set backgnd";
@@ -740,8 +733,14 @@
         case 'U':
             teks = "Redo";
             break;
+        case 'a':
+            teks = "Bitmap only|on/off";
+            break;
+        case 'A':
+            teks = "Export as|" + g_exportext;
+            break;
         case 'e':
-            teks = "Export PNG";
+            teks = "Export PNG|"+ (g_data[int('Q')] ? "w/border" : "w/o border");
             break;
         case 'E':
             teks = "Export as|source";
@@ -756,12 +755,16 @@
             teks = "Playbrush|on/off|RMB=speed";
             break;
         case 'w':
-            teks = "Format|Import:|no support";
-            if (g_formatname != "") teks = "Import as|" + g_formatname;
+            if (g_formatname != "")
+                teks = "Import as|" + g_formatname;
+            else
+                teks = "Format|Import:|no support";
             break;
         case 'W':
-            teks = "Export:|no support";
-            if (g_formatname != "") teks = "Export as|" + g_formatname;
+            if (g_formatname != "")
+                teks = "Export as|" + g_formatname;
+            else
+                teks = "Format|Export:|no support";
             break;
 
         default:
diff -r 6db5defacbb3 -r 17f635da5180 palettes/0/colodore.act
Binary file palettes/0/colodore.act has changed
diff -r 6db5defacbb3 -r 17f635da5180 palettes/0/pepto.act
Binary file palettes/0/pepto.act has changed