Updated to OTCv8 3.1 rev 229

modules/client_options/custom.otui

@@ -45,17 +45,17 @@ OptionPanel
       type: horizontalBox
 
     OptionCheckBox
-      id: actionbarBottom1
+      id: actionbar1
       !text: tr('Bar 1')
       width: 60
 
     OptionCheckBox
-      id: actionbarBottom2
+      id: actionbar2
       !text: tr('Bar 2')
       width: 60
 
     OptionCheckBox
-      id: actionbarBottom3
+      id: actionbar3
       !text: tr('Bar 3')
       width: 60
 
@@ -75,17 +75,17 @@ OptionPanel
       type: horizontalBox
 
     OptionCheckBox
-      id: actionbarLeft1
+      id: actionbar4
       !text: tr('Bar 1')
       width: 60
 
     OptionCheckBox
-      id: actionbarLeft2
+      id: actionbar5
       !text: tr('Bar 2')
       width: 60
 
     OptionCheckBox
-      id: actionbarLeft3
+      id: actionbar6
       !text: tr('Bar 3')
       width: 60
 
@@ -104,17 +104,17 @@ OptionPanel
       visible: false
 
     OptionCheckBox
-      id: actionbarRight1
+      id: actionbar7
       !text: tr('Bar 1')
       width: 60
 
     OptionCheckBox
-      id: actionbarRight2
+      id: actionbar8
       !text: tr('Bar 2')
       width: 60
 
     OptionCheckBox
-      id: actionbarRight3
+      id: actionbar9
       !text: tr('Bar 3')
       width: 60
 

modules/client_options/options.lua

@@ -52,17 +52,15 @@ local defaultOptions = {
 
   topBar = true,
 
-  actionbarBottom1 = true,
-  actionbarBottom2 = false,
-  actionbarBottom3 = false,
-
-  actionbarLeft1 = false,
-  actionbarLeft2 = false,
-  actionbarLeft3 = false,
-
-  actionbarRight1 = false,
-  actionbarRight2 = false,
-  actionbarRight3 = false,
+  actionbar1 = true,
+  actionbar2 = false,
+  actionbar3 = false,
+  actionbar4 = false,
+  actionbar5 = false,
+  actionbar6 = false,
+  actionbar7 = false,
+  actionbar8 = false,
+  actionbar9 = false,
 
   actionbarLock = false,