From 08ed64ff6868d5f4aa1d97f49874e6717c3afc77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20R=C4=99bacz?= Date: Sun, 3 Jul 2022 21:04:12 +0200 Subject: [PATCH] GridCtrl layout control has been move to Upp namespace. (#78) --- examples/HomeBudget/HomeBudget.lay | 74 ++++++++++++------------- reference/GridCtrlTest/GridCtrlTest.lay | 20 +++---- reference/GridCtrlTest/Panel.lay | 2 +- uppsrc/DropGrid/DropGrid.usc | 2 + uppsrc/GridCtrl/GridCtrl.usc | 2 + 5 files changed, 52 insertions(+), 48 deletions(-) diff --git a/examples/HomeBudget/HomeBudget.lay b/examples/HomeBudget/HomeBudget.lay index ff3fc2ce8..35313b855 100644 --- a/examples/HomeBudget/HomeBudget.lay +++ b/examples/HomeBudget/HomeBudget.lay @@ -1,52 +1,52 @@ LAYOUT(HomeBudgetLayout, 748, 400) - ITEM(GridCtrl, month, LeftPosZ(4, 124).VSizePosZ(4, 34)) - ITEM(TabCtrl, tab, HSizePosZ(132, 2).VSizePosZ(4, 186)) - ITEM(Button, about, SetLabel(t_("About")).LeftPosZ(4, 76).BottomPosZ(4, 26)) - ITEM(Button, help, SetLabel(t_("Help")).LeftPosZ(84, 76).BottomPosZ(4, 26)) - ITEM(Button, options, SetLabel(t_("Options")).LeftPosZ(164, 76).BottomPosZ(4, 26)) - ITEM(Button, exit, SetLabel(t_("Exit")).RightPosZ(6, 76).BottomPosZ(4, 26)) - ITEM(LabelBox, dv___6, SetLabel(t_("Summary")).HSizePosZ(132, 224).BottomPosZ(34, 148)) - ITEM(StaticText, dv___7, SetText(t_("Income:")).SetFont(StdFontZ(18).Bold()).LeftPosZ(140, 88).BottomPosZ(144, 22)) - ITEM(StaticText, plus, SetFont(StdFontZ(18).Bold()).HSizePosZ(232, 376).BottomPosZ(144, 22)) - ITEM(StaticText, dv___9, SetText(t_("Spent:")).SetFont(StdFontZ(18).Bold()).LeftPosZ(140, 88).BottomPosZ(118, 24)) - ITEM(StaticText, minus, SetFont(StdFontZ(18).Bold()).HSizePosZ(232, 376).BottomPosZ(120, 22)) - ITEM(StaticText, rest_label, SetText(t_("Rest:")).SetFont(StdFontZ(18).Bold()).LeftPosZ(140, 88).BottomPosZ(96, 22)) - ITEM(StaticText, rest, SetFont(StdFontZ(18).Bold()).HSizePosZ(232, 376).BottomPosZ(96, 22)) - ITEM(StaticText, dv___13, SetText(t_("Amount from prev. month:")).SetFont(StdFontZ(18).Bold()).LeftPosZ(140, 268).BottomPosZ(72, 22)) - ITEM(StaticText, prev_month, SetFont(StdFontZ(18).Bold()).HSizePosZ(412, 232).BottomPosZ(72, 22)) - ITEM(StaticText, dv___15, SetText(t_("Final rest:")).SetFont(StdFontZ(18).Bold()).LeftPosZ(140, 268).BottomPosZ(48, 22)) - ITEM(StaticText, real_rest, SetFont(StdFontZ(18).Bold()).HSizePosZ(412, 232).BottomPosZ(48, 22)) - ITEM(LabelBox, dv___17, SetLabel(t_("Most expensive")).RightPosZ(4, 216).BottomPosZ(34, 148)) - ITEM(TabCtrl, tabmost, RightPosZ(12, 200).BottomPosZ(42, 124)) + ITEM(Upp::GridCtrl, month, LeftPosZ(4, 124).VSizePosZ(4, 34)) + ITEM(Upp::TabCtrl, tab, HSizePosZ(132, 2).VSizePosZ(4, 186)) + ITEM(Upp::Button, about, SetLabel(t_("About")).LeftPosZ(4, 76).BottomPosZ(4, 26)) + ITEM(Upp::Button, help, SetLabel(t_("Help")).LeftPosZ(84, 76).BottomPosZ(4, 26)) + ITEM(Upp::Button, options, SetLabel(t_("Options")).LeftPosZ(164, 76).BottomPosZ(4, 26)) + ITEM(Upp::Button, exit, SetLabel(t_("Exit")).RightPosZ(6, 76).BottomPosZ(4, 26)) + ITEM(Upp::LabelBox, dv___6, SetLabel(t_("Summary")).HSizePosZ(132, 224).BottomPosZ(34, 148)) + ITEM(Upp::StaticText, dv___7, SetText(t_("Income:")).SetFont(Upp::StdFontZ(18).Bold()).LeftPosZ(140, 88).BottomPosZ(144, 22)) + ITEM(Upp::StaticText, plus, SetFont(Upp::StdFontZ(18).Bold()).HSizePosZ(232, 376).BottomPosZ(144, 22)) + ITEM(Upp::StaticText, dv___9, SetText(t_("Spent:")).SetFont(Upp::StdFontZ(18).Bold()).LeftPosZ(140, 88).BottomPosZ(118, 24)) + ITEM(Upp::StaticText, minus, SetFont(Upp::StdFontZ(18).Bold()).HSizePosZ(232, 376).BottomPosZ(120, 22)) + ITEM(Upp::StaticText, rest_label, SetText(t_("Rest:")).SetFont(Upp::StdFontZ(18).Bold()).LeftPosZ(140, 88).BottomPosZ(96, 22)) + ITEM(Upp::StaticText, rest, SetFont(Upp::StdFontZ(18).Bold()).HSizePosZ(232, 376).BottomPosZ(96, 22)) + ITEM(Upp::StaticText, dv___13, SetText(t_("Amount from prev. month:")).SetFont(Upp::StdFontZ(18).Bold()).LeftPosZ(140, 268).BottomPosZ(72, 22)) + ITEM(Upp::StaticText, prev_month, SetFont(Upp::StdFontZ(18).Bold()).HSizePosZ(412, 232).BottomPosZ(72, 22)) + ITEM(Upp::StaticText, dv___15, SetText(t_("Final rest:")).SetFont(Upp::StdFontZ(18).Bold()).LeftPosZ(140, 268).BottomPosZ(48, 22)) + ITEM(Upp::StaticText, real_rest, SetFont(Upp::StdFontZ(18).Bold()).HSizePosZ(412, 232).BottomPosZ(48, 22)) + ITEM(Upp::LabelBox, dv___17, SetLabel(t_("Most expensive")).RightPosZ(4, 216).BottomPosZ(34, 148)) + ITEM(Upp::TabCtrl, tabmost, RightPosZ(12, 200).BottomPosZ(42, 124)) END_LAYOUT LAYOUT(OptionsLayout, 216, 86) - ITEM(StaticText, dv___0, SetText(t_("Language")).LeftPosZ(4, 60).TopPosZ(4, 18)) - ITEM(DropList, lang, LeftPosZ(68, 144).TopPosZ(4, 19)) - ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(4, 74).BottomPosZ(4, 24)) - ITEM(Button, clear, SetLabel(t_("Clear all data from database")).RightPosZ(4, 208).BottomPosZ(34, 24)) + ITEM(Upp::StaticText, dv___0, SetText(t_("Language")).LeftPosZ(4, 60).TopPosZ(4, 18)) + ITEM(Upp::DropList, lang, LeftPosZ(68, 144).TopPosZ(4, 19)) + ITEM(Upp::Button, ok, SetLabel(t_("OK")).RightPosZ(4, 74).BottomPosZ(4, 24)) + ITEM(Upp::Button, clear, SetLabel(t_("Clear all data from database")).RightPosZ(4, 208).BottomPosZ(34, 24)) END_LAYOUT LAYOUT(AboutLayout, 456, 288) - ITEM(RichTextView, info, SetFrame(BlackFrame()).HSizePosZ(4, 4).TopPosZ(4, 252)) - ITEM(Button, cancel, SetLabel(t_("OK")).HCenterPosZ(72, 0).TopPosZ(260, 24)) + ITEM(Upp::RichTextView, info, SetFrame(Upp::BlackFrame()).HSizePosZ(4, 4).TopPosZ(4, 252)) + ITEM(Upp::Button, cancel, SetLabel(t_("OK")).HCenterPosZ(72, 0).TopPosZ(260, 24)) END_LAYOUT LAYOUT(NewCategoryLayout, 244, 108) - ITEM(StaticText, dv___0, SetText(t_("Category")).LeftPosZ(4, 60).TopPosZ(4, 19)) - ITEM(DropList, groups, LeftPosZ(68, 146).TopPosZ(4, 20)) - ITEM(Button, addgroup, LeftPosZ(218, 20).TopPosZ(4, 20)) - ITEM(StaticText, dv___3, SetText(t_("Name")).LeftPosZ(4, 60).TopPosZ(26, 19)) - ITEM(EditString, name, LeftPosZ(68, 172).TopPosZ(26, 19)) - ITEM(Switch, pm, SetLabel(t_("Plus\nMinus")).LeftPosZ(68, 100).TopPosZ(50, 15)) - ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(88, 74).TopPosZ(80, 24)) - ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(166, 74).TopPosZ(80, 24)) + ITEM(Upp::StaticText, dv___0, SetText(t_("Category")).LeftPosZ(4, 60).TopPosZ(4, 19)) + ITEM(Upp::DropList, groups, LeftPosZ(68, 146).TopPosZ(4, 20)) + ITEM(Upp::Button, addgroup, LeftPosZ(218, 20).TopPosZ(4, 20)) + ITEM(Upp::StaticText, dv___3, SetText(t_("Name")).LeftPosZ(4, 60).TopPosZ(26, 19)) + ITEM(Upp::EditString, name, LeftPosZ(68, 172).TopPosZ(26, 19)) + ITEM(Upp::Switch, pm, SetLabel(t_("Plus\nMinus")).LeftPosZ(68, 100).TopPosZ(50, 15)) + ITEM(Upp::Button, ok, SetLabel(t_("OK")).LeftPosZ(88, 74).TopPosZ(80, 24)) + ITEM(Upp::Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(166, 74).TopPosZ(80, 24)) END_LAYOUT LAYOUT(NewGroupLayout, 204, 56) - ITEM(StaticText, dv___0, SetText(t_("Name")).LeftPosZ(4, 60).TopPosZ(4, 19)) - ITEM(EditString, name, LeftPosZ(68, 130).TopPosZ(4, 19)) - ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(48, 74).TopPosZ(28, 24)) - ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(126, 74).TopPosZ(28, 24)) + ITEM(Upp::StaticText, dv___0, SetText(t_("Name")).LeftPosZ(4, 60).TopPosZ(4, 19)) + ITEM(Upp::EditString, name, LeftPosZ(68, 130).TopPosZ(4, 19)) + ITEM(Upp::Button, ok, SetLabel(t_("OK")).LeftPosZ(48, 74).TopPosZ(28, 24)) + ITEM(Upp::Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(126, 74).TopPosZ(28, 24)) END_LAYOUT diff --git a/reference/GridCtrlTest/GridCtrlTest.lay b/reference/GridCtrlTest/GridCtrlTest.lay index 963b43dc1..a08208f20 100644 --- a/reference/GridCtrlTest/GridCtrlTest.lay +++ b/reference/GridCtrlTest/GridCtrlTest.lay @@ -1,25 +1,25 @@ LAYOUT(GridPanel, 896, 540) - ITEM(TabCtrl, tab, HSizePosZ(4, 412).VSizePosZ(4, 28)) - ITEM(Button, resort, SetLabel(t_("Resort")).LeftPosZ(4, 104).BottomPosZ(4, 20)) - ITEM(Button, toxml, SetLabel(t_("To XML")).LeftPosZ(112, 56).BottomPosZ(4, 20)) - ITEM(Button, fromxml, SetLabel(t_("From XML")).LeftPosZ(172, 56).BottomPosZ(4, 20)) + ITEM(Upp::TabCtrl, tab, HSizePosZ(4, 412).VSizePosZ(4, 28)) + ITEM(Upp::Button, resort, SetLabel(t_("Resort")).LeftPosZ(4, 104).BottomPosZ(4, 20)) + ITEM(Upp::Button, toxml, SetLabel(t_("To XML")).LeftPosZ(112, 56).BottomPosZ(4, 20)) + ITEM(Upp::Button, fromxml, SetLabel(t_("From XML")).LeftPosZ(172, 56).BottomPosZ(4, 20)) ITEM(Panel, panel, RightPosZ(4, 404).VSizePosZ(4, 0)) END_LAYOUT LAYOUT(Test, 564, 356) - ITEM(GridCtrl, dv___0, MovingCols(true).MovingRows(true).LiveCursor(true).Indicator(true).LeftPosZ(112, 312).TopPosZ(48, 202)) + ITEM(Upp::GridCtrl, dv___0, Indicator(true).MovingCols(true).MovingRows(true).LiveCursor(true).LeftPosZ(112, 312).TopPosZ(48, 202)) END_LAYOUT LAYOUT(DynamicLayout, 380, 216) - ITEM(Button, create, SetLabel(t_("Create Grid")).LeftPosZ(4, 72).TopPosZ(4, 24)) - ITEM(Button, remove, SetLabel(t_("Remove Grid")).LeftPosZ(80, 72).TopPosZ(4, 24)) + ITEM(Upp::Button, create, SetLabel(t_("Create Grid")).LeftPosZ(4, 72).TopPosZ(4, 24)) + ITEM(Upp::Button, remove, SetLabel(t_("Remove Grid")).LeftPosZ(80, 72).TopPosZ(4, 24)) ITEM(Splitter, spl, HSizePosZ(4, 4).VSizePosZ(32, 4)) END_LAYOUT LAYOUT(DisplayLayout, 400, 200) - ITEM(LabelBox, dv___0, HSizePosZ(4, 8).VSizePosZ(12, 16)) - ITEM(Button, dv___1, SetLabel(t_("Button")).RightPosZ(32, 76).TopPosZ(72, 32)) - ITEM(DocEdit, dv___2, LeftPosZ(20, 168).TopPosZ(48, 104)) + ITEM(Upp::LabelBox, dv___0, HSizePosZ(4, 8).VSizePosZ(12, 16)) + ITEM(Upp::Button, dv___1, SetLabel(t_("Button")).RightPosZ(32, 76).TopPosZ(72, 32)) + ITEM(Upp::DocEdit, dv___2, LeftPosZ(20, 168).TopPosZ(48, 104)) END_LAYOUT LAYOUT(GridTestMain, 628, 520) diff --git a/reference/GridCtrlTest/Panel.lay b/reference/GridCtrlTest/Panel.lay index 1d96644ba..f12fb4a3b 100644 --- a/reference/GridCtrlTest/Panel.lay +++ b/reference/GridCtrlTest/Panel.lay @@ -63,7 +63,7 @@ END_LAYOUT LAYOUT(PanelLayout, 408, 572) ITEM(Upp::Button, clear_grid, SetLabel(t_("Clear grid")).RightPosZ(308, 96).BottomPosZ(4, 20)) ITEM(Upp::Button, reset_grid, SetLabel(t_("Reset grid")).RightPosZ(208, 92).BottomPosZ(4, 20)) - ITEM(Upp::LineEdit, log0, SetFont(MonospaceZ(12)).RightPosZ(4, 200).VSizePosZ(4, 28)) + ITEM(Upp::LineEdit, log0, SetFont(Upp::MonospaceZ(12)).RightPosZ(4, 200).VSizePosZ(4, 28)) ITEM(Upp::Button, clear, SetLabel(t_("Clear")).RightPosZ(4, 64).BottomPosZ(4, 20)) ITEM(Upp::Button, debug, SetLabel(t_("Debug")).RightPosZ(140, 64).BottomPosZ(4, 20)) ITEM(Upp::TabCtrl, opts, RightPosZ(208, 196).VSizePosZ(4, 28)) diff --git a/uppsrc/DropGrid/DropGrid.usc b/uppsrc/DropGrid/DropGrid.usc index 90dec06c2..a01b8572a 100644 --- a/uppsrc/DropGrid/DropGrid.usc +++ b/uppsrc/DropGrid/DropGrid.usc @@ -1,3 +1,5 @@ +namespace Upp; + ctrl DropGrid { group "Input fields"; diff --git a/uppsrc/GridCtrl/GridCtrl.usc b/uppsrc/GridCtrl/GridCtrl.usc index 07a8c8df0..754754f63 100644 --- a/uppsrc/GridCtrl/GridCtrl.usc +++ b/uppsrc/GridCtrl/GridCtrl.usc @@ -1,3 +1,5 @@ +namespace Upp; + fn PaintVertSb(w, r) { PaintVScrollBar(w, r);