diff --git a/data/bamboo-0fg-m-p-alt.tablet b/data/bamboo-0fg-m-p-alt.tablet index b5736b4d4..fd64d9e07 100644 --- a/data/bamboo-0fg-m-p-alt.tablet +++ b/data/bamboo-0fg-m-p-alt.tablet @@ -52,7 +52,6 @@ Layout=bamboo-0fg-s-p-alt.svg Stylus=true Reversible=false Touch=false -Buttons=4 Ring=true [Buttons] diff --git a/data/bamboo-0fg-s-p-alt.tablet b/data/bamboo-0fg-s-p-alt.tablet index 0760378c7..d656e3178 100644 --- a/data/bamboo-0fg-s-p-alt.tablet +++ b/data/bamboo-0fg-s-p-alt.tablet @@ -53,7 +53,6 @@ Layout=bamboo-0fg-s-p-alt.svg Stylus=true Reversible=false Touch=false -Buttons=4 Ring=true [Buttons] diff --git a/data/bamboo-0fg-s-p.tablet b/data/bamboo-0fg-s-p.tablet index 6d607c5ce..700618530 100644 --- a/data/bamboo-0fg-s-p.tablet +++ b/data/bamboo-0fg-s-p.tablet @@ -53,7 +53,6 @@ Layout=bamboo-0fg-s-p.svg Stylus=true Reversible=false Touch=false -Buttons=4 Ring=true [Buttons] diff --git a/data/bamboo-16fg-m-pt.tablet b/data/bamboo-16fg-m-pt.tablet index ebc8ebba2..e1d8d83b6 100644 --- a/data/bamboo-16fg-m-pt.tablet +++ b/data/bamboo-16fg-m-pt.tablet @@ -22,7 +22,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-16fg-s-p.tablet b/data/bamboo-16fg-s-p.tablet index 9ac0a7939..29d8b2545 100644 --- a/data/bamboo-16fg-s-p.tablet +++ b/data/bamboo-16fg-s-p.tablet @@ -21,5 +21,4 @@ IntegratedIn= Stylus=true Reversible=true Touch=false -Buttons=0 EvdevCodes=BTN_LEFT;BTN_FORWARD;BTN_BACK;BTN_RIGHT diff --git a/data/bamboo-16fg-s-pt.tablet b/data/bamboo-16fg-s-pt.tablet index 47bfb67e5..eaed53c74 100644 --- a/data/bamboo-16fg-s-pt.tablet +++ b/data/bamboo-16fg-s-pt.tablet @@ -22,7 +22,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-16fg-s-t.tablet b/data/bamboo-16fg-s-t.tablet index 83eb1fc47..815edab81 100644 --- a/data/bamboo-16fg-s-t.tablet +++ b/data/bamboo-16fg-s-t.tablet @@ -21,7 +21,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-2fg-fun-m-pt.tablet b/data/bamboo-2fg-fun-m-pt.tablet index d0c3bf749..303ccf462 100644 --- a/data/bamboo-2fg-fun-m-pt.tablet +++ b/data/bamboo-2fg-fun-m-pt.tablet @@ -34,7 +34,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-2fg-fun-s-pt.tablet b/data/bamboo-2fg-fun-s-pt.tablet index 2265443d0..a0f408061 100644 --- a/data/bamboo-2fg-fun-s-pt.tablet +++ b/data/bamboo-2fg-fun-s-pt.tablet @@ -34,7 +34,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-2fg-m-p.tablet b/data/bamboo-2fg-m-p.tablet index 14107c669..a4e001b19 100644 --- a/data/bamboo-2fg-m-p.tablet +++ b/data/bamboo-2fg-m-p.tablet @@ -21,4 +21,3 @@ IntegratedIn= Stylus=true Reversible=true Touch=false -Buttons=0 diff --git a/data/bamboo-2fg-s-p.tablet b/data/bamboo-2fg-s-p.tablet index d04a80134..7fb7b8b7a 100644 --- a/data/bamboo-2fg-s-p.tablet +++ b/data/bamboo-2fg-s-p.tablet @@ -21,4 +21,3 @@ IntegratedIn= Stylus=true Reversible=true Touch=false -Buttons=0 diff --git a/data/bamboo-2fg-s-pt.tablet b/data/bamboo-2fg-s-pt.tablet index 4882e2259..f7ec9a083 100644 --- a/data/bamboo-2fg-s-pt.tablet +++ b/data/bamboo-2fg-s-pt.tablet @@ -34,7 +34,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-2fg-s-t.tablet b/data/bamboo-2fg-s-t.tablet index 2f0fb3a97..631ca9545 100644 --- a/data/bamboo-2fg-s-t.tablet +++ b/data/bamboo-2fg-s-t.tablet @@ -33,7 +33,6 @@ IntegratedIn= Stylus=false Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-4fg-fun-m.tablet b/data/bamboo-4fg-fun-m.tablet index c53715e8a..997a95f9a 100644 --- a/data/bamboo-4fg-fun-m.tablet +++ b/data/bamboo-4fg-fun-m.tablet @@ -22,7 +22,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-4fg-fun-s.tablet b/data/bamboo-4fg-fun-s.tablet index 428f8d016..f63254752 100644 --- a/data/bamboo-4fg-fun-s.tablet +++ b/data/bamboo-4fg-fun-s.tablet @@ -22,7 +22,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-4fg-s-pt.tablet b/data/bamboo-4fg-s-pt.tablet index 307a5d2a0..07c242422 100644 --- a/data/bamboo-4fg-s-pt.tablet +++ b/data/bamboo-4fg-s-pt.tablet @@ -22,7 +22,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-4fg-s-t.tablet b/data/bamboo-4fg-s-t.tablet index fef1a3faa..b3a0050a7 100644 --- a/data/bamboo-4fg-s-t.tablet +++ b/data/bamboo-4fg-s-t.tablet @@ -21,7 +21,6 @@ IntegratedIn= Stylus=false Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-4fg-se-m-pt.tablet b/data/bamboo-4fg-se-m-pt.tablet index 23175754d..7ca317c0e 100644 --- a/data/bamboo-4fg-se-m-pt.tablet +++ b/data/bamboo-4fg-se-m-pt.tablet @@ -22,7 +22,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-4fg-se-s-pt.tablet b/data/bamboo-4fg-se-s-pt.tablet index 58a8d90b6..c4115dc84 100644 --- a/data/bamboo-4fg-se-s-pt.tablet +++ b/data/bamboo-4fg-se-s-pt.tablet @@ -22,7 +22,6 @@ IntegratedIn= Stylus=true Reversible=true Touch=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/bamboo-one-m-p.tablet b/data/bamboo-one-m-p.tablet index 643627a87..f31e378b3 100644 --- a/data/bamboo-one-m-p.tablet +++ b/data/bamboo-one-m-p.tablet @@ -17,4 +17,3 @@ IntegratedIn= [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/bamboo-one.tablet b/data/bamboo-one.tablet index 4b3d6f101..d2bea7a5e 100644 --- a/data/bamboo-one.tablet +++ b/data/bamboo-one.tablet @@ -17,4 +17,3 @@ Stylus=true Touch=false Ring=false NumStrips=0 -Buttons=0 diff --git a/data/bamboo-pad-wireless.tablet b/data/bamboo-pad-wireless.tablet index a902e971e..c0e853db3 100644 --- a/data/bamboo-pad-wireless.tablet +++ b/data/bamboo-pad-wireless.tablet @@ -17,7 +17,6 @@ Layout=bamboo-pad.svg Stylus=true Reversible=false Touch=true -Buttons=2 [Buttons] Bottom=A;B diff --git a/data/bamboo-pad.tablet b/data/bamboo-pad.tablet index 918a8befe..de455c3b1 100644 --- a/data/bamboo-pad.tablet +++ b/data/bamboo-pad.tablet @@ -17,7 +17,6 @@ Layout=bamboo-pad.svg Stylus=true Reversible=false Touch=true -Buttons=2 [Buttons] Bottom=A;B diff --git a/data/chuwi-minibookx.tablet b/data/chuwi-minibookx.tablet index eac100713..e367e3aa1 100644 --- a/data/chuwi-minibookx.tablet +++ b/data/chuwi-minibookx.tablet @@ -16,4 +16,3 @@ Styli=0x621 [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/cintiq-12wx.tablet b/data/cintiq-12wx.tablet index f0b1aea55..2ba21aac9 100644 --- a/data/cintiq-12wx.tablet +++ b/data/cintiq-12wx.tablet @@ -44,7 +44,6 @@ IntegratedIn=Display [Features] Stylus=true NumStrips=2 -Buttons=10 [Buttons] Left=A;B;C;D;I diff --git a/data/cintiq-13hd.tablet b/data/cintiq-13hd.tablet index c86ca2ec3..b9daabbdb 100644 --- a/data/cintiq-13hd.tablet +++ b/data/cintiq-13hd.tablet @@ -37,7 +37,6 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=9 [Buttons] Left=B;C;G;H;A;F;I;D;E diff --git a/data/cintiq-13hdt.tablet b/data/cintiq-13hdt.tablet index 0d6b2ecfa..704ebf168 100644 --- a/data/cintiq-13hdt.tablet +++ b/data/cintiq-13hdt.tablet @@ -39,7 +39,6 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=9 [Buttons] Left=B;C;G;H;A;F;I;D;E diff --git a/data/cintiq-16-2.tablet b/data/cintiq-16-2.tablet index 10e1ba1c4..4e8594140 100644 --- a/data/cintiq-16-2.tablet +++ b/data/cintiq-16-2.tablet @@ -18,4 +18,3 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=0 diff --git a/data/cintiq-16.tablet b/data/cintiq-16.tablet index c620898f8..a3ca3c98e 100644 --- a/data/cintiq-16.tablet +++ b/data/cintiq-16.tablet @@ -18,4 +18,3 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=0 diff --git a/data/cintiq-20wsx.tablet b/data/cintiq-20wsx.tablet index 9bedf6282..ea70aa35f 100644 --- a/data/cintiq-20wsx.tablet +++ b/data/cintiq-20wsx.tablet @@ -48,7 +48,6 @@ IntegratedIn=Display Reversible=false Stylus=true NumStrips=2 -Buttons=14 [Buttons] Left=A;B;C;D;I;K;L diff --git a/data/cintiq-21ux.tablet b/data/cintiq-21ux.tablet index 79409de46..0316e0d3c 100644 --- a/data/cintiq-21ux.tablet +++ b/data/cintiq-21ux.tablet @@ -41,7 +41,6 @@ IntegratedIn=Display Reversible=false Stylus=true NumStrips=2 -Buttons=8 [Buttons] Left=A;B;C;D diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet index b586ce223..061a29a2f 100644 --- a/data/cintiq-21ux2.tablet +++ b/data/cintiq-21ux2.tablet @@ -57,7 +57,6 @@ IntegratedIn=Display Stylus=true Ring=false NumStrips=2 -Buttons=18 StatusLEDs=Touchstrip2;Touchstrip [Buttons] diff --git a/data/cintiq-22.tablet b/data/cintiq-22.tablet index 2d3979ce0..599888f9f 100644 --- a/data/cintiq-22.tablet +++ b/data/cintiq-22.tablet @@ -18,4 +18,3 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=0 diff --git a/data/cintiq-22hd.tablet b/data/cintiq-22hd.tablet index f06b08ea1..692ef8916 100644 --- a/data/cintiq-22hd.tablet +++ b/data/cintiq-22hd.tablet @@ -47,7 +47,6 @@ Reversible=false Touch=false Ring=false NumStrips=2 -Buttons=18 [Buttons] Left=B;C;D;E;A;F;G;H;I diff --git a/data/cintiq-22hdt.tablet b/data/cintiq-22hdt.tablet index 2a0f5451d..5d01d8769 100644 --- a/data/cintiq-22hdt.tablet +++ b/data/cintiq-22hdt.tablet @@ -49,7 +49,6 @@ Reversible=false Touch=true Ring=false NumStrips=2 -Buttons=18 [Buttons] Left=B;C;D;E;A;F;G;H;I diff --git a/data/cintiq-24hd-touch.tablet b/data/cintiq-24hd-touch.tablet index 45e5e5ff4..ea80f5226 100644 --- a/data/cintiq-24hd-touch.tablet +++ b/data/cintiq-24hd-touch.tablet @@ -55,7 +55,6 @@ IntegratedIn=Display Stylus=true Reversible=false Touch=true -Buttons=16 Ring=true Ring2=true StatusLEDs=Ring2;Ring diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet index 92b67c923..4fb808879 100644 --- a/data/cintiq-24hd.tablet +++ b/data/cintiq-24hd.tablet @@ -53,7 +53,6 @@ IntegratedIn=Display Stylus=true Reversible=false Touch=false -Buttons=16 Ring=true Ring2=true StatusLEDs=Ring2;Ring diff --git a/data/cintiq-27hd.tablet b/data/cintiq-27hd.tablet index 4003e769a..b0dca6824 100644 --- a/data/cintiq-27hd.tablet +++ b/data/cintiq-27hd.tablet @@ -17,6 +17,5 @@ IntegratedIn=Display Stylus=true Reversible=false Touch=false -Buttons=0 Ring=false Ring2=false diff --git a/data/cintiq-27hdt.tablet b/data/cintiq-27hdt.tablet index 63504490f..8a775cd38 100644 --- a/data/cintiq-27hdt.tablet +++ b/data/cintiq-27hdt.tablet @@ -19,6 +19,5 @@ IntegratedIn=Display Stylus=true Reversible=false Touch=true -Buttons=0 Ring=false Ring2=false diff --git a/data/cintiq-companion-2.tablet b/data/cintiq-companion-2.tablet index e5f47dd50..500d8b5cd 100644 --- a/data/cintiq-companion-2.tablet +++ b/data/cintiq-companion-2.tablet @@ -42,7 +42,6 @@ IntegratedIn=Display;System Stylus=true Touch=true Ring=false -Buttons=11 [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K diff --git a/data/cintiq-companion-hybrid.tablet b/data/cintiq-companion-hybrid.tablet index 23450f32f..23c79a528 100644 --- a/data/cintiq-companion-hybrid.tablet +++ b/data/cintiq-companion-hybrid.tablet @@ -41,7 +41,6 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=9 [Buttons] Left=B;C;G;H;A;F;I;D;E diff --git a/data/cintiq-companion.tablet b/data/cintiq-companion.tablet index 44415a797..1397fdf38 100644 --- a/data/cintiq-companion.tablet +++ b/data/cintiq-companion.tablet @@ -40,7 +40,6 @@ IntegratedIn=Display;System Stylus=true Touch=true Ring=false -Buttons=9 [Buttons] Left=B;C;G;H;A;F;I;D;E diff --git a/data/cintiq-pro-13.tablet b/data/cintiq-pro-13.tablet index 9dfbf88dc..4b0b773ea 100644 --- a/data/cintiq-pro-13.tablet +++ b/data/cintiq-pro-13.tablet @@ -43,4 +43,3 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=0 diff --git a/data/cintiq-pro-16-2.tablet b/data/cintiq-pro-16-2.tablet index 30d841e53..ca57c5ded 100644 --- a/data/cintiq-pro-16-2.tablet +++ b/data/cintiq-pro-16-2.tablet @@ -40,7 +40,6 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=8 [Buttons] Left=A;B;C;D diff --git a/data/cintiq-pro-16.tablet b/data/cintiq-pro-16.tablet index 09ad8122c..712097b99 100644 --- a/data/cintiq-pro-16.tablet +++ b/data/cintiq-pro-16.tablet @@ -43,4 +43,3 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=0 diff --git a/data/cintiq-pro-24-p.tablet b/data/cintiq-pro-24-p.tablet index a58478181..574068c3a 100644 --- a/data/cintiq-pro-24-p.tablet +++ b/data/cintiq-pro-24-p.tablet @@ -42,4 +42,3 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=0 diff --git a/data/cintiq-pro-24-pt.tablet b/data/cintiq-pro-24-pt.tablet index 4776c8901..968f4289f 100644 --- a/data/cintiq-pro-24-pt.tablet +++ b/data/cintiq-pro-24-pt.tablet @@ -43,4 +43,3 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=0 diff --git a/data/cintiq-pro-27.tablet b/data/cintiq-pro-27.tablet index a616c1fa8..57bfa53b9 100644 --- a/data/cintiq-pro-27.tablet +++ b/data/cintiq-pro-27.tablet @@ -41,7 +41,6 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=8 [Buttons] Left=A;B;C;D diff --git a/data/cintiq-pro-32.tablet b/data/cintiq-pro-32.tablet index dada3f322..a0a48a86e 100644 --- a/data/cintiq-pro-32.tablet +++ b/data/cintiq-pro-32.tablet @@ -43,4 +43,3 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=0 diff --git a/data/dell-canvas-27.tablet b/data/dell-canvas-27.tablet index d14ab1873..a35d4b874 100644 --- a/data/dell-canvas-27.tablet +++ b/data/dell-canvas-27.tablet @@ -35,4 +35,3 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=0 diff --git a/data/dtf-720.tablet b/data/dtf-720.tablet index 8203e1473..0b4eec869 100644 --- a/data/dtf-720.tablet +++ b/data/dtf-720.tablet @@ -14,5 +14,4 @@ IntegratedIn=Display [Features] Stylus=true -Buttons=0 diff --git a/data/dth-1152.tablet b/data/dth-1152.tablet index 406ef2ebf..b92eca218 100644 --- a/data/dth-1152.tablet +++ b/data/dth-1152.tablet @@ -21,4 +21,3 @@ Touch=true Ring=false Ring2=false NumStrips=0 -Buttons=0 diff --git a/data/dth-2242.tablet b/data/dth-2242.tablet index b3a32b4aa..2ee4a3892 100644 --- a/data/dth-2242.tablet +++ b/data/dth-2242.tablet @@ -35,7 +35,6 @@ Ring=false Ring2=false NumStrips=0 # Actually 7 buttons but one is reserved for onscreen menus -Buttons=6 [Buttons] Top=A;B;C;D;E;F diff --git a/data/dth-2452.tablet b/data/dth-2452.tablet index 67b92fada..0cbb2d02b 100644 --- a/data/dth-2452.tablet +++ b/data/dth-2452.tablet @@ -32,7 +32,6 @@ Ring=false Ring2=false NumStrips=0 # Actually 5 buttons but one is reserved for onscreen menus -Buttons=4 [Buttons] Right=A;B;C;D diff --git a/data/dti-520.tablet b/data/dti-520.tablet index 04ceee8c5..b20846283 100644 --- a/data/dti-520.tablet +++ b/data/dti-520.tablet @@ -35,7 +35,6 @@ Ring=false Ring2=false NumStrips=0 # Actually 11 buttons but the two Ctrl ones send the same scancode -Buttons=10 [Buttons] Top=F;G;H;I;J diff --git a/data/dtk-1651.tablet b/data/dtk-1651.tablet index 53436bdf7..711a81f09 100644 --- a/data/dtk-1651.tablet +++ b/data/dtk-1651.tablet @@ -29,7 +29,6 @@ Touch=false Ring=false Ring2=false NumStrips=0 -Buttons=4 [Buttons] Right=A;B;C;D diff --git a/data/dtk-1660e-2.tablet b/data/dtk-1660e-2.tablet index 3223ad9be..af11aa757 100644 --- a/data/dtk-1660e-2.tablet +++ b/data/dtk-1660e-2.tablet @@ -17,4 +17,3 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=0 diff --git a/data/dtk-1660e.tablet b/data/dtk-1660e.tablet index 321879519..e77353a45 100644 --- a/data/dtk-1660e.tablet +++ b/data/dtk-1660e.tablet @@ -17,4 +17,3 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=0 diff --git a/data/dtk-2241.tablet b/data/dtk-2241.tablet index 04c9e2e43..b5d0ae13b 100644 --- a/data/dtk-2241.tablet +++ b/data/dtk-2241.tablet @@ -33,7 +33,6 @@ Ring=false Ring2=false NumStrips=0 # Actually 7 buttons but one is reserved for onscreen menus -Buttons=6 [Buttons] Top=A;B;C;D;E;F diff --git a/data/dtk-2451.tablet b/data/dtk-2451.tablet index 5ba175cb3..3d276815d 100644 --- a/data/dtk-2451.tablet +++ b/data/dtk-2451.tablet @@ -31,7 +31,6 @@ Ring=false Ring2=false NumStrips=0 # Actually 5 buttons but one is reserved for onscreen menus -Buttons=4 [Buttons] Right=A;B;C;D diff --git a/data/dtu-1031.tablet b/data/dtu-1031.tablet index ac00788d7..f6ec37bce 100644 --- a/data/dtu-1031.tablet +++ b/data/dtu-1031.tablet @@ -32,7 +32,6 @@ Touch=false Ring=false Ring2=false NumStrips=0 -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/dtu-1031x.tablet b/data/dtu-1031x.tablet index ef44e4a3d..bf92485c8 100644 --- a/data/dtu-1031x.tablet +++ b/data/dtu-1031x.tablet @@ -20,4 +20,3 @@ Touch=false Ring=false Ring2=false NumStrips=0 -Buttons=0 diff --git a/data/dtu-1141.tablet b/data/dtu-1141.tablet index dc59f06aa..6c776d89e 100644 --- a/data/dtu-1141.tablet +++ b/data/dtu-1141.tablet @@ -32,7 +32,6 @@ Touch=false Ring=false Ring2=false NumStrips=0 -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/dtu-1141b.tablet b/data/dtu-1141b.tablet index f2f41d89f..296f0a7bd 100644 --- a/data/dtu-1141b.tablet +++ b/data/dtu-1141b.tablet @@ -30,7 +30,6 @@ Touch=false Ring=false Ring2=false NumStrips=0 -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/dtu-1631.tablet b/data/dtu-1631.tablet index f1729858f..1bb5df893 100644 --- a/data/dtu-1631.tablet +++ b/data/dtu-1631.tablet @@ -14,5 +14,4 @@ IntegratedIn=Display [Features] Stylus=true -Buttons=0 diff --git a/data/dtu-1931.tablet b/data/dtu-1931.tablet index 6548a8271..b42b5622b 100644 --- a/data/dtu-1931.tablet +++ b/data/dtu-1931.tablet @@ -13,4 +13,3 @@ IntegratedIn=Display [Features] Stylus=true -Buttons=0 diff --git a/data/dtu-2231.tablet b/data/dtu-2231.tablet index f8f20c4ca..d471da64e 100644 --- a/data/dtu-2231.tablet +++ b/data/dtu-2231.tablet @@ -13,5 +13,4 @@ IntegratedIn=Display [Features] Stylus=true -Buttons=0 diff --git a/data/ek-remote.tablet b/data/ek-remote.tablet index 45415a736..748e8e78a 100644 --- a/data/ek-remote.tablet +++ b/data/ek-remote.tablet @@ -22,7 +22,6 @@ Class=Remote Stylus=false Ring=true NumStrips=0 -Buttons=18 StatusLEDs=Ring [Buttons] diff --git a/data/elan-0732.tablet b/data/elan-0732.tablet index 2ffc35fd8..5cb832392 100644 --- a/data/elan-0732.tablet +++ b/data/elan-0732.tablet @@ -11,5 +11,4 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2072.tablet b/data/elan-2072.tablet index 4f472d7ae..1231b0546 100644 --- a/data/elan-2072.tablet +++ b/data/elan-2072.tablet @@ -13,4 +13,3 @@ Styli=@generic-no-eraser; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-22e2.tablet b/data/elan-22e2.tablet index f6624e93c..9bd39a3d9 100644 --- a/data/elan-22e2.tablet +++ b/data/elan-22e2.tablet @@ -16,4 +16,3 @@ TouchSwitch=false Ring=false Ring2=false NumStrips=0 -Buttons=0 diff --git a/data/elan-22f7.tablet b/data/elan-22f7.tablet index 3f585895d..8aaae33e0 100644 --- a/data/elan-22f7.tablet +++ b/data/elan-22f7.tablet @@ -17,4 +17,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-24d8.tablet b/data/elan-24d8.tablet index 2820aab91..1738e0dfc 100644 --- a/data/elan-24d8.tablet +++ b/data/elan-24d8.tablet @@ -19,4 +19,3 @@ Touch=true TouchSwitch=false # StatusLEDs= NumStrips=0 -Buttons=0 diff --git a/data/elan-24db.tablet b/data/elan-24db.tablet index 96e5a522d..106755762 100644 --- a/data/elan-24db.tablet +++ b/data/elan-24db.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2513.tablet b/data/elan-2513.tablet index ab4b54e7c..9b3182125 100644 --- a/data/elan-2513.tablet +++ b/data/elan-2513.tablet @@ -15,4 +15,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2514-alt.tablet b/data/elan-2514-alt.tablet index 4da736743..f08cdb221 100644 --- a/data/elan-2514-alt.tablet +++ b/data/elan-2514-alt.tablet @@ -15,4 +15,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2514-alt2.tablet b/data/elan-2514-alt2.tablet index c396dac67..b04be52c4 100644 --- a/data/elan-2514-alt2.tablet +++ b/data/elan-2514-alt2.tablet @@ -24,4 +24,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2514.tablet b/data/elan-2514.tablet index 66d5806f9..c9c97a523 100644 --- a/data/elan-2514.tablet +++ b/data/elan-2514.tablet @@ -51,4 +51,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2537.tablet b/data/elan-2537.tablet index 5cf955dca..0b086a4bd 100644 --- a/data/elan-2537.tablet +++ b/data/elan-2537.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2627.tablet b/data/elan-2627.tablet index 36be7db5d..9c2036ff9 100644 --- a/data/elan-2627.tablet +++ b/data/elan-2627.tablet @@ -11,5 +11,4 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2628.tablet b/data/elan-2628.tablet index e7154b9cc..a292fb8fc 100644 --- a/data/elan-2628.tablet +++ b/data/elan-2628.tablet @@ -11,4 +11,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-262b.tablet b/data/elan-262b.tablet index 92e13e983..aeac7bf55 100644 --- a/data/elan-262b.tablet +++ b/data/elan-262b.tablet @@ -11,5 +11,4 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-264c.tablet b/data/elan-264c.tablet index 33c7105d0..c938b2aac 100644 --- a/data/elan-264c.tablet +++ b/data/elan-264c.tablet @@ -14,4 +14,3 @@ Styli=@generic-no-eraser;@generic-with-eraser; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-29a1.tablet b/data/elan-29a1.tablet index 3dbbaefdb..4936a6f9d 100644 --- a/data/elan-29a1.tablet +++ b/data/elan-29a1.tablet @@ -15,4 +15,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-29b6.tablet b/data/elan-29b6.tablet index b145ed0b4..0cf050850 100644 --- a/data/elan-29b6.tablet +++ b/data/elan-29b6.tablet @@ -15,4 +15,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2a70.tablet b/data/elan-2a70.tablet index 88044e0ed..e5f6b0fb0 100644 --- a/data/elan-2a70.tablet +++ b/data/elan-2a70.tablet @@ -13,5 +13,4 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2ad9.tablet b/data/elan-2ad9.tablet index 4013ca38c..60a6fcbf5 100644 --- a/data/elan-2ad9.tablet +++ b/data/elan-2ad9.tablet @@ -14,4 +14,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2bb3.tablet b/data/elan-2bb3.tablet index d99d0386e..a6e8f24b9 100644 --- a/data/elan-2bb3.tablet +++ b/data/elan-2bb3.tablet @@ -13,4 +13,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2c1b.tablet b/data/elan-2c1b.tablet index 144dd4135..5fc163eb2 100644 --- a/data/elan-2c1b.tablet +++ b/data/elan-2c1b.tablet @@ -17,4 +17,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2d55.tablet b/data/elan-2d55.tablet index 2e8ee2510..184aba01e 100644 --- a/data/elan-2d55.tablet +++ b/data/elan-2d55.tablet @@ -17,4 +17,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-2fc2.tablet b/data/elan-2fc2.tablet index 0e5d57eb4..42d33d3fb 100644 --- a/data/elan-2fc2.tablet +++ b/data/elan-2fc2.tablet @@ -15,4 +15,3 @@ Styli=@generic-no-eraser; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/elan-5515.tablet b/data/elan-5515.tablet index f490214fa..3486b299b 100644 --- a/data/elan-5515.tablet +++ b/data/elan-5515.tablet @@ -10,4 +10,3 @@ IntegratedIn=Display [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/gaomon-s620.tablet b/data/gaomon-s620.tablet index a1b843b1c..9c09913b3 100644 --- a/data/gaomon-s620.tablet +++ b/data/gaomon-s620.tablet @@ -22,7 +22,6 @@ Styli=@generic-no-eraser; [Features] Stylus=true Reversible=true -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/generic.tablet b/data/generic.tablet index 462988b63..fcd0b399c 100644 --- a/data/generic.tablet +++ b/data/generic.tablet @@ -8,4 +8,3 @@ Reversible=true Stylus=true Ring=true NumStrips=2 -Buttons=4 diff --git a/data/graphire-usb.tablet b/data/graphire-usb.tablet index 38b01b89b..832c3795f 100644 --- a/data/graphire-usb.tablet +++ b/data/graphire-usb.tablet @@ -26,4 +26,3 @@ Height=4 [Features] Stylus=true -Buttons=0 diff --git a/data/graphire-wireless-8x6.tablet b/data/graphire-wireless-8x6.tablet index 2ed0f073e..138f8af69 100644 --- a/data/graphire-wireless-8x6.tablet +++ b/data/graphire-wireless-8x6.tablet @@ -28,7 +28,6 @@ IntegratedIn= Reversible=false Stylus=true Ring=false -Buttons=2 [Buttons] Top=A;B diff --git a/data/graphire2-4x5.tablet b/data/graphire2-4x5.tablet index 0059b56cb..890e36fef 100644 --- a/data/graphire2-4x5.tablet +++ b/data/graphire2-4x5.tablet @@ -26,4 +26,3 @@ Height=4 [Features] Stylus=true -Buttons=0 diff --git a/data/graphire2-5x7.tablet b/data/graphire2-5x7.tablet index 9733d8cb8..df55f3ff9 100644 --- a/data/graphire2-5x7.tablet +++ b/data/graphire2-5x7.tablet @@ -26,4 +26,3 @@ Height=5 [Features] Stylus=true -Buttons=0 diff --git a/data/graphire3-4x5.tablet b/data/graphire3-4x5.tablet index f37e73de9..fc03b0d59 100644 --- a/data/graphire3-4x5.tablet +++ b/data/graphire3-4x5.tablet @@ -13,4 +13,3 @@ Height=4 [Features] Stylus=true -Buttons=0 diff --git a/data/graphire3-6x8.tablet b/data/graphire3-6x8.tablet index 7243a375d..1a050a978 100644 --- a/data/graphire3-6x8.tablet +++ b/data/graphire3-6x8.tablet @@ -13,4 +13,3 @@ Height=6 [Features] Stylus=true -Buttons=0 diff --git a/data/graphire4-4x5.tablet b/data/graphire4-4x5.tablet index 76ac4bce3..acf5ac932 100644 --- a/data/graphire4-4x5.tablet +++ b/data/graphire4-4x5.tablet @@ -27,7 +27,6 @@ Layout=graphire4-4x5.svg [Features] Stylus=true -Buttons=2 [Buttons] Top=A;B diff --git a/data/graphire4-6x8.tablet b/data/graphire4-6x8.tablet index fab446b8a..761574d69 100644 --- a/data/graphire4-6x8.tablet +++ b/data/graphire4-6x8.tablet @@ -27,7 +27,6 @@ Layout=graphire4-6x8.svg [Features] Stylus=true -Buttons=2 [Buttons] Top=A;B diff --git a/data/hp-pro-tablet-408.tablet b/data/hp-pro-tablet-408.tablet index 6a8d01346..7e3d29627 100644 --- a/data/hp-pro-tablet-408.tablet +++ b/data/hp-pro-tablet-408.tablet @@ -16,4 +16,3 @@ IntegratedIn=Display;System; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/huion-420.tablet b/data/huion-420.tablet index dcf0bd537..593df557c 100644 --- a/data/huion-420.tablet +++ b/data/huion-420.tablet @@ -15,4 +15,3 @@ Styli=@generic-no-eraser; [Features] Stylus=true Reversible=true -Buttons=0 diff --git a/data/huion-h1060p.tablet b/data/huion-h1060p.tablet index 9ed05cf27..8b946dbb8 100644 --- a/data/huion-h1060p.tablet +++ b/data/huion-h1060p.tablet @@ -19,7 +19,6 @@ Stylus=true Reversible=true Touch=false NumStrips=0 -Buttons=12 [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K;L diff --git a/data/huion-h420.tablet b/data/huion-h420.tablet index 6a3ad9417..e941e4e7e 100644 --- a/data/huion-h420.tablet +++ b/data/huion-h420.tablet @@ -27,7 +27,6 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=3 [Buttons] Left=A;B;C diff --git a/data/huion-h610-pro.tablet b/data/huion-h610-pro.tablet index 4878a99ad..87c5a0505 100644 --- a/data/huion-h610-pro.tablet +++ b/data/huion-h610-pro.tablet @@ -17,7 +17,6 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/huion-h640p.tablet b/data/huion-h640p.tablet index e81cd07a9..b1d657c04 100644 --- a/data/huion-h640p.tablet +++ b/data/huion-h640p.tablet @@ -28,7 +28,6 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=6 [Buttons] Left=A;B;C;D;E;F diff --git a/data/huion-h950p.tablet b/data/huion-h950p.tablet index c7fbfe36f..6c44e4a87 100644 --- a/data/huion-h950p.tablet +++ b/data/huion-h950p.tablet @@ -18,7 +18,6 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/huion-hs611.tablet b/data/huion-hs611.tablet index 5239b0a9a..dcc4b8d68 100644 --- a/data/huion-hs611.tablet +++ b/data/huion-hs611.tablet @@ -49,7 +49,6 @@ Stylus=true Reversible=true Touch=false NumStrips=1 -Buttons=10 [Buttons] Left=A;B;C;D;E;F;G;H;I;J diff --git a/data/huion-kamvas-13.tablet b/data/huion-kamvas-13.tablet index f8a21f089..116905c7a 100644 --- a/data/huion-kamvas-13.tablet +++ b/data/huion-kamvas-13.tablet @@ -39,7 +39,6 @@ Touch=false TouchSwitch=false Ring=false NumStrips=0 -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/huion-new-1060-plus.tablet b/data/huion-new-1060-plus.tablet index 4f3f504bf..6f8b4183f 100644 --- a/data/huion-new-1060-plus.tablet +++ b/data/huion-new-1060-plus.tablet @@ -17,7 +17,6 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=12 [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K;L diff --git a/data/intuos-12x12.tablet b/data/intuos-12x12.tablet index 691c80a83..f86383cf9 100644 --- a/data/intuos-12x12.tablet +++ b/data/intuos-12x12.tablet @@ -13,4 +13,3 @@ Styli=@intuos-airbrush;@intuos; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos-12x18.tablet b/data/intuos-12x18.tablet index d174bef65..dd791789c 100644 --- a/data/intuos-12x18.tablet +++ b/data/intuos-12x18.tablet @@ -13,4 +13,3 @@ Styli=@intuos-airbrush;@intuos; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos-4x5.tablet b/data/intuos-4x5.tablet index cededf77b..66d4eac09 100644 --- a/data/intuos-4x5.tablet +++ b/data/intuos-4x5.tablet @@ -13,4 +13,3 @@ Styli=@intuos-airbrush;@intuos; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos-6x8.tablet b/data/intuos-6x8.tablet index e56556bc9..f1c8f46d7 100644 --- a/data/intuos-6x8.tablet +++ b/data/intuos-6x8.tablet @@ -13,4 +13,3 @@ Styli=@intuos-airbrush;@intuos; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos-9x12.tablet b/data/intuos-9x12.tablet index bb392c45c..3cd15f6e1 100644 --- a/data/intuos-9x12.tablet +++ b/data/intuos-9x12.tablet @@ -13,4 +13,3 @@ Styli=@intuos-airbrush;@intuos; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos-m-p.tablet b/data/intuos-m-p.tablet index 8df314a63..02599cb1e 100644 --- a/data/intuos-m-p.tablet +++ b/data/intuos-m-p.tablet @@ -33,7 +33,6 @@ IntegratedIn= [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-m-p2.tablet b/data/intuos-m-p2.tablet index a7745aa6e..a44467bf7 100644 --- a/data/intuos-m-p2.tablet +++ b/data/intuos-m-p2.tablet @@ -35,7 +35,6 @@ Styli=@intuospt; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-m-p3-android.tablet b/data/intuos-m-p3-android.tablet index 7f227c83e..fc62b3f7c 100644 --- a/data/intuos-m-p3-android.tablet +++ b/data/intuos-m-p3-android.tablet @@ -36,7 +36,6 @@ Styli=@intuospt3; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-m-p3-wl-android.tablet b/data/intuos-m-p3-wl-android.tablet index 64b868c64..4cb1d8fa1 100644 --- a/data/intuos-m-p3-wl-android.tablet +++ b/data/intuos-m-p3-wl-android.tablet @@ -36,7 +36,6 @@ Styli=@intuospt3; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-m-p3-wl.tablet b/data/intuos-m-p3-wl.tablet index 89c52b442..aa83b1e8e 100644 --- a/data/intuos-m-p3-wl.tablet +++ b/data/intuos-m-p3-wl.tablet @@ -31,7 +31,6 @@ Styli=@intuospt3; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-m-p3.tablet b/data/intuos-m-p3.tablet index d53067ba9..77501ca36 100644 --- a/data/intuos-m-p3.tablet +++ b/data/intuos-m-p3.tablet @@ -31,7 +31,6 @@ Styli=@intuospt3; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-m-pt.tablet b/data/intuos-m-pt.tablet index 2881da5e5..c284c1ded 100644 --- a/data/intuos-m-pt.tablet +++ b/data/intuos-m-pt.tablet @@ -47,7 +47,6 @@ IntegratedIn= Stylus=true Reversible=false Touch=true -Buttons=4 TouchSwitch=true [Buttons] diff --git a/data/intuos-m-pt2.tablet b/data/intuos-m-pt2.tablet index cdda10d54..e953c32a3 100644 --- a/data/intuos-m-pt2.tablet +++ b/data/intuos-m-pt2.tablet @@ -49,7 +49,6 @@ Styli=@intuospt; Stylus=true Reversible=false Touch=true -Buttons=4 TouchSwitch=true [Buttons] diff --git a/data/intuos-pro-2-l.tablet b/data/intuos-pro-2-l.tablet index 75e1f695e..28e83a949 100644 --- a/data/intuos-pro-2-l.tablet +++ b/data/intuos-pro-2-l.tablet @@ -57,7 +57,6 @@ Styli=@intuos5;@mobilestudio;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=9 Ring=true StatusLEDs=Ring diff --git a/data/intuos-pro-2-m.tablet b/data/intuos-pro-2-m.tablet index 581082f5a..a3b99c7f2 100644 --- a/data/intuos-pro-2-m.tablet +++ b/data/intuos-pro-2-m.tablet @@ -57,7 +57,6 @@ Styli=@intuos5;@mobilestudio;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=9 Ring=true StatusLEDs=Ring diff --git a/data/intuos-pro-2-s.tablet b/data/intuos-pro-2-s.tablet index 9613f5a46..df2c2b3d8 100644 --- a/data/intuos-pro-2-s.tablet +++ b/data/intuos-pro-2-s.tablet @@ -44,7 +44,6 @@ Styli=@intuos5;@mobilestudio;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=7 Ring=true [Buttons] diff --git a/data/intuos-pro-l.tablet b/data/intuos-pro-l.tablet index 9c4fee2f4..10357a943 100644 --- a/data/intuos-pro-l.tablet +++ b/data/intuos-pro-l.tablet @@ -57,7 +57,6 @@ Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=9 Ring=true StatusLEDs=Ring diff --git a/data/intuos-pro-m.tablet b/data/intuos-pro-m.tablet index e507e2c13..756052e33 100644 --- a/data/intuos-pro-m.tablet +++ b/data/intuos-pro-m.tablet @@ -57,7 +57,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=9 Ring=true StatusLEDs=Ring diff --git a/data/intuos-pro-s.tablet b/data/intuos-pro-s.tablet index 4e35fa589..61905e4fb 100644 --- a/data/intuos-pro-s.tablet +++ b/data/intuos-pro-s.tablet @@ -55,7 +55,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=7 Ring=true StatusLEDs=Ring diff --git a/data/intuos-s-p.tablet b/data/intuos-s-p.tablet index 1fc96ad6d..a9810f334 100644 --- a/data/intuos-s-p.tablet +++ b/data/intuos-s-p.tablet @@ -31,7 +31,6 @@ IntegratedIn= [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-s-p2.tablet b/data/intuos-s-p2.tablet index 71caf2bf0..30035f6a6 100644 --- a/data/intuos-s-p2.tablet +++ b/data/intuos-s-p2.tablet @@ -33,7 +33,6 @@ Styli=@intuospt; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-s-p3-android.tablet b/data/intuos-s-p3-android.tablet index d872c1cd6..0d803b131 100644 --- a/data/intuos-s-p3-android.tablet +++ b/data/intuos-s-p3-android.tablet @@ -36,7 +36,6 @@ Styli=@intuospt3; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-s-p3-wl-android.tablet b/data/intuos-s-p3-wl-android.tablet index 633d5bf0b..251a945b7 100644 --- a/data/intuos-s-p3-wl-android.tablet +++ b/data/intuos-s-p3-wl-android.tablet @@ -36,7 +36,6 @@ Styli=@intuospt3; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-s-p3-wl.tablet b/data/intuos-s-p3-wl.tablet index a513da522..07e2e204e 100644 --- a/data/intuos-s-p3-wl.tablet +++ b/data/intuos-s-p3-wl.tablet @@ -31,7 +31,6 @@ Styli=@intuospt3; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-s-p3.tablet b/data/intuos-s-p3.tablet index 8e940a7b8..c7a156735 100644 --- a/data/intuos-s-p3.tablet +++ b/data/intuos-s-p3.tablet @@ -31,7 +31,6 @@ Styli=@intuospt3; [Features] Stylus=true Reversible=false -Buttons=4 [Buttons] Top=A;B;C;D diff --git a/data/intuos-s-pt.tablet b/data/intuos-s-pt.tablet index 193963824..d897f8c22 100644 --- a/data/intuos-s-pt.tablet +++ b/data/intuos-s-pt.tablet @@ -47,7 +47,6 @@ IntegratedIn= Stylus=true Reversible=false Touch=true -Buttons=4 TouchSwitch=true [Buttons] diff --git a/data/intuos-s-pt2.tablet b/data/intuos-s-pt2.tablet index 2af0c8cc9..5a25b41f3 100644 --- a/data/intuos-s-pt2.tablet +++ b/data/intuos-s-pt2.tablet @@ -48,7 +48,6 @@ Styli=@intuospt; Stylus=true Reversible=false Touch=true -Buttons=4 TouchSwitch=true [Buttons] diff --git a/data/intuos2-12x12.tablet b/data/intuos2-12x12.tablet index dbf2d926d..7ee744963 100644 --- a/data/intuos2-12x12.tablet +++ b/data/intuos2-12x12.tablet @@ -10,4 +10,3 @@ Styli=0x842;@intuos;@intuos2; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos2-12x18.tablet b/data/intuos2-12x18.tablet index 150869a8c..336b69663 100644 --- a/data/intuos2-12x18.tablet +++ b/data/intuos2-12x18.tablet @@ -14,4 +14,3 @@ Styli=0x842;@intuos;@intuos2; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos2-4x5.tablet b/data/intuos2-4x5.tablet index ffdce157a..df087fcc9 100644 --- a/data/intuos2-4x5.tablet +++ b/data/intuos2-4x5.tablet @@ -14,4 +14,3 @@ Styli=0x842;@intuos;@intuos2; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos2-6x8.tablet b/data/intuos2-6x8.tablet index cf291d605..dbc42aa90 100644 --- a/data/intuos2-6x8.tablet +++ b/data/intuos2-6x8.tablet @@ -15,4 +15,3 @@ Styli=0x842;@intuos;@intuos2; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos2-9x12.tablet b/data/intuos2-9x12.tablet index 255bead29..020373d03 100644 --- a/data/intuos2-9x12.tablet +++ b/data/intuos2-9x12.tablet @@ -14,4 +14,3 @@ Styli=0x842;@intuos;@intuos2; [Features] Stylus=true -Buttons=0 diff --git a/data/intuos3-12x12.tablet b/data/intuos3-12x12.tablet index 69162b9d7..69f2fbed5 100644 --- a/data/intuos3-12x12.tablet +++ b/data/intuos3-12x12.tablet @@ -42,7 +42,6 @@ Styli=@intuos3-pucks;@intuos3; [Features] Stylus=true NumStrips=2 -Buttons=8 [Buttons] Left=A;B;C;D diff --git a/data/intuos3-12x19.tablet b/data/intuos3-12x19.tablet index 6dc17e6e6..cc2422707 100644 --- a/data/intuos3-12x19.tablet +++ b/data/intuos3-12x19.tablet @@ -42,7 +42,6 @@ Styli=@intuos3-pucks;@intuos3; [Features] Stylus=true NumStrips=2 -Buttons=8 [Buttons] Left=A;B;C;D diff --git a/data/intuos3-4x5.tablet b/data/intuos3-4x5.tablet index c0f91716b..63378e1ef 100644 --- a/data/intuos3-4x5.tablet +++ b/data/intuos3-4x5.tablet @@ -42,7 +42,6 @@ Styli=@intuos3-pucks;@intuos3; [Features] Stylus=true NumStrips=1 -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/intuos3-4x6.tablet b/data/intuos3-4x6.tablet index 767ef4d1e..f9642760c 100644 --- a/data/intuos3-4x6.tablet +++ b/data/intuos3-4x6.tablet @@ -41,7 +41,6 @@ Styli=@intuos3-pucks;@intuos3; [Features] Stylus=true NumStrips=1 -Buttons=4 [Buttons] Left=A;B;C;D diff --git a/data/intuos3-6x11.tablet b/data/intuos3-6x11.tablet index e2a1869f7..152988920 100644 --- a/data/intuos3-6x11.tablet +++ b/data/intuos3-6x11.tablet @@ -41,7 +41,6 @@ Styli=@intuos3-pucks;@intuos3; [Features] Stylus=true NumStrips=2 -Buttons=8 [Buttons] Left=A;B;C;D diff --git a/data/intuos3-6x8.tablet b/data/intuos3-6x8.tablet index 0fe0222b6..a2312e695 100644 --- a/data/intuos3-6x8.tablet +++ b/data/intuos3-6x8.tablet @@ -41,7 +41,6 @@ Styli=@intuos3-pucks;@intuos3; [Features] Stylus=true NumStrips=2 -Buttons=8 [Buttons] Left=A;B;C;D diff --git a/data/intuos3-9x12.tablet b/data/intuos3-9x12.tablet index e6a320a0d..396748b97 100644 --- a/data/intuos3-9x12.tablet +++ b/data/intuos3-9x12.tablet @@ -41,7 +41,6 @@ Styli=@intuos3-pucks;@intuos3; [Features] Stylus=true NumStrips=2 -Buttons=8 [Buttons] Left=A;B;C;D diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet index 2dc9ea9d2..afb905b89 100644 --- a/data/intuos4-12x19.tablet +++ b/data/intuos4-12x19.tablet @@ -47,7 +47,6 @@ Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2; Reversible=true Stylus=true Ring=true -Buttons=9 StatusLEDs=Ring [Buttons] diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet index 114771604..93ba3ad4b 100644 --- a/data/intuos4-4x6.tablet +++ b/data/intuos4-4x6.tablet @@ -48,7 +48,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Reversible=true Stylus=true Ring=true -Buttons=7 StatusLEDs=Ring [Buttons] diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet index bd60600d3..e785e8c78 100644 --- a/data/intuos4-6x9-wl.tablet +++ b/data/intuos4-6x9-wl.tablet @@ -47,7 +47,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Reversible=true Stylus=true Ring=true -Buttons=9 StatusLEDs=Ring [Buttons] diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet index 875fd078f..fa9183ed7 100644 --- a/data/intuos4-6x9.tablet +++ b/data/intuos4-6x9.tablet @@ -47,7 +47,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Reversible=true Stylus=true Ring=true -Buttons=9 StatusLEDs=Ring [Buttons] diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet index cfe3afdc4..aece71672 100644 --- a/data/intuos4-8x13.tablet +++ b/data/intuos4-8x13.tablet @@ -47,7 +47,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Reversible=true Stylus=true Ring=true -Buttons=9 StatusLEDs=Ring [Buttons] diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet index 8370397cc..e25eaa06f 100644 --- a/data/intuos5-m.tablet +++ b/data/intuos5-m.tablet @@ -57,7 +57,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Stylus=true Reversible=true Touch=false -Buttons=9 Ring=true StatusLEDs=Ring diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet index e67585cdf..eb1fa94ad 100644 --- a/data/intuos5-s.tablet +++ b/data/intuos5-s.tablet @@ -55,7 +55,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Stylus=true Reversible=true Touch=false -Buttons=7 Ring=true StatusLEDs=Ring diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet index 85c4fa800..435c9d3ac 100644 --- a/data/intuos5-touch-l.tablet +++ b/data/intuos5-touch-l.tablet @@ -57,7 +57,6 @@ Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=9 Ring=true StatusLEDs=Ring diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet index 46421d0fd..d9be7abee 100644 --- a/data/intuos5-touch-m.tablet +++ b/data/intuos5-touch-m.tablet @@ -57,7 +57,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=9 Ring=true StatusLEDs=Ring diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet index 7c0af1e57..ff3c01bfc 100644 --- a/data/intuos5-touch-s.tablet +++ b/data/intuos5-touch-s.tablet @@ -55,7 +55,6 @@ Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; Stylus=true Reversible=true Touch=true -Buttons=7 Ring=true StatusLEDs=Ring diff --git a/data/isdv4-016c.tablet b/data/isdv4-016c.tablet index b1e2ea449..629c92630 100644 --- a/data/isdv4-016c.tablet +++ b/data/isdv4-016c.tablet @@ -19,4 +19,3 @@ Styli=@generic-with-eraser;@generic-no-eraser [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-100.tablet b/data/isdv4-100.tablet index 7ab265e51..12b8eeb9a 100644 --- a/data/isdv4-100.tablet +++ b/data/isdv4-100.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=false Touch=true -Buttons=0 diff --git a/data/isdv4-101.tablet b/data/isdv4-101.tablet index 14b592f08..11831be5e 100644 --- a/data/isdv4-101.tablet +++ b/data/isdv4-101.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-104.tablet b/data/isdv4-104.tablet index c05db884a..4ec1c3850 100644 --- a/data/isdv4-104.tablet +++ b/data/isdv4-104.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-10d.tablet b/data/isdv4-10d.tablet index ce555d42a..bcc8a47ec 100644 --- a/data/isdv4-10d.tablet +++ b/data/isdv4-10d.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-10e.tablet b/data/isdv4-10e.tablet index 6b6555840..d93a0adf1 100644 --- a/data/isdv4-10e.tablet +++ b/data/isdv4-10e.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-10f.tablet b/data/isdv4-10f.tablet index 3d94e5303..725ef6509 100644 --- a/data/isdv4-10f.tablet +++ b/data/isdv4-10f.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-114.tablet b/data/isdv4-114.tablet index 2d4de04ea..dd0586518 100644 --- a/data/isdv4-114.tablet +++ b/data/isdv4-114.tablet @@ -12,4 +12,3 @@ Height=5 [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-116.tablet b/data/isdv4-116.tablet index cd015b649..a33772169 100644 --- a/data/isdv4-116.tablet +++ b/data/isdv4-116.tablet @@ -10,4 +10,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-117.tablet b/data/isdv4-117.tablet index caafa2318..10d8e24ef 100644 --- a/data/isdv4-117.tablet +++ b/data/isdv4-117.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-121a.tablet b/data/isdv4-121a.tablet index 2c38216ee..6d3b50f10 100644 --- a/data/isdv4-121a.tablet +++ b/data/isdv4-121a.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-124.tablet b/data/isdv4-124.tablet index d4086eb6f..ff75c1fbe 100644 --- a/data/isdv4-124.tablet +++ b/data/isdv4-124.tablet @@ -13,4 +13,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-12c.tablet b/data/isdv4-12c.tablet index 82f2b45c9..bbc1bc6b5 100644 --- a/data/isdv4-12c.tablet +++ b/data/isdv4-12c.tablet @@ -9,4 +9,3 @@ IntegratedIn=Display;System [Features] Stylus=true -Buttons=0 diff --git a/data/isdv4-149.tablet b/data/isdv4-149.tablet index 95b1c43df..6ab22b3c4 100644 --- a/data/isdv4-149.tablet +++ b/data/isdv4-149.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-2d1f-001e.tablet b/data/isdv4-2d1f-001e.tablet index 73ac9076f..7ac772cf3 100644 --- a/data/isdv4-2d1f-001e.tablet +++ b/data/isdv4-2d1f-001e.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true -Buttons=0 diff --git a/data/isdv4-2d1f-002c.tablet b/data/isdv4-2d1f-002c.tablet index 8aee7124d..73c421890 100644 --- a/data/isdv4-2d1f-002c.tablet +++ b/data/isdv4-2d1f-002c.tablet @@ -19,4 +19,3 @@ Styli=@generic-with-eraser; [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-2d1f-002e.tablet b/data/isdv4-2d1f-002e.tablet index 4916509a7..f0547bf11 100644 --- a/data/isdv4-2d1f-002e.tablet +++ b/data/isdv4-2d1f-002e.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true -Buttons=0 diff --git a/data/isdv4-2d1f-0040.tablet b/data/isdv4-2d1f-0040.tablet index b84b8d6a4..ee5b8309d 100644 --- a/data/isdv4-2d1f-0040.tablet +++ b/data/isdv4-2d1f-0040.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-2d1f-0066.tablet b/data/isdv4-2d1f-0066.tablet index 7a12ab319..7fa395b58 100644 --- a/data/isdv4-2d1f-0066.tablet +++ b/data/isdv4-2d1f-0066.tablet @@ -19,4 +19,3 @@ Styli=@generic-with-eraser; [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-2d1f-0095.tablet b/data/isdv4-2d1f-0095.tablet index 8fdcb7b34..45a39d43b 100644 --- a/data/isdv4-2d1f-0095.tablet +++ b/data/isdv4-2d1f-0095.tablet @@ -19,4 +19,3 @@ Styli=@generic-with-eraser; [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-2d1f-0114.tablet b/data/isdv4-2d1f-0114.tablet index 9c9905351..b68c77f65 100644 --- a/data/isdv4-2d1f-0114.tablet +++ b/data/isdv4-2d1f-0114.tablet @@ -20,4 +20,3 @@ Styli=@generic-with-eraser; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-2d1f-0136.tablet b/data/isdv4-2d1f-0136.tablet index 0c71e3a06..3501e826d 100644 --- a/data/isdv4-2d1f-0136.tablet +++ b/data/isdv4-2d1f-0136.tablet @@ -20,4 +20,3 @@ Styli=@generic-with-eraser; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-2d1f-0163.tablet b/data/isdv4-2d1f-0163.tablet index cfd1d61f0..fcf6c6dac 100644 --- a/data/isdv4-2d1f-0163.tablet +++ b/data/isdv4-2d1f-0163.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-2d1f-524c.tablet b/data/isdv4-2d1f-524c.tablet index 9d4db39e7..7081d7c2f 100644 --- a/data/isdv4-2d1f-524c.tablet +++ b/data/isdv4-2d1f-524c.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4004.tablet b/data/isdv4-4004.tablet index 85f480fa8..b0e1eae4e 100644 --- a/data/isdv4-4004.tablet +++ b/data/isdv4-4004.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4800.tablet b/data/isdv4-4800.tablet index 08d38523a..a01d8dfa2 100644 --- a/data/isdv4-4800.tablet +++ b/data/isdv4-4800.tablet @@ -11,4 +11,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4804.tablet b/data/isdv4-4804.tablet index 3470a57af..2ab66b118 100644 --- a/data/isdv4-4804.tablet +++ b/data/isdv4-4804.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4806.tablet b/data/isdv4-4806.tablet index 545d6dff4..2b14f352b 100644 --- a/data/isdv4-4806.tablet +++ b/data/isdv4-4806.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4807.tablet b/data/isdv4-4807.tablet index 030370563..acd301ef1 100644 --- a/data/isdv4-4807.tablet +++ b/data/isdv4-4807.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4809.tablet b/data/isdv4-4809.tablet index fab15315b..558fef5b0 100644 --- a/data/isdv4-4809.tablet +++ b/data/isdv4-4809.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4814.tablet b/data/isdv4-4814.tablet index 1da554465..e11d8f1d5 100644 --- a/data/isdv4-4814.tablet +++ b/data/isdv4-4814.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-481a.tablet b/data/isdv4-481a.tablet index eae42aa44..7b68fb0ec 100644 --- a/data/isdv4-481a.tablet +++ b/data/isdv4-481a.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4822.tablet b/data/isdv4-4822.tablet index 5afdb77ca..dbf8d05b7 100644 --- a/data/isdv4-4822.tablet +++ b/data/isdv4-4822.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4824.tablet b/data/isdv4-4824.tablet index 58cfaed30..70bad3074 100644 --- a/data/isdv4-4824.tablet +++ b/data/isdv4-4824.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4831.tablet b/data/isdv4-4831.tablet index 7c7e11f8d..e74eb896a 100644 --- a/data/isdv4-4831.tablet +++ b/data/isdv4-4831.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4834.tablet b/data/isdv4-4834.tablet index 719dd2a2b..52f19dc14 100644 --- a/data/isdv4-4834.tablet +++ b/data/isdv4-4834.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4838.tablet b/data/isdv4-4838.tablet index da674ec4f..4bcae2f64 100644 --- a/data/isdv4-4838.tablet +++ b/data/isdv4-4838.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4841.tablet b/data/isdv4-4841.tablet index cd136f6b1..3d2253443 100644 --- a/data/isdv4-4841.tablet +++ b/data/isdv4-4841.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-484c.tablet b/data/isdv4-484c.tablet index 1a7a6b4e1..b82233e54 100644 --- a/data/isdv4-484c.tablet +++ b/data/isdv4-484c.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-484d.tablet b/data/isdv4-484d.tablet index b21296b70..c0da0ef74 100644 --- a/data/isdv4-484d.tablet +++ b/data/isdv4-484d.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-484e.tablet b/data/isdv4-484e.tablet index 49fe3b12d..fab0e78dd 100644 --- a/data/isdv4-484e.tablet +++ b/data/isdv4-484e.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4851.tablet b/data/isdv4-4851.tablet index 471ce2bba..55d42db82 100644 --- a/data/isdv4-4851.tablet +++ b/data/isdv4-4851.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-485e.tablet b/data/isdv4-485e.tablet index 83b95584c..83fa3b437 100644 --- a/data/isdv4-485e.tablet +++ b/data/isdv4-485e.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4865.tablet b/data/isdv4-4865.tablet index bce73dcdd..b3c0704d1 100644 --- a/data/isdv4-4865.tablet +++ b/data/isdv4-4865.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-486a.tablet b/data/isdv4-486a.tablet index 92cdf4630..b23e9db18 100644 --- a/data/isdv4-486a.tablet +++ b/data/isdv4-486a.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4870.tablet b/data/isdv4-4870.tablet index b4af151b8..ca800b0bb 100644 --- a/data/isdv4-4870.tablet +++ b/data/isdv4-4870.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4875.tablet b/data/isdv4-4875.tablet index deedbb931..ee1b8649d 100644 --- a/data/isdv4-4875.tablet +++ b/data/isdv4-4875.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-488f.tablet b/data/isdv4-488f.tablet index 0ac93149f..92548f4e7 100644 --- a/data/isdv4-488f.tablet +++ b/data/isdv4-488f.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4898.tablet b/data/isdv4-4898.tablet index ca11affeb..d6a632086 100644 --- a/data/isdv4-4898.tablet +++ b/data/isdv4-4898.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48c9.tablet b/data/isdv4-48c9.tablet index 231a6bfc6..5bdf6d352 100644 --- a/data/isdv4-48c9.tablet +++ b/data/isdv4-48c9.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48ca.tablet b/data/isdv4-48ca.tablet index de266934a..cab19ef62 100644 --- a/data/isdv4-48ca.tablet +++ b/data/isdv4-48ca.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48ce.tablet b/data/isdv4-48ce.tablet index f00ad681d..949d5547c 100644 --- a/data/isdv4-48ce.tablet +++ b/data/isdv4-48ce.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48d6.tablet b/data/isdv4-48d6.tablet index c10cb1494..0da4267f7 100644 --- a/data/isdv4-48d6.tablet +++ b/data/isdv4-48d6.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48eb.tablet b/data/isdv4-48eb.tablet index ccaa7752c..b96379bfe 100644 --- a/data/isdv4-48eb.tablet +++ b/data/isdv4-48eb.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48ec.tablet b/data/isdv4-48ec.tablet index 0cd4f6155..f82c9e279 100644 --- a/data/isdv4-48ec.tablet +++ b/data/isdv4-48ec.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48ed.tablet b/data/isdv4-48ed.tablet index 4fe69c365..c2cb5f4b7 100644 --- a/data/isdv4-48ed.tablet +++ b/data/isdv4-48ed.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48ee.tablet b/data/isdv4-48ee.tablet index 9a05d8741..a19de2a96 100644 --- a/data/isdv4-48ee.tablet +++ b/data/isdv4-48ee.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-48f6.tablet b/data/isdv4-48f6.tablet index 9e4195400..ed4b53bcb 100644 --- a/data/isdv4-48f6.tablet +++ b/data/isdv4-48f6.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-490a.tablet b/data/isdv4-490a.tablet index 9b00a9a6f..5c95902f2 100644 --- a/data/isdv4-490a.tablet +++ b/data/isdv4-490a.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-490b.tablet b/data/isdv4-490b.tablet index c0063f095..996300574 100644 --- a/data/isdv4-490b.tablet +++ b/data/isdv4-490b.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4957.tablet b/data/isdv4-4957.tablet index 7d735477f..26a2c03bb 100644 --- a/data/isdv4-4957.tablet +++ b/data/isdv4-4957.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-495f.tablet b/data/isdv4-495f.tablet index 65773853f..b0add14c5 100644 --- a/data/isdv4-495f.tablet +++ b/data/isdv4-495f.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-496c.tablet b/data/isdv4-496c.tablet index f49b0533e..e87869ce9 100644 --- a/data/isdv4-496c.tablet +++ b/data/isdv4-496c.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4988.tablet b/data/isdv4-4988.tablet index 40c6f339e..a41f4bc83 100644 --- a/data/isdv4-4988.tablet +++ b/data/isdv4-4988.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-4995.tablet b/data/isdv4-4995.tablet index 6cdd1115e..99950990c 100644 --- a/data/isdv4-4995.tablet +++ b/data/isdv4-4995.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-49a3.tablet b/data/isdv4-49a3.tablet index ec25567d8..84598d0fb 100644 --- a/data/isdv4-49a3.tablet +++ b/data/isdv4-49a3.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-49c8.tablet b/data/isdv4-49c8.tablet index d98927040..a6b47a347 100644 --- a/data/isdv4-49c8.tablet +++ b/data/isdv4-49c8.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5000.tablet b/data/isdv4-5000.tablet index 09bcb1a75..a1c0fa4cd 100644 --- a/data/isdv4-5000.tablet +++ b/data/isdv4-5000.tablet @@ -10,4 +10,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5002.tablet b/data/isdv4-5002.tablet index b465d516f..d460098d1 100644 --- a/data/isdv4-5002.tablet +++ b/data/isdv4-5002.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5010.tablet b/data/isdv4-5010.tablet index 35e748af3..0e28b3b85 100644 --- a/data/isdv4-5010.tablet +++ b/data/isdv4-5010.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5013.tablet b/data/isdv4-5013.tablet index 060757c6b..7fa09bb57 100644 --- a/data/isdv4-5013.tablet +++ b/data/isdv4-5013.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5014.tablet b/data/isdv4-5014.tablet index 62a680d67..459ac2271 100644 --- a/data/isdv4-5014.tablet +++ b/data/isdv4-5014.tablet @@ -14,4 +14,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5019.tablet b/data/isdv4-5019.tablet index d19f4fb06..1031c67c6 100644 --- a/data/isdv4-5019.tablet +++ b/data/isdv4-5019.tablet @@ -19,4 +19,3 @@ Styli=@generic-with-eraser; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-502a.tablet b/data/isdv4-502a.tablet index 8281a6d4d..dbe47033c 100644 --- a/data/isdv4-502a.tablet +++ b/data/isdv4-502a.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-503e.tablet b/data/isdv4-503e.tablet index 066fb3dd9..b3ee5ee13 100644 --- a/data/isdv4-503e.tablet +++ b/data/isdv4-503e.tablet @@ -15,4 +15,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-503f.tablet b/data/isdv4-503f.tablet index 194076a65..8caca1967 100644 --- a/data/isdv4-503f.tablet +++ b/data/isdv4-503f.tablet @@ -15,4 +15,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5040.tablet b/data/isdv4-5040.tablet index d821a1aa9..8f74231f1 100644 --- a/data/isdv4-5040.tablet +++ b/data/isdv4-5040.tablet @@ -16,4 +16,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5044.tablet b/data/isdv4-5044.tablet index 5baaefd8e..0c178ca40 100644 --- a/data/isdv4-5044.tablet +++ b/data/isdv4-5044.tablet @@ -16,4 +16,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5048.tablet b/data/isdv4-5048.tablet index ec3f9f2f2..dca6ea14d 100644 --- a/data/isdv4-5048.tablet +++ b/data/isdv4-5048.tablet @@ -15,4 +15,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-504a.tablet b/data/isdv4-504a.tablet index 07d91fcc4..46c477353 100644 --- a/data/isdv4-504a.tablet +++ b/data/isdv4-504a.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-504c.tablet b/data/isdv4-504c.tablet index 2ddf2085b..f5731524f 100644 --- a/data/isdv4-504c.tablet +++ b/data/isdv4-504c.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5072.tablet b/data/isdv4-5072.tablet index d1ef61819..622daf222 100644 --- a/data/isdv4-5072.tablet +++ b/data/isdv4-5072.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5090.tablet b/data/isdv4-5090.tablet index be1e5552a..e265aee9d 100644 --- a/data/isdv4-5090.tablet +++ b/data/isdv4-5090.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5093.tablet b/data/isdv4-5093.tablet index 66b46cbf2..f34028880 100644 --- a/data/isdv4-5093.tablet +++ b/data/isdv4-5093.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5099.tablet b/data/isdv4-5099.tablet index c0e53bd02..a005b2b68 100644 --- a/data/isdv4-5099.tablet +++ b/data/isdv4-5099.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-509d.tablet b/data/isdv4-509d.tablet index 0dad8ad2c..6b607bdc4 100644 --- a/data/isdv4-509d.tablet +++ b/data/isdv4-509d.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-509f.tablet b/data/isdv4-509f.tablet index 27a68222a..d609455cb 100644 --- a/data/isdv4-509f.tablet +++ b/data/isdv4-509f.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50a9.tablet b/data/isdv4-50a9.tablet index 1fe8897a3..4e3f629c7 100644 --- a/data/isdv4-50a9.tablet +++ b/data/isdv4-50a9.tablet @@ -14,5 +14,4 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50b4.tablet b/data/isdv4-50b4.tablet index d82a6cc54..0ad670a95 100644 --- a/data/isdv4-50b4.tablet +++ b/data/isdv4-50b4.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50b6.tablet b/data/isdv4-50b6.tablet index 0609a59d3..52d8ebbc2 100644 --- a/data/isdv4-50b6.tablet +++ b/data/isdv4-50b6.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50b8.tablet b/data/isdv4-50b8.tablet index b0d33240a..241fd06f0 100644 --- a/data/isdv4-50b8.tablet +++ b/data/isdv4-50b8.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50db.tablet b/data/isdv4-50db.tablet index e151cfc61..6df8a745c 100644 --- a/data/isdv4-50db.tablet +++ b/data/isdv4-50db.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50e9.tablet b/data/isdv4-50e9.tablet index 9a9730fec..1512b9142 100644 --- a/data/isdv4-50e9.tablet +++ b/data/isdv4-50e9.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50ef.tablet b/data/isdv4-50ef.tablet index 4d7661a0a..bc1269642 100644 --- a/data/isdv4-50ef.tablet +++ b/data/isdv4-50ef.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50f1.tablet b/data/isdv4-50f1.tablet index 314fd1e2c..3702240cf 100644 --- a/data/isdv4-50f1.tablet +++ b/data/isdv4-50f1.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50f8.tablet b/data/isdv4-50f8.tablet index e3fe04b11..1a1abfbca 100644 --- a/data/isdv4-50f8.tablet +++ b/data/isdv4-50f8.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50fd.tablet b/data/isdv4-50fd.tablet index f470d5d29..1c94695bd 100644 --- a/data/isdv4-50fd.tablet +++ b/data/isdv4-50fd.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-50fe.tablet b/data/isdv4-50fe.tablet index 59f100d8a..55e86c4f6 100644 --- a/data/isdv4-50fe.tablet +++ b/data/isdv4-50fe.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5110.tablet b/data/isdv4-5110.tablet index 1882bad57..292a17261 100644 --- a/data/isdv4-5110.tablet +++ b/data/isdv4-5110.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5115.tablet b/data/isdv4-5115.tablet index f373922ee..a43dd0fa4 100644 --- a/data/isdv4-5115.tablet +++ b/data/isdv4-5115.tablet @@ -12,4 +12,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-511a.tablet b/data/isdv4-511a.tablet index b016a692e..957c5d6e1 100644 --- a/data/isdv4-511a.tablet +++ b/data/isdv4-511a.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5122.tablet b/data/isdv4-5122.tablet index b8948eee9..471e6a568 100644 --- a/data/isdv4-5122.tablet +++ b/data/isdv4-5122.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5128.tablet b/data/isdv4-5128.tablet index 43036951c..a02df5f97 100644 --- a/data/isdv4-5128.tablet +++ b/data/isdv4-5128.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-513b.tablet b/data/isdv4-513b.tablet index 750ecfa15..3c99a882e 100644 --- a/data/isdv4-513b.tablet +++ b/data/isdv4-513b.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5144.tablet b/data/isdv4-5144.tablet index 80238126d..d202e5300 100644 --- a/data/isdv4-5144.tablet +++ b/data/isdv4-5144.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5146.tablet b/data/isdv4-5146.tablet index 755929c52..3956bb932 100644 --- a/data/isdv4-5146.tablet +++ b/data/isdv4-5146.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5147.tablet b/data/isdv4-5147.tablet index 45c66e83c..18661ec32 100644 --- a/data/isdv4-5147.tablet +++ b/data/isdv4-5147.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5148.tablet b/data/isdv4-5148.tablet index 8639a3009..86632c6e2 100644 --- a/data/isdv4-5148.tablet +++ b/data/isdv4-5148.tablet @@ -16,4 +16,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5150.tablet b/data/isdv4-5150.tablet index d815286f5..92dcd34cc 100644 --- a/data/isdv4-5150.tablet +++ b/data/isdv4-5150.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5155.tablet b/data/isdv4-5155.tablet index 0aede6921..12d14170e 100644 --- a/data/isdv4-5155.tablet +++ b/data/isdv4-5155.tablet @@ -16,4 +16,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5157.tablet b/data/isdv4-5157.tablet index 4bec2850a..8ad293a05 100644 --- a/data/isdv4-5157.tablet +++ b/data/isdv4-5157.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5158.tablet b/data/isdv4-5158.tablet index 972e4b129..aa3fa65a7 100644 --- a/data/isdv4-5158.tablet +++ b/data/isdv4-5158.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5159.tablet b/data/isdv4-5159.tablet index d64f905c8..d09972b20 100644 --- a/data/isdv4-5159.tablet +++ b/data/isdv4-5159.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-515a.tablet b/data/isdv4-515a.tablet index 952880d11..431ba9da7 100644 --- a/data/isdv4-515a.tablet +++ b/data/isdv4-515a.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5169.tablet b/data/isdv4-5169.tablet index b218fefa9..51ea7d40c 100644 --- a/data/isdv4-5169.tablet +++ b/data/isdv4-5169.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-516b.tablet b/data/isdv4-516b.tablet index 0074ff009..22e960a39 100644 --- a/data/isdv4-516b.tablet +++ b/data/isdv4-516b.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-517d.tablet b/data/isdv4-517d.tablet index 452f556f7..2808c1461 100644 --- a/data/isdv4-517d.tablet +++ b/data/isdv4-517d.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5196.tablet b/data/isdv4-5196.tablet index d3c7e8a28..186e3c477 100644 --- a/data/isdv4-5196.tablet +++ b/data/isdv4-5196.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51a0.tablet b/data/isdv4-51a0.tablet index a843789f5..8e850278f 100644 --- a/data/isdv4-51a0.tablet +++ b/data/isdv4-51a0.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51af.tablet b/data/isdv4-51af.tablet index c5d1b1a57..430ad76a4 100644 --- a/data/isdv4-51af.tablet +++ b/data/isdv4-51af.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51b0.tablet b/data/isdv4-51b0.tablet index 41a7122bd..c999962ac 100644 --- a/data/isdv4-51b0.tablet +++ b/data/isdv4-51b0.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51b1.tablet b/data/isdv4-51b1.tablet index 396be8381..bb795a54e 100644 --- a/data/isdv4-51b1.tablet +++ b/data/isdv4-51b1.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51b2.tablet b/data/isdv4-51b2.tablet index b2dc99ca2..402bfee22 100644 --- a/data/isdv4-51b2.tablet +++ b/data/isdv4-51b2.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51b3.tablet b/data/isdv4-51b3.tablet index 39ee0dd50..1054d71f2 100644 --- a/data/isdv4-51b3.tablet +++ b/data/isdv4-51b3.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51b6.tablet b/data/isdv4-51b6.tablet index 234fa87f7..a6110027f 100644 --- a/data/isdv4-51b6.tablet +++ b/data/isdv4-51b6.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51b7.tablet b/data/isdv4-51b7.tablet index 53a58235e..10ffd56a2 100644 --- a/data/isdv4-51b7.tablet +++ b/data/isdv4-51b7.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51b8.tablet b/data/isdv4-51b8.tablet index d55a3c3dd..4e8942019 100644 --- a/data/isdv4-51b8.tablet +++ b/data/isdv4-51b8.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51b9.tablet b/data/isdv4-51b9.tablet index b7e182c84..58839854a 100644 --- a/data/isdv4-51b9.tablet +++ b/data/isdv4-51b9.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51ba.tablet b/data/isdv4-51ba.tablet index bf51970d4..469a59f35 100644 --- a/data/isdv4-51ba.tablet +++ b/data/isdv4-51ba.tablet @@ -15,4 +15,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51bb.tablet b/data/isdv4-51bb.tablet index 6ddb91fd3..ad3f9a796 100644 --- a/data/isdv4-51bb.tablet +++ b/data/isdv4-51bb.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51bc.tablet b/data/isdv4-51bc.tablet index fe992c326..aac2103c4 100644 --- a/data/isdv4-51bc.tablet +++ b/data/isdv4-51bc.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51bd.tablet b/data/isdv4-51bd.tablet index 18da01ea2..4b24248bb 100644 --- a/data/isdv4-51bd.tablet +++ b/data/isdv4-51bd.tablet @@ -15,4 +15,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51be.tablet b/data/isdv4-51be.tablet index f2af426d6..427b02716 100644 --- a/data/isdv4-51be.tablet +++ b/data/isdv4-51be.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51bf.tablet b/data/isdv4-51bf.tablet index 99a18e6dd..ef542d753 100644 --- a/data/isdv4-51bf.tablet +++ b/data/isdv4-51bf.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51c4.tablet b/data/isdv4-51c4.tablet index 999620a30..fe71d49ee 100644 --- a/data/isdv4-51c4.tablet +++ b/data/isdv4-51c4.tablet @@ -13,4 +13,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51c7.tablet b/data/isdv4-51c7.tablet index 3e3176618..f9ce64f7a 100644 --- a/data/isdv4-51c7.tablet +++ b/data/isdv4-51c7.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51d0.tablet b/data/isdv4-51d0.tablet index 6dffec9b0..3444683d5 100644 --- a/data/isdv4-51d0.tablet +++ b/data/isdv4-51d0.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51e2.tablet b/data/isdv4-51e2.tablet index d396d8274..e548a0536 100644 --- a/data/isdv4-51e2.tablet +++ b/data/isdv4-51e2.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51e9.tablet b/data/isdv4-51e9.tablet index 8684b26c6..af8b6e269 100644 --- a/data/isdv4-51e9.tablet +++ b/data/isdv4-51e9.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51ef.tablet b/data/isdv4-51ef.tablet index 3ef9ed232..ad6964f1b 100644 --- a/data/isdv4-51ef.tablet +++ b/data/isdv4-51ef.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51f5.tablet b/data/isdv4-51f5.tablet index 99977549d..43cefc565 100644 --- a/data/isdv4-51f5.tablet +++ b/data/isdv4-51f5.tablet @@ -14,4 +14,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51f6.tablet b/data/isdv4-51f6.tablet index c40078615..1cdc41974 100644 --- a/data/isdv4-51f6.tablet +++ b/data/isdv4-51f6.tablet @@ -14,4 +14,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-51f9.tablet b/data/isdv4-51f9.tablet index 6eecb63ae..de5d42f92 100644 --- a/data/isdv4-51f9.tablet +++ b/data/isdv4-51f9.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5202.tablet b/data/isdv4-5202.tablet index 8014b5d6b..7429cdbf9 100644 --- a/data/isdv4-5202.tablet +++ b/data/isdv4-5202.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5204.tablet b/data/isdv4-5204.tablet index df7089bd3..fed13c594 100644 --- a/data/isdv4-5204.tablet +++ b/data/isdv4-5204.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5215.tablet b/data/isdv4-5215.tablet index eb523a368..45a9e6503 100644 --- a/data/isdv4-5215.tablet +++ b/data/isdv4-5215.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5216.tablet b/data/isdv4-5216.tablet index 5863d980d..becc69105 100644 --- a/data/isdv4-5216.tablet +++ b/data/isdv4-5216.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5218.tablet b/data/isdv4-5218.tablet index 00a007b4b..b37464211 100644 --- a/data/isdv4-5218.tablet +++ b/data/isdv4-5218.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-521c.tablet b/data/isdv4-521c.tablet index eda989360..d09ca77eb 100644 --- a/data/isdv4-521c.tablet +++ b/data/isdv4-521c.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-521f.tablet b/data/isdv4-521f.tablet index a9fa2c2e7..1480f1931 100644 --- a/data/isdv4-521f.tablet +++ b/data/isdv4-521f.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5220.tablet b/data/isdv4-5220.tablet index c1bba66c4..ae841495c 100644 --- a/data/isdv4-5220.tablet +++ b/data/isdv4-5220.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5221.tablet b/data/isdv4-5221.tablet index 70a396344..93b4584e5 100644 --- a/data/isdv4-5221.tablet +++ b/data/isdv4-5221.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5222.tablet b/data/isdv4-5222.tablet index f4ced34ee..591660eb2 100644 --- a/data/isdv4-5222.tablet +++ b/data/isdv4-5222.tablet @@ -20,4 +20,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5229.tablet b/data/isdv4-5229.tablet index 646e2e8e2..16b9f1323 100644 --- a/data/isdv4-5229.tablet +++ b/data/isdv4-5229.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-523a.tablet b/data/isdv4-523a.tablet index 10ab10920..8df3c9cdd 100644 --- a/data/isdv4-523a.tablet +++ b/data/isdv4-523a.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-523e.tablet b/data/isdv4-523e.tablet index 2a2e72225..9de8bc7ee 100644 --- a/data/isdv4-523e.tablet +++ b/data/isdv4-523e.tablet @@ -18,4 +18,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5256.tablet b/data/isdv4-5256.tablet index 24855affc..8bc509ce5 100644 --- a/data/isdv4-5256.tablet +++ b/data/isdv4-5256.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-526c.tablet b/data/isdv4-526c.tablet index 5be10f280..af589751a 100644 --- a/data/isdv4-526c.tablet +++ b/data/isdv4-526c.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5276.tablet b/data/isdv4-5276.tablet index 8b30aa9cb..6595b550b 100644 --- a/data/isdv4-5276.tablet +++ b/data/isdv4-5276.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5277.tablet b/data/isdv4-5277.tablet index 453e376bf..e12d0e8bb 100644 --- a/data/isdv4-5277.tablet +++ b/data/isdv4-5277.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5278.tablet b/data/isdv4-5278.tablet index dd86c263d..2e6165267 100644 --- a/data/isdv4-5278.tablet +++ b/data/isdv4-5278.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5279.tablet b/data/isdv4-5279.tablet index 12a1d6ce8..b54448cda 100644 --- a/data/isdv4-5279.tablet +++ b/data/isdv4-5279.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-527a.tablet b/data/isdv4-527a.tablet index f46da56bc..5d926f422 100644 --- a/data/isdv4-527a.tablet +++ b/data/isdv4-527a.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-527e.tablet b/data/isdv4-527e.tablet index 2466b9bda..6a60d7613 100644 --- a/data/isdv4-527e.tablet +++ b/data/isdv4-527e.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-527f.tablet b/data/isdv4-527f.tablet index 25335bed3..7a59ba48a 100644 --- a/data/isdv4-527f.tablet +++ b/data/isdv4-527f.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5285.tablet b/data/isdv4-5285.tablet index 75626ee60..7fd00f098 100644 --- a/data/isdv4-5285.tablet +++ b/data/isdv4-5285.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-5286.tablet b/data/isdv4-5286.tablet index e99d8beb9..fbd6c4e56 100644 --- a/data/isdv4-5286.tablet +++ b/data/isdv4-5286.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-528e.tablet b/data/isdv4-528e.tablet index d697f279e..11d192472 100644 --- a/data/isdv4-528e.tablet +++ b/data/isdv4-528e.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-52a2.tablet b/data/isdv4-52a2.tablet index db6b9f970..04f8bb255 100644 --- a/data/isdv4-52a2.tablet +++ b/data/isdv4-52a2.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-52b0.tablet b/data/isdv4-52b0.tablet index 4ff56fcb0..836d58b09 100644 --- a/data/isdv4-52b0.tablet +++ b/data/isdv4-52b0.tablet @@ -19,4 +19,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-52d3.tablet b/data/isdv4-52d3.tablet index 279711387..ddf458e6b 100644 --- a/data/isdv4-52d3.tablet +++ b/data/isdv4-52d3.tablet @@ -16,4 +16,3 @@ Styli=@isdv4-aes; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-52d5.tablet b/data/isdv4-52d5.tablet index 1eeb1e492..dd0d74e28 100644 --- a/data/isdv4-52d5.tablet +++ b/data/isdv4-52d5.tablet @@ -17,5 +17,4 @@ Reversible=false Stylus=true Touch=true Ring=false -Buttons=0 BuiltIn=true diff --git a/data/isdv4-90.tablet b/data/isdv4-90.tablet index 2958db6dd..aa07fdf26 100644 --- a/data/isdv4-90.tablet +++ b/data/isdv4-90.tablet @@ -16,4 +16,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-93.tablet b/data/isdv4-93.tablet index e9a1172fe..09a56282d 100644 --- a/data/isdv4-93.tablet +++ b/data/isdv4-93.tablet @@ -16,4 +16,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-e2.tablet b/data/isdv4-e2.tablet index 55c610241..10f503211 100644 --- a/data/isdv4-e2.tablet +++ b/data/isdv4-e2.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=false -Buttons=0 diff --git a/data/isdv4-e3.tablet b/data/isdv4-e3.tablet index d18ee8be6..c84783438 100644 --- a/data/isdv4-e3.tablet +++ b/data/isdv4-e3.tablet @@ -10,4 +10,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-e5.tablet b/data/isdv4-e5.tablet index fd74dc73a..cfdc03d0c 100644 --- a/data/isdv4-e5.tablet +++ b/data/isdv4-e5.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=false Touch=true -Buttons=0 diff --git a/data/isdv4-e6.tablet b/data/isdv4-e6.tablet index ca6b31eba..1510ad189 100644 --- a/data/isdv4-e6.tablet +++ b/data/isdv4-e6.tablet @@ -12,4 +12,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-ec.tablet b/data/isdv4-ec.tablet index 5f0021787..6a3fd9683 100644 --- a/data/isdv4-ec.tablet +++ b/data/isdv4-ec.tablet @@ -12,4 +12,3 @@ PairedID=usb:04f3:0254 [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-ed.tablet b/data/isdv4-ed.tablet index 06cde176a..b7ce39703 100644 --- a/data/isdv4-ed.tablet +++ b/data/isdv4-ed.tablet @@ -10,4 +10,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/isdv4-ef.tablet b/data/isdv4-ef.tablet index 03064bc1e..0181a0acf 100644 --- a/data/isdv4-ef.tablet +++ b/data/isdv4-ef.tablet @@ -9,4 +9,3 @@ IntegratedIn=Display;System [Features] Stylus=true -Buttons=0 diff --git a/data/kamvas-pro-13.tablet b/data/kamvas-pro-13.tablet index 1bee3698d..cf5d9c2c5 100644 --- a/data/kamvas-pro-13.tablet +++ b/data/kamvas-pro-13.tablet @@ -50,7 +50,6 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=5 [Buttons] Left=A;B;C;D;E diff --git a/data/letsketch-wp9620.tablet b/data/letsketch-wp9620.tablet index 326ec0fba..8f2e4fc78 100644 --- a/data/letsketch-wp9620.tablet +++ b/data/letsketch-wp9620.tablet @@ -17,4 +17,3 @@ IntegratedIn= [Features] Stylus=true Reversible=true -Buttons=0 diff --git a/data/mobilestudio-pro-13-2.tablet b/data/mobilestudio-pro-13-2.tablet index 6be21cb24..18c128369 100644 --- a/data/mobilestudio-pro-13-2.tablet +++ b/data/mobilestudio-pro-13-2.tablet @@ -49,7 +49,6 @@ IntegratedIn=Display;System Stylus=true Touch=true Ring=true -Buttons=11 [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K diff --git a/data/mobilestudio-pro-13.tablet b/data/mobilestudio-pro-13.tablet index 61963bd07..18d53b12a 100644 --- a/data/mobilestudio-pro-13.tablet +++ b/data/mobilestudio-pro-13.tablet @@ -49,7 +49,6 @@ IntegratedIn=Display;System Stylus=true Touch=true Ring=true -Buttons=11 [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K diff --git a/data/mobilestudio-pro-16-2.tablet b/data/mobilestudio-pro-16-2.tablet index f11c90957..0da451167 100644 --- a/data/mobilestudio-pro-16-2.tablet +++ b/data/mobilestudio-pro-16-2.tablet @@ -51,7 +51,6 @@ IntegratedIn=Display;System Stylus=true Touch=true Ring=true -Buttons=13 [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K;L;M diff --git a/data/mobilestudio-pro-16-3.tablet b/data/mobilestudio-pro-16-3.tablet index b6a932c51..ad9643b8a 100644 --- a/data/mobilestudio-pro-16-3.tablet +++ b/data/mobilestudio-pro-16-3.tablet @@ -51,7 +51,6 @@ IntegratedIn=Display;System Stylus=true Touch=true Ring=true -Buttons=13 [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K;L;M diff --git a/data/mobilestudio-pro-16.tablet b/data/mobilestudio-pro-16.tablet index a99e171fa..203d49008 100644 --- a/data/mobilestudio-pro-16.tablet +++ b/data/mobilestudio-pro-16.tablet @@ -51,7 +51,6 @@ IntegratedIn=Display;System Stylus=true Touch=true Ring=true -Buttons=13 [Buttons] Left=A;B;C;D;E;F;G;H;I;J;K;L;M diff --git a/data/n-trig-pen.tablet b/data/n-trig-pen.tablet index f16c38a2d..f47da4906 100644 --- a/data/n-trig-pen.tablet +++ b/data/n-trig-pen.tablet @@ -17,4 +17,3 @@ IntegratedIn=Display;System [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/one-by-wacom-m-p.tablet b/data/one-by-wacom-m-p.tablet index 40dfb7bc4..1f079ad90 100644 --- a/data/one-by-wacom-m-p.tablet +++ b/data/one-by-wacom-m-p.tablet @@ -21,4 +21,3 @@ IntegratedIn= Stylus=true Reversible=true Touch=false -Buttons=0 diff --git a/data/one-by-wacom-m-p2.tablet b/data/one-by-wacom-m-p2.tablet index 28208720f..b1c876d93 100644 --- a/data/one-by-wacom-m-p2.tablet +++ b/data/one-by-wacom-m-p2.tablet @@ -21,4 +21,3 @@ IntegratedIn= Stylus=true Reversible=true Touch=false -Buttons=0 diff --git a/data/one-by-wacom-s-p.tablet b/data/one-by-wacom-s-p.tablet index 2947e6d77..8d0270726 100644 --- a/data/one-by-wacom-s-p.tablet +++ b/data/one-by-wacom-s-p.tablet @@ -21,4 +21,3 @@ IntegratedIn= Stylus=true Reversible=true Touch=false -Buttons=0 diff --git a/data/one-by-wacom-s-p2.tablet b/data/one-by-wacom-s-p2.tablet index 453926ee6..68edf4241 100644 --- a/data/one-by-wacom-s-p2.tablet +++ b/data/one-by-wacom-s-p2.tablet @@ -21,4 +21,3 @@ IntegratedIn= Stylus=true Reversible=true Touch=false -Buttons=0 diff --git a/data/serial-wacf004.tablet b/data/serial-wacf004.tablet index d349bf588..28001601d 100644 --- a/data/serial-wacf004.tablet +++ b/data/serial-wacf004.tablet @@ -8,4 +8,3 @@ IntegratedIn=Display;System [Features] Stylus=true Ring=false -Buttons=0 diff --git a/data/surface-go-2.tablet b/data/surface-go-2.tablet index ff3d464d0..f2f4bd99c 100644 --- a/data/surface-go-2.tablet +++ b/data/surface-go-2.tablet @@ -16,4 +16,3 @@ IntegratedIn=Display;System; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/surface-go.tablet b/data/surface-go.tablet index 73da0c543..5a61d10db 100644 --- a/data/surface-go.tablet +++ b/data/surface-go.tablet @@ -15,4 +15,3 @@ IntegratedIn=Display;System; [Features] Stylus=true Touch=true -Buttons=0 diff --git a/data/volito-4x5.tablet b/data/volito-4x5.tablet index e926307ca..119e11180 100644 --- a/data/volito-4x5.tablet +++ b/data/volito-4x5.tablet @@ -13,4 +13,3 @@ Styli=@generic-no-eraser; [Features] Stylus=true -Buttons=0 diff --git a/data/wacom-hid-52fa-pen.tablet b/data/wacom-hid-52fa-pen.tablet index b9409f3f1..4f1c4dcf5 100644 --- a/data/wacom-hid-52fa-pen.tablet +++ b/data/wacom-hid-52fa-pen.tablet @@ -20,4 +20,3 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=0 diff --git a/data/wacom-one-12.tablet b/data/wacom-one-12.tablet index 5662fd697..f256447dc 100644 --- a/data/wacom-one-12.tablet +++ b/data/wacom-one-12.tablet @@ -20,4 +20,3 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=0 \ No newline at end of file diff --git a/data/wacom-one-13.tablet b/data/wacom-one-13.tablet index 8cb4b6297..7f9b8c087 100644 --- a/data/wacom-one-13.tablet +++ b/data/wacom-one-13.tablet @@ -20,4 +20,3 @@ Stylus=true Reversible=false Touch=true Ring=false -Buttons=0 diff --git a/data/wacom-one-pen-m.tablet b/data/wacom-one-pen-m.tablet index db507539b..862adc615 100644 --- a/data/wacom-one-pen-m.tablet +++ b/data/wacom-one-pen-m.tablet @@ -28,4 +28,3 @@ IntegratedIn= Stylus=true Reversible=false Touch=false -Buttons=0 diff --git a/data/wacom-one-pen-s.tablet b/data/wacom-one-pen-s.tablet index 30cf99024..9c53cb0ec 100644 --- a/data/wacom-one-pen-s.tablet +++ b/data/wacom-one-pen-s.tablet @@ -28,4 +28,3 @@ IntegratedIn= Stylus=true Reversible=false Touch=false -Buttons=0 diff --git a/data/wacom-one.tablet b/data/wacom-one.tablet index 3bd2b18c7..eec4f3186 100644 --- a/data/wacom-one.tablet +++ b/data/wacom-one.tablet @@ -17,4 +17,3 @@ Stylus=true Reversible=false Touch=false Ring=false -Buttons=0 diff --git a/data/wacom.example b/data/wacom.example index c6e6f4654..d4366c3c1 100644 --- a/data/wacom.example +++ b/data/wacom.example @@ -166,7 +166,6 @@ Ring2=false NumStrips=1 # Number of buttons on the tablet -Buttons=9 # Metadata about the buttons on the tablet # Buttons are "numbered" using upper-case letters diff --git a/data/waltop-slim-tablet-12-1.tablet b/data/waltop-slim-tablet-12-1.tablet index 3c362f392..746818416 100644 --- a/data/waltop-slim-tablet-12-1.tablet +++ b/data/waltop-slim-tablet-12-1.tablet @@ -20,4 +20,3 @@ Styli=@generic-no-eraser; Stylus=true Reversible=false Touch=false -Buttons=0 diff --git a/data/xp-pen-artist12.tablet b/data/xp-pen-artist12.tablet index 0484a7321..31fdc8e92 100644 --- a/data/xp-pen-artist12.tablet +++ b/data/xp-pen-artist12.tablet @@ -24,7 +24,6 @@ TouchSwitch=false Ring=false Ring2=false NumStrips=1 -Buttons=6 [Buttons] Left=A;B;C;D;E;F diff --git a/data/xp-pen-deco-l.tablet b/data/xp-pen-deco-l.tablet index 8e48a2b8d..ebb66e2ad 100644 --- a/data/xp-pen-deco-l.tablet +++ b/data/xp-pen-deco-l.tablet @@ -24,7 +24,6 @@ TouchSwitch=false Ring=false Ring2=false NumStrips=0 -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/xp-pen-deco-mini7.tablet b/data/xp-pen-deco-mini7.tablet index eaaeb585f..f31763749 100644 --- a/data/xp-pen-deco-mini7.tablet +++ b/data/xp-pen-deco-mini7.tablet @@ -18,7 +18,6 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/xp-pen-deco-mw.tablet b/data/xp-pen-deco-mw.tablet index fdbe7fd2d..e2294fb63 100644 --- a/data/xp-pen-deco-mw.tablet +++ b/data/xp-pen-deco-mw.tablet @@ -22,7 +22,6 @@ TouchSwitch=false Ring=false Ring2=false NumStrips=0 -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/xp-pen-deco-pro-mw.tablet b/data/xp-pen-deco-pro-mw.tablet index 6f564cfbc..7e391c85f 100644 --- a/data/xp-pen-deco-pro-mw.tablet +++ b/data/xp-pen-deco-pro-mw.tablet @@ -36,7 +36,6 @@ Touch=false Ring=true Ring2=false NumStrips=0 -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/xp-pen-deco-pro-sw.tablet b/data/xp-pen-deco-pro-sw.tablet index a836dd4d5..d1532e35d 100644 --- a/data/xp-pen-deco-pro-sw.tablet +++ b/data/xp-pen-deco-pro-sw.tablet @@ -23,7 +23,6 @@ Touch=false Ring=true Ring2=false NumStrips=0 -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/xp-pen-deco01-v2.tablet b/data/xp-pen-deco01-v2.tablet index 609188e90..e7e77d579 100644 --- a/data/xp-pen-deco01-v2.tablet +++ b/data/xp-pen-deco01-v2.tablet @@ -24,7 +24,6 @@ TouchSwitch=false Ring=false Ring2=false NumStrips=0 -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/data/xp-pen-g430.tablet b/data/xp-pen-g430.tablet index 65f7a2800..ad7bf1532 100644 --- a/data/xp-pen-g430.tablet +++ b/data/xp-pen-g430.tablet @@ -15,4 +15,3 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=0 diff --git a/data/xp-pen-g640.tablet b/data/xp-pen-g640.tablet index 7e8278f87..3c2513c35 100644 --- a/data/xp-pen-g640.tablet +++ b/data/xp-pen-g640.tablet @@ -15,5 +15,4 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=0 diff --git a/data/xp-pen-star03.tablet b/data/xp-pen-star03.tablet index edfdf97ef..76a567845 100644 --- a/data/xp-pen-star03.tablet +++ b/data/xp-pen-star03.tablet @@ -17,7 +17,6 @@ Styli=@generic-no-eraser; Stylus=true Reversible=true Touch=false -Buttons=8 [Buttons] Left=A;B;C;D;E;F;G;H diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c index e55cbb445..f7a3a3c98 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c @@ -591,6 +591,9 @@ libwacom_parse_buttons(WacomDevice *device, { guint i; + if (!g_key_file_has_group(keyfile, BUTTONS_GROUP)) + return; + for (i = 0; i < G_N_ELEMENTS (options); i++) libwacom_parse_buttons_key(device, keyfile, options[i].key, options[i].flag); @@ -661,7 +664,6 @@ libwacom_parse_tablet_keyfile(WacomDeviceDatabase *db, char *paired; char **string_list; bool success = FALSE; - int num_buttons; keyfile = g_key_file_new(); @@ -799,17 +801,9 @@ libwacom_parse_tablet_keyfile(WacomDeviceDatabase *db, device->num_strips = g_key_file_get_integer(keyfile, FEATURES_GROUP, "NumStrips", NULL); - num_buttons = g_key_file_get_integer(keyfile, FEATURES_GROUP, "Buttons", &error); - if (num_buttons == 0 && - g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) { - g_warning ("Tablet '%s' has no buttons defined, do something!", libwacom_get_match(device)); - g_clear_error (&error); - } - device->buttons = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free); - if (num_buttons > 0) - libwacom_parse_buttons(device, keyfile); + libwacom_parse_buttons(device, keyfile); device->status_leds = g_array_new (FALSE, FALSE, sizeof(WacomStatusLEDs)); string_list = g_key_file_get_string_list(keyfile, FEATURES_GROUP, "StatusLEDs", NULL, NULL); diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c index 84cfd099b..27e6eadd4 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c @@ -886,7 +886,6 @@ libwacom_print_device_description(int fd, const WacomDevice *device) print_supported_leds(fd, device); dprintf(fd, "NumStrips=%d\n", libwacom_get_num_strips(device)); - dprintf(fd, "Buttons=%d\n", libwacom_get_num_buttons(device)); dprintf(fd, "\n"); print_buttons_for_device(fd, device); @@ -1354,7 +1353,6 @@ libwacom_print_stylus_description (int fd, const WacomStylus *stylus) dprintf(fd, "[%#x]\n", libwacom_stylus_get_id(stylus)); dprintf(fd, "Name=%s\n", libwacom_stylus_get_name(stylus)); - dprintf(fd, "Buttons=%d\n", libwacom_stylus_get_num_buttons(stylus)); dprintf(fd, "PairedIds="); paired_ids = libwacom_stylus_get_paired_ids(stylus, &count); for (i = 0; i < count; i++) { diff --git a/test/test_data_files.py b/test/test_data_files.py index c2db89975..4cca787f2 100755 --- a/test/test_data_files.py +++ b/test/test_data_files.py @@ -87,7 +87,13 @@ def test_button_evcodes(tabletfile): config.read(tabletfile) try: - nbuttons = int(config["Features"]["Buttons"]) + nbuttons = 0 + for where in ["Top", "Bottom", "Left", "Right"]: + try: + buttons = config["Buttons"][where] + nbuttons += len([s for s in buttons.split(";") if s]) + except KeyError: + pass str = config["Buttons"]["EvdevCodes"] codes = [ c for c in str.split(";") if c diff --git a/tools/libwacom-update-db.py b/tools/libwacom-update-db.py index 63c4093e3..e30c88c99 100755 --- a/tools/libwacom-update-db.py +++ b/tools/libwacom-update-db.py @@ -147,10 +147,7 @@ def _load(self, path): ) except KeyError: pass - try: - t.has_pad = int(config["Features"]["Buttons"]) > 0 - except KeyError: - pass + t.has_pad = config.has_section("Buttons") yield t