Hotkeys order, minimap mark windw changes

modules/corelib/string.lua

@@ -50,3 +50,20 @@ function string:explode(sep, limit)
   return t
 end
 
+function string:operatorLess(other)
+  local selfLower = self:lower()
+  local otherLower = other:lower()
+  local selfLen = self:len()
+  local otherLen = other:len()
+  local minLen = math.min(selfLen, otherLen)
+  for i=1,minLen do
+    local selfByteI = string.byte(selfLower, i)
+    local otherByteI = string.byte(otherLower, i)
+    if selfByteI < otherByteI then
+      return true
+    elseif selfByteI > otherByteI then
+      return false
+    end
+  end
+  return selfLen < otherLen
+end

modules/game_hotkeys/hotkeys_manager.lua

@@ -252,7 +252,25 @@ end
 function addKeyCombo(messageBox, keyCombo, keySettings)
   local label = nil
   if currentHotkeysList:getChildById(keyCombo) == nil then
-    local label = g_ui.createWidget('HotkeyListLabel', currentHotkeysList)
+    local label = g_ui.createWidget('HotkeyListLabel')
+
+    local children = currentHotkeysList:getChildren()
+    if #children == 0 then
+      currentHotkeysList:addChild(label)
+    else
+      local add = false
+      for i=1,#children do
+        if keyCombo:operatorLess(children[i]:getId()) then
+          currentHotkeysList:insertChild(i, label)
+          add = true
+          break
+        end
+      end
+      if not add then
+        currentHotkeysList:addChild(label)
+      end
+    end
+
     label:setId(keyCombo)
     label:setColor(HotkeyColors.text)
     label:setText(keyCombo .. ': ')

modules/game_minimap/flagwindow.otui

@@ -26,7 +26,7 @@ FlagButton < CheckBox
 FlagWindow < MainWindow
   id: flagWindow
   !text: tr('Create Map Mark')
-  size: 196 170
+  size: 196 185
 
   Label
     id: position
@@ -110,7 +110,6 @@ FlagWindow < MainWindow
     anchors.left: prev.right
     anchors.top: prev.top
 
-  
   FlagButton
     id: flag11
     icon-clip: 0 11 11 11
@@ -176,15 +175,14 @@ FlagWindow < MainWindow
   Button
     id: okButton
     !text: tr('Ok')
-    anchors.top: prev.bottom
+    width: 64
-    anchors.left: parent.left
+    anchors.right: next.left
-    margin-top: 10
+    anchors.bottom: parent.bottom
-    width: 60
+    margin-right: 10
 
   Button
     id: cancelButton
     !text: tr('Cancel')
-    anchors.top: prev.top
+    width: 64
-    anchors.left: prev.right
+    anchors.right: parent.right
-    margin-left: 15
+    anchors.bottom: parent.bottom
-    width: 60

modules/game_minimap/minimap.otui

@@ -104,4 +104,3 @@ MiniWindow
       anchors.top: parent.top
       margin: 4
       @onClick: center()
-