Android fixes

android/apk_build.cmake

@@ -126,6 +126,7 @@ macro(setup_variant VARIANT)
     -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL}
     -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake
     BUILD_ALWAYS True
+    DEPENDS lagui-${VARIANT} freetype-${VARIANT} png-${VARIANT} lcms2-${VARIANT}
     )
 
 endmacro()
@@ -174,16 +175,8 @@ add_custom_command(
   WORKING_DIRECTORY ${APK_CONTENTS_ROOT}
   DEPENDS
     ${RESOURCES_APK}
-    #${EXECUTABLE_NAME}-armeabi-v7a
     ${EXECUTABLE_NAME}-arm64-v8a
-    #${EXECUTABLE_NAME}-x86
     ${EXECUTABLE_NAME}-x86_64
-    freetype-x86_64
-    #freetype-x86
-    freetype-arm64-v8a
-    #freetype-armeabi-v7a
-    png-x86_64
-    png-arm64-v8a
   )
 add_custom_command(
   OUTPUT ${FINAL_APK}

ouroperations.c

@@ -3099,6 +3099,17 @@ void ourui_MenuButtons(laUiList *uil, laPropPack *pp, laPropPack *actinst, laCol
         
         laShowLabel(muil, mc, "Information", 0, 0)->Flags|=LA_TEXT_MONO|LA_UI_FLAGS_DISABLED;
         laShowItemFull(muil, mc, 0, "LA_panel_activator", 0, "panel_id=LAUI_about;text=About;", 0, 0);
+
+#ifdef _WIN32
+        laShowSeparator(muil,mc);
+        laShowItem(muil,mc,0,"LA_toggle_system_console");
+#endif
+        if(MAIN.InitArgs.HasTerminal){
+#ifndef _WIN32
+            laShowSeparator(muil,mc);
+#endif
+            laShowItemFull(muil, mc, 0, "LA_panel_activator", 0, "panel_id=LAUI_terminal;", 0, 0);
+        }
     }
 }
 void ourui_ToolExtras(laUiList *uil, laPropPack *pp, laPropPack *actinst, laColumn *extracol, int context){
@@ -3647,7 +3658,7 @@ void ourRegisterEverything(){
     laNewCustomSignal("our.toggle_sketch",OUR_SIGNAL_TOGGLE_SKETCH);
     laNewCustomSignal("our.zoom_in",OUR_SIGNAL_ZOOM_IN);
     laNewCustomSignal("our.zoom_out",OUR_SIGNAL_ZOOM_OUT);
-    laNewCustomSignal("our.bursh_bigger",OUR_SIGNAL_BRUSH_BIGGER);
+    laNewCustomSignal("our.brush_bigger",OUR_SIGNAL_BRUSH_BIGGER);
     laNewCustomSignal("our.brush_smaller",OUR_SIGNAL_BRUSH_SMALLER);
     laNewCustomSignal("our.brush_number_0",OUR_SIGNAL_SELECT_BRUSH_NUMBER_0);
     laNewCustomSignal("our.brush_number_1",OUR_SIGNAL_SELECT_BRUSH_NUMBER_1);

ourpaint.c

@@ -61,14 +61,29 @@ int main(int argc, char *argv[]){
 
     laMarkMemClean(Our->CanvasSaverDummyList.pFirst);
 
+    if(!MAIN.InputMapping->Toolboxes.pFirst){
+        laInputMapping* im=laNewToolbox("Default Toolbox"); laInputMappingEntry* ime;
+        ime=laNewInputMappingEntry(im,0,0,0,0,"la.undo"); strSafeSet(&ime->Key,"Undo");
+        ime=laNewInputMappingEntry(im,0,0,0,0,"la.redo"); strSafeSet(&ime->Key,"Redo");
+        ime=laNewInputMappingEntry(im,0,0,0,0,"la.save"); strSafeSet(&ime->Key,"Save");
+        ime=laNewInputMappingEntry(im,0,0,0,0,"our.brush_smaller"); strSafeSet(&ime->Key,"Smaller");
+        ime=laNewInputMappingEntry(im,0,0,0,0,"our.brush_bigger"); strSafeSet(&ime->Key,"Bigger");
+    }
+
     //laAddRootDBInst("our.tools");
     if(!MAIN.Windows.pFirst){
         laWindow* w = laDesignWindow(-1,-1,35*LA_RH,25*LA_RH);
         laLayout* l = laDesignLayout(w, "Our Paint");
         laBlock* b = l->FirstBlock;
 #ifdef LAGUI_ANDROID
-        b->Folded = 1;
-        laCreatePanel(b, "panel_canvas");
+        laSplitBlockVertical(b,0.3);
+        laSplitBlockHorizon(b->B1, 0.5);
+        laCreatePanel(b->B1->B1, "panel_color");
+        laCreatePanel(b->B1->B2, "panel_brushes");
+        b->B2->Folded = 1; laCreatePanel(b->B2, "panel_canvas");
+        l = laDesignLayout(w, "Our Paint");
+        b = l->FirstBlock;
+        b->Folded=1; laCreatePanel(b, "panel_canvas");
 #else
         laSplitBlockHorizon(b,0.7);
         b->B1->Folded = 1;
@@ -83,6 +98,7 @@ int main(int argc, char *argv[]){
         laStartWindow(w);
 #endif
     }
+
     our_EnableSplashPanel();
     laMainLoop();
 }