Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. 41e98e52c170362fefc7d67d6334d7860f2de58b
|
From: Eran I. <no...@so...> - 2014-01-12 06:54:07
|
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 41e98e52c170362fefc7d67d6334d7860f2de58b (commit)
from f46aba13034282f7b900d1069d2cb1a1d57db7d6 (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/41e98e52c170362fefc7d67d6334d7860f2de58b
commit 41e98e52c170362fefc7d67d6334d7860f2de58b
Author: Eran <era...@gm...>
Date: Sun Jan 12 08:53:29 2014 +0200
Added minimum size to the CMake global settings dialog
diff --git a/CMakePlugin/CMakePlugin.wxcp b/CMakePlugin/CMakePlugin.wxcp
index ef29af0..0f9ae2f 100644
--- a/CMakePlugin/CMakePlugin.wxcp
+++ b/CMakePlugin/CMakePlugin.wxcp
@@ -22,11 +22,11 @@
"m_properties": [{
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "400,150"
}, {
"type": "string",
"m_label": "Minimum Size:",
- "m_value": ""
+ "m_value": "400,150"
}, {
"type": "string",
"m_label": "Name:",
diff --git a/CMakePlugin/CMakePluginUi.cpp b/CMakePlugin/CMakePluginUi.cpp
index d98f4d5..e144056 100644
--- a/CMakePlugin/CMakePluginUi.cpp
+++ b/CMakePlugin/CMakePluginUi.cpp
@@ -65,7 +65,8 @@ CMakeSettingsDialogBase::CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id
m_stdBtnSizer->AddButton(m_buttonCancel);
m_stdBtnSizer->Realize();
- SetSizeHints(-1,-1);
+ SetMinSize( wxSize(400,150) );
+ SetSizeHints(400,150);
if ( GetSizer() ) {
GetSizer()->Fit(this);
}
diff --git a/CMakePlugin/CMakePluginUi.h b/CMakePlugin/CMakePluginUi.h
index b29c811..e773067 100644
--- a/CMakePlugin/CMakePluginUi.h
+++ b/CMakePlugin/CMakePluginUi.h
@@ -47,7 +47,7 @@ protected:
protected:
public:
- CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("CMakePlugin Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+ CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("CMakePlugin Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(400,150), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
virtual ~CMakeSettingsDialogBase();
};
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 86f724d..08385ee 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -44,7 +44,7 @@
<Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
<Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/>
<BuildMatrix>
- <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+ <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
<Project Name="abbreviation" ConfigName="WinReleaseUnicode"/>
<Project Name="CallGraph" ConfigName="WinReleaseUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/>
@@ -219,7 +219,7 @@
<Project Name="Tweaks" ConfigName="DebugUnicode"/>
<Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/>
</WorkspaceConfiguration>
- <WorkspaceConfiguration Name="OSX_Release" Selected="yes">
+ <WorkspaceConfiguration Name="OSX_Release" Selected="no">
<Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
<Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
<Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/git/gitui.wxcp b/git/gitui.wxcp
index 86eaa3a..af0f856 100644
--- a/git/gitui.wxcp
+++ b/git/gitui.wxcp
@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
- "m_objCounter": 296,
+ "m_objCounter": 292,
"m_includeFiles": [],
"m_bitmapFunction": "wxCrafterpca4kKInitBitmapResources",
"m_bitmapsFile": "gitui_git_bitmaps.cpp",
@@ -5127,7 +5127,7 @@
"m_properties": [{
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "879,600"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -7032,7 +7032,7 @@
"m_properties": [{
"type": "string",
"m_label": "Size:",
- "m_value": "-1,-1"
+ "m_value": "500,300"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -7157,7 +7157,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxAUI_TB_PLAIN_BACKGROUND", "wxAUI_TB_DEFAULT_STYLE"],
+ "m_styles": ["wxAUI_TB_DEFAULT_STYLE"],
"m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -7242,7 +7242,7 @@
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
- "m_styles": ["wxBORDER_THEME"],
+ "m_styles": [],
"m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
@@ -7251,7 +7251,7 @@
}, {
"type": "string",
"m_label": "Size:",
- "m_value": "500,300"
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
@@ -7356,7 +7356,7 @@
"m_events": [],
"m_children": []
}, {
- "m_type": 4467,
+ "m_type": 4401,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
@@ -7364,65 +7364,22 @@
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_HORIZONTAL"],
"m_properties": [{
- "type": "winid",
- "m_label": "ID:",
- "m_winid": "wxID_ANY"
- }, {
- "type": "string",
- "m_label": "Size:",
- "m_value": "-1,-1"
- }, {
- "type": "string",
- "m_label": "Minimum Size:",
- "m_value": "-1,-1"
- }, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_stdBtnSizer294"
- }, {
- "type": "multi-string",
- "m_label": "Tooltip:",
- "m_value": ""
- }, {
- "type": "colour",
- "m_label": "Bg Colour:",
- "colour": "<Default>"
- }, {
- "type": "colour",
- "m_label": "Fg Colour:",
- "colour": "<Default>"
- }, {
- "type": "font",
- "m_label": "Font:",
- "m_value": ""
- }, {
- "type": "bool",
- "m_label": "Hidden",
- "m_value": false
- }, {
- "type": "bool",
- "m_label": "Disabled",
- "m_value": false
- }, {
- "type": "bool",
- "m_label": "Focused",
- "m_value": false
- }, {
- "type": "string",
- "m_label": "Class Name:",
- "m_value": ""
- }, {
- "type": "string",
- "m_label": "Include File:",
- "m_value": ""
+ "m_value": "boxSizer126"
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
+ }, {
+ "type": "choice",
+ "m_label": "Orientation:",
+ "m_selection": 1,
+ "m_options": ["wxVERTICAL", "wxHORIZONTAL"]
}],
"m_events": [],
"m_children": [{
- "m_type": 4468,
+ "m_type": 4400,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
@@ -7430,22 +7387,77 @@
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
- "type": "choice",
+ "type": "winid",
"m_label": "ID:",
- "m_selection": 0,
- "m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
+ "m_winid": "wxID_OK"
+ }, {
+ "type": "string",
+ "m_label": "Size:",
+ "m_value": "-1,-1"
+ }, {
+ "type": "string",
+ "m_label": "Minimum Size:",
+ "m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
- "m_value": "m_button296"
+ "m_value": "m_button128"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
+ "type": "colour",
+ "m_label": "Bg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "colour",
+ "m_label": "Fg Colour:",
+ "colour": "<Default>"
+ }, {
+ "type": "font",
+ "m_label": "Font:",
+ "m_value": ""
+ }, {
+ "type": "bool",
+ "m_label": "Hidden",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Disabled",
+ "m_value": false
+ }, {
+ "type": "bool",
+ "m_label": "Focused",
+ "m_value": false
+ }, {
+ "type": "string",
+ "m_label": "Class Name:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Include File:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Style:",
+ "m_value": ""
+ }, {
+ "type": "string",
+ "m_label": "Label:",
+ "m_value": "&OK"
+ }, {
"type": "bool",
"m_label": "Default Button",
"m_value": true
+ }, {
+ "type": "bitmapPicker",
+ "m_label": "Bitmap File:",
+ "m_path": ""
+ }, {
+ "type": "string",
+ "m_label": "Margins:",
+ "m_value": "2,2"
}],
"m_events": [],
"m_children": []
@@ -9178,7 +9190,7 @@
}, {
"type": "bool",
"m_label": "Hidden",
- "m_value": false
+ "m_value": true
}, {
"type": "bool",
"m_label": "Disabled",
@@ -9352,7 +9364,7 @@
"m_children": [{
"m_type": 4405,
"proportion": 0,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
@@ -9427,7 +9439,7 @@
}, {
"m_type": 4420,
"proportion": 0,
- "border": 5,
+ "border": 2,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxGA_SMOOTH", "wxGA_HORIZONTAL"],
-----------------------------------------------------------------------
Summary of changes:
CMakePlugin/CMakePlugin.wxcp | 4 +-
CMakePlugin/CMakePluginUi.cpp | 3 +-
CMakePlugin/CMakePluginUi.h | 2 +-
LiteEditor.workspace | 4 +-
git/gitui.wxcp | 140 ++++++++++++++++++++++-------------------
5 files changed, 83 insertions(+), 70 deletions(-)
hooks/post-receive
--
codelite
|
