[dw-free] Add "icon scaling" to customize options

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/854cd299a2b5]

http://bugs.dwscoalition.org/show_bug.cgi?id=3495

Add option for entries icons size in core2. Use in Tabula Rasa. Update
option in core1 to match the backend.

Patch by ninetydegrees.

Files modified:

• bin/upgrading/s2layers/core1.s2
• bin/upgrading/s2layers/core2.s2
• bin/upgrading/s2layers/core2base/layout.s2

--------------------------------------------------------------------------------
diff -r d848707362a3 -r 854cd299a2b5 bin/upgrading/s2layers/core1.s2
--- a/bin/upgrading/s2layers/core1.s2	Mon Apr 18 13:32:13 2011 +0800
+++ b/bin/upgrading/s2layers/core1.s2	Mon Apr 18 13:37:19 2011 +0800
@@ -1696,11 +1696,13 @@ property Color color_comment_bar {
 }
 set color_comment_bar = "#d0d0ff";
 
+# Updated to match Core2 option
+# Off value was removed
 property string comment_userpic_style {
-   des = "Userpic display style for comments";
-   doc = "Userpic display style for comments.  Either '' for full, 'small' for small, or 'off' for none.";
-   doc_flags = "[construct]";
-   values = "|Full|small|Small|off|Off";
+    des = "Select the size of icons in comments";
+    doc = "Either '' for 100%, 'small' for 75% and 'smaller' for 50%";
+    doc_flags = "[construct]";
+    values = "|Full|small|Small|smaller|Smaller";
 }
 set comment_userpic_style = "";
 
diff -r d848707362a3 -r 854cd299a2b5 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Mon Apr 18 13:32:13 2011 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Mon Apr 18 13:37:19 2011 +0800
@@ -1292,11 +1292,25 @@ property bool tags_aware {
     noui = 1;
 }
 
-property string comment_userpic_style {
-   des = "Select the size of icons in comments";
+property string[] userpic_style_group {
+    des = "Select the size of icons";
+    grouptype = "datetime";
+    }
+set userpic_style_group = ["entry_userpic_style", "comment_userpic_style"];
+property string entry_userpic_style {
+   des = "In entries";
    doc = "Either '' for 100%, 'small' for 75% and 'smaller' for 50%";
    doc_flags = "[construct]";
    values = "|Full|small|Small|smaller|Smaller";
+    grouped = 1;
+}
+
+property string comment_userpic_style {
+   des = "In comments";
+   doc = "Either '' for 100%, 'small' for 75% and 'smaller' for 50%";
+   doc_flags = "[construct]";
+   values = "|Full|small|Small|smaller|Smaller";
+    grouped = 1;
 }
 
 property string userpics_position {
@@ -1336,6 +1350,7 @@ property string module_tags_opts_count_t
 
 set use_shared_pic = false;
 set tags_aware = true;
+set entry_userpic_style = "";
 set comment_userpic_style = "";
 set userpics_position = "left";
 set entry_metadata_position = "bottom";
diff -r d848707362a3 -r 854cd299a2b5 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Mon Apr 18 13:32:13 2011 +0800
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Mon Apr 18 13:37:19 2011 +0800
@@ -14,7 +14,7 @@ propgroup presentation {
     property use tags_page_type;
     property use sidebar_width;
     property use sidebar_width_doubled;
-    property use comment_userpic_style;
+    property use userpic_style_group;
     property use userpics_position;
     property use entry_metadata_position;
     property use use_custom_friend_colors;
--------------------------------------------------------------------------------