From 9e2668303436fe5cfeaff82d71e05ecb20b3950d Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 3 Sep 2012 11:35:15 +0000 Subject: [PATCH] ide: Remote development settings removed git-svn-id: svn://ultimatepp.org/upp/trunk@5312 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Img/Img.upp | 2 ++ uppsrc/ide/Methods.cpp | 2 ++ uppsrc/ide/ide.lay | 14 +++----------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/uppsrc/ide/Img/Img.upp b/uppsrc/ide/Img/Img.upp index 47e22f092..b2d2e0d5c 100644 --- a/uppsrc/ide/Img/Img.upp +++ b/uppsrc/ide/Img/Img.upp @@ -1,3 +1,5 @@ +description "\377B"; + file Img.h, Png.cpp, diff --git a/uppsrc/ide/Methods.cpp b/uppsrc/ide/Methods.cpp index 2fa139914..d472d8c03 100644 --- a/uppsrc/ide/Methods.cpp +++ b/uppsrc/ide/Methods.cpp @@ -199,6 +199,7 @@ BuildMethods::BuildMethods() method.AddCtrl("PATH", path); method.AddCtrl("INCLUDE", include); method.AddCtrl("LIB", lib); +#if 0 // REMOTE REMOVED method.AddCtrl("REMOTE_HOST", remote_host); method.AddCtrl("REMOTE_OS", remote_os); remote_os.Add("WIN32"); @@ -211,6 +212,7 @@ BuildMethods::BuildMethods() remote_file_access.Add("0", "direct (SAMBA)"); remote_file_access.Add("1", "indirect (transfer)"); method.AddCtrl("REMOTE_MAP", remote_path_map); +#endif method.AddCtrl("SCRIPT", scriptfile); method.AddCtrl("LINKMODE_LOCK", linkmode_lock); open_script.Attach(scriptfile); diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay index 69c37e58e..01b0743bd 100644 --- a/uppsrc/ide/ide.lay +++ b/uppsrc/ide/ide.lay @@ -35,7 +35,7 @@ LAYOUT(ConfLayout, 344, 416) ITEM(LabelBox, dv___4, SetLabel(t_("Thread model")).LeftPosZ(204, 130).TopPosZ(0, 52)) ITEM(Switch, mt, SetLabel(t_("Singlethreaded\nMultithreaded")).LeftPosZ(212, 118).TopPosZ(16, 34)) ITEM(Option, sse2, SetLabel(t_("Use SSE2")).LeftPosZ(8, 248).TopPosZ(56, 16)) - ITEM(ArrayCtrl, accepts, VertGrid(false).AutoHideSb(true).HorzGrid(false).SetLineCy(20).HSizePosZ(8, 10).VSizePosZ(76, 64)) + ITEM(ArrayCtrl, accepts, AutoHideSb(true).VertGrid(false).HorzGrid(false).SetLineCy(20).HSizePosZ(8, 10).VSizePosZ(76, 64)) ITEM(Label, dv___8, SetLabel(t_("&Other flags:")).LeftPosZ(8, 58).BottomPosZ(39, 19)) ITEM(EditString, other, LeftPosZ(68, 268).BottomPosZ(39, 19)) ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24)) @@ -198,20 +198,12 @@ LAYOUT(BuildMethodsLayout, 724, 560) ITEM(EditString, release_flags, RightPosZ(4, 172).TopPosZ(132, 19)) ITEM(Label, dv___27, SetLabel(t_("Release link options:")).RightPosZ(176, 100).TopPosZ(152, 19)) ITEM(EditString, release_link, RightPosZ(4, 172).TopPosZ(152, 19)) - ITEM(TabCtrl, paths, HSizePosZ(160, 4).VSizePosZ(180, 140)) - ITEM(LabelBox, dv___30, SetLabel(t_("Remote host")).HSizePosZ(164, 4).BottomPosZ(40, 96)) - ITEM(Label, dv___31, SetLabel(t_("&Remote host[:port]:")).LeftPosZ(174, 96).BottomPosZ(98, 19)) - ITEM(EditField, remote_host, HSizePosZ(272, 328).BottomPosZ(99, 19)) - ITEM(Label, dv___33, SetLabel(t_("&OS type:")).LeftPosZ(174, 80).BottomPosZ(74, 19)) - ITEM(DropList, remote_os, HSizePosZ(272, 326).BottomPosZ(75, 19)) - ITEM(Label, dv___35, SetLabel(t_("File &access:")).LeftPosZ(174, 78).BottomPosZ(51, 19)) - ITEM(DropList, remote_file_access, HSizePosZ(272, 326).BottomPosZ(53, 19)) - UNTYPED(remote_path_map, RightPosZ(12, 308).BottomPosZ(49, 71)) + ITEM(TabCtrl, paths, HSizePosZ(160, 4).VSizePosZ(180, 40)) ITEM(Button, setdefault, SetLabel(t_("&Set as default")).LeftPosZ(4, 152).BottomPosZ(40, 22)) ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22)) ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22)) ITEM(Option, use_target, SetLabel(t_("Store all target files\nin the same directory")).LeftPosZ(4, 148).BottomPosZ(74, 28)) - ITEM(Label, dv___42, SetLabel(t_("Script file:")).LeftPosZ(4, 54).BottomPosZ(133, 19)) + ITEM(Label, dv___34, SetLabel(t_("Script file:")).LeftPosZ(4, 54).BottomPosZ(133, 19)) ITEM(EditField, scriptfile, LeftPosZ(4, 152).BottomPosZ(113, 19)) UNTYPED(linkmode_lock, LeftPosZ(4, 148).TopPosZ(384, 20)) END_LAYOUT