diff --git a/uppsrc/ide/Abbr.cpp b/uppsrc/ide/Abbr.cpp index 274159098..c0735eb65 100644 --- a/uppsrc/ide/Abbr.cpp +++ b/uppsrc/ide/Abbr.cpp @@ -112,6 +112,9 @@ void Ide::LoadAbbr() abbr.Add("eib", "else\r\nif(@) {\r\n\t;\r\n}"); abbr.Add("f", "for(@;;)\r\n\t;"); abbr.Add("fb", "for(@;;) {\r\n\t\r\n}"); + abbr.Add("fi", "for(int i = 0; i < @.GetCount(); i++)"); + abbr.Add("fj", "for(int j = 0; j < @.GetCount(); j++)"); + abbr.Add("fk", "for(int k = 0; k < @.GetCount(); k++)"); abbr.Add("i", "if(@)\r\n\t;"); abbr.Add("ib", "if(@) {\r\n\t\r\n}"); abbr.Add("ie", "if(@)\r\n\t;\r\nelse\r\n\t;"); diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay index 8b294a0e4..d7cba400f 100644 --- a/uppsrc/ide/ide.lay +++ b/uppsrc/ide/ide.lay @@ -566,14 +566,14 @@ LAYOUT(InsertColorLayout, 432, 520) ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(284, 144).TopPosZ(492, 24)) END_LAYOUT -LAYOUT(AbbreviationsLayout, 424, 476) +LAYOUT(AbbreviationsLayout, 664, 476) ITEM(ArrayCtrl, abbr, LeftPosZ(4, 108).TopPosZ(4, 432)) - ITEM(CodeEditor, code, LeftPosZ(116, 304).TopPosZ(4, 408)) + ITEM(CodeEditor, code, LeftPosZ(116, 544).TopPosZ(4, 408)) ITEM(Button, add, SetLabel(t_("Add")).LeftPosZ(4, 64).TopPosZ(444, 24)) ITEM(Button, edit, SetLabel(t_("Edit")).LeftPosZ(72, 64).TopPosZ(444, 24)) ITEM(Button, remove, SetLabel(t_("Remove")).LeftPosZ(140, 64).TopPosZ(444, 24)) - ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(288, 64).TopPosZ(444, 24)) - ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(356, 64).TopPosZ(444, 24)) + ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(524, 64).TopPosZ(444, 24)) + ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(592, 64).TopPosZ(444, 24)) ITEM(Label, dv___7, SetLabel(t_("Use '@' character to place the caret.")).LeftPosZ(116, 304).TopPosZ(416, 19)) END_LAYOUT