Files

Merge lp://staging/~marcus-lundgren/pantheon-files/fix-996254 into lp://staging/~elementary-apps/pantheon-files/trunk

fix-996254
Merge into trunk

Proposed by Marcus Lundgren on 2012-07-09

Status:

Merged

Merged at revision:

880

Proposed branch:

lp://staging/~marcus-lundgren/pantheon-files/fix-996254

Merge into:

lp://staging/~elementary-apps/pantheon-files/trunk

Diff against target:

142 lines (+69/-11)

2 files modified

schemas/org.gnome.marlin.gschema.xml (+13/-0)
src/View/SettingsDialog.vala (+56/-11)

To merge this branch:

bzr merge lp://staging/~marcus-lundgren/pantheon-files/fix-996254

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
elementary Apps team		2012-07-09	Pending
Review via email: mp+114017@code.staging.launchpad.net

Revision history for this message

Danielle Foré (danrabbit) wrote on 2012-07-09:

I'd like it if we could find a way to put the on/off switch with the slider, but having an option to turn if off at all is imo an improvement.

The label "Mouse auto-selection speed" should probably become insensitive when the switch is set to "off"

lp://staging/~marcus-lundgren/pantheon-files/fix-996254 updated on 2012-07-10

882. By Marcus Lundgren on 2012-07-09: Made the label insensitive as well.
883. By Marcus Lundgren on 2012-07-09: The switch is now on the left side of the scale.
884. By Marcus Lundgren on 2012-07-09: The label now also becomes insensitive.
885. By Marcus Lundgren on 2012-07-09: Now displays the labels slow and fast instead of numbers in the scale.
886. By Marcus Lundgren on 2012-07-09: The slow and fast labels now becomes insensitive and they are also both italic/small.
887. By Marcus Lundgren on 2012-07-09: Made it less cramp. Removed the horizontal ruler. Changed the text of the auto-selection label.
888. By Marcus Lundgren on 2012-07-09: Clean up.
889. By Marcus Lundgren on 2012-07-09: Removed some padding.
890. By Marcus Lundgren on 2012-07-10: The scale is now inverted in order to behave according to the labels.
891. By Marcus Lundgren on 2012-07-10: Using Gtk.Box instead of Gtk.HBox.

Revision history for this message

xapantu (xapantu) wrote on 2012-07-10:

"The label "Mouse auto-selection speed" should probably become insensitive when the switch is set to "off"", it is not consistent, it will look like if the switcher was disabled, so, no, please make it sensitive ;)

lp://staging/~marcus-lundgren/pantheon-files/fix-996254 updated on 2012-07-10