From a99eba9a1fda2e091128003cbc0844398c3b9cd8 Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Wed, 28 Mar 2012 18:11:43 +0200 Subject: [PATCH] Add some svg files and display it in the menu --- assets/icon/Add.svg | 7 +++++++ assets/icon/AtoZ.svg | 11 +++++++++++ assets/icon/Attache.svg | 7 +++++++ assets/icon/Close.svg | 9 +++++++++ assets/icon/Contact.svg | 14 ++++++++++++++ assets/icon/FavoriteDisable.svg | 7 +++++++ assets/icon/FavoriteEnable.svg | 9 +++++++++ assets/icon/FavoriteMiddle.svg | 9 +++++++++ assets/icon/Folder.svg | 7 +++++++ assets/icon/Forbidden.svg | 7 +++++++ assets/icon/Help.svg | 7 +++++++ assets/icon/Home.svg | 11 +++++++++++ assets/icon/Info.svg | 7 +++++++ assets/icon/List.svg | 11 +++++++++++ assets/icon/Load.svg | 7 +++++++ assets/icon/Lock.svg | 7 +++++++ assets/icon/Next.svg | 7 +++++++ assets/icon/OpenMenu.svg | 9 +++++++++ assets/icon/Parameter.svg | 9 +++++++++ assets/icon/Previous.svg | 7 +++++++ assets/icon/Quit.svg | 9 +++++++++ assets/icon/Redo.svg | 12 ++++++++++++ assets/icon/Remove.svg | 7 +++++++ assets/icon/SDCard.svg | 7 +++++++ assets/icon/Save.svg | 16 ++++++++++++++++ assets/icon/Search.svg | 7 +++++++ assets/icon/Trash.svg | 9 +++++++++ assets/icon/Undo.svg | 12 ++++++++++++ assets/icon/Update.svg | 9 +++++++++ assets/icon/Validate.svg | 7 +++++++ assets/icon/VolumeMax.svg | 13 +++++++++++++ assets/icon/VolumeMute.svg | 9 +++++++++ assets/icon/Warning.svg | 7 +++++++ assets/icon/WhereAmI.svg | 17 +++++++++++++++++ assets/icon/ZoomIn.svg | 9 +++++++++ assets/lang_xml.xml | 1 + jni/Linux.mk | 2 +- jni/edn/Gui/MainWindows.cpp | 27 +++++++++++++-------------- jni/edn/init.cpp | 2 +- 39 files changed, 335 insertions(+), 16 deletions(-) create mode 100644 assets/icon/Add.svg create mode 100644 assets/icon/AtoZ.svg create mode 100644 assets/icon/Attache.svg create mode 100644 assets/icon/Close.svg create mode 100644 assets/icon/Contact.svg create mode 100644 assets/icon/FavoriteDisable.svg create mode 100644 assets/icon/FavoriteEnable.svg create mode 100644 assets/icon/FavoriteMiddle.svg create mode 100644 assets/icon/Folder.svg create mode 100644 assets/icon/Forbidden.svg create mode 100644 assets/icon/Help.svg create mode 100644 assets/icon/Home.svg create mode 100644 assets/icon/Info.svg create mode 100644 assets/icon/List.svg create mode 100644 assets/icon/Load.svg create mode 100644 assets/icon/Lock.svg create mode 100644 assets/icon/Next.svg create mode 100644 assets/icon/OpenMenu.svg create mode 100644 assets/icon/Parameter.svg create mode 100644 assets/icon/Previous.svg create mode 100644 assets/icon/Quit.svg create mode 100644 assets/icon/Redo.svg create mode 100644 assets/icon/Remove.svg create mode 100644 assets/icon/SDCard.svg create mode 100644 assets/icon/Save.svg create mode 100644 assets/icon/Search.svg create mode 100644 assets/icon/Trash.svg create mode 100644 assets/icon/Undo.svg create mode 100644 assets/icon/Update.svg create mode 100644 assets/icon/Validate.svg create mode 100644 assets/icon/VolumeMax.svg create mode 100644 assets/icon/VolumeMute.svg create mode 100644 assets/icon/Warning.svg create mode 100644 assets/icon/WhereAmI.svg create mode 100644 assets/icon/ZoomIn.svg diff --git a/assets/icon/Add.svg b/assets/icon/Add.svg new file mode 100644 index 0000000..562f893 --- /dev/null +++ b/assets/icon/Add.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/AtoZ.svg b/assets/icon/AtoZ.svg new file mode 100644 index 0000000..781cd3c --- /dev/null +++ b/assets/icon/AtoZ.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/assets/icon/Attache.svg b/assets/icon/Attache.svg new file mode 100644 index 0000000..84be150 --- /dev/null +++ b/assets/icon/Attache.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Close.svg b/assets/icon/Close.svg new file mode 100644 index 0000000..ef041c8 --- /dev/null +++ b/assets/icon/Close.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/Contact.svg b/assets/icon/Contact.svg new file mode 100644 index 0000000..61e6b2d --- /dev/null +++ b/assets/icon/Contact.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/assets/icon/FavoriteDisable.svg b/assets/icon/FavoriteDisable.svg new file mode 100644 index 0000000..5d9e376 --- /dev/null +++ b/assets/icon/FavoriteDisable.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/FavoriteEnable.svg b/assets/icon/FavoriteEnable.svg new file mode 100644 index 0000000..804bb84 --- /dev/null +++ b/assets/icon/FavoriteEnable.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/FavoriteMiddle.svg b/assets/icon/FavoriteMiddle.svg new file mode 100644 index 0000000..4a3a616 --- /dev/null +++ b/assets/icon/FavoriteMiddle.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/Folder.svg b/assets/icon/Folder.svg new file mode 100644 index 0000000..3f309e2 --- /dev/null +++ b/assets/icon/Folder.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Forbidden.svg b/assets/icon/Forbidden.svg new file mode 100644 index 0000000..f844890 --- /dev/null +++ b/assets/icon/Forbidden.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Help.svg b/assets/icon/Help.svg new file mode 100644 index 0000000..8dd63d7 --- /dev/null +++ b/assets/icon/Help.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Home.svg b/assets/icon/Home.svg new file mode 100644 index 0000000..4aa0a07 --- /dev/null +++ b/assets/icon/Home.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/assets/icon/Info.svg b/assets/icon/Info.svg new file mode 100644 index 0000000..3c957ff --- /dev/null +++ b/assets/icon/Info.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/List.svg b/assets/icon/List.svg new file mode 100644 index 0000000..8f2414a --- /dev/null +++ b/assets/icon/List.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/assets/icon/Load.svg b/assets/icon/Load.svg new file mode 100644 index 0000000..926fb25 --- /dev/null +++ b/assets/icon/Load.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Lock.svg b/assets/icon/Lock.svg new file mode 100644 index 0000000..b4d88e6 --- /dev/null +++ b/assets/icon/Lock.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Next.svg b/assets/icon/Next.svg new file mode 100644 index 0000000..8ac2c93 --- /dev/null +++ b/assets/icon/Next.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/OpenMenu.svg b/assets/icon/OpenMenu.svg new file mode 100644 index 0000000..7754b5e --- /dev/null +++ b/assets/icon/OpenMenu.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/Parameter.svg b/assets/icon/Parameter.svg new file mode 100644 index 0000000..bdaf9c7 --- /dev/null +++ b/assets/icon/Parameter.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/Previous.svg b/assets/icon/Previous.svg new file mode 100644 index 0000000..08c79b5 --- /dev/null +++ b/assets/icon/Previous.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Quit.svg b/assets/icon/Quit.svg new file mode 100644 index 0000000..bc512d1 --- /dev/null +++ b/assets/icon/Quit.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/Redo.svg b/assets/icon/Redo.svg new file mode 100644 index 0000000..a76f98c --- /dev/null +++ b/assets/icon/Redo.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/assets/icon/Remove.svg b/assets/icon/Remove.svg new file mode 100644 index 0000000..e4c4d79 --- /dev/null +++ b/assets/icon/Remove.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/SDCard.svg b/assets/icon/SDCard.svg new file mode 100644 index 0000000..1b434d3 --- /dev/null +++ b/assets/icon/SDCard.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Save.svg b/assets/icon/Save.svg new file mode 100644 index 0000000..138c8a4 --- /dev/null +++ b/assets/icon/Save.svg @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/assets/icon/Search.svg b/assets/icon/Search.svg new file mode 100644 index 0000000..8c66cfe --- /dev/null +++ b/assets/icon/Search.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/Trash.svg b/assets/icon/Trash.svg new file mode 100644 index 0000000..c7765e9 --- /dev/null +++ b/assets/icon/Trash.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/Undo.svg b/assets/icon/Undo.svg new file mode 100644 index 0000000..2cdc7f8 --- /dev/null +++ b/assets/icon/Undo.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/assets/icon/Update.svg b/assets/icon/Update.svg new file mode 100644 index 0000000..67286a1 --- /dev/null +++ b/assets/icon/Update.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/Validate.svg b/assets/icon/Validate.svg new file mode 100644 index 0000000..54e9f80 --- /dev/null +++ b/assets/icon/Validate.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/VolumeMax.svg b/assets/icon/VolumeMax.svg new file mode 100644 index 0000000..181f34d --- /dev/null +++ b/assets/icon/VolumeMax.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/assets/icon/VolumeMute.svg b/assets/icon/VolumeMute.svg new file mode 100644 index 0000000..a28cefb --- /dev/null +++ b/assets/icon/VolumeMute.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/icon/Warning.svg b/assets/icon/Warning.svg new file mode 100644 index 0000000..2e1cbd7 --- /dev/null +++ b/assets/icon/Warning.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/assets/icon/WhereAmI.svg b/assets/icon/WhereAmI.svg new file mode 100644 index 0000000..80e6032 --- /dev/null +++ b/assets/icon/WhereAmI.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/assets/icon/ZoomIn.svg b/assets/icon/ZoomIn.svg new file mode 100644 index 0000000..25578fc --- /dev/null +++ b/assets/icon/ZoomIn.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/assets/lang_xml.xml b/assets/lang_xml.xml index dbf2ae1..561a19a 100644 --- a/assets/lang_xml.xml +++ b/assets/lang_xml.xml @@ -2,6 +2,7 @@ *.xml *.eol + *.svg comment diff --git a/jni/Linux.mk b/jni/Linux.mk index 06ec1a9..dfe1254 100644 --- a/jni/Linux.mk +++ b/jni/Linux.mk @@ -6,7 +6,7 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/file.mk LOCAL_MODULE := ednn -LOCAL_STATIC_LIBRARIES := ewol etk tinyxml libzip libpng libfreetype +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)))) diff --git a/jni/edn/Gui/MainWindows.cpp b/jni/edn/Gui/MainWindows.cpp index 4e0b68f..6839cdd 100644 --- a/jni/edn/Gui/MainWindows.cpp +++ b/jni/edn/Gui/MainWindows.cpp @@ -69,30 +69,29 @@ 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", "", ednMsgGuiNew); (void)myMenu->AddSpacer(); - (void)myMenu->Add(idMenuFile, "Open", "", ednMsgGuiOpen); - (void)myMenu->Add(idMenuFile, "Close", "", ednMsgGuiClose, "current"); - (void)myMenu->Add(idMenuFile, "Close (all)", "", ednMsgGuiClose, "All"); - (void)myMenu->Add(idMenuFile, "Save", "", ednMsgGuiSave, "current"); - (void)myMenu->Add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs); + (void)myMenu->Add(idMenuFile, "Open", "icon/Load.svg", ednMsgGuiOpen); + (void)myMenu->Add(idMenuFile, "Close", "icon/Close.svg", ednMsgGuiClose, "current"); + (void)myMenu->Add(idMenuFile, "Close (all)", "", ednMsgGuiClose, "All"); + (void)myMenu->Add(idMenuFile, "Save", "icon/Save.svg", ednMsgGuiSave, "current"); + (void)myMenu->Add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs); (void)myMenu->AddSpacer(); //(void)myMenu->Add(idMenuFile, "Exit", "", ednMsgGuiExit); int32_t idMenuEdit = myMenu->AddTitle("Edit"); - (void)myMenu->Add(idMenuEdit, "Undo", "", ednMsgGuiUndo); - (void)myMenu->Add(idMenuEdit, "Redo", "", ednMsgGuiRedo); + (void)myMenu->Add(idMenuEdit, "Undo", "icon/Undo.svg", ednMsgGuiUndo); + (void)myMenu->Add(idMenuEdit, "Redo", "icon/Redo.svg", ednMsgGuiRedo); (void)myMenu->AddSpacer(); - (void)myMenu->Add(idMenuEdit, "Copy", "", ednMsgGuiCopy, "STD"); - (void)myMenu->Add(idMenuEdit, "Cut", "", ednMsgGuiCut, "STD"); - (void)myMenu->Add(idMenuEdit, "Paste", "", ednMsgGuiPaste, "STD"); - (void)myMenu->Add(idMenuEdit, "Redo", "", ednMsgGuiRedo); - (void)myMenu->Add(idMenuEdit, "Remove","", ednMsgGuiRm); + (void)myMenu->Add(idMenuEdit, "Copy", "", ednMsgGuiCopy, "STD"); + (void)myMenu->Add(idMenuEdit, "Cut", "", ednMsgGuiCut, "STD"); + (void)myMenu->Add(idMenuEdit, "Paste", "", ednMsgGuiPaste, "STD"); + (void)myMenu->Add(idMenuEdit, "Remove", "", ednMsgGuiRm); (void)myMenu->AddSpacer(); (void)myMenu->Add(idMenuEdit, "Select All","", ednMsgGuiSelect, "ALL"); (void)myMenu->Add(idMenuEdit, "Un-Select","", ednMsgGuiSelect, "NONE"); (void)myMenu->Add(idMenuEdit, "Goto line ...","", ednMsgGuiGotoLine, "???"); int32_t idMenuSearch = myMenu->AddTitle("Search"); - (void)myMenu->Add(idMenuSearch, "Search", "", ednMsgGuiSearch); + (void)myMenu->Add(idMenuSearch, "Search", "icon/Search.svg", ednMsgGuiSearch); (void)myMenu->Add(idMenuSearch, "Replace", "", ednMsgGuiReplace); (void)myMenu->AddSpacer(); (void)myMenu->Add(idMenuSearch, "Find (previous)","", ednMsgGuiFind, "Previous"); diff --git a/jni/edn/init.cpp b/jni/edn/init.cpp index 00658c6..d67dcc1 100644 --- a/jni/edn/init.cpp +++ b/jni/edn/init.cpp @@ -78,7 +78,7 @@ void APP_Init(void) #ifdef __PLATFORM__Android ewol::SetDefaultFont("freefont/FreeSerif.ttf", 16); #else - ewol::SetDefaultFont("freefont/FreeSerif.ttf", 12); + ewol::SetDefaultFont("freefont/FreeSerif.ttf", 14); #endif // init internal global value