Merge lp:~alanbell/ubuntu/precise/compizconfig-settings-manager/safetyfirst into lp:ubuntu/precise/compizconfig-settings-manager

[Alan Bell]

removes slidey range widgets, because mousewheel users can accidentally use them, inadvertently breaking stuff.

[lp:~alanbell/ubuntu/precise/compizconfig-settings-manager/safetyfirst]

37. By Alan Bell on 2012-01-27

undoing slightly overzealous deleting of code

[Didier Roche (didrocks)]

Hey Alan, thanks and glad to see you are the first one to act on compiz from the ubuntu-desktop discussion :)

We try to have our distro patch using a patch system, I'll do it for you this one, but please, have a look at https://wiki.ubuntu.com/PackagingGuide for the next time!

Also, the branch for the compiz package is lp:~compiz/compizconfig-settings-manager/ubuntu (it's a debian branch only). Do not hesitate to ping me on irc if you need any help for any further work :)

Oh, and btw, can you submit it upstream as well?

Thanks again for starting working on ccsm so that it will still be shippable in precise! :)

review: Approve

=== modified file 'ccm/Settings.py'
--- ccm/Settings.py	2011-02-24 17:39:03 +0000
+++ ccm/Settings.py	2012-01-27 22:20:29 +0000
@@ -441,16 +441,10 @@
         self.NoneValue = info[0]
         self.Adj = gtk.Adjustment(self.Get(), info[0], info[1], inc, inc*10)
         self.Spin = gtk.SpinButton(self.Adj)
-
-        self.Scale = gtk.HScale(self.Adj)
-
-        self.Scale.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
-        self.Scale.connect("value-changed", self.Changed)
         self.Spin.connect("value-changed", self.Changed)
-        self.Widget = self.Scale
+        self.Widget = self.Spin
 
-        self.Box.pack_start(self.Scale, True, True)
-        self.Box.pack_start(self.Spin, False, False)
+        self.Box.pack_end(self.Spin, False, False)
 
     def _Read(self):
         self.Adj.set_value(self.Get())
@@ -464,7 +458,6 @@
         self.Inc = 1
         NumberSetting._Init(self)
         self.Spin.set_digits(0)
-        self.Scale.set_digits(0)
 
 class FloatSetting(NumberSetting):
 
@@ -474,7 +467,6 @@
         self.Inc = None
         NumberSetting._Init(self)
         self.Spin.set_digits(4)
-        self.Scale.set_digits(4)
 
 
 class ColorSetting(StockSetting):