Keep g_settings as a 'static' variable rather than a direct object.

modules/corelib/config.lua

@@ -71,6 +71,3 @@ function Config:getColor(key, default)
   return tocolor(self:get(key, default))
 end
 
-function Config:getColor(key, default)
-  return tocolor(self:get(key, default))
-end

modules/corelib/settings.lua

@@ -1,4 +1,82 @@
 -- @docclass
-g_settings = g_configs.getSettings()
+g_settings = {
+  impl = g_configs.getSettings()
+}
 
--- Reserved for settings specific functionality
+function g_settings.save()
+  g_settings.impl:save()
+end
+
+function g_settings.setList(key, list)
+  g_settings.impl:setList(key, list)
+end
+
+function g_settings.getList(key)
+  g_settings.impl:getList(key)
+end
+
+function g_settings.exists(key)
+  g_settings.impl:exists(key)
+end
+
+function g_settings.remove(key)
+  g_settings.impl:remove(key)
+end
+
+function g_settings.setNode(key, node)
+  g_settings.impl:setNode(key, node)
+end
+
+function g_settings.getNode(key)
+  g_settings.impl:getNode(key)
+end
+
+function g_settings.mergeNode(key, node)
+  g_settings.impl:mergeNode(key, node)
+end
+
+-- convenience methods
+
+function g_settings.set(key, value)
+  g_settings.impl:set(key, value)
+end
+
+function g_settings.setDefault(key, value)
+  return g_settings.impl:setDefault(key, value)
+end
+
+function g_settings.get(key, default)
+  return g_settings.impl:get(key, default)
+end
+
+function g_settings.getString(key, default)
+  return g_settings.impl:getString(key, default)
+end
+
+function g_settings.getInteger(key, default)
+  return g_settings.impl:getInteger(key, default)
+end
+
+function g_settings.getNumber(key, default)
+  return g_settings.impl:getNumber(key, default)
+end
+
+function g_settings.getBoolean(key, default)
+  return g_settings.impl:getBoolean(key, default)
+end
+
+function g_settings.getPoint(key, default)
+  return g_settings.impl:getPoint(key, default)
+end
+
+function g_settings.getRect(key, default)
+  return g_settings.impl:getRect(key, default)
+end
+
+function g_settings.getSize(key, default)
+  return g_settings.impl:getSize(key, default)
+end
+
+function g_settings.getColor(key, default)
+  return g_settings.impl:getColor(key, default)
+end

modules/corelib/ui/uiminiwindow.lua

@@ -93,7 +93,7 @@ function UIMiniWindow:setup()
 
   local oldParent = self:getParent()
 
-  local settings = g_settings:getNode('MiniWindows')
+  local settings = g_settings.getNode('MiniWindows')
   if settings then
     local selfSettings = settings[self:getId()]
     if selfSettings then
@@ -245,7 +245,7 @@ end
 
 function UIMiniWindow:getSettings(name)
   if not self.save then return nil end
-  local settings = g_settings:getNode('MiniWindows')
+  local settings = g_settings.getNode('MiniWindows')
   if settings then
     local selfSettings = settings[self:getId()]
     if selfSettings then
@@ -258,7 +258,7 @@ end
 function UIMiniWindow:setSettings(data)
   if not self.save then return end
 
-  local settings = g_settings:getNode('MiniWindows')
+  local settings = g_settings.getNode('MiniWindows')
   if not settings then
     settings = {}
   end
@@ -272,13 +272,13 @@ function UIMiniWindow:setSettings(data)
     settings[id][key] = value
   end
 
-  g_settings:setNode('MiniWindows', settings)
+  g_settings.setNode('MiniWindows', settings)
 end
 
 function UIMiniWindow:eraseSettings(data)
   if not self.save then return end
 
-  local settings = g_settings:getNode('MiniWindows')
+  local settings = g_settings.getNode('MiniWindows')
   if not settings then
     settings = {}
   end
@@ -292,7 +292,7 @@ function UIMiniWindow:eraseSettings(data)
     settings[id][key] = nil
   end
 
-  g_settings:setNode('MiniWindows', settings)
+  g_settings.setNode('MiniWindows', settings)
 end
 
 function UIMiniWindow:saveParent(parent)