Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. 334340fd6f27983b2a0922307be26eab6527e4b8
|
From: Eran I. <no...@so...> - 2013-12-20 06:19:20
|
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 334340fd6f27983b2a0922307be26eab6527e4b8 (commit)
from ed975befe743d5f52b058929ab91a8d8e25f1b68 (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/334340fd6f27983b2a0922307be26eab6527e4b8
commit 334340fd6f27983b2a0922307be26eab6527e4b8
Author: eran <era...@gm...>
Date: Fri Dec 20 08:18:56 2013 +0200
Make the caret virtual space optional from the Settings -> Global Editor Preferences -> Caret & Scrolling
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index d367c68..0ecfcc6 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -169,8 +169,6 @@
<File Name="editorsettingsmiscpanel.h"/>
</VirtualDirectory>
<VirtualDirectory Name="Caret">
- <File Name="editorsettingscaretbase.cpp"/>
- <File Name="editorsettingscaretbase.h"/>
<File Name="editorsettingscaret.h"/>
<File Name="editorsettingscaret.cpp"/>
</VirtualDirectory>
@@ -189,6 +187,7 @@
</VirtualDirectory>
<File Name="optionsdialogbase2.wxcp"/>
<File Name="editor_options_misc.wxcp"/>
+ <File Name="editor_options_caret.wxcp"/>
</VirtualDirectory>
<File Name="env_var_dlg_base.h"/>
<File Name="env_var_dlg_base.cpp"/>
@@ -618,7 +617,6 @@
<File Name="editor_options_guides.fbp"/>
<File Name="editor_options_save.fbp"/>
<File Name="editor_options_bookmarks.fbp"/>
- <File Name="editor_options_caret.fbp"/>
<File Name="editor_options_comments.fbp"/>
<File Name="editor_options_indetation.fbp"/>
<File Name="editor_options_dialogs.fbp"/>
@@ -774,6 +772,8 @@
<File Name="editor_options_copy_paste.cpp"/>
<File Name="new_virtual_folder.h"/>
<File Name="new_virtual_folder.cpp"/>
+ <File Name="editor_options_caret.h"/>
+ <File Name="editor_options_caret.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="resources">
<File Name="wxcrafter_liteeditor_bitmaps.cpp"/>
@@ -803,6 +803,7 @@
<File Name="optionsdialogbase2_liteeditor_bitmaps.cpp"/>
<File Name="new_virtual_folder_liteeditor_bitmaps.cpp"/>
<File Name="editor_options_misc_liteeditor_bitmaps.cpp"/>
+ <File Name="editor_options_caret_liteeditor_bitmaps.cpp"/>
</VirtualDirectory>
<File Name="../formbuilder/editorsettingslocalbase.wxcp"/>
<File Name="../formbuilder/findinfiles_dlg.wxcp"/>
diff --git a/LiteEditor/cl_editor.cpp b/LiteEditor/cl_editor.cpp
index 3f9b3a6..017208f 100644
--- a/LiteEditor/cl_editor.cpp
+++ b/LiteEditor/cl_editor.cpp
@@ -297,7 +297,6 @@ void LEditor::SetProperties()
{
SetRectangularSelectionModifier(wxSTC_SCMOD_CTRL);
SetAdditionalSelectionTyping(true);
- SetVirtualSpaceOptions(2);
OptionsConfigPtr options = GetOptions();
CallTipUseStyle(1);
@@ -318,6 +317,7 @@ void LEditor::SetProperties()
SetHighlightGuide(0);
}
+ SetVirtualSpaceOptions( options->GetOptions() & OptionsConfig::Opt_AllowCaretAfterEndOfLine ? 2 : 1 );
SetWrapMode(options->GetWordWrap() ? wxSTC_WRAP_WORD : wxSTC_WRAP_NONE);
SetViewWhiteSpace(options->GetShowWhitspaces());
SetMouseDwellTime(500);
diff --git a/LiteEditor/editor_options_caret.cpp b/LiteEditor/editor_options_caret.cpp
new file mode 100644
index 0000000..4941052
--- /dev/null
+++ b/LiteEditor/editor_options_caret.cpp
@@ -0,0 +1,86 @@
+//////////////////////////////////////////////////////////////////////
+// This file was auto-generated by codelite's wxCrafter Plugin
+// Do not modify this file by hand!
+//////////////////////////////////////////////////////////////////////
+
+#include "editor_options_caret.h"
+
+
+// Declare the bitmap loading function
+extern void wxC933InitBitmapResources();
+
+static bool bBitmapLoaded = false;
+
+
+EditorSettingsCaretBase::EditorSettingsCaretBase(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
+ : wxPanel(parent, id, pos, size, style)
+{
+ if ( !bBitmapLoaded ) {
+ // We need to initialise the default bitmap handler
+ wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler);
+ wxC933InitBitmapResources();
+ bBitmapLoaded = true;
+ }
+
+ mainSizer = new wxBoxSizer(wxVERTICAL);
+ this->SetSizer(mainSizer);
+
+ fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0);
+ fgSizer1->SetFlexibleDirection( wxBOTH );
+ fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+ fgSizer1->AddGrowableCol(1);
+
+ mainSizer->Add(fgSizer1, 0, wxALL|wxEXPAND, 5);
+
+ m_staticText1 = new wxStaticText(this, wxID_ANY, _("Caret blink period (milliseconds):"), wxDefaultPosition, wxSize(-1, -1), 0);
+
+ fgSizer1->Add(m_staticText1, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_spinCtrlBlinkPeriod = new wxTextCtrl(this, wxID_ANY, wxT("500"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_spinCtrlBlinkPeriod->SetToolTip(_("Sets the caret blinking period in millisconds"));
+
+ fgSizer1->Add(m_spinCtrlBlinkPeriod, 0, wxALL|wxEXPAND|wxALIGN_LEFT, 5);
+
+ m_staticText3 = new wxStaticText(this, wxID_ANY, _("Caret width (pixels):"), wxDefaultPosition, wxSize(-1, -1), 0);
+
+ fgSizer1->Add(m_staticText3, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
+
+ m_spinCtrlCaretWidth = new wxTextCtrl(this, wxID_ANY, wxT("1"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_spinCtrlCaretWidth->SetToolTip(_("Set the caret width in pixels"));
+
+ fgSizer1->Add(m_spinCtrlCaretWidth, 0, wxALL|wxEXPAND|wxALIGN_LEFT, 5);
+
+ m_checkBoxScrollBeyondLastLine = new wxCheckBox(this, wxID_ANY, _("Allow caret to scroll beyond end of file"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_checkBoxScrollBeyondLastLine->SetValue(false);
+ m_checkBoxScrollBeyondLastLine->SetToolTip(_("When scrolling with the mouse, the scrolling can go beyond the end of file"));
+
+ fgSizer1->Add(m_checkBoxScrollBeyondLastLine, 0, wxALL, 5);
+
+ m_checkBoxAdjustScrollbarSize = new wxCheckBox(this, wxID_ANY, _("Auto-adjust horizontal scrollbar width"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_checkBoxAdjustScrollbarSize->SetValue(false);
+ m_checkBoxAdjustScrollbarSize->SetToolTip(_("Auto adjust the borizontal toolbar to fit to the page content"));
+
+ fgSizer1->Add(m_checkBoxAdjustScrollbarSize, 0, wxALL, 5);
+
+ m_checkBoxCaretOnVirtualSpace = new wxCheckBox(this, wxID_ANY, _("Allow caret to be placed beyond the end of line"), wxDefaultPosition, wxSize(-1,-1), 0);
+ m_checkBoxCaretOnVirtualSpace->SetValue(false);
+ m_checkBoxCaretOnVirtualSpace->SetToolTip(_("Allow the user to place the caret using the mouse beyond the end of line"));
+
+ fgSizer1->Add(m_checkBoxCaretOnVirtualSpace, 0, wxALL, 5);
+
+ m_checkBoxCaretUseCamelCase = new wxCheckBox(this, wxID_ANY, _("Caret jumps between word segments"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_checkBoxCaretUseCamelCase->SetValue(false);
+ m_checkBoxCaretUseCamelCase->SetToolTip(_("Caret jumps between word segments marked by capitalisation (CamelCase) or underscores"));
+
+ fgSizer1->Add(m_checkBoxCaretUseCamelCase, 0, wxALL, 5);
+
+ SetSizeHints(-1,-1);
+ if ( GetSizer() ) {
+ GetSizer()->Fit(this);
+ }
+ Centre(wxBOTH);
+}
+
+EditorSettingsCaretBase::~EditorSettingsCaretBase()
+{
+}
diff --git a/LiteEditor/editor_options_caret.fbp b/LiteEditor/editor_options_caret.fbp
deleted file mode 100644
index 73edd21..0000000
--- a/LiteEditor/editor_options_caret.fbp
+++ /dev/null
@@ -1,860 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<wxFormBuilder_Project>
- <FileVersion major="1" minor="10" />
- <object class="Project" expanded="1">
- <property name="class_decoration"></property>
- <property name="code_generation">C++</property>
- <property name="disconnect_events">1</property>
- <property name="disconnect_mode">source_name</property>
- <property name="disconnect_python_events">0</property>
- <property name="embedded_files_path">res</property>
- <property name="encoding">UTF-8</property>
- <property name="event_generation">connect</property>
- <property name="file">editorsettingscaretbase</property>
- <property name="first_id">1000</property>
- <property name="help_provider">none</property>
- <property name="internationalize">1</property>
- <property name="name">EditorSettingsCaretBase</property>
- <property name="namespace"></property>
- <property name="path">.</property>
- <property name="precompiled_header"></property>
- <property name="relative_path">1</property>
- <property name="skip_python_events">1</property>
- <property name="use_enum">0</property>
- <property name="use_microsoft_bom">0</property>
- <object class="Panel" expanded="1">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_managed">0</property>
- <property name="aui_name"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="event_handler">impl_virtual</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="layer"></property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">EditorSettingsCaretBase</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="position"></property>
- <property name="resize">Resizable</property>
- <property name="row"></property>
- <property name="show">1</property>
- <property name="size">-1,-1</property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style">wxTAB_TRAVERSAL</property>
- <event name="OnAuiFindManager"></event>
- <event name="OnAuiPaneButton"></event>
- <event name="OnAuiPaneClose"></event>
- <event name="OnAuiPaneMaximize"></event>
- <event name="OnAuiPaneRestore"></event>
- <event name="OnAuiRender"></event>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnInitDialog"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- <object class="wxBoxSizer" expanded="1">
- <property name="minimum_size"></property>
- <property name="name">mainSizer</property>
- <property name="orient">wxVERTICAL</property>
- <property name="permission">none</property>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxEXPAND|wxALL</property>
- <property name="proportion">0</property>
- <object class="wxFlexGridSizer" expanded="1">
- <property name="cols">2</property>
- <property name="flexible_direction">wxBOTH</property>
- <property name="growablecols">1</property>
- <property name="growablerows"></property>
- <property name="hgap">0</property>
- <property name="minimum_size"></property>
- <property name="name">fgSizer1</property>
- <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
- <property name="permission">none</property>
- <property name="rows">0</property>
- <property name="vgap">0</property>
- <object class="sizeritem" expanded="0">
- <property name="border">5</property>
- <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">0</property>
- <object class="wxStaticText" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_name"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="label">Caret blink period (milliseconds):</property>
- <property name="layer"></property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">m_staticText1</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="position"></property>
- <property name="resize">Resizable</property>
- <property name="row"></property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style"></property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <property name="wrap">-1</property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="1">
- <property name="border">5</property>
- <property name="flag">wxALL|wxALIGN_RIGHT</property>
- <property name="proportion">0</property>
- <object class="wxTextCtrl" expanded="1">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_name"></property>
- <property name="best_size"></property>
- <property name="bg"></property>
- <property name="caption"></property>
- <property name="caption_visible">1</property>
- <property name="center_pane">0</property>
- <property name="close_button">1</property>
- <property name="context_help"></property>
- <property name="context_menu">1</property>
- <property name="default_pane">0</property>
- <property name="dock">Dock</property>
- <property name="dock_fixed">0</property>
- <property name="docking">Left</property>
- <property name="enabled">1</property>
- <property name="fg"></property>
- <property name="floatable">1</property>
- <property name="font"></property>
- <property name="gripper">0</property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
- <property name="layer"></property>
- <property name="max_size"></property>
- <property name="maximize_button">0</property>
- <property name="maximum_size"></property>
- <property name="maxlength">0</property>
- <property name="min_size"></property>
- <property name="minimize_button">0</property>
- <property name="minimum_size"></property>
- <property name="moveable">1</property>
- <property name="name">m_spinCtrlBlinkPeriod</property>
- <property name="pane_border">1</property>
- <property name="pane_position"></property>
- <property name="pane_size"></property>
- <property name="permission">protected</property>
- <property name="pin_button">1</property>
- <property name="pos"></property>
- <property name="position"></property>
- <property name="resize">Resizable</property>
- <property name="row"></property>
- <property name="show">1</property>
- <property name="size"></property>
- <property name="style">wxTE_RICH2</property>
- <property name="subclass"></property>
- <property name="toolbar_pane">0</property>
- <property name="tooltip"></property>
- <property name="validator_data_type"></property>
- <property name="validator_style">wxFILTER_NONE</property>
- <property name="validator_type">wxDefaultValidator</property>
- <property name="validator_variable"></property>
- <property name="value">500</property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
- <property name="window_style"></property>
- <event name="OnChar"></event>
- <event name="OnEnterWindow"></event>
- <event name="OnEraseBackground"></event>
- <event name="OnKeyDown"></event>
- <event name="OnKeyUp"></event>
- <event name="OnKillFocus"></event>
- <event name="OnLeaveWindow"></event>
- <event name="OnLeftDClick"></event>
- <event name="OnLeftDown"></event>
- <event name="OnLeftUp"></event>
- <event name="OnMiddleDClick"></event>
- <event name="OnMiddleDown"></event>
- <event name="OnMiddleUp"></event>
- <event name="OnMotion"></event>
- <event name="OnMouseEvents"></event>
- <event name="OnMouseWheel"></event>
- <event name="OnPaint"></event>
- <event name="OnRightDClick"></event>
- <event name="OnRightDown"></event>
- <event name="OnRightUp"></event>
- <event name="OnSetFocus"></event>
- <event name="OnSize"></event>
- <event name="OnText"></event>
- <event name="OnTextEnter"></event>
- <event name="OnTextMaxLen"></event>
- <event name="OnTextURL"></event>
- <event name="OnUpdateUI"></event>
- </object>
- </object>
- <object class="sizeritem" expanded="0">
- <property name="border">5</property>
- <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
- <property name="proportion">0</property>
- <object class="wxStaticText" expanded="0">
- <property name="BottomDockable">1</property>
- <property name="LeftDockable">1</property>
- <property name="RightDockable">1</property>
- <property name="TopDockable">1</property>
- <property name="aui_name"></property>
- <property name="best_size"></property>
... 1694 lines suppressed ...
hooks/post-receive
--
codelite
|
