[Codelite-svn] codelite git: codelite branch master updated. 8f90b92a01e5db2290d8d0a85df1202e79efe1b6

[Eran I. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".

The branch, master has been updated
       via  8f90b92a01e5db2290d8d0a85df1202e79efe1b6 (commit)
      from  41e98e52c170362fefc7d67d6334d7860f2de58b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/8f90b92a01e5db2290d8d0a85df1202e79efe1b6

commit 8f90b92a01e5db2290d8d0a85df1202e79efe1b6
Author: Eran <era...@gm...>
Date:   Tue Jan 14 09:23:28 2014 +0200

    Use the proper font for the 'Output' tab

diff --git a/LiteEditor/outputtabwindow.cpp b/LiteEditor/outputtabwindow.cpp
index 16994e6..49e5cd1 100644
--- a/LiteEditor/outputtabwindow.cpp
+++ b/LiteEditor/outputtabwindow.cpp
@@ -33,6 +33,7 @@
 #include "pluginmanager.h"

 #include "quickfindbar.h"

 #include "event_notifier.h"

+#include "lexer_configuration.h"

 

 BEGIN_EVENT_TABLE(OutputTabWindow, wxPanel)

     EVT_MENU(XRCID("scroll_on_output"),      OutputTabWindow::OnOutputScrolls)

@@ -102,7 +103,7 @@ void OutputTabWindow::InitStyle(wxStyledTextCtrl *sci, int lexer, bool folding)
     }

 

     wxFont defFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

-    wxFont font(defFont.GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);

+    wxFont font = EditorConfigST::Get()->GetLexer("text")->GetFontForSyle(0);

     sci->StyleSetFont(0, font);

 

     sci->SetIndicatorCurrent(1);

diff --git a/LiteEditor/shelltab.cpp b/LiteEditor/shelltab.cpp
index b84990a..d9fd39c 100644
--- a/LiteEditor/shelltab.cpp
+++ b/LiteEditor/shelltab.cpp
@@ -31,6 +31,8 @@
 #include "frame.h"

 #include "shelltab.h"

 #include "pluginmanager.h"

+#include "editor_config.h"

+#include "lexer_configuration.h"

 

 

 BEGIN_EVENT_TABLE(ShellTab, OutputTabWindow)

@@ -83,9 +85,9 @@ ShellTab::ShellTab(wxWindow* parent, wxWindowID id, const wxString& name)
     m_vertSizer->Add(m_inputSizer,  0, wxEXPAND | wxALL, 1);

 

 #ifdef __WXMAC__

-    mainSizer->Insert(0, m_vertSizer,     1, wxEXPAND | wxALL, 1);

+    mainSizer->Insert(0, m_vertSizer, 1, wxEXPAND | wxALL, 1);

 #else

-    mainSizer->Add(m_vertSizer,     1, wxEXPAND | wxALL, 1);

+    mainSizer->Add(m_vertSizer, 1, wxEXPAND | wxALL, 1);

 #endif

 

     mainSizer->Layout();

@@ -98,19 +100,8 @@ ShellTab::~ShellTab()
 

 void ShellTab::InitStyle(wxStyledTextCtrl* sci)

 {

-    int caretSlop = 1;

-    int caretStrict = 0;

-    int caretEven = 0;

-    int caretJumps = 0;

-    int caretZone = 20;

-    sci->SetXCaretPolicy(caretStrict | caretSlop | caretEven | caretJumps, caretZone);

-

-    caretSlop = 1;

-    caretStrict = 4;

-    caretEven = 8;

-    caretJumps = 0;

-    caretZone = 1;

-    sci->SetYCaretPolicy(caretStrict | caretSlop | caretEven | caretJumps, caretZone);

+    LexerConfPtr text = EditorConfigST::Get()->GetLexer("text");

+    text->Apply(sci);

 }

 

 bool ShellTab::DoSendInput(const wxString &line)


-----------------------------------------------------------------------

Summary of changes:
 LiteEditor/outputtabwindow.cpp |    3 ++-
 LiteEditor/shelltab.cpp        |   21 ++++++---------------
 2 files changed, 8 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
codelite