diff --git a/uppsrc/CtrlLib/Ctrl.lay b/uppsrc/CtrlLib/Ctrl.lay index 03986025a..4058aa296 100644 --- a/uppsrc/CtrlLib/Ctrl.lay +++ b/uppsrc/CtrlLib/Ctrl.lay @@ -51,11 +51,11 @@ LAYOUT(FileSelectorLayout, 652, 400) ITEM(EditString, search, RightPosZ(8, 140).BottomPosZ(41, 19)) ITEM(Label, sort_lbl, SetLabel(t_("&Sort by")).LeftPosZ(8, 76).BottomPosZ(21, 15)) ITEM(Switch, sortext, SetLabel(t_("Name\nExtension")).LeftPosZ(84, 132).BottomPosZ(4, 32)) - ITEM(Option, readonly, SetLabel(t_("Read only")).LeftPosZ(224, 72).BottomPosZ(4, 16)) + ITEM(Option, readonly, SetLabel(t_("Read only")).LeftPosZ(224, 84).BottomPosZ(4, 16)) ITEM(Option, hidden, SetLabel(t_("Show hidden items")).RightPosZ(152, 152).BottomPosZ(22, 18)) ITEM(Option, hiddenfiles, SetLabel(t_("Show hidden files")).RightPosZ(152, 152).BottomPosZ(4, 16)) - ITEM(Button, ok, SetLabel(t_("Open")).RightPosZ(76, 64).BottomPosZ(8, 24)) - ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24)) + ITEM(Button, ok, SetLabel(t_("Open")).RightPosZ(80, 68).BottomPosZ(8, 24)) + ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 68).BottomPosZ(8, 24)) END_LAYOUT LAYOUT(PaletteLayout, 216, 332) @@ -101,28 +101,28 @@ LAYOUT(KeysLayout, 604, 500) ITEM(Button, defaults, SetLabel(t_("Defaults")).LeftPosZ(8, 64).TopPosZ(468, 24)) END_LAYOUT -LAYOUT(PrinterLayout, 372, 264) - ITEM(LabelBox, dv___0, SetLabel(t_("Printer")).LeftPosZ(8, 356).TopPosZ(4, 68)) - ITEM(Label, dv___1, SetLabel(t_("Printer")).LeftPosZ(16, 92).TopPosZ(20, 20)) - ITEM(DropList, printer, LeftPosZ(104, 252).TopPosZ(20, 19)) - ITEM(Label, dv___3, SetLabel(t_("Paper size")).LeftPosZ(16, 88).TopPosZ(44, 20)) - ITEM(DropList, paper, LeftPosZ(104, 84).TopPosZ(44, 19)) - ITEM(Label, dv___5, SetLabel(t_("Input slot")).LeftPosZ(196, 72).TopPosZ(44, 20)) - ITEM(DropList, slot, LeftPosZ(268, 88).TopPosZ(44, 19)) - ITEM(Label, dv___7, SetLabel(t_("Pages per sheet")).LeftPosZ(188, 104).TopPosZ(192, 20)) - ITEM(DropList, npage, LeftPosZ(296, 60).TopPosZ(192, 19)) - ITEM(LabelBox, dv___9, SetLabel(t_("Print range")).LeftPosZ(8, 216).TopPosZ(80, 88)) - ITEM(Switch, range, SetLabel(t_("All pages\nCurrent page\nPages from")).LeftPosZ(16, 196).TopPosZ(100, 60)) - ITEM(EditIntSpin, from, LeftPosZ(100, 52).TopPosZ(132, 19)) - ITEM(Label, dv___12, SetLabel(t_("to")).LeftPosZ(156, 16).TopPosZ(135, 13)) - ITEM(EditIntSpin, to, LeftPosZ(172, 48).TopPosZ(132, 19)) - ITEM(LabelBox, dv___14, SetLabel(t_("Copies")).LeftPosZ(232, 132).TopPosZ(80, 88)) - ITEM(Label, dv___15, SetLabel(t_("Copies")).LeftPosZ(244, 56).TopPosZ(100, 20)) - ITEM(EditIntSpin, copies, LeftPosZ(300, 56).TopPosZ(100, 19)) - ITEM(Option, collate, SetLabel(t_("Collate")).LeftPosZ(244, 116).TopPosZ(136, 19)) - ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(232, 64).TopPosZ(232, 24)) - ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(300, 64).TopPosZ(232, 24)) - ITEM(Switch, landscape, SetLabel(t_("Portrait\nLandscape")).LeftPosZ(16, 168).TopPosZ(194, 18)) - ITEM(LabelBox, dv___21, SetLabel(t_("Placement")).LeftPosZ(8, 356).TopPosZ(176, 48)) +LAYOUT(PrinterLayout, 380, 276) + ITEM(LabelBox, dv___0, SetLabel(t_("Printer")).HSizePosZ(8, 8).TopPosZ(8, 76)) + ITEM(Label, dv___1, SetLabel(t_("Printer")).LeftPosZ(16, 88).TopPosZ(28, 20)) + ITEM(DropList, printer, HSizePosZ(104, 16).TopPosZ(28, 19)) + ITEM(Label, dv___3, SetLabel(t_("Paper size")).LeftPosZ(16, 88).TopPosZ(52, 20)) + ITEM(DropList, paper, LeftPosZ(272, 92).TopPosZ(52, 19)) + ITEM(Label, dv___5, SetLabel(t_("Input slot")).LeftPosZ(204, 68).TopPosZ(52, 20)) + ITEM(DropList, slot, LeftPosZ(104, 92).TopPosZ(52, 19)) + ITEM(Label, dv___7, SetLabel(t_("Pages per sheet")).LeftPosZ(196, 108).TopPosZ(200, 20)) + ITEM(DropList, npage, LeftPosZ(308, 56).TopPosZ(200, 19)) + ITEM(LabelBox, dv___9, SetLabel(t_("Print range")).LeftPosZ(8, 224).TopPosZ(92, 80)) + ITEM(Switch, range, SetLabel(t_("All pages\nCurrent page\nPages from")).LeftPosZ(16, 196).TopPosZ(112, 56)) + ITEM(EditIntSpin, from, LeftPosZ(112, 44).TopPosZ(136, 19)) + ITEM(Label, dv___12, SetLabel(t_("to")).LeftPosZ(160, 16).TopPosZ(140, 13)) + ITEM(EditIntSpin, to, LeftPosZ(176, 44).TopPosZ(136, 19)) + ITEM(LabelBox, dv___14, SetLabel(t_("Copies")).HSizePosZ(240, 8).TopPosZ(92, 80)) + ITEM(Label, dv___15, SetLabel(t_("Copies")).LeftPosZ(252, 56).TopPosZ(112, 20)) + ITEM(EditIntSpin, copies, RightPosZ(16, 56).TopPosZ(112, 19)) + ITEM(Option, collate, SetLabel(t_("Collate")).RightPosZ(16, 112).TopPosZ(140, 19)) + ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24)) + ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24)) + ITEM(Switch, landscape, SetLabel(t_("Portrait\nLandscape")).LeftPosZ(16, 176).TopPosZ(200, 15)) + ITEM(LabelBox, dv___21, SetLabel(t_("Placement")).HSizePosZ(8, 8).TopPosZ(180, 52)) END_LAYOUT diff --git a/uppsrc/ide/ide.key b/uppsrc/ide/ide.key index 2c39c4980..ad2d1fe21 100644 --- a/uppsrc/ide/ide.key +++ b/uppsrc/ide/ide.key @@ -5,13 +5,13 @@ KEY(SAVEFILE, "Save", K_CTRL_S) KEY(READONLY, "Read only", 0) KEY(PACKAGESFILES, "Show/hide workspace", K_CTRL_SLASH) KEY(STATISTICS, "Statistics..", 0) -KEY(EXIT, "Exit", 0) +KEY(EXIT, "Exit", K_CTRL_Q) KEY(SPLIT, "Split editor vertical", K_CTRL_MINUS) KEY(VSPLIT, "Split editor horizontal", K_CTRL_BACKSLASH) KEY(SWAP, "Other editor", K_CTRL_GRAVE) KEY(CLOSETAB, "Close file tab", K_CTRL_U) KEY(CLOSETABS, "Close all file tabs", K_SHIFT|K_CTRL_U) -KEY(PRINT, "Print..", 0) +KEY(PRINT, "Print..", K_CTRL_P) KEY(FINDINFILES, "Find in Files..", K_CTRL_F|K_SHIFT) KEY(REPLACEINFILES, "Replace in Files..", K_CTRL_H|K_SHIFT)