ide: remove background image, make ToolBox and Properties Sheet invisible by default.

diff --git a/ide/Makefile b/ide/Makefile
index bbe9db0..960c1e6 100644 (file)
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -193,7 +193,6 @@ RESOURCES2 = \
        ../extras/res/types/countryCode/il.png \
        ../extras/res/types/countryCode/br.png \
        res/ecere.jpg \
-       res/ecereBack.jpg \
        res/icon.png \
        ../crossplatform.mk
 
@@ -212,7 +211,9 @@ PRJ_CFLAGS += \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FPIC) -w \
                         $(FVISIBILITY) \
                         -DREPOSITORY_VERSION="\"$(REPOSITORY_VER)\"" \
-                        -I../extras/include
+                        -I../extras/include \
+                        -DGDB_DEBUG_GUI \
+                        -DIDE_NO_BACKGROUND
 
 ECFLAGS += -module $(MODULE)
 ECFLAGS += \
@@ -274,7 +275,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
 endif
-       $(EAR) aw$(EARFLAGS) $(TARGET) res/ecere.jpg res/ecereBack.jpg res/icon.png ../crossplatform.mk ""
+       $(EAR) aw$(EARFLAGS) $(TARGET) res/ecere.jpg res/icon.png ../crossplatform.mk ""
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)actions/attach.png $(RES)actions/delete.png $(RES)actions/detach.png $(RES)actions/docNew.png $(RES)actions/editCopy.png $(RES)actions/editDelete.png $(RES)actions/delete2.png $(RES)actions/build.png $(RES)actions/clean.png $(RES)actions/debug.png "actions"
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)actions/docOpen.png $(RES)actions/docSave.png $(RES)actions/docSaveAll.png $(RES)actions/pause.png $(RES)actions/projAdd.png $(RES)actions/projNew.png $(RES)actions/projOpen.png $(RES)actions/rebuild.png $(RES)actions/regMakefile.png $(RES)actions/relink.png "actions"
        $(EAR) aw$(EARFLAGS) $(TARGET) $(RES)actions/restart.png $(RES)actions/run.png $(RES)actions/skipBreaks.png $(RES)actions/stepInto.png $(RES)actions/stepOut.png $(RES)actions/stepOver.png $(RES)actions/stopDebug.png $(RES)actions/stepOverSkipBreak.png "actions"

diff --git a/ide/ide.epj b/ide/ide.epj
index dbede4f..b168584 100644 (file)
--- a/ide/ide.epj
+++ b/ide/ide.epj
@@ -4,7 +4,8 @@
    "Options" : {
       "Warnings" : "All",
       "PreprocessorDefinitions" : [
-         "GDB_DEBUG_GUI"
+         "GDB_DEBUG_GUI",
+         "IDE_NO_BACKGROUND"
       ],
       "IncludeDirs" : [
          "../extras/include"
@@ -361,7 +362,6 @@
          ]
       },
       "ecere.jpg",
-      "ecereBack.jpg",
       "icon.png",
       "../crossplatform.mk"
    ]

diff --git a/ide/src/ProjectSettings.ec b/ide/src/ProjectSettings.ec
index e50faef..8ffb1e5 100644 (file)
--- a/ide/src/ProjectSettings.ec
+++ b/ide/src/ProjectSettings.ec
@@ -105,7 +105,6 @@ class ProjectSettings : Window
    minClientSize = { 650, 520 };
    hasClose = true;
    tabCycle = true;
-   size = { 650, 520 };
 
    property Project project
    {

diff --git a/ide/src/designer/Sheet.ec b/ide/src/designer/Sheet.ec
index cd4ee42..31aabeb 100644 (file)
--- a/ide/src/designer/Sheet.ec
+++ b/ide/src/designer/Sheet.ec
@@ -283,6 +283,7 @@ class Sheet : Window
    size.w = 300;
    anchor = { left = 0, top = 0, bottom = 0 };
    background = formColor;
+   visible = false;
 
    Sheet()
    {

diff --git a/ide/src/designer/ToolBox.ec b/ide/src/designer/ToolBox.ec
index ee4e944..3e8bfc6 100644 (file)
--- a/ide/src/designer/ToolBox.ec
+++ b/ide/src/designer/ToolBox.ec
@@ -19,6 +19,7 @@ class ToolBox : Window
    anchor = { right = 0 };
    //anchor = { right = 0, top = 0, bottom = 0 };
    hasVertScroll = true;
+   visible = false;
    menu = Menu { };
 
    /* isRemote = true;

diff --git a/ide/src/ide.ec b/ide/src/ide.ec
index e02a253..673a1c5 100755 (executable)
--- a/ide/src/ide.ec
+++ b/ide/src/ide.ec
@@ -421,7 +421,9 @@ class IDEWorkSpace : Window
    StatusField ovr, caps, num;
    DualPipe documentor;
 
+#ifndef IDE_NO_BACKGROUND
    BitmapResource back                 { ":ecereBack.jpg", window = this };
+#endif
    BitmapResource bmpBp                { ":codeMarks/breakpoint.png", window = this };
    BitmapResource bmpBpDisabled        { ":codeMarks/breakpointDisabled.png", window = this };
    BitmapResource bmpBpHalf            { ":codeMarks/breakpointHalf.png", window = this };
@@ -2840,12 +2842,14 @@ class IDEWorkSpace : Window
          ShellOpen(path);
    }
 
+#ifndef IDE_NO_BACKGROUND
    void OnRedraw(Surface surface)
    {
       Bitmap bitmap = back.bitmap;
       if(bitmap)
          surface.Blit(bitmap, (clientSize.w - bitmap.width) / 2, (clientSize.h - bitmap.height) / 2, 0, 0, bitmap.width, bitmap.height);
    }
+#endif
 
    void SheetSelected(SheetType sheetSelected)
    {