github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Default build method layout now completly depends on ctrls with usc binding

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8748 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2015-07-25 19:13:34 +00:00
parent bce47a0af8
commit 09dee46772
6 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
uppsrc/ide/Methods.cpp
View file

@ -1,16 +1,5 @@
#include "Methods.h"
void TextSwitch::SetData(const Value& data)
{
String s = data;
Switch::SetData(atoi((String)data));
}
Value TextSwitch::GetData() const
{
return AsString(Switch::GetData());
}
void DirTable::SetData(const Value& data)
{
Vector<String> l = Split((String)data, ';');
@ -329,8 +318,6 @@ DefaultBuilderSetup::DefaultBuilderSetup()
{
CtrlLayout(*this);
allow_pch.SetLabel("Allow precompiled headers");
paths.Add(path.SizePos(), "PATH - executable directories");
paths.Add(include.SizePos(), "INCLUDE directories");
paths.Add(lib.SizePos(), "LIB directories");

11
uppsrc/ide/Methods.h
View file

@ -3,12 +3,6 @@
#include "ide.h"
class TextSwitch : public Switch {
public:
virtual void SetData(const Value& data);
virtual Value GetData() const;
};
class DirTable : public ArrayCtrl {
public:
virtual void SetData(const Value& data);
@ -106,11 +100,6 @@ public:
class DefaultBuilderSetup : public WithBuildMethodsDefaultBuilderSetupLayout<BuilderSetupInterface> {
public:
TextOption debug_blitz;
TextSwitch debug_linkmode;
TextOption release_blitz;
TextSwitch release_linkmode;
TextOption allow_pch;
DirTable path;
DirTable include;
DirTable lib;

11
uppsrc/ide/MethodsCtrls.cpp
View file

@ -10,3 +10,14 @@ Value TextOption::GetData() const
{
return Get() ? "1" : "0";
}
void TextSwitch::SetData(const Value& data)
{
String s = data;
Switch::SetData(atoi((String)data));
}
Value TextSwitch::GetData() const
{
return AsString(Switch::GetData());
}

6
uppsrc/ide/MethodsCtrls.h
View file

@ -11,6 +11,12 @@ public:
virtual Value GetData() const;
};
class TextSwitch : public Switch {
public:
virtual void SetData(const Value& data);
virtual Value GetData() const;
};
END_UPP_NAMESPACE
#endif

10
uppsrc/ide/ide.lay
View file

@ -244,17 +244,17 @@ LAYOUT(BuildMethodsDefaultBuilderSetupLayout, 648, 500)
ITEM(LabelBox, dv___12, SetLabel(t_("Tools")).HSizePosZ(0, 0).TopPosZ(0, 44))
ITEM(Label, dv___13, SetLabel(t_("Default debug info level:")).LeftPosZ(4, 132).TopPosZ(152, 19))
ITEM(DropList, debug_info, LeftPosZ(140, 116).TopPosZ(152, 19))
UNTYPED(debug_blitz, SwitchImage(false).SetLabel(t_("Use BLIT&Z")).HSizePosZ(264, 276).TopPosZ(152, 15))
UNTYPED(debug_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(376, 12).TopPosZ(152, 15))
ITEM(TextOption, debug_blitz, SetLabel(t_("Use BLIT&Z")).HSizePosZ(264, 276).TopPosZ(152, 15))
ITEM(TextOption, debug_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(376, 12).TopPosZ(152, 15))
ITEM(Label, dv___17, SetLabel(t_("&Debug options:")).LeftPosZ(0, 112).TopPosZ(184, 19))
ITEM(EditString, debug_options, HSizePosZ(116, 0).TopPosZ(184, 19))
ITEM(Label, dv___19, SetLabel(t_("Debug fixed flags:")).LeftPosZ(0, 112).TopPosZ(204, 19))
ITEM(EditString, debug_flags, HSizePosZ(116, 0).TopPosZ(204, 19))
ITEM(Label, dv___21, SetLabel(t_("Debug link options:")).LeftPosZ(0, 112).TopPosZ(224, 19))
ITEM(EditString, debug_link, HSizePosZ(116, 0).TopPosZ(224, 19))
UNTYPED(release_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(376, 20).TopPosZ(268, 16))
ITEM(TextSwitch, release_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(376, 20).TopPosZ(268, 16))
ITEM(LabelBox, dv___24, SetLabel(t_("Release mode defaults")).HSizePosZ(0, 0).TopPosZ(252, 40))
UNTYPED(release_blitz, SwitchImage(false).SetLabel(t_("&Use BLITZ")).LeftPosZ(8, 256).TopPosZ(268, 15))
ITEM(TextOption, release_blitz, SetLabel(t_("&Use BLITZ")).LeftPosZ(8, 256).TopPosZ(268, 15))
ITEM(Label, dv___26, SetLabel(t_("Optimize for speed:")).LeftPosZ(0, 112).TopPosZ(296, 19))
ITEM(EditString, speed_options, HSizePosZ(116, 0).TopPosZ(296, 19))
ITEM(Label, dv___28, SetLabel(t_("Optimize for size:")).LeftPosZ(0, 112).TopPosZ(316, 19))
@ -264,7 +264,7 @@ LAYOUT(BuildMethodsDefaultBuilderSetupLayout, 648, 500)
ITEM(Label, dv___32, SetLabel(t_("Release link options:")).LeftPosZ(0, 112).TopPosZ(356, 19))
ITEM(EditString, release_link, HSizePosZ(116, 0).TopPosZ(356, 19))
ITEM(TabCtrl, paths, HSizePosZ(0, 0).VSizePosZ(400, 0))
UNTYPED(allow_pch, LeftPosZ(0, 212).TopPosZ(380, 16))
ITEM(TextOption, allow_pch, SetLabel(t_("Allow precompiled headers")).LeftPosZ(0, 212).TopPosZ(380, 16))
ITEM(LabelBox, dv___36, SetLabel(t_("Debug mode defaults")).HSizePosZ(0, 0).TopPosZ(136, 44))
END_LAYOUT

8
uppsrc/ide/ide.usc
View file

@ -1,4 +1,8 @@
// MethodsCtrl
subctrl TextOption {
>Option;
}
> Option;
};
subctrl TextSwitch {
> Switch;
};