Merge branch 'master' into rational_slider

app/widget/slider/sliderbase.h

@@ -61,9 +61,11 @@ public:
 
   bool IsDragging() const;
 
-  void SetFormat(const QString& s);
+  void SetFormat(const QString& s, const bool plural=false);
   void ClearFormat();
 
+  bool IsFormatPlural() const;
+
   void SetLadderElementCount(int b)
   {
     ladder_element_count_ = b;
@@ -102,6 +104,8 @@ private:
 
   QString GetFormat() const;
 
+  bool UsingLadders() const;
+
   SliderLabel* label_;
 
   FocusableLineEdit* editor_;
@@ -130,6 +134,8 @@ private:
 
   QString custom_format_;
 
+  bool format_plural_;
+
   SliderLadder* drag_ladder_;
 
   int ladder_element_count_;