Default Style: Cleanup

Revised ScriptedInfo syntax.

doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/colors.dei

@@ -12,7 +12,7 @@ color accent      { rgb <1.0, 0.8, 0.4> }
 color altaccent   { rgb <0.63, 0.75, 0.67> }
 color glow        { rgb <1.0, 1.0, 1.0, 0.14> }
 
-group inverted {
+inverted {
     color text       { rgb <0.0, 0.0, 0.0> }
     color background { rgb <1.0, 1.0, 1.0, 0.75> }
     color accent     { rgb <0.5, 0.4, 0.2> }
@@ -23,57 +23,57 @@ group inverted {
 # COLORS FOR SPECIFIC WIDGETS
 #
 
-group label {
+label {
     color highlight { rgb <1.0, 1.0, 1.0> }
     color dimmed    { rgb <0.72, 0.72, 0.68> }
     color accent    { rgb $= accent.rgb }
     color dimaccent { rgb <0.85, 0.68, 0.34> }
     color altaccent { rgb $= altaccent.rgb }
 }
 
-group popup {
-    group info {
+popup {
+    info {
         color background { rgb <1.0, 1.0, 1.0> }
         color glow       { rgb $= inverted.glow.rgb }
     }
 }
 
-group choice {
+choice {
     color popup { rgb $= gui.colorAlpha(background.rgb, 1.0) }
 }
 
-group tab {
+tab {
     color selected          { rgb $= text.rgb }
     color inverted.selected { rgb $= inverted.text.rgb }
 }
 
-group progress {
-    group light {
+progress {
+    light {
         color wheel  { rgb <1.0, 1.0, 1.0, 0.25> }
         color shadow { rgb <0.0, 0.0, 0.0, 0.45> }
     }
-    group dark {
+    dark {
         color wheel  { rgb <0.0, 0.0, 0.0, 0.25> }
         color shadow { rgb <1.0, 1.0, 1.0, 0.54> }
     }
 }
 
-group dialog {
+dialog {
     color background { rgb $= gui.colorAlpha(background.rgb, 0.9) }
     color default    { rgb $= altaccent.rgb }
 }
 
-group editor {
+editor {
     color cursor { rgb $= gui.colorAlpha(accent.rgb, 0.7) }
     color hint   { rgb $= altaccent.rgb }
 
-    #group completion {
+    #completion {
     #    color background { rgb <1.0, 1.0, 1.0> }
     #    color glow       { rgb $= inverted.glow.rgb }
     #}
 }
 
-group log {
+log {
     color normal    { rgb <0.85, 0.85, 0.8> }
     color highlight { rgb <1.0, 1.0, 1.0> }
     color dimmed { 
@@ -91,7 +91,7 @@ group log {
     color dimaccent { rgb <0.85, 0.68, 0.34> }
 }
 
-group document {
+document {
     color normal    { rgb $= gui.colorMix(inverted.text.rgb, [1, 1, 1], 0.2) }
     color highlight { rgb $= inverted.text.rgb }
     color dimmed    { rgb <0.5, 0.5, 0.5> }

doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei

@@ -103,15 +103,15 @@ font small inherits default {
     size $: gui.scale(self.size, 0.75)
 }
 
-group editor {
+editor {
     font plaintext inherits default {}
     font hint inherits default {
         style: italic
         weight: light
     }
 }
 
-group separator {
+separator {
     font empty inherits default {
         size $: gui.scale(self.size, 0.5)
     }
@@ -127,26 +127,26 @@ group separator {
     font annotation inherits small {}    
 }
 
-group choice {
+choice {
     font selected inherits default {
         weight: bold
     }
 }
 
-group tab {
+tab {
     font label inherits title {
         size $: gui.scale(self.size, 0.75)
     }
     font selected inherits tab.label {}
 }
 
-group slider {
+slider {
     font label inherits small {}
     font value inherits slider.label {
         weight: bold
     }
 }
 
-group log {
+log {
     font normal inherits default {}
 }

doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/images.dei

@@ -2,14 +2,14 @@
 
 script { import gui, DisplayMode }
 
-group window {
+window {
     image background { path = "graphics/background.jpg" }
     image borderglow { path = "graphics/borderglow.png" }
     image icon       { path = "graphics/window.png" }
     image cursor     { path = "graphics/mouse.png" }
 }
 
-group logo {
+logo {
     image px128 { path = "graphics/deng-logo-128.png" }
     image px256 { path = "graphics/deng-logo-256.png" }
 
@@ -20,7 +20,7 @@ group logo {
         image px256 { path = "graphics/deng-logo-512.png" }
     }
 
-    group game {
+    game {
         image libdoom    { path = "graphics/game-libdoom.png" }
         image libheretic { path = "graphics/game-libheretic.png" }
         image libhexen   { path = "graphics/game-libhexen.png" }
@@ -31,7 +31,7 @@ group logo {
 image fold     { path = "graphics/fold.png" }
 image gauge    { path = "graphics/gauge.png" }
 image gear     { path = "graphics/gear.png" }
-group close {
+close {
     image ring     { path = "graphics/close.png" }
     image ringless { path = "graphics/close-ringless.png" }
 }
@@ -52,7 +52,7 @@ image toggle.onoff {
     path $= gui.dpiScaledImagePath("graphics/toggle-onoff.png")
 }
 
-group progress {
+progress {
     image wheel { path = "graphics/progress-wheel.png" }
     image gear  { path = "graphics/progress-gear.png" }
     image mini  { path = "graphics/progress-mini.png" }

doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/rules.dei

@@ -10,40 +10,40 @@ rule halfunit { constant $= UNIT / 2 }
 rule gap      { constant $= UNIT * 3 }
 rule glow     { constant $= UNIT * 25 }
 
-group label {
+label {
     rule gap { constant $= gap.constant / 2 }
 }
 
 rule scrollarea.bar { constant $= UNIT }
 
-group popup {
-    group menu {
+popup {
+    menu {
         rule margin { constant $= UNIT }
         rule paddedmargin { constant $= UNIT * 8 }
     }
 }
 
-group document {
+document {
     rule progress    { constant $= UNIT * 30 }
     rule popup.width { constant $= UNIT * 120 }
 }
 
-group editor {
+editor {
     rule width { constant $= UNIT * 60 }
     rule completion.height { constant $= UNIT * 100 }
 }
 
-group progress {
+progress {
     rule textgap { constant $= gap.constant }
 }
 
-group slider {
+slider {
     rule width  { constant $= UNIT * 55 }
     rule label  { constant $= UNIT * 9 }
     rule editor { constant $= UNIT * 20 }
 }
 
-group dialog {
+dialog {
     rule gap { constant $= UNIT * 2 }
 
     rule about.width       { constant $= UNIT * 80 }
@@ -53,33 +53,33 @@ group dialog {
     rule packages.width    { constant $= UNIT * 100 }
 }
 
-group alerts {
+alerts {
     rule width { constant $= UNIT * 100 }
 }
 
-group sidebar {
+sidebar {
     rule width { constant $= UNIT * 80 }
 }
 
-group console {
+console {
     rule prompt.width { constant $= UNIT * 13 }
     rule width { constant $= UNIT * 125 }
 
-    group commandline {
+    commandline {
         rule width.min { constant $= UNIT * 25 }
         rule width.max { constant $= UNIT * 75 }
     }
 }
 
-group gameselection {
+gameselection {
     rule max.width  { constant $= UNIT * 270 }
     rule max.height { constant $= UNIT * 215 }
 }
 
-group coloradjustment {
+coloradjustment {
     rule slider { constant $= slider.width.constant * 1.36 }
 }
 
-group rendererappearance {
+rendererappearance {
     rule width { constant $= UNIT * 100 }
 }