Menu
▾
▴
[Wxdevcenter-cvs] StdPlugin/src/Text SimpleTextDocView.cpp,1.1,1.2
|
From: Emilien K. <cur...@us...> - 2005-09-14 15:36:39
|
Update of /cvsroot/wxdevcenter/StdPlugin/src/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17156/src/Text Modified Files: SimpleTextDocView.cpp Log Message: Add Command support (menu/toolbar unification). Add begining of layout support. Index: SimpleTextDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Text/SimpleTextDocView.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleTextDocView.cpp 25 Aug 2005 20:36:07 -0000 1.1 --- SimpleTextDocView.cpp 14 Sep 2005 15:36:25 -0000 1.2 *************** *** 26,29 **** --- 26,30 ---- #include <wxDevCenter/StdPlugin/Text/SimpleTextDocView.h> + #include <wx/stream.h> #include <wx/sstream.h> *************** *** 45,48 **** --- 46,51 ---- + + /** Définition du type de document 'Texte simple'.*/ wxDevCenter::DocType TxtType(WXDC_DOCTYPE_TEXT_NAME, CLASSINFO(SimpleTextDocument), WXDC_DOCTYPE_TEXT_DESCRIPT, wxT("txt;log"), *************** *** 63,66 **** --- 66,92 ---- + //! Identifiacteurs de menus + #define IDM_SHOW_LINENUMBER 6000 // IDM_VIEW_MIN + #define IDM_SHOW_LINEENDING 6001 + #define IDM_SHOW_INDENTGUIDES 6002 + #define IDM_SHOW_LONGLINES 6003 + #define IDM_SHOW_SPACECHAR 6004 + #define IDM_SHOW_OPTION 6005 + + #define IDM_EDIT_FINDNEXT 6020 + #define IDM_EDIT_REPLACE 6021 + + + #define IDM_LANG_START 6100 + #define IDM_LANG_NULL (IDM_LANG_START + wxSTC_LEX_NULL) + #define IDM_LANG_CPP (IDM_LANG_START + wxSTC_LEX_CPP) + #define IDM_LANG_LUA (IDM_LANG_START + wxSTC_LEX_LUA) + #define IDM_LANG_END 6199 + + wxDevCenter::CommandGroup* SimpleTextView::s_pEditCommandGroup = NULL; + wxDevCenter::CommandGroup* SimpleTextView::s_pViewCommandGroup = NULL; + wxDevCenter::CommandGroup* SimpleTextView::s_pLangCommandGroup = NULL; + + ////////////////////////////////////////////////////////////////////// // LanguageProperty *************** *** 100,105 **** } - - /** Traduction d'une couleur vers sa forme de sauvegarde de config. * @param col Couleur à sauvegarder. --- 126,129 ---- *************** *** 662,684 **** #define ID_TEXT 1 - //! Identifiacteurs de menus - #define IDM_SHOW_LINENUMBER 6000 // IDM_VIEW_MIN - #define IDM_SHOW_LINEENDING 6001 - #define IDM_SHOW_INDENTGUIDES 6002 - #define IDM_SHOW_LONGLINES 6003 - #define IDM_SHOW_SPACECHAR 6004 - #define IDM_SHOW_OPTION 6005 - - #define IDM_EDIT_FINDNEXT 6020 - #define IDM_EDIT_REPLACE 6021 - - - #define IDM_LANG_START 6100 - #define IDM_LANG_NULL (IDM_LANG_START + wxSTC_LEX_NULL) - #define IDM_LANG_CPP (IDM_LANG_START + wxSTC_LEX_CPP) - #define IDM_LANG_LUA (IDM_LANG_START + wxSTC_LEX_LUA) - #define IDM_LANG_END 6199 - - BEGIN_EVENT_TABLE(SimpleTextView, View) EVT_SIZE(SimpleTextView::OnSize) --- 686,689 ---- *************** *** 740,771 **** m_pFindReplaceDialog(NULL) { ! wxMenu *pMenu; ! pMenu = new wxMenu(); ! pMenu->Append(IDM_EDIT_UNDO, WXDC_MENU_EDIT_UNDO); ! pMenu->Append(IDM_EDIT_REDO, WXDC_MENU_EDIT_REDO); ! pMenu->AppendSeparator(); ! pMenu->Append(IDM_EDIT_CUT, WXDC_MENU_EDIT_CUT); ! pMenu->Append(IDM_EDIT_COPY, WXDC_MENU_EDIT_COPY); ! pMenu->Append(IDM_EDIT_PASTE, WXDC_MENU_EDIT_PASTE); ! pMenu->Append(IDM_EDIT_CLEAR, WXDC_MENU_EDIT_DEL); ! m_aMenu.Append(pMenu, WXDC_MENU_EDIT); ! pMenu = new wxMenu(); ! pMenu->AppendCheckItem(IDM_SHOW_LINENUMBER, WXDC_MENU_VIEW_SIMPLETEXT_LINENUMBER); ! pMenu->AppendCheckItem(IDM_SHOW_LINEENDING, WXDC_MENU_VIEW_SIMPLETEXT_LINEENDING); ! pMenu->AppendCheckItem(IDM_SHOW_INDENTGUIDES, WXDC_MENU_VIEW_SIMPLETEXT_INDENTGUIDES); ! pMenu->AppendCheckItem(IDM_SHOW_LONGLINES, WXDC_MENU_VIEW_SIMPLETEXT_LONGLINES); ! pMenu->AppendCheckItem(IDM_SHOW_SPACECHAR, WXDC_MENU_VIEW_SIMPLETEXT_SPACECHAR); ! pMenu->AppendSeparator(); ! pMenu->Append(IDM_SHOW_OPTION, WXDC_MENU_VIEW_OPTIONS); ! m_aMenu.Append(pMenu, WXDC_MENU_VIEW); ! pMenu = new wxMenu(); ! pMenu->Append(IDM_EDIT_FIND, WXDC_MENU_FIND_FIND); ! pMenu->Append(IDM_EDIT_FINDNEXT, WXDC_MENU_FIND_FINDNEXT); ! pMenu->Append(IDM_EDIT_REPLACE, WXDC_MENU_FIND_REPLACE); ! m_aMenu.Append(pMenu, WXDC_MENU_FIND); ! pMenu = new wxMenu(); ! for(int i=1; i<WXDC_NB_LEX; i++) ! pMenu->AppendCheckItem(IDM_LANG_START + i, g_LangagePropertyArray[i].strName); ! m_aMenu.Append(pMenu, WXDC_MENU_LANGUAGE); } --- 745,749 ---- m_pFindReplaceDialog(NULL) { ! CreateCommandGroups(); } *************** *** 779,782 **** --- 757,803 ---- } + // Create command groups if any. + void SimpleTextView::CreateCommandGroups() + { + if(s_pEditCommandGroup==NULL) + { + s_pEditCommandGroup = new wxDevCenter::CommandGroup(WXDC_MENU_EDIT); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_UNDO, WXDC_MENU_EDIT_UNDO); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_REDO, WXDC_MENU_EDIT_REDO); + s_pEditCommandGroup->AppendSeparator(); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_CUT, WXDC_MENU_EDIT_CUT); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_COPY, WXDC_MENU_EDIT_COPY); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_PASTE, WXDC_MENU_EDIT_PASTE); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_CLEAR, WXDC_MENU_EDIT_DEL); + s_pEditCommandGroup->AppendSeparator(); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_FIND, WXDC_MENU_FIND_FIND); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_FINDNEXT, WXDC_MENU_FIND_FINDNEXT); + s_pEditCommandGroup->AppendCommand(IDM_EDIT_REPLACE, WXDC_MENU_FIND_REPLACE); + wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pEditCommandGroup, CLASSINFO(SimpleTextView), CmdGrpType_View); + } + + if(s_pViewCommandGroup==NULL) + { + s_pViewCommandGroup = new wxDevCenter::CommandGroup(WXDC_MENU_VIEW); + s_pViewCommandGroup->AppendChechCommand(IDM_SHOW_LINENUMBER, WXDC_MENU_VIEW_SIMPLETEXT_LINENUMBER); + s_pViewCommandGroup->AppendChechCommand(IDM_SHOW_LINEENDING, WXDC_MENU_VIEW_SIMPLETEXT_LINEENDING); + s_pViewCommandGroup->AppendChechCommand(IDM_SHOW_INDENTGUIDES, WXDC_MENU_VIEW_SIMPLETEXT_INDENTGUIDES); + s_pViewCommandGroup->AppendChechCommand(IDM_SHOW_LONGLINES, WXDC_MENU_VIEW_SIMPLETEXT_LONGLINES); + s_pViewCommandGroup->AppendChechCommand(IDM_SHOW_SPACECHAR, WXDC_MENU_VIEW_SIMPLETEXT_SPACECHAR); + s_pViewCommandGroup->AppendSeparator(); + s_pViewCommandGroup->AppendCommand(IDM_SHOW_OPTION, WXDC_MENU_VIEW_OPTIONS); + wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pViewCommandGroup, CLASSINFO(SimpleTextView), CmdGrpType_View); + } + + if(s_pLangCommandGroup==NULL) + { + s_pLangCommandGroup = new wxDevCenter::CommandGroup(WXDC_MENU_LANGUAGE); + for(int i=1; i<WXDC_NB_LEX; i++) + s_pLangCommandGroup->AppendChechCommand(IDM_LANG_START + i, g_LangagePropertyArray[i].strName); + wxDevCenter::CommandManager::GetCommandManager().AddCommandManager(s_pLangCommandGroup, CLASSINFO(SimpleTextView), CmdGrpType_View); + } + } + + bool SimpleTextView::OnCreate() { |
