HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] base rework

Browse Source
This commit is contained in:
Edouard DUPIN 2013-04-10 22:04:54 +02:00
parent 46969e15b1
commit aabc92f309
3 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sources/appl/Gui/MainWindows.cpp
View File

@ -51,8 +51,7 @@ class ParameterAboutGui : public widget::Sizer
if (NULL == mySpacer) { if (NULL == mySpacer) {
APPL_ERROR("Can not allocate widget ==> display might be in error"); APPL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
mySpacer->SetExpendX(true); mySpacer->SetExpand(bvec2(true,true));
mySpacer->SetExpendY(true);
SubWidgetAdd(mySpacer); SubWidgetAdd(mySpacer);
} }
etk::UString tmpLabel = "<left>"; etk::UString tmpLabel = "<left>";
@ -74,7 +73,7 @@ class ParameterAboutGui : public widget::Sizer
if (NULL == myLabel) { if (NULL == myLabel) {
APPL_ERROR("Can not allocate widget ==> display might be in error"); APPL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
myLabel->SetExpendX(true); myLabel->SetExpand(bvec2(true,false));
SubWidgetAdd(myLabel); SubWidgetAdd(myLabel);
} }
}; };
@ -107,10 +106,8 @@ MainWindows::MainWindows(void)
mySizerHori = new widget::Sizer(widget::Sizer::modeHori); mySizerHori = new widget::Sizer(widget::Sizer::modeHori);
mySizerVert->SubWidgetAdd(mySizerHori); mySizerVert->SubWidgetAdd(mySizerHori);
myBufferView = new BufferView(); myBufferView = new BufferView();
myBufferView->SetExpendX(false); myBufferView->SetExpand(bvec2(false,true));
myBufferView->SetExpendY(true); myBufferView->SetFill(bvec2(true,true));
myBufferView->SetFillX(true);
myBufferView->SetFillY(true);
mySizerHori->SubWidgetAdd(myBufferView); mySizerHori->SubWidgetAdd(myBufferView);
mySizerVert2 = new widget::Sizer(widget::Sizer::modeVert); mySizerVert2 = new widget::Sizer(widget::Sizer::modeVert);
@ -118,10 +115,8 @@ MainWindows::MainWindows(void)
// main buffer Area : // main buffer Area :
myCodeView = new CodeView("FreeMono", 11); myCodeView = new CodeView("FreeMono", 11);
myCodeView->SetExpendX(true); myCodeView->SetExpand(bvec2(true,true));
myCodeView->SetExpendY(true); myCodeView->SetFill(bvec2(true,true));
myCodeView->SetFillX(true);
myCodeView->SetFillY(true);
mySizerVert2->SubWidgetAdd(myCodeView); mySizerVert2->SubWidgetAdd(myCodeView);
// search area : // search area :
@ -139,7 +134,7 @@ MainWindows::MainWindows(void)
widget::Slider* tmpSlider = new widget::Slider(); widget::Slider* tmpSlider = new widget::Slider();
mySizerHori2->SubWidgetAdd(tmpSlider); mySizerHori2->SubWidgetAdd(tmpSlider);
tmpSlider->RegisterOnEvent(this, ewolEventSliderChange, l_smoothMin); tmpSlider->RegisterOnEvent(this, ewolEventSliderChange, l_smoothMin);
tmpSlider->SetExpendX(true); tmpSlider->SetExpand(bvec2(true,false));
tmpSlider->SetMin(0); tmpSlider->SetMin(0);
tmpSlider->SetMax(1000); tmpSlider->SetMax(1000);
tmpSlider->SetValue(0450); tmpSlider->SetValue(0450);
@ -148,7 +143,7 @@ MainWindows::MainWindows(void)
tmpSlider = new widget::Slider(); tmpSlider = new widget::Slider();
mySizerHori2->SubWidgetAdd(tmpSlider); mySizerHori2->SubWidgetAdd(tmpSlider);
tmpSlider->RegisterOnEvent(this, ewolEventSliderChange, l_smoothMax); tmpSlider->RegisterOnEvent(this, ewolEventSliderChange, l_smoothMax);
tmpSlider->SetExpendX(true); tmpSlider->SetExpand(bvec2(true,false));
tmpSlider->SetMin(0); tmpSlider->SetMin(0);
tmpSlider->SetMax(1000); tmpSlider->SetMax(1000);
tmpSlider->SetValue(0550); tmpSlider->SetValue(0550);
@ -209,8 +204,8 @@ MainWindows::MainWindows(void)
(void)myMenu->Add(idMenugDisplay, "Reload OpenGl Shader", "", ednMsgGuiReloadShader); (void)myMenu->Add(idMenugDisplay, "Reload OpenGl Shader", "", ednMsgGuiReloadShader);
m_widgetLabelFileName = new widget::Label("<left>FileName</left>"); m_widgetLabelFileName = new widget::Label("<left>FileName</left>");
m_widgetLabelFileName->SetExpendX(true); m_widgetLabelFileName->SetExpand(bvec2(true,false));
m_widgetLabelFileName->SetFillY(true); m_widgetLabelFileName->SetFill(bvec2(false,true));;
mySizerHori->SubWidgetAdd(m_widgetLabelFileName); mySizerHori->SubWidgetAdd(m_widgetLabelFileName);

12
sources/appl/Gui/Search.cpp
View File

@ -38,7 +38,7 @@ Search::Search(void) :
m_forward = false; m_forward = false;
widget::Button * myButtonImage = NULL; widget::Button * myButtonImage = NULL;
myButtonImage = new widget::Button("", ""); myButtonImage = new widget::Button("");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
@ -59,7 +59,7 @@ Search::Search(void) :
SubWidgetAdd(m_searchEntry); SubWidgetAdd(m_searchEntry);
} }
myButtonImage = new widget::Button("",""); myButtonImage = new widget::Button("");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
@ -80,7 +80,7 @@ Search::Search(void) :
SubWidgetAdd(m_replaceEntry); SubWidgetAdd(m_replaceEntry);
} }
myButtonImage = new widget::Button("",""); myButtonImage = new widget::Button("");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
@ -90,7 +90,7 @@ Search::Search(void) :
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new widget::Button("",""); myButtonImage = new widget::Button("");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
@ -103,7 +103,7 @@ Search::Search(void) :
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new widget::Button("",""); myButtonImage = new widget::Button("");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {
@ -116,7 +116,7 @@ Search::Search(void) :
SubWidgetAdd(myButtonImage); SubWidgetAdd(myButtonImage);
} }
myButtonImage = new widget::Button("",""); myButtonImage = new widget::Button("");
if (NULL == myButtonImage) { if (NULL == myButtonImage) {
APPL_ERROR("Widget allocation error ==> it will missing in the display"); APPL_ERROR("Widget allocation error ==> it will missing in the display");
} else { } else {

13
sources/appl/global.cpp
View File

@ -123,15 +123,14 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
if (NULL == mySpacer) { if (NULL == mySpacer) {
APPL_ERROR("Can not allocate widget ==> display might be in error"); APPL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
mySpacer->SetExpendX(true); mySpacer->SetExpand(bvec2(true,true));
mySpacer->SetExpendY(true);
SubWidgetAdd(mySpacer); SubWidgetAdd(mySpacer);
} }
myCheckbox = new widget::CheckBox("Automatic Indentation"); myCheckbox = new widget::CheckBox("Automatic Indentation");
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget ==> display might be in error"); APPL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
myCheckbox->SetExpendX(true); myCheckbox->SetExpand(bvec2(true,false));
myCheckbox->SetValue(IsSetAutoIndent()); myCheckbox->SetValue(IsSetAutoIndent());
myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeIndentation); myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeIndentation);
SubWidgetAdd(myCheckbox); SubWidgetAdd(myCheckbox);
@ -140,7 +139,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget ==> display might be in error"); APPL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
myCheckbox->SetExpendX(true); myCheckbox->SetExpand(bvec2(true,false));
myCheckbox->SetValue(IsSetDisplaySpaceChar()); myCheckbox->SetValue(IsSetDisplaySpaceChar());
myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeSpace); myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeSpace);
SubWidgetAdd(myCheckbox); SubWidgetAdd(myCheckbox);
@ -149,7 +148,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget ==> display might be in error"); APPL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
myCheckbox->SetExpendX(true); myCheckbox->SetExpand(bvec2(true,false));
myCheckbox->SetValue(IsSetDisplayTabChar()); myCheckbox->SetValue(IsSetDisplayTabChar());
myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeTabulation); myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeTabulation);
SubWidgetAdd(myCheckbox); SubWidgetAdd(myCheckbox);
@ -158,7 +157,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget ==> display might be in error"); APPL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
myCheckbox->SetExpendX(true); myCheckbox->SetExpand(bvec2(true,false));
myCheckbox->SetValue(IsSetDisplayEndOfLine()); myCheckbox->SetValue(IsSetDisplayEndOfLine());
myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeEndOfLine); myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeEndOfLine);
SubWidgetAdd(myCheckbox); SubWidgetAdd(myCheckbox);
@ -167,7 +166,7 @@ globals::ParameterGlobalsGui::ParameterGlobalsGui(void) :
if (NULL == myCheckbox) { if (NULL == myCheckbox) {
APPL_ERROR("Can not allocate widget ==> display might be in error"); APPL_ERROR("Can not allocate widget ==> display might be in error");
} else { } else {
myCheckbox->SetExpendX(true); myCheckbox->SetExpand(bvec2(true,false));
myCheckbox->SetValue(IsSetDisplayEndOfLine()); myCheckbox->SetValue(IsSetDisplayEndOfLine());
myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeRounded); myCheckbox->RegisterOnEvent(this, ewolEventCheckBoxClicked, l_changeRounded);
SubWidgetAdd(myCheckbox); SubWidgetAdd(myCheckbox);