From d6ff3f91654d68ed46f1820791cec2a0125c29e1 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 6 Jul 2014 15:17:46 +0000 Subject: [PATCH] .cosmetics #782 git-svn-id: svn://ultimatepp.org/upp/trunk@7488 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/MKeys.h | 2 +- uppsrc/CtrlCore/init | 2 +- uppsrc/ide/Debug.cpp | 5 +++++ uppsrc/ide/ide.lay | 16 ++++++++-------- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/uppsrc/CtrlCore/MKeys.h b/uppsrc/CtrlCore/MKeys.h index 82f967cf9..001275fb9 100644 --- a/uppsrc/CtrlCore/MKeys.h +++ b/uppsrc/CtrlCore/MKeys.h @@ -1,4 +1,4 @@ -enum { +enum CtrlCoreKeys { #ifdef GUIPLATFORM_KEYCODES_INCLUDE #include GUIPLATFORM_KEYCODES_INCLUDE #else diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init index aa63470cf..27c33a181 100644 --- a/uppsrc/CtrlCore/init +++ b/uppsrc/CtrlCore/init @@ -3,7 +3,7 @@ #include "Draw/init" #include "plugin\bmp/init" #include "RichText/init" -#define BLITZ_INDEX__ F656a4ea94e4f808b1ec63034b0e6c5ac +#define BLITZ_INDEX__ Fe2ff541f9bb9f4ad3f5bcc23a34e1b73 #include "CtrlCore.icpp" #undef BLITZ_INDEX__ #endif diff --git a/uppsrc/ide/Debug.cpp b/uppsrc/ide/Debug.cpp index 0d254da8b..c1b05bcc8 100644 --- a/uppsrc/ide/Debug.cpp +++ b/uppsrc/ide/Debug.cpp @@ -3,6 +3,11 @@ void Ide::RunArgs() { WithRunLayout dlg; CtrlLayoutOKCancel(dlg, "Run options"); + +#ifndef PLATFORM_POSIX + dlg.consolemode.Hide(); + dlg.console_lable.Hide(); +#endif SelectDirButton dir_browse("Run in folder"); dir_browse.Attach(dlg.dir); diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay index 25c1cfc0b..537ba49c4 100644 --- a/uppsrc/ide/ide.lay +++ b/uppsrc/ide/ide.lay @@ -53,20 +53,20 @@ LAYOUT(CustomLayout, 608, 410) ITEM(Button, exit, SetLabel(t_("Close")).RightPosZ(4, 80).BottomPosZ(4, 22)) END_LAYOUT -LAYOUT(RunLayout, 416, 164) +LAYOUT(RunLayout, 420, 172) ITEM(Label, dv___0, SetLabel(t_("&Program arguments:")).LeftPosZ(4, 112).TopPosZ(4, 19)) - ITEM(WithDropChoice, arg, HSizePosZ(116, 4).TopPosZ(4, 19)) + ITEM(WithDropChoice, arg, HSizePosZ(120, 4).TopPosZ(4, 19)) ITEM(Label, dv___2, SetLabel(t_("&Working directory:")).LeftPosZ(4, 112).TopPosZ(28, 19)) - ITEM(EditString, dir, HSizePosZ(116, 4).TopPosZ(28, 19)) + ITEM(EditString, dir, HSizePosZ(120, 4).TopPosZ(28, 19)) ITEM(Label, dv___4, SetLabel(t_("STDOUT file:")).LeftPosZ(4, 112).TopPosZ(52, 19)) - ITEM(WithDropChoice, stdout_file, HSizePosZ(116, 4).TopPosZ(52, 19)) + ITEM(WithDropChoice, stdout_file, HSizePosZ(120, 4).TopPosZ(52, 19)) ITEM(Label, dv___6, SetLabel(t_("Standard output:")).LeftPosZ(4, 112).TopPosZ(76, 19)) - ITEM(Switch, runmode, SetLabel(t_("&Standalone\n&Console\n&File")).LeftPosZ(116, 212).TopPosZ(78, 19)) - ITEM(Option, external, SetLabel(t_("&External application")).LeftPosZ(116, 122).TopPosZ(96, 15)) - ITEM(Switch, consolemode, SetLabel(t_("Auto\nAlways\nNever")).LeftPosZ(236, 168).TopPosZ(112, 15)) + ITEM(Switch, runmode, SetLabel(t_("&Standalone\n&Console\n&File")).HSizePosZ(120, 4).TopPosZ(76, 19)) + ITEM(Option, external, SetLabel(t_("&External application")).HSizePosZ(120, 4).TopPosZ(96, 15)) + ITEM(Switch, consolemode, SetLabel(t_("Auto\nAlways\nNever")).HSizePosZ(120, 4).TopPosZ(116, 20)) ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(8, 24)) ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(8, 24)) - ITEM(Label, dv___12, SetLabel(t_("Open console (POSIX)")).LeftPosZ(116, 116).TopPosZ(112, 16)) + ITEM(Label, console_lable, SetLabel(t_("Open console:")).LeftPosZ(4, 112).TopPosZ(116, 20)) END_LAYOUT LAYOUT(FindInFilesLayout, 420, 152)