From 9b67a6a4e9c334db4632871da7db71b30a28030d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 15 May 2024 01:32:53 -0300 Subject: [PATCH] Minor fixes. --- src/tools/ecode/ecode.cpp | 4 ++++ src/tools/ecode/iconmanager.cpp | 1 + src/tools/ecode/settingsmenu.cpp | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index 80618ece9..fe2eb3387 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -2519,6 +2519,10 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) { editor->setAutoCloseXMLTags( config.autoCloseXMLTags ); editor->setLineSpacing( config.lineSpacing ); editor->setCursorBlinkTime( config.cursorBlinkingTime ); + editor->setLineWrapKeepIndentation( config.wrapKeepIndentation ); + editor->setLineWrapMode( config.wrapMode ); + editor->setLineWrapType( config.wrapType ); + doc.setAutoCloseBrackets( !mConfig.editor.autoCloseBrackets.empty() ); doc.setAutoCloseBracketsPairs( makeAutoClosePairs( mConfig.editor.autoCloseBrackets ) ); doc.setLineEnding( docc.lineEndings ); diff --git a/src/tools/ecode/iconmanager.cpp b/src/tools/ecode/iconmanager.cpp index 5fe352a5f..5e7a52a05 100644 --- a/src/tools/ecode/iconmanager.cpp +++ b/src/tools/ecode/iconmanager.cpp @@ -92,6 +92,7 @@ void IconManager::init( UISceneNode* sceneNode, FontTrueType* iconFont, FontTrue { "filetype-pkm", 0xF3C5 }, { "settings", 0xF0E3 }, { "stop", 0xF1A0 }, + { "text-wrap", 0xF200 }, }; for ( const auto& icon : icons ) diff --git a/src/tools/ecode/settingsmenu.cpp b/src/tools/ecode/settingsmenu.cpp index 416a7516c..3edc25e76 100644 --- a/src/tools/ecode/settingsmenu.cpp +++ b/src/tools/ecode/settingsmenu.cpp @@ -1231,7 +1231,8 @@ UIMenu* SettingsMenu::createViewMenu() { mLineWrapMenu = UIPopUpMenu::New(); - mViewMenu->addSubMenu( i18n( "line_wrap", "Line Wrap" ), nullptr, mLineWrapMenu ) + mViewMenu + ->addSubMenu( i18n( "line_wrap", "Line Wrap" ), findIcon( "text-wrap" ), mLineWrapMenu ) ->on( Event::OnMenuShow, [this]( auto ) { if ( mLineWrapMenu->getCount() == 0 ) { UIPopUpMenu* wrapModeMenu = UIPopUpMenu::New(); @@ -1315,6 +1316,8 @@ UIMenu* SettingsMenu::createViewMenu() { wrapKeepIndentation->setActive( cfg.editor.wrapKeepIndentation ); } ); + mViewMenu->addSeparator(); + mViewMenu->addCheckBox( i18n( "show_line_numbers", "Show Line Numbers" ) ) ->setActive( mApp->getConfig().editor.showLineNumbers ) ->setId( "show-line-numbers" );