Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. 397ddba115d331f9d4c9c0fcb3730ffde24502db
|
From: Eran I. <no...@so...> - 2013-12-19 07:23:45
|
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 397ddba115d331f9d4c9c0fcb3730ffde24502db (commit)
from 03b4bea2c6a42c548535a61d309b638966f49b3c (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/397ddba115d331f9d4c9c0fcb3730ffde24502db
commit 397ddba115d331f9d4c9c0fcb3730ffde24502db
Author: eran <era...@gm...>
Date: Thu Dec 19 09:23:30 2013 +0200
Adjusted colours in the message pane
diff --git a/LiteEditor/messagepane.wxcp b/LiteEditor/messagepane.wxcp
index 600f194..d220301 100644
--- a/LiteEditor/messagepane.wxcp
+++ b/LiteEditor/messagepane.wxcp
@@ -333,7 +333,7 @@
"m_label": "Style:",
"m_value": ""
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": ""
}],
@@ -482,11 +482,11 @@
}, {
"type": "colour",
"m_label": "Bg Colour:",
- "colour": "rgb(255, 255, 225)"
+ "colour": "Tooltip"
}, {
"type": "colour",
"m_label": "Fg Colour:",
- "colour": "black"
+ "colour": "TooltipText"
}, {
"type": "font",
"m_label": "Font:",
@@ -557,11 +557,11 @@
}, {
"type": "colour",
"m_label": "Bg Colour:",
- "colour": "rgb(255, 255, 225)"
+ "colour": "Tooltip"
}, {
"type": "colour",
"m_label": "Fg Colour:",
- "colour": "black"
+ "colour": "TooltipText"
}, {
"type": "font",
"m_label": "Font:",
@@ -709,7 +709,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -775,7 +775,7 @@
"m_label": "Default Button",
"m_value": false
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": ""
}, {
@@ -798,7 +798,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -864,7 +864,7 @@
"m_label": "Default Button",
"m_value": true
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": ""
}, {
@@ -887,7 +887,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
- "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
+ "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
@@ -953,7 +953,7 @@
"m_label": "Default Button",
"m_value": false
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": ""
}, {
@@ -1042,7 +1042,7 @@
"m_label": "Default Button",
"m_value": false
}, {
- "type": "filePicker",
+ "type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": ""
}, {
diff --git a/LiteEditor/messagepane_base.cpp b/LiteEditor/messagepane_base.cpp
index c1890cc..a015ae1 100644
--- a/LiteEditor/messagepane_base.cpp
+++ b/LiteEditor/messagepane_base.cpp
@@ -22,7 +22,7 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bBitmapLoaded = true;
}
- wxBoxSizer* bSizer8 = new wxBoxSizer(wxVERTICAL);
+ bSizer8 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(bSizer8);
m_panel2 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL|wxBORDER_SIMPLE);
@@ -30,14 +30,14 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer8->Add(m_panel2, 1, wxEXPAND, 0);
- wxBoxSizer* mainSizer = new wxBoxSizer(wxHORIZONTAL);
+ mainSizer = new wxBoxSizer(wxHORIZONTAL);
m_panel2->SetSizer(mainSizer);
- wxBoxSizer* bSizer81 = new wxBoxSizer(wxHORIZONTAL);
+ bSizer81 = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(bSizer81, 1, wxALIGN_CENTER_VERTICAL, 5);
- wxBoxSizer* bSizer4 = new wxBoxSizer(wxHORIZONTAL);
+ bSizer4 = new wxBoxSizer(wxHORIZONTAL);
bSizer81->Add(bSizer4, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
@@ -50,18 +50,22 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer4->Add(m_panel1, 1, wxALL|wxEXPAND, 5);
- wxBoxSizer* bSizer2 = new wxBoxSizer(wxHORIZONTAL);
+ bSizer2 = new wxBoxSizer(wxHORIZONTAL);
m_panel1->SetSizer(bSizer2);
- wxBoxSizer* bSizer3 = new wxBoxSizer(wxVERTICAL);
+ bSizer3 = new wxBoxSizer(wxVERTICAL);
bSizer2->Add(bSizer3, 1, wxALIGN_CENTER_VERTICAL, 5);
m_staticText2 = new wxStaticText(m_panel1, wxID_ANY, _("Message:"), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_staticText2->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
+ m_staticText2->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
bSizer3->Add(m_staticText2, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_staticTextMessage = new wxStaticText(m_panel1, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
+ m_staticTextMessage->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
+ m_staticTextMessage->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
bSizer3->Add(m_staticTextMessage, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
@@ -73,22 +77,22 @@ MessagePaneBase::MessagePaneBase(wxWindow* parent, wxWindowID id, const wxPoint&
bSizer3->Add(m_DontAnnoyMeCheck, 0, wxALL, 5);
- wxBoxSizer* bSizer7 = new wxBoxSizer(wxVERTICAL);
+ bSizer7 = new wxBoxSizer(wxVERTICAL);
bSizer4->Add(bSizer7, 0, wxALIGN_CENTER_VERTICAL, 5);
m_buttonClose = new wxButton(m_panel2, wxID_CANCEL, _("Hide"), wxDefaultPosition, wxSize(-1, -1), 0);
- bSizer7->Add(m_buttonClose, 0, wxALL|wxEXPAND, 5);
+ bSizer7->Add(m_buttonClose, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5);
m_buttonAction = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
m_buttonAction->SetDefault();
- bSizer7->Add(m_buttonAction, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ bSizer7->Add(m_buttonAction, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_buttonAction1 = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
- bSizer7->Add(m_buttonAction1, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
+ bSizer7->Add(m_buttonAction1, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5);
m_buttonAction2 = new wxButton(m_panel2, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
diff --git a/LiteEditor/messagepane_base.h b/LiteEditor/messagepane_base.h
index ca74e96..46e0bbb 100644
--- a/LiteEditor/messagepane_base.h
+++ b/LiteEditor/messagepane_base.h
@@ -1,28 +1,3 @@
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// copyright : (C) 2013 by Eran Ifrah
-// file name : messagepane_base.h
-//
-// -------------------------------------------------------------------------
-// A
-// _____ _ _ _ _
-// / __ \ | | | | (_) |
-// | / \/ ___ __| | ___| | _| |_ ___
-// | | / _ \ / _ |/ _ \ | | | __/ _ )
-// | \__/\ (_) | (_| | __/ |___| | || __/
-// \____/\___/ \__,_|\___\_____/_|\__\___|
-//
-// F i l e
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
//////////////////////////////////////////////////////////////////////
// This file was auto-generated by codelite's wxCrafter Plugin
// Do not modify this file by hand!
@@ -35,6 +10,7 @@
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xh_bmp.h>
#include <wx/panel.h>
+#include <wx/artprov.h>
#include <wx/sizer.h>
#include <wx/statbmp.h>
#include <wx/stattext.h>
@@ -44,12 +20,19 @@
class MessagePaneBase : public wxPanel
{
protected:
+ wxBoxSizer* bSizer8;
wxPanel* m_panel2;
+ wxBoxSizer* mainSizer;
+ wxBoxSizer* bSizer81;
+ wxBoxSizer* bSizer4;
wxStaticBitmap* m_bitmap1;
wxPanel* m_panel1;
+ wxBoxSizer* bSizer2;
+ wxBoxSizer* bSizer3;
wxStaticText* m_staticText2;
wxStaticText* m_staticTextMessage;
wxCheckBox* m_DontAnnoyMeCheck;
+ wxBoxSizer* bSizer7;
wxButton* m_buttonClose;
wxButton* m_buttonAction;
wxButton* m_buttonAction1;
-----------------------------------------------------------------------
Summary of changes:
LiteEditor/messagepane.wxcp | 24 ++++++++++++------------
LiteEditor/messagepane_base.cpp | 24 ++++++++++++++----------
LiteEditor/messagepane_base.h | 33 ++++++++-------------------------
3 files changed, 34 insertions(+), 47 deletions(-)
hooks/post-receive
--
codelite
|
