data: Update to use NumStrips

32 files changed, 14 insertions, 66 deletions

diff --git a/data/bamboo-pen-and-touch.tablet b/data/bamboo-pen-and-touch.tablet
index 424e118..feea4dd 100644
--- a/data/bamboo-pen-and-touch.tablet
+++ b/data/bamboo-pen-and-touch.tablet
@@ -25,9 +25,6 @@ Touch=true
 Ring=false
 Ring2=false
 
-VStrip=false
-HStrip=false
-
 Buttons=4
 
 BuiltIn=false
diff --git a/data/cintiq-12wx.tablet b/data/cintiq-12wx.tablet
index 28c8023..39f2b93 100644
--- a/data/cintiq-12wx.tablet
+++ b/data/cintiq-12wx.tablet
@@ -40,7 +40,6 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
 
 [Features]
 Stylus=true
-VStrip=true
-HStrip=true
+NumStrips=2
 Buttons=10
 BuiltIn=true
diff --git a/data/cintiq-20wsx.tablet b/data/cintiq-20wsx.tablet
index baaa91d..716f2d2 100644
--- a/data/cintiq-20wsx.tablet
+++ b/data/cintiq-20wsx.tablet
@@ -44,7 +44,6 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
 [Features]
 Reversible=false
 Stylus=true
-VStrip=true
-HStrip=true
+NumStrips=2
 Buttons=14
 BuiltIn=true
diff --git a/data/cintiq-21ux.tablet b/data/cintiq-21ux.tablet
index 21d4271..26ef778 100644
--- a/data/cintiq-21ux.tablet
+++ b/data/cintiq-21ux.tablet
@@ -37,7 +37,6 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
 [Features]
 Reversible=false
 Stylus=true
-HStrip=true
-VStrip=true
+NumStrips=2
 Buttons=8
 BuiltIn=true
diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet
index 916b468..1a4af07 100644
--- a/data/cintiq-21ux2.tablet
+++ b/data/cintiq-21ux2.tablet
@@ -53,7 +53,6 @@ Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
 [Features]
 Stylus=true
 Ring=false
-VStrip=true
-HStrip=true
+NumStrips=2
 Buttons=18
 BuiltIn=true
diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet
index d9c3d12..f296d14 100644
--- a/data/cintiq-24hd.tablet
+++ b/data/cintiq-24hd.tablet
@@ -54,8 +54,6 @@ Stylus=true
 Reversible=false
 Touch=false
 Buttons=16
-VStrip=false
-HStrip=false
 Ring=true
 Ring2=true
 BuiltIn=true
diff --git a/data/generic.tablet b/data/generic.tablet
index a8e13b0..7be3033 100644
--- a/data/generic.tablet
+++ b/data/generic.tablet
@@ -6,7 +6,6 @@ DeviceMatch=generic
 Reversible=true
 Stylus=true
 Ring=true
-VStrip=true
-HStrip=true
+NumStrips=2
 Buttons=4
 BuiltIn=false
diff --git a/data/intuos-12x12.tablet b/data/intuos-12x12.tablet
index de29bd0..b4822a1 100644
--- a/data/intuos-12x12.tablet
+++ b/data/intuos-12x12.tablet
@@ -8,6 +8,4 @@ Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;0x096;0x094;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos-12x18.tablet b/data/intuos-12x18.tablet
index a46f0e2..560bfc4 100644
--- a/data/intuos-12x18.tablet
+++ b/data/intuos-12x18.tablet
@@ -8,6 +8,4 @@ Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;0x096;0x094;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos-4x5.tablet b/data/intuos-4x5.tablet
index ddcff74..236ca66 100644
--- a/data/intuos-4x5.tablet
+++ b/data/intuos-4x5.tablet
@@ -8,6 +8,4 @@ Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;0x096;0x094;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos-6x8.tablet b/data/intuos-6x8.tablet
index 1a7d62b..22a7dc1 100644
--- a/data/intuos-6x8.tablet
+++ b/data/intuos-6x8.tablet
@@ -8,6 +8,4 @@ Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;0x096;0x094;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos-9x12.tablet b/data/intuos-9x12.tablet
index d5f2325..ae817a9 100644
--- a/data/intuos-9x12.tablet
+++ b/data/intuos-9x12.tablet
@@ -8,6 +8,4 @@ Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;0x096;0x094;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos2-12x12.tablet b/data/intuos2-12x12.tablet
index c401c91..5f103ae 100644
--- a/data/intuos2-12x12.tablet
+++ b/data/intuos2-12x12.tablet
@@ -8,6 +8,4 @@ Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;0x096;0x094;0x007;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos2-12x18.tablet b/data/intuos2-12x18.tablet
index 11bc57a..86625a8 100644
--- a/data/intuos2-12x18.tablet
+++ b/data/intuos2-12x18.tablet
@@ -8,6 +8,4 @@ Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;0x096;0x094;0x007;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos2-4x5.tablet b/data/intuos2-4x5.tablet
index 370e98a..d6b6eff 100644
--- a/data/intuos2-4x5.tablet
+++ b/data/intuos2-4x5.tablet
@@ -8,6 +8,4 @@ Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;0x096;0x094;0x007;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos2-6x8.tablet b/data/intuos2-6x8.tablet
index 5c189a5..32c933b 100644
--- a/data/intuos2-6x8.tablet
+++ b/data/intuos2-6x8.tablet
@@ -9,6 +9,4 @@ Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;0x096;0x094;0x007;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos2-9x12.tablet b/data/intuos2-9x12.tablet
index 9f041bc..8186711 100644
--- a/data/intuos2-9x12.tablet
+++ b/data/intuos2-9x12.tablet
@@ -8,6 +8,4 @@ Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;0x096;0x094;0x007;
 
 [Features]
 Stylus=true
-HStrip=false
-VStrip=false
 Buttons=0
diff --git a/data/intuos3-12x12.tablet b/data/intuos3-12x12.tablet
index 70ec3ff..6a0d051 100644
--- a/data/intuos3-12x12.tablet
+++ b/data/intuos3-12x12.tablet
@@ -39,6 +39,5 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x017;0x097;
 
 [Features]
 Stylus=true
-HStrip=true
-VStrip=true
+NumStrips=2
 Buttons=8
diff --git a/data/intuos3-12x19.tablet b/data/intuos3-12x19.tablet
index a9afcbb..f60887e 100644
--- a/data/intuos3-12x19.tablet
+++ b/data/intuos3-12x19.tablet
@@ -39,6 +39,5 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x017;0x097;
 
 [Features]
 Stylus=true
-HStrip=true
-VStrip=true
+NumStrips=2
 Buttons=8
diff --git a/data/intuos3-4x5.tablet b/data/intuos3-4x5.tablet
index 34cdbd1..a1ab6b8 100644
--- a/data/intuos3-4x5.tablet
+++ b/data/intuos3-4x5.tablet
@@ -39,6 +39,5 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x017;0x097;
 
 [Features]
 Stylus=true
-HStrip=true
-VStrip=false
+NumStrips=1
 Buttons=4
diff --git a/data/intuos3-4x6.tablet b/data/intuos3-4x6.tablet
index ed9d638..3896ec6 100644
--- a/data/intuos3-4x6.tablet
+++ b/data/intuos3-4x6.tablet
@@ -38,6 +38,5 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x017;0x097;
 
 [Features]
 Stylus=true
-HStrip=true
-VStrip=false
+NumStrips=1
 Buttons=4
diff --git a/data/intuos3-6x11.tablet b/data/intuos3-6x11.tablet
index 8e549f7..5d106eb 100644
--- a/data/intuos3-6x11.tablet
+++ b/data/intuos3-6x11.tablet
@@ -38,6 +38,5 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x017;0x097;
 
 [Features]
 Stylus=true
-HStrip=true
-VStrip=true
+NumStrips=2
 Buttons=8
diff --git a/data/intuos3-6x8.tablet b/data/intuos3-6x8.tablet
index c34422f..9884b31 100644
--- a/data/intuos3-6x8.tablet
+++ b/data/intuos3-6x8.tablet
@@ -38,6 +38,5 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x017;0x097;
 
 [Features]
 Stylus=true
-HStrip=true
-VStrip=true
+NumStrips=2
 Buttons=8
diff --git a/data/intuos3-9x12.tablet b/data/intuos3-9x12.tablet
index 4eeff4a..7747195 100644
--- a/data/intuos3-9x12.tablet
+++ b/data/intuos3-9x12.tablet
@@ -38,6 +38,5 @@ Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x017;0x097;
 
 [Features]
 Stylus=true
-HStrip=true
-VStrip=true
+NumStrips=2
 Buttons=8
diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet
index 9eacf56..b9ad08c 100644
--- a/data/intuos4-12x19.tablet
+++ b/data/intuos4-12x19.tablet
@@ -44,7 +44,5 @@ Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
 Reversible=true
 Stylus=true
 Ring=true
-VStrip=false
-HStrip=false
 Buttons=9
 BuiltIn=false
diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet
index 9c56aba..15af85f 100644
--- a/data/intuos4-4x6.tablet
+++ b/data/intuos4-4x6.tablet
@@ -45,7 +45,5 @@ Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 Reversible=true
 Stylus=true
 Ring=true
-VStrip=false
-HStrip=false
 Buttons=7
 BuiltIn=false
diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet
index 41e9cd1..41965ce 100644
--- a/data/intuos4-6x9-wl.tablet
+++ b/data/intuos4-6x9-wl.tablet
@@ -45,7 +45,5 @@ Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 Reversible=true
 Stylus=true
 Ring=true
-VStrip=false
-HStrip=false
 Buttons=9
 BuiltIn=false
diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet
index d7a50db..81769e5 100644
--- a/data/intuos4-6x9.tablet
+++ b/data/intuos4-6x9.tablet
@@ -44,7 +44,5 @@ Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
 Reversible=true
 Stylus=true
 Ring=true
-VStrip=false
-HStrip=false
 Buttons=9
 BuiltIn=false
diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet
index 9862324..0ec5d3a 100644
--- a/data/intuos4-8x13.tablet
+++ b/data/intuos4-8x13.tablet
@@ -44,7 +44,5 @@ Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
 Reversible=true
 Stylus=true
 Ring=true
-VStrip=false
-HStrip=false
 Buttons=9
 BuiltIn=false
diff --git a/data/serial-wacf004.tablet b/data/serial-wacf004.tablet
index 758afba..0afca33 100644
--- a/data/serial-wacf004.tablet
+++ b/data/serial-wacf004.tablet
@@ -5,7 +5,5 @@ DeviceMatch=serial:0:0
 [Features]
 Stylus=true
 Ring=false
-VStrip=false
-HStrip=false
 Buttons=0
 BuiltIn=true
diff --git a/data/wacom.example b/data/wacom.example
index a089b92..28f2d1e 100644
--- a/data/wacom.example
+++ b/data/wacom.example
@@ -80,9 +80,8 @@ Ring=true
 # This tablet has a second touch ring (Cintiq 24HD)
 Ring2=false
 
-# This tablet has a vertical/horizontal scroll strip
-VStrip=false
-HStrip=false
+# This tablet's number of strips, default is zero
+NumStrips=1
 
 # Number of buttons on the tablet
 Buttons=9
diff --git a/data/wireless-pen-tablet.tablet b/data/wireless-pen-tablet.tablet
index 5b32d98..648d1b7 100644
--- a/data/wireless-pen-tablet.tablet
+++ b/data/wireless-pen-tablet.tablet
@@ -9,7 +9,5 @@ Height=6
 Reversible=false
 Stylus=true
 Ring=false
-VStrip=false
-HStrip=false
 Buttons=2
 BuiltIn=false