diff --git a/assets/icon/Parameter.svg b/assets/icon/Parameter.svg index bdaf9c7..5eeed26 100644 --- a/assets/icon/Parameter.svg +++ b/assets/icon/Parameter.svg @@ -1,9 +1,61 @@ - - - - - + + + + + + + + + image/svg+xml + + + + + + diff --git a/jni/appl/Gui/MainWindows.cpp b/jni/appl/Gui/MainWindows.cpp index 3316e5a..6c5d9de 100644 --- a/jni/appl/Gui/MainWindows.cpp +++ b/jni/appl/Gui/MainWindows.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -79,6 +80,8 @@ MainWindows::MainWindows(void) (void)myMenu->Add(idMenuFile, "Save As ...", "", ednMsgGuiSaveAs); (void)myMenu->AddSpacer(); //(void)myMenu->Add(idMenuFile, "Exit", "", ednMsgGuiExit); + (void)myMenu->AddSpacer(); + (void)myMenu->Add(idMenuFile, "Properties", "icon/Parameter.svg", ednMsgProperties); int32_t idMenuEdit = myMenu->AddTitle("Edit"); (void)myMenu->Add(idMenuEdit, "Undo", "icon/Undo.svg", ednMsgGuiUndo); (void)myMenu->Add(idMenuEdit, "Redo", "icon/Redo.svg", ednMsgGuiRedo); @@ -111,7 +114,6 @@ MainWindows::MainWindows(void) (void)myMenu->AddSpacer(); (void)myMenu->Add(idMenugDisplay, "Color Black", "", ednMsgGuiChangeColor, "Black"); (void)myMenu->Add(idMenugDisplay, "Color White", "", ednMsgGuiChangeColor, "White"); - (void)myMenu->AddTitle("?", "", ednMsgGuiAbout); m_widgetLabelFileName = new ewol::Label("FileName"); m_widgetLabelFileName->SetExpendX(true); @@ -148,8 +150,8 @@ MainWindows::MainWindows(void) // Generic event ... RegisterMultiCast(ednMsgGuiSaveAs); + RegisterMultiCast(ednMsgProperties); RegisterMultiCast(ednMsgGuiOpen); - RegisterMultiCast(ednMsgGuiAbout); // to update the title ... RegisterMultiCast(ednMsgBufferState); RegisterMultiCast(ednMsgBufferId); @@ -253,19 +255,23 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev } else { Buffer * myBuffer = BufferManager::Get(m_currentSavingAsIdBuffer); ewol::FileChooser* tmpWidget = new ewol::FileChooser(); - tmpWidget->SetTitle("Save Files As..."); - tmpWidget->SetValidateLabel("Save"); - etk::UString folder = "/home/"; - etk::UString fileName = ""; - if (true == myBuffer->HaveName()) { - etk::File tmpName = myBuffer->GetFileName(); - folder = tmpName.GetFolder(); - fileName = tmpName.GetShortFilename(); + if (NULL == tmpWidget) { + APPL_ERROR("Can not allocate widget ==> display might be in error"); + } else { + tmpWidget->SetTitle("Save Files As..."); + tmpWidget->SetValidateLabel("Save"); + etk::UString folder = "/home/"; + etk::UString fileName = ""; + if (true == myBuffer->HaveName()) { + etk::File tmpName = myBuffer->GetFileName(); + folder = tmpName.GetFolder(); + fileName = tmpName.GetShortFilename(); + } + tmpWidget->SetFolder(folder); + tmpWidget->SetFileName(fileName); + PopUpWidgetPush(tmpWidget); + tmpWidget->RegisterOnEvent(this, ewolEventFileChooserValidate, ednEventPopUpFileSaveAs); } - tmpWidget->SetFolder(folder); - tmpWidget->SetFileName(fileName); - PopUpWidgetPush(tmpWidget); - tmpWidget->RegisterOnEvent(this, ewolEventFileChooserValidate, ednEventPopUpFileSaveAs); } } } else if (eventId == ednEventPopUpFileSaveAs) { @@ -306,7 +312,24 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev } return; // TODO : Set the Title .... - } else if (eventId == ednMsgGuiAbout) { + } else if (eventId == ednMsgProperties) { + // Request the parameter GUI + ewol::Parameter* tmpWidget = new ewol::Parameter(); + if (NULL == tmpWidget) { + APPL_ERROR("Can not allocate widget ==> display might be in error"); + } else { + tmpWidget->SetTitle("Properties"); + PopUpWidgetPush(tmpWidget); + tmpWidget->MenuAdd("Affichage", "", NULL); + tmpWidget->MenuAdd("Editor", "", NULL); + tmpWidget->MenuAdd("Polices & Color", "", NULL); + tmpWidget->MenuAdd("Highlight", "", NULL); + tmpWidget->MenuAdd("About", "", NULL); + } + } + // request a sub element parameter GUI + + /* //Title "Edn" @@ -336,7 +359,6 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev " * Use it to travel in the space with a toaster.\n\n" "I reserve the right to change this licence. If it change the version of the copy you have keep its own license." */ - } return; } diff --git a/jni/appl/globalMsg.cpp b/jni/appl/globalMsg.cpp index c60e9b1..ddf04b2 100644 --- a/jni/appl/globalMsg.cpp +++ b/jni/appl/globalMsg.cpp @@ -34,6 +34,7 @@ extern const char* const ednMsgGuiOpen = "edn-Msg-Gui-Open"; extern const char* const ednMsgGuiClose = "edn-Msg-Gui-Close"; extern const char* const ednMsgGuiSave = "edn-Msg-Gui-Save"; extern const char* const ednMsgGuiSaveAs = "edn-Msg-Gui-SaveAs"; +extern const char* const ednMsgProperties = "edn-Msg-Gui-Properties"; extern const char* const ednMsgGuiUndo = "edn-Msg-Gui-Undo"; extern const char* const ednMsgGuiRedo = "edn-Msg-Gui-Redo"; @@ -55,7 +56,6 @@ extern const char* const ednMsgGuiShowEndOfLine = "edn-Msg-Gui-ShowEndOfLine"; extern const char* const ednMsgGuiCtags = "edn-Msg-Gui-CTags"; -extern const char* const ednMsgGuiAbout = "edn-Msg-Gui-About"; //////////////////////////////////////////////////////////////////////// diff --git a/jni/appl/globalMsg.h b/jni/appl/globalMsg.h index 6884858..83fbb7e 100644 --- a/jni/appl/globalMsg.h +++ b/jni/appl/globalMsg.h @@ -34,6 +34,7 @@ extern const char* const ednMsgGuiClose; // data : "current" "All" extern const char* const ednMsgGuiSave; // data : "" extern const char* const ednMsgGuiSaveAs; // data : "" + extern const char* const ednMsgProperties; // data : "" extern const char* const ednMsgGuiUndo; // data : "" extern const char* const ednMsgGuiRedo; // data : "" @@ -55,7 +56,6 @@ extern const char* const ednMsgGuiCtags; // data : "Load" "ReLoad" "Jump" "Back" - extern const char* const ednMsgGuiAbout; // data : "" ////////////////////////////////////////////////////////////////////////