Update the basic Makefile

This commit is contained in:
2012-03-29 17:48:48 +02:00
parent de9d630fee
commit f2bcd9052b
4 changed files with 25 additions and 51 deletions

View File

@@ -5,7 +5,16 @@ include $(CLEAR_VARS)
# load the common sources file of the platform
include $(LOCAL_PATH)/file.mk
# name of the librairy
LOCAL_MODULE := ednn
# get the tag of the current project :
LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags)
LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0)
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
# name of the dependency
LOCAL_STATIC_LIBRARIES := ewol etk tinyxml libzip libpng libfreetype parsersvg agg
LOCAL_C_INCLUDES := -I$(LOCAL_PATH) $(addprefix -I$(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))

View File

@@ -69,7 +69,7 @@ MainWindows::MainWindows(void)
myMenu = new ewol::Menu();
mySizerHori->SubWidgetAdd(myMenu);
int32_t idMenuFile = myMenu->AddTitle("File");
(void)myMenu->Add(idMenuFile, "New", "", ednMsgGuiNew);
(void)myMenu->Add(idMenuFile, "New", "iconEdn.bmp", ednMsgGuiNew);
(void)myMenu->AddSpacer();
(void)myMenu->Add(idMenuFile, "Open", "icon/Load.svg", ednMsgGuiOpen);
(void)myMenu->Add(idMenuFile, "Close", "icon/Close.svg", ednMsgGuiClose, "current");
@@ -282,7 +282,13 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev
return;
}
m_widgetLabelFileName->SetLabel(directName);
etk::UString windowsTitle = "edn - ";
windowsTitle += directName;
ewol::SetTitle(windowsTitle);
return;
} else {
m_widgetLabelFileName->SetLabel("");
ewol::SetTitle("edn");
}
return;
// TODO : Set the Title ....

View File

@@ -25,6 +25,7 @@
#include <tools_debug.h>
#include <tools_globals.h>
#include <etk/File.h>
#include <ewol/ewol.h>
#include <Gui/MainWindows.h>
#include <Display.h>
@@ -72,7 +73,6 @@ void APP_Init(void)
SetBaseFolderDataUser("~/."PROJECT_NAME"/");
SetBaseFolderCache("/tmp/"PROJECT_NAME"/");
#endif
ewol::SetFontFolder("Font");
#ifdef __PLATFORM__Android
@@ -143,7 +143,6 @@ void APP_Init(void)
ewol::shortCut::Add("ctrl+l", ednMsgGuiGotoLine, "???");
// add files
EDN_INFO("show list of files : ");
@@ -157,6 +156,12 @@ void APP_Init(void)
}
etk::File APP_Icon(void)
{
etk::File bitmapFile("iconEdn.bmp", etk::FILE_TYPE_DATA);
return bitmapFile;
}
/**
* @brief main application function Un-Initialisation
*/