From 15ff9cebb0f3daaefb6bd8b9d01d06e78ffba55c Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 16 Mar 2017 21:14:14 +0100 Subject: [PATCH] [DEBUG] correct display menu wrong view --- sources/appl/TextPluginCopy.cpp | 10 +++++----- sources/appl/TextPluginHistory.cpp | 8 +++++--- sources/appl/TextPluginSelectAll.cpp | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/sources/appl/TextPluginCopy.cpp b/sources/appl/TextPluginCopy.cpp index 57147bd..70f7b26 100644 --- a/sources/appl/TextPluginCopy.cpp +++ b/sources/appl/TextPluginCopy.cpp @@ -22,12 +22,12 @@ void appl::TextPluginCopy::onPluginEnable(appl::TextViewer& _textDrawer) { // add event : ememory::SharedPtr menu = m_menuInterface.lock(); if (menu != nullptr) { - m_menuIdTitle = menu->addTitle("Edit"); + m_menuIdTitle = menu->addTitle("_T{Edit}"); if (m_menuIdTitle != -1) { - m_menuIdCopy = menu->add(m_menuIdTitle, "Copy", "", "appl::TextPluginCopy::menu:copy"); - m_menuIdCut = menu->add(m_menuIdTitle, "Cut", "", "appl::TextPluginCopy::menu:cut"); - m_menuIdPast = menu->add(m_menuIdTitle, "Paste", "", "appl::TextPluginCopy::menu:past"); - m_menuIdRemove = menu->add(m_menuIdTitle, "Remove", "", "appl::TextPluginCopy::menu:remove"); + m_menuIdCopy = menu->add(m_menuIdTitle, "_T{Copy}", "", "appl::TextPluginCopy::menu:copy"); + m_menuIdCut = menu->add(m_menuIdTitle, "_T{Cut}", "", "appl::TextPluginCopy::menu:cut"); + m_menuIdPast = menu->add(m_menuIdTitle, "_T{Paste}", "", "appl::TextPluginCopy::menu:past"); + m_menuIdRemove = menu->add(m_menuIdTitle, "_T{Remove}", "", "appl::TextPluginCopy::menu:remove"); } } _textDrawer.ext_shortCutAdd("ctrl+x", "appl::TextPluginCopy::cut"); diff --git a/sources/appl/TextPluginHistory.cpp b/sources/appl/TextPluginHistory.cpp index b67b999..c64a4ca 100644 --- a/sources/appl/TextPluginHistory.cpp +++ b/sources/appl/TextPluginHistory.cpp @@ -22,10 +22,10 @@ appl::TextPluginHistory::TextPluginHistory() : void appl::TextPluginHistory::onPluginEnable(appl::TextViewer& _textDrawer) { ememory::SharedPtr menu = m_menuInterface.lock(); if (menu != nullptr) { - m_menuIdTitle = menu->addTitle("Edit"); + m_menuIdTitle = menu->addTitle("_T{Edit}"); if (m_menuIdTitle != -1) { - m_menuIdUndo = menu->add(m_menuIdTitle, "Undo", "THEME:GUI:Undo.svg", "appl::TextPluginHistory::menu:undo"); - m_menuIdRedo = menu->add(m_menuIdTitle, "Redo", "THEME:GUI:Redo.svg", "appl::TextPluginHistory::menu:redo"); + m_menuIdUndo = menu->add(m_menuIdTitle, "_T{Undo}", "THEME:GUI:Undo.svg", "appl::TextPluginHistory::menu:undo"); + m_menuIdRedo = menu->add(m_menuIdTitle, "_T{Redo}", "THEME:GUI:Redo.svg", "appl::TextPluginHistory::menu:redo"); } } // add event : @@ -130,6 +130,8 @@ bool appl::TextPluginHistory::onDataWrite(appl::TextViewer& _textDrawer, tmpElement->m_addedText = _strData; tmpElement->m_posAdded = (int64_t)_pos; tmpElement->m_endPosRemoved = (int64_t)_pos; + } else { + APPL_ERROR("History allocation error"); } _textDrawer.writeDirect(_strData, _pos); if (tmpElement != nullptr) { diff --git a/sources/appl/TextPluginSelectAll.cpp b/sources/appl/TextPluginSelectAll.cpp index ec09993..b2bb0e1 100644 --- a/sources/appl/TextPluginSelectAll.cpp +++ b/sources/appl/TextPluginSelectAll.cpp @@ -18,10 +18,10 @@ appl::TextPluginSelectAll::TextPluginSelectAll() : void appl::TextPluginSelectAll::onPluginEnable(appl::TextViewer& _textDrawer) { ememory::SharedPtr menu = m_menuInterface.lock(); if (menu != nullptr) { - m_menuIdTitle = menu->addTitle("Edit"); + m_menuIdTitle = menu->addTitle("_T{Edit}"); if (m_menuIdTitle != -1) { - m_menuIdSelectAll = menu->add(m_menuIdTitle, "Select All","", "appl::TextPluginSelectAll::menu:select-all"); - m_menuIdSelectNone = menu->add(m_menuIdTitle, "Un-Select","", "appl::TextPluginSelectAll::menu:select-none"); + m_menuIdSelectAll = menu->add(m_menuIdTitle, "_T{Select All}", "", "appl::TextPluginSelectAll::menu:select-all"); + m_menuIdSelectNone = menu->add(m_menuIdTitle, "_T{Un-Select}", "", "appl::TextPluginSelectAll::menu:select-none"); } } // add event :