diff options
| author | ruki <[email protected]> | 2018-02-01 23:06:33 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-02-01 12:39:20 +0800 |
| commit | 251cb9f992863cf53cf502c2e31126fba1e58432 (patch) | |
| tree | 04fc071704c195ec124f3e116cf7c944f8b3e435 | |
| parent | ea8eab3b9469101595502673dda4db42e167fcc0 (diff) | |
improve menuconf layout
| -rw-r--r-- | xmake/actions/config/xmake.lua | 8 | ||||
| -rw-r--r-- | xmake/core/ui/mconfdialog.lua | 2 | ||||
| -rw-r--r-- | xmake/core/ui/menuconf.lua | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/xmake/actions/config/xmake.lua b/xmake/actions/config/xmake.lua index 336572b5c..84616caf1 100644 --- a/xmake/actions/config/xmake.lua +++ b/xmake/actions/config/xmake.lua @@ -100,7 +100,7 @@ task("config") , " - static" , " - shared" , " - binary" } - , {nil, "host", "kv", "$(host)", "The current host environment." } + , {nil, "host", "kv", "$(host)", "The Current Host Environment." } -- show project menu options , function () @@ -113,14 +113,14 @@ task("config") end , {category = "Cross Complation Configuration"} - , {nil, "cross", "kv", nil, "The cross toolchains prefix" + , {nil, "cross", "kv", nil, "The Cross Toolchains Prefix" , ".e.g" , " - i386-mingw32-" , " - arm-linux-androideabi-" } - , {nil, "toolchains", "kv", nil, "The cross toolchains directory" + , {nil, "toolchains", "kv", nil, "The Cross Toolchains Directory" , ".e.g" , " - sdk/bin (/arm-linux-gcc ..)" } - , {nil, "sdk", "kv", nil, "The cross sdk directory" + , {nil, "sdk", "kv", nil, "The Cross SDK Directory" , ".e.g" , " - sdk/bin (toolchains)" , " - sdk/lib" diff --git a/xmake/core/ui/mconfdialog.lua b/xmake/core/ui/mconfdialog.lua index 8f2f76a87..41e2947a9 100644 --- a/xmake/core/ui/mconfdialog.lua +++ b/xmake/core/ui/mconfdialog.lua @@ -104,7 +104,7 @@ end function mconfdialog:menuconf() if not self._MENUCONF then local bounds = self:box():panel():bounds() - self._MENUCONF = menuconf:new("mconfdialog.menuconf", rect:new(math.floor(bounds:width() / 3), 0, bounds:width(), bounds:height())) + self._MENUCONF = menuconf:new("mconfdialog.menuconf", rect:new(math.floor(bounds:width() / 4), 0, bounds:width(), bounds:height())) self._MENUCONF:state_set("focused", true) -- we can select and highlight selected item end return self._MENUCONF diff --git a/xmake/core/ui/menuconf.lua b/xmake/core/ui/menuconf.lua index c4beb9d24..acf2fb007 100644 --- a/xmake/core/ui/menuconf.lua +++ b/xmake/core/ui/menuconf.lua @@ -242,9 +242,9 @@ function config:__tostring() if self.kind == "boolean" or (not self.kind and type(value) == "boolean") then -- boolean config? text = (value and "[*] " or "[ ] ") .. text elseif self.kind == "number" or (not self.kind and type(value) == "number") then -- number config? - text = "(" .. tostring(value or 0) .. ") " .. text + text = " " .. text .. " (" .. tostring(value or 0) .. ")" elseif self.kind == "string" or (not self.kind and type(value) == "string") then -- string config? - text = "(" .. tostring(value or "") .. ") " .. text + text = " " .. text .. " (" .. tostring(value or "") .. ")" elseif self.kind == "choice" then -- choice config? if self.values and #self.values > 0 then text = " " .. text .. " (" .. tostring(self.values[value or 1]) .. ")" .. " --->" |