- remove translator warnings about the need for same translations for

  both _Options and Options since we handle this automagically
- use new ln design for welcome page :-)
- rearrange code: regroup functions in functionnal units
- simplify spacing managment for left icons & text
- simplify ressource file quest

1 files changed, 5 insertions, 451 deletions

diff --git a/control-center.rc b/control-center.rc
index 1b7d9b55..596f8710 100644
--- a/control-center.rc
+++ b/control-center.rc
@@ -21,459 +21,13 @@
 #  Authors: Thierry Vignaud <tvignaud@mandrakesoft.com>
 
 
-pixmap_path "/usr/share/mcc/themes/default/"
+# Default style for mcc specific widgets (mainly main_window and
+# scrolled windows per mcc category
 
-style "any"
+style "mcc"
 {
-  fontset = "-adobe-helvetica-medium-r-normal--*-120-75-75-p-*-iso8859-*,*-r-*"
   bg[NORMAL] = { 1.0, 1.0, 1.0 }
-  bg[SELECTED] = { 0.0, 0.8, 0.3 }
-  bg[INSENSITIVE] = { 1.0, 1.0, 1.0 }
-  bg[ACTIVE] = { 1.0, 1.0, 1.0 }
-  bg[PRELIGHT] = { 1.0, 1.0, 1.0 }
-
-  base[NORMAL] = { 1.0, 1.0, 1.0 }
-  base[SELECTED] = { 1.0, 1.0, 1.0 }
-  base[INSENSITIVE] = { 1.0, 1.0, 1.0 }
-  base[ACTIVE] = { 1.0, 1.0, 1.0 }
-  base[PRELIGHT] = { 1.0, 1.0, 1.0 }
-
-  text[NORMAL] = { 0.0, 0.0, 0.0 }
-  text[SELECTED] = { 0.0, 0.0, 0.0 }
-  text[INSENSITIVE] = { 0.0, 0.0, 0.0 }
-  text[ACTIVE] = { 0.0, 0.0, 0.0 }
-  text[PRELIGHT] = { 0.0, 0.0, 0.0 }
-
-  fg[NORMAL] = { 0.0, 0.0, 0.0 }
-  fg[SELECTED] = { 0.8, 0.8, 0.8 }
-  fg[INSENSITIVE] = { 1.0, 1.0, 0.0 }
-  fg[ACTIVE] = { 1.0, 1.0, 0.0 }
-  fg[PRELIGHT] = { 0.0, 0.3, 0.8 }
-
+#  bg[PRELIGHT] = { 1.0, 1.0, 1.0 }
 }
 
-
-#widget_class "GtkWindow" style "window"
-widget_class "*Area*" style "any"
-#widget_class "*abel*" style "any"
-#class "*" style "any"
-#widget_class "*GtkSpin*" style "entry"
-#widget_class "*GtkEntry*" style "entry"
-#widget_class "*Gtk*List*" style "entry"
-#widget_class "*GtkCTree*" style "entry"
-#widget_class "*GtkNotebook*" style "notebook"
-#widget "*GtkButton" style "button"
-#widget "*background*" style "background"
-
-#class "GtkRadioButton" style "checkradiobutton"
-#class "GtkCheckButton" style "checkradiobutton"
-
-
-
-
-
-# The syntax in the engine sections is a mess. Here are some hints:
-
-# gradient : '{' direction gradient-color-list '}'
-#	   | '<' INT '>'				-- palette ref
-
-# direction : /* nothing */
-#	    | VERTICAL
-#	    | HORIZONTAL
-
-# gradient-color-list : color
-#		      : color ',' gradient-color-list
-#		      : color '[' weight ']' gradient-color-list
-
-# weight : FLOAT
-#	 | INT
-
-# color : "#RRGGBB"
-#	| '{' FLOAT ',' FLOAT ',' FLOAT '}'
-#	| '<' color-ext '>'
-
-# color-ext : STRING			-- file in $HOME to read color from
-#	    | '<' INT '>'		-- use indexed palette entry
-#	    | '<' INT ',' FLOAT '>'	-- multiply palette entry
-
-# Default style for all widgets to build from
-style "default"
-{
-  GtkWidget::interior_focus = 0
-  GtkWidget::focus_padding = 0
-  GtkWidegt::focus_line_width = 3
-
-  GtkRange::slider_width = 11
-  GtkRange::stepper_size = 11
-  GtkRange::trough_border = 2
-
-  GtkScale::slider_length = 16
-  GtkCheckButton::indicator_size = 10
-  GtkCheckButton::indicator_spacing = 3
-
-  #GtkMenuBar::shadow_type = GTK_SHADOW_NONE
-  GtkToolBar::shadow_type = GTK_SHADOW_NONE
-  #GtkSpinButton::shadow_type = GTK_SHADOW_NONE
-
-  GtkOptionMenu::indicator_size = { 11, 6 }
-  GtkOptionMenu::indicator_spacing = { 30, 5, 2, 2 }
-
-  fg[NORMAL] = "#000000"
-  fg[ACTIVE] = "#000000"
-  fg[PRELIGHT] = "#000000"
-  fg[SELECTED] = "#ffffff"
-  fg[INSENSITIVE] = "#000000"
-
-  bg[NORMAL] = "#dcdcdc"
-  bg[ACTIVE] = "#ababab"
-  bg[PRELIGHT] = "#f2f2f2"
-  bg[INSENSITIVE] = "#ffffff"
-  bg[SELECTED] = "#0A5F89"
-
-  text[NORMAL] = "#000000"
-  text[ACTIVE] = "#ffffff"
-  text[PRELIGHT] = "#ffffff"
-  text[SELECTED] = "#ffffff"
-  text[INSENSITIVE] = "#ffffff"
-
-  base[NORMAL] = "#ffffff"
-  base[PRELIGHT] = "#ffffff"
-  base[INSENSITIVE] = "#ffffff"
-
-  engine "crux-engine" {
-
-    # The focus/selection color
-    palette[0] = { "#21449c" }
-
-    # The gradient used for recoloring images
-    palette[1] = { "#000000", <0>, "#ffffff" }
-
-    # Used for recolouring inactive images
-    palette[2] = { "#000000", "#888888", "#ffffff" }
-
-    # Set these colors here, so we can just reference the palette
-    bg[SELECTED] = <0>
-    base[SELECTED] = <0>
-
-    focus_color = <0>
-    insensitive_colors = "#636563", "#cecfce"
-
-    # Create the default (only) stock image table. This maps from
-    # identifiers used in the engine to reference image parts to
-    # the actual images, and sets attributes of the images
-    stock
-    {
-      "CHECK" {
-        image = "check-default.png"
-      }
-      "CHECK_FOCUS" {
-        image = "check-default-focus.png"
-	recolor = <1>
-      }
-      "CHECK_HI" {
-        image = "check-hilight.png"
-      }
-      "CHECK_HI_FOCUS" {
-        image = "check-hilight-focus.png"
-	recolor = <1>
-      }
-      "CHECK_PRESSED" {
-        image = "check-pressed.png"
-      }
-      "CHECK_PRESSED_FOCUS" {
-	image = "check-pressed-focus.png"
-	recolor = <1>
-      }
-      "CHECK_DISABLED" {
-	image = "check-insensitive.png"
-      }
-      "CHECK_ACTIVE" {
-	image = "check-active-default.png"
-      }
-      "CHECK_ACTIVE_FOCUS" {
-	image = "check-active-default-focus.png"
-	recolor = <1>
-      }
-      "CHECK_ACTIVE_HI" {
-	image = "check-active-hilight.png"
-      }
-      "CHECK_ACTIVE_HI_FOCUS" {
-	image = "check-active-hilight-focus.png"
-	recolor = <1>
-      }
-      "CHECK_ACTIVE_PRESSED" {
-	image = "check-active-pressed.png"
-      }
-      "CHECK_ACTIVE_PRESSED_FOCUS" {
-	image = "check-active-pressed-focus.png"
-	recolor = <1>
-      }
-      "CHECK_ACTIVE_DISABLED" {
-	image = "check-active-insensitive.png"
-      }
-      "OPTION" {
-	image = "radio-default.png"
-      }
-      "OPTION_FOCUS" {
-	image = "radio-default-focus.png"
-	recolor = <1>
-      }
-      "OPTION_HI" {
-	image = "radio-hilight.png"
-      }
-      "OPTION_HI_FOCUS" {
-	image = "radio-hilight-focus.png"
-	recolor = <1>
-      }
-      "OPTION_PRESSED" {
-	image = "radio-pressed.png"
-      }
-      "OPTION_PRESSED_FOCUS" {
-	image = "radio-pressed-focus.png"
-	recolor = <1>
-      }
-      "OPTION_DISABLED" {
-	image = "radio-insensitive.png"
-      }
-      "OPTION_ACTIVE" {
-	image = "radio-active-default.png"
-      }
-      "OPTION_ACTIVE_FOCUS" {
-	image = "radio-active-default-focus.png"
-	recolor = <1>
-      }
-      "OPTION_ACTIVE_HI" {
-	image = "radio-active-hilight.png"
-      }
-      "OPTION_ACTIVE_HI_FOCUS" {
-	image = "radio-active-hilight-focus.png"
-	recolor = <1>
-      }
-      "OPTION_ACTIVE_PRESSED" {
-	image = "radio-active-pressed.png"
-      }
-      "OPTION_ACTIVE_PRESSED_FOCUS" {
-	image = "radio-active-pressed-focus.png"
-	recolor = <1>
-      }
-      "OPTION_ACTIVE_DISABLED" {
-	image = "radio-active-insensitive.png"
-      }
-      "H_TROUGH" {
-	image = "scroller-h-trough.png"
-	border = { 28, 28, 2, 2 }
-      }
-      "V_TROUGH" {
-	image = "scroller-v-trough.png"
-	border = { 2, 2, 28, 28 }
-      }
-      "ARROW_UP" {
-	image = "scroller-arrow-up.png"
-      }
-      "ARROW_UP_HI" {
-	image = "scroller-arrow-up-hilight.png"
-      }
-      "ARROW_UP_ACTIVE" {
-	image = "scroller-arrow-up-pressed.png"
-      }
-      "ARROW_DOWN" {
-	image = "scroller-arrow-down.png"
-      }
-      "ARROW_DOWN_HI" {
-	image = "scroller-arrow-down-hilight.png"
-      }
-      "ARROW_DOWN_ACTIVE" {
-	image = "scroller-arrow-down-pressed.png"
-      }
-      "ARROW_RIGHT" {
-	image = "scroller-arrow-right.png"
-      }
-      "ARROW_RIGHT_HI" {
-	image = "scroller-arrow-right-hilight.png"
-      }
-      "ARROW_RIGHT_ACTIVE" {
-	image = "scroller-arrow-right-pressed.png"
-      }
-      "ARROW_LEFT" {
-	image = "scroller-arrow-left.png"
-      }
-      "ARROW_LEFT_HI" {
-	image = "scroller-arrow-left-hilight.png"
-      }
-      "ARROW_LEFT_ACTIVE" {
-	image = "scroller-arrow-left-pressed.png"
-      }
-      "H_SCROLLBAR" {
-	image = "scroller-h.png"
-	border = { 3, 3, 1, 1 }
-	recolor = <1>
-      }
-      "H_SCROLLBAR_HI" {
-	image = "scroller-h-hilight.png"
-	border = { 3, 3, 1, 1 }
-	recolor = <1>
-      }
-      "H_SCROLLBAR_INACTIVE" {
-	image = "scroller-h.png"
-	border = { 3, 3, 1, 1 }
-	recolor = <2>
-      }
-      "H_SCROLLBAR_THUMB" {
-	image = "scroller-h-thumb.png"
-	recolor = <1>
-      }
-      "H_SCROLLBAR_THUMB_HI" {
-	image = "scroller-h-thumb-hilight.png"
-	recolor = <1>
-      }
-      "H_SCROLLBAR_THUMB_INACTIVE" {
-	image = "scroller-h-thumb.png"
-	recolor = <2>
-      }
-      "V_SCROLLBAR" {
-	image = "scroller-v.png"
-	border = { 1, 1, 3, 3 }
-	recolor = <1>
-      }
-      "V_SCROLLBAR_HI" {
-	image = "scroller-v-hilight.png"
-	border = { 1, 1, 3, 3 }
-	recolor = <1>
-      }
-      "V_SCROLLBAR_INACTIVE" {
-	image = "scroller-v.png"
-	border = { 1, 1, 3, 3 }
-	recolor = <2>
-      }
-      "V_SCROLLBAR_THUMB" {
-	image = "scroller-v-thumb.png"
-	recolor = <1>
-      }
-      "V_SCROLLBAR_THUMB_HI" {
-	image = "scroller-v-thumb-hilight.png"
-	recolor = <1>
-      }
-      "V_SCROLLBAR_THUMB_INACTIVE" {
-	image = "scroller-v-thumb.png"
-	recolor = <2>
-      }
-      "PROGRESS_BAR" {
-	image = "progressbar.png"
-	border = { 4, 4, 1, 1 }
-	recolor = <1>
-      }
-      "PROGRESS_BAR_LEFT" {
-	image = "progressbar-left.png"
-      }
-      "PROGRESS_BAR_RIGHT" {
-	image = "progressbar-right.png"
-	border = { 0, 0, 2, 0 }
-      }
-      "PROGRESS_BAR_INACTIVE" {
-	image = "progressbar.png"
-	border = { 4, 4, 1, 1 }
-	recolor = <2>
-      }
-      "PROGRESS_TROUGH" {
-	image = "progressbar_trough.png"
-	border = { 6, 4, 6, 4 }
-      }
-      "H_SLIDER_THUMB" {
-	image = "slider_h_thumb.png"
-	border = { 4, 4, 1, 1 }
-	recolor = <1>
-      }
-      "H_SLIDER_THUMB_INACTIVE" {
-	image = "slider_h_thumb.png"
-	border = { 4, 4, 1, 1 }
-	recolor = <2>
-      }
-      "H_SLIDER_TROUGH" {
-	image = "slider_h_trough.png"
-	border = { 6, 6, 0, 0 }
-      }
-      "H_SLIDER_TROUGH_ACTIVE" {
-	image = "slider_h_trough_focus.png"
-	border = { 6, 6, 0, 0 }
-	recolor = <1>
-      }
-      "V_SLIDER_THUMB" {
-	image = "slider_v_thumb.png"
-	border = { 1, 1, 4, 4 }
-	recolor = <1>
-      }
-      "V_SLIDER_THUMB_INACTIVE" {
-	image = "slider_v_thumb.png"
-	border = { 1, 1, 4, 4 }
-	recolor = <2>
-      }
-      "V_SLIDER_TROUGH" {
-	image = "slider_v_trough.png"
-	border = { 0, 0, 6, 6 }
-      }
-      "V_SLIDER_TROUGH_ACTIVE" {
-	image = "slider_v_trough_focus.png"
-	border = { 0, 0, 6, 6 }
-	recolor = <1>
-      }
-      "TAB_TOP" {
-	image = "tab_usel.png"
-	border = { 4, 4, 10, 5 }
-      }
-      "TAB_TOP_LEFT" {
-	image = "tab_usel-left.png"
-	border = { 4, 4, 10, 5 }
-      }
-      "TAB_TOP_ACTIVE" {
-	image = "tab_sel.png"
-	border = { 4, 14, 10, 5 }
-      }
-      "TAB_BOTTOM" {
-	image = "tab_usel-bottom.png"
-	border = { 4, 4, 10, 5 }
-      }
-      "TAB_BOTTOM_LEFT" {
-	image = "tab_usel-bottom-left.png"
-	border = { 4, 4, 10, 5 }
-      }
-      "TAB_BOTTOM_ACTIVE" {
-	image = "tab_sel-bottom.png"
-	border = { 4, 4, 10, 5 }
-      }
-      "SPIN_ARROW_UP" {
-	image = "arrow_up-spinner.png"
-      }
-      "SPIN_ARROW_DOWN" {
-	image = "arrow_down-spinner.png"
-      }
-    }
-  }
-}
-
-# common default
-#class "GtkWidget" style "default"
-
-
-
-# MCC right icons: keep parent background on transparent parts
-style "eventbox"
-{
-  # Causes the parent-relative feature of gdk_window_set_back_pixmap ()
-  # to be used.
-  bg_pixmap[NORMAL] = "<parent>"
-  bg_pixmap[INSENSITIVE] = "<parent>"
-  bg_pixmap[PRELIGHT] = "<parent>"
-  bg_pixmap[SELECTED] = "<parent>"
-  bg_pixmap[ACTIVE] = "<parent>"
-  engine "crux-engine" {}
-}
-
-# Ensure that there are no holes in tool bars, etc..
-class "GtkEventBox" style "eventbox"
-class "GtkSocket"   style "eventbox"
-#class "GtkNotebook" style "eventbox"
-
-
-# These don't work right with GTK2, ends up drawing black
-#class "GtkPlug" style "eventbox"
-
+widget "*mcc*"              style "mcc"
\ No newline at end of file