[SCM] calf/master: Complete RC rewrite (in progress)
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:39:52 UTC 2013
The following commit has been merged in the master branch:
commit c4a1bbab29aa8c9b1329a52d50a2f2dfc040361b
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Sun Nov 22 06:49:27 2009 +0100
Complete RC rewrite (in progress)
diff --git a/gui/calf.rc b/gui/calf.rc
index b227763..a342fad 100644
--- a/gui/calf.rc
+++ b/gui/calf.rc
@@ -8,7 +8,7 @@
gtk_color_scheme = "fg_color:#101010\nbg_color:#EFEBE7\nbase_color:#FFF\ntext_color:#1A1A1A\nselected_bg_color:#FFA443\nselected_fg_color:#1A1A1A\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
-style "clearlooks-default"
+style "calf-default"
{
########
# Style Properties
@@ -80,21 +80,29 @@ style "clearlooks-default"
bg_pixmap[ACTIVE] = "background_black.png"
bg_pixmap[INSENSITIVE] = "background_dark.png"
- engine "clearlooks"
+ engine "pixmap"
{
- colorize_scrollbar = FALSE
- reliefstyle = 0
- menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient
- toolbarstyle = 1 # 0 = flat, 1 = enable effects
- animation = TRUE
- radius = 5.0
- style = GUMMY
-
- # Set a hint to disable backward compatibility fallbacks.
- hint = "use-hints"
+
}
}
+style "calf-wide"
+{
+ xthickness = 3
+ ythickness = 2
+
+ bg[SELECTED] = @selected_bg_color
+}
+
+style "calf-wider"
+{
+ xthickness = 5
+ ythickness = 4
+}
+
+
+
+
style "calf-rack"
{
fg[NORMAL] = "#111"
@@ -114,25 +122,20 @@ style "calf-rack"
bg_pixmap[ACTIVE] = "background_light_calf.png"
bg_pixmap[INSENSITIVE] = "background_light_calf.png"
}
-style "clearlooks-wide"
-{
- xthickness = 3
- ythickness = 2
- bg[SELECTED] = @selected_bg_color
-}
-style "clearlooks-wider"
-{
- xthickness = 5
- ythickness = 4
-}
-style "clearlooks-button"
+
+################################################################################
+# BUTTONS #
+################################################################################
+
+### BUTTON ###
+
+style "calf-button"
{
GtkButton ::child-displacement-x = 0
GtkButton ::child-displacement-y = 0
-# GtkButton ::default-border = { 8, 8, 6, 6 }
GtkButton ::inner-border = { 8, 8, 3, 3}
xthickness = 5
@@ -196,11 +199,14 @@ style "clearlooks-button"
}
}
-style "clearlooks-toggle"
+
+
+### TOGGLE BUTTON ###
+
+style "calf-toggle"
{
GtkButton ::child-displacement-x = 0
GtkButton ::child-displacement-y = 0
-# GtkButton ::default-border = { 8, 26, 6, 6 }
GtkButton ::inner-border = { 8, 26, 3, 3}
xthickness = 5
@@ -264,15 +270,19 @@ style "clearlooks-toggle"
}
}
-style "clearlooks-button-norm"
+
+
+
+### DEFAULT BUTTON ###
+
+style "calf-button-norm"
{
GtkButton ::child-displacement-x = 0
GtkButton ::child-displacement-y = 0
-# GtkButton ::default-border = { 6, 6, 5, 5 }
GtkButton ::inner-border = { 6, 6, 3, 3}
xthickness = 5
- ythickness = 3
+ ythickness = 2
fg[NORMAL] = "#000"
fg[PRELIGHT] = "#000"
@@ -330,278 +340,12 @@ style "clearlooks-button-norm"
}
}
-style "clearlooks-button-clear"
-{
- engine "clearlooks" {
-
- }
- engine "pixmap"
- {
- image
- {
- function = BOX
- }
- image
- {
- function = VLINE
- }
- image
- {
- function = HLINE
- }
- }
-}
-style "clearlooks-notebook"
-{
- GtkNotebook::tab-overlap = -2
- xthickness = 18
- ythickness = 10
- engine "pixmap"
- {
- image
- {
- function = EXTENSION
- recolorable = FALSE
- state = ACTIVE
- file = "tab_bottom_normal.png"
- border = { 24, 24, 0, 19 }
- stretch = TRUE
- gap_side = TOP
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- state = ACTIVE
- file = "tab_top_normal.png"
- border = { 24, 24, 19, 0 }
- stretch = TRUE
- gap_side = BOTTOM
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- state = ACTIVE
- file = "tab_left_normal.png"
- border = { 19, 0, 24, 24 }
- stretch = TRUE
- gap_side = RIGHT
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- state = ACTIVE
- file = "tab_right_normal.png"
- border = { 0, 19, 24, 24 }
- stretch = TRUE
- gap_side = LEFT
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- file = "tab_top_prelight.png"
- border = { 24, 24, 19, 0 }
- stretch = TRUE
- gap_side = BOTTOM
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- file = "tab_bottom_prelight.png"
- border = { 24, 24, 0, 19 }
- stretch = TRUE
- gap_side = TOP
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- file = "tab_left_prelight.png"
- border = { 19, 0, 24, 24 }
- stretch = TRUE
- gap_side = RIGHT
- }
- image
- {
- function = EXTENSION
- recolorable = FALSE
- file = "tab_right_prelight.png"
- border = { 0, 19, 24, 24 }
- stretch = TRUE
- gap_side = LEFT
- }
-
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook_top.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- gap_side = TOP
- }
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook_bottom.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- gap_side = BOTTOM
- }
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook_left.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- gap_side = LEFT
- }
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook_right.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- gap_side = RIGHT
- }
-# How to draw boxes with a gap on one side (ie the page of a notebook)
-
- image
- {
- function = BOX_GAP
- recolorable = FALSE
- file = "notebook.png"
- border = { 21, 21, 21, 21 }
- stretch = TRUE
- }
- }
-}
-style "clearlooks-tasklist" = "clearlooks-wide"
-{
-}
-style "clearlooks-menu" = "clearlooks-wider"
-{
- fg[PRELIGHT] = "#fff"
- fg[SELECTED] = "#fff"
- fg[NORMAL] = "#fff"
- bg[PRELIGHT] = "#000"
- bg[SELECTED] = "#000"
- bg[NORMAL] = "#000"
- bg_pixmap[NORMAL] = "background_black.png"
- bg_pixmap[ACTIVE] = "background_black.png"
- bg_pixmap[INSENSITIVE] = "background_black.png"
- engine "clearlooks"
- {
- radius = 5.0
- menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient
- }
-}
-style "clearlooks-menu-item" = "clearlooks-wider"
-{
- fg[PRELIGHT] = "#fff"
- fg[SELECTED] = "#fff"
- fg[NORMAL] = "#fff"
- bg[PRELIGHT] = "#000"
- bg[SELECTED] = "#000"
- bg[NORMAL] = "#000"
- bg_pixmap[NORMAL] = "background_black.png"
- bg_pixmap[ACTIVE] = "background_black.png"
- bg_pixmap[INSENSITIVE] = "background_black.png"
- engine "clearlooks"
- {
- radius = 3.0
- }
-}
+### COMBOBOX ###
-style "clearlooks-separator-menu-item"
-{
-}
-
-style "clearlooks-treeview"
-{
- engine "clearlooks"
- {
- hint = "treeview"
- }
-}
-
-style "clearlooks-treeview-header"
-{
- fg[NORMAL] = "#fff"
- fg[PRELIGHT] = "#fff"
- fg[ACTIVE] = "#fff"
- fg[SELECTED] = "#0af"
- fg[INSENSITIVE] = "#aaa"
-
- bg[NORMAL] = "#465160"
- bg[PRELIGHT] = "#000"
- bg[ACTIVE] = shade (0.9, "#465160")
- bg[SELECTED] = "#000" # Gnome Appearances Preferences workaround
- bg[INSENSITIVE] = shade (0.7, "#465160")
- engine "clearlooks"
- {
- hint = "treeview-header"
- }
-}
-
-style "clearlooks-frame"
-{
- xthickness = 8
- ythickness = 8
- bg[NORMAL] = "#fff"
- engine "clearlooks"
- {
- radius = 7.0
- }
-}
-
-style "clearlooks-frame-title"
-{
- fg[NORMAL] = "#fff"
- font_name = "Sans 8"
-}
-
-style "clearlooks-tooltips" = "clearlooks-wider"
-{
- bg[NORMAL] = @tooltip_bg_color
- fg[NORMAL] = @tooltip_fg_color
-}
-
-style "clearlooks-progressbar"
-{
- xthickness = 1
- ythickness = 1
- bg[NORMAL] = "#000"
- bg[SELECTED] = "#0af"
- fg[PRELIGHT] = "#000"
-
- engine "clearlooks"
- {
- hint = "progressbar"
- }
-}
-
-style "clearlooks-statusbar"
-{
- engine "clearlooks"
- {
- hint = "statusbar"
- }
-}
-
-
-
-style "clearlooks-combobox"
+style "calf-combobox"
{
fg[NORMAL] = "#000"
fg[PRELIGHT] = "#000"
@@ -707,26 +451,102 @@ style "clearlooks-combobox"
}
image
{
- function = HLINE
+ function = HLINE
+ recolorable = FALSE
+ file = "hline.png"
+ border = { 0, 0, 1, 1 }
+ stretch = TRUE
+ }
+ }
+}
+
+style "calf-comboboxentry" = "calf-combobox"
+{
+ # NOTE:
+ # If you set the appears-as-list option on comboboxes in the theme
+ # you should set this hint on the combobox instead.
+ xthickness = 0
+ ythickness = 0
+ base[NORMAL] = "#000"
+}
+
+
+
+### TEXT ENTRY ###
+
+style "calf-entry"
+{
+ xthickness = 0
+ ythickness = 0
+ GtkEntry::shadow-type = GTK_SHADOW_NONE
+ GtkEntry::inner-border = { 6, 6, 5, 4 }
+ base[NORMAL] = "#000"
+ engine "pixmap"
+ {
+ image
+ {
+ function = SHADOW
+ shadow = IN
+ recolorable = FALSE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = SHADOW
+ shadow = OUT
+ recolorable = FALSE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ shadow = IN
+ recolorable = FALSE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = BOX
+ shadow = OUT
recolorable = FALSE
- file = "hline.png"
- border = { 0, 0, 1, 1 }
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
stretch = TRUE
}
- }
+ image
+ {
+ function = FLAT_BOX
+ recolorable = TRUE
+ state = INSENSITIVE
+ detail = "entry_bg"
+ file = "entry_inactive.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = FLAT_BOX
+ recolorable = TRUE
+ state = NORMAL
+ detail = "entry_bg"
+ file = "entry.png"
+ border = { 4, 4, 5, 4 }
+ stretch = TRUE
+ }
+ }
}
-style "clearlooks-comboboxentry" = "clearlooks-combobox"
-{
- # NOTE:
- # If you set the appears-as-list option on comboboxes in the theme
- # you should set this hint on the combobox instead.
- xthickness = 0
- ythickness = 0
- base[NORMAL] = "#000"
-}
-style "clearlooks-spinbutton" = "clearlooks-default"
+
+### SPIN BUTTON ###
+
+style "calf-spinbutton" = "calf-default"
{
xthickness = 0
ythickness = 0
@@ -838,7 +658,100 @@ style "clearlooks-spinbutton" = "clearlooks-default"
}
}
-style "clearlooks-scale"
+
+
+
+################################################################################
+# MENUS #
+################################################################################
+
+### MENU ###
+
+style "calf-menu" = "calf-wider"
+{
+ fg[PRELIGHT] = "#fff"
+ fg[SELECTED] = "#fff"
+ fg[NORMAL] = "#fff"
+ bg[PRELIGHT] = "#000"
+ bg[SELECTED] = "#000"
+ bg[NORMAL] = "#000"
+ bg_pixmap[NORMAL] = "background_black.png"
+ bg_pixmap[ACTIVE] = "background_black.png"
+ bg_pixmap[INSENSITIVE] = "background_black.png"
+# engine "clearlooks"
+# {
+# radius = 5.0
+# menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient
+# }
+}
+
+style "calf-menu-item" = "calf-wider"
+{
+ fg[PRELIGHT] = "#fff"
+ fg[SELECTED] = "#fff"
+ fg[NORMAL] = "#fff"
+ bg[PRELIGHT] = "#000"
+ bg[SELECTED] = "#000"
+ bg[NORMAL] = "#000"
+ bg_pixmap[NORMAL] = "background_black.png"
+ bg_pixmap[ACTIVE] = "background_black.png"
+ bg_pixmap[INSENSITIVE] = "background_black.png"
+# engine "clearlooks"
+# {
+# radius = 3.0
+# }
+}
+
+style "calf-menubar"
+{
+ fg[PRELIGHT] = "#fff"
+ fg[SELECTED] = "#fff"
+ fg[NORMAL] = "#fff"
+ bg[PRELIGHT] = "#000"
+ bg[SELECTED] = "#000"
+ bg[NORMAL] = "#000"
+ bg_pixmap[NORMAL] = "background_black.png"
+ bg_pixmap[ACTIVE] = "background_black.png"
+ bg_pixmap[INSENSITIVE] = "background_black.png"
+# engine "clearlooks"
+# {
+# radius = 3.0
+# hint = "menubar"
+# }
+}
+
+style "calf-menu-separator" = "menu"
+{
+ engine "pixmap" {
+ image
+ {
+ function = VLINE
+ recolorable = FALSE
+ file = "vline.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ image
+ {
+ function = HLINE
+ recolorable = FALSE
+ file = "hline.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ }
+ }
+}
+
+
+
+
+################################################################################
+# SCALES #
+################################################################################
+
+### H/V SCALES ###
+
+style "calf-scale"
{
GtkVScale::slider_length = 46
GtkVScale::slider_width = 35
@@ -944,7 +857,7 @@ style "clearlooks-scale"
}
}
-style "clearlooks-hscale"
+style "calf-hscale"
{
GtkVScale::slider_length = 46
GtkVScale::slider_width = 35
@@ -1050,7 +963,7 @@ style "clearlooks-hscale"
}
}
-style "clearlooks-vscale"
+style "calf-vscale"
{
GtkVScale::slider_length = 46
GtkVScale::slider_width = 35
@@ -1141,192 +1054,31 @@ style "clearlooks-vscale"
overlay_stretch = FALSE
orientation = VERTICAL
}
- image
- {
- function = SLIDER
- recolorable = FALSE
- state = INSENSITIVE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- overlay_file = "slider-vert.png"
- overlay_stretch = FALSE
- orientation = VERTICAL
- }
- }
-}
-
-style "clearlooks-scrollbar"
-{
- engine "pixmap" {
- image {
-
- }
- }
- engine "clearlooks"
- {
- hint = "scrollbar"
- #style = CLASSIC
- }
-}
-
-style "clearlooks-hscrollbar"
-{
- engine "clearlooks"
- {
- hint = "hscrollbar"
- }
-}
-
-style "clearlooks-vscrollbar"
-{
- engine "clearlooks"
- {
- hint = "vscrollbar"
- }
-}
-
-style "clearlooks-menubar"
-{
- fg[PRELIGHT] = "#fff"
- fg[SELECTED] = "#fff"
- fg[NORMAL] = "#fff"
- bg[PRELIGHT] = "#000"
- bg[SELECTED] = "#000"
- bg[NORMAL] = "#000"
- bg_pixmap[NORMAL] = "background_black.png"
- bg_pixmap[ACTIVE] = "background_black.png"
- bg_pixmap[INSENSITIVE] = "background_black.png"
- engine "clearlooks"
- {
- radius = 3.0
- hint = "menubar"
- }
-}
-
-style "clearlooks-nautilus-location"
-{
- bg[NORMAL] = mix(0.50, shade (1.05, @selected_bg_color), @tooltip_bg_color)
-}
-
-style "metacity-frame"
-{
- bg[SELECTED] = mix (0.25, @tooltip_fg_color, @selected_bg_color)
-}
-
-style "clearlooks-radiocheck"
-{
- text[PRELIGHT] = @base_color # Text on Mouseover
-}
-
-style "clearlooks-panel"
-{
- bg[SELECTED] = mix(0.70, shade (1.05, @selected_bg_color), @tooltip_bg_color)
-}
-
-
-#########################################
-# CALF stuff
-#########################################
-
-style "menu-separator" = "menu"
-{
- engine "pixmap" {
- image
- {
- function = VLINE
- recolorable = FALSE
- file = "vline.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = HLINE
- recolorable = FALSE
- file = "hline.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
- }
-}
-style "calf-entry"
-{
- xthickness = 0
- ythickness = 0
- GtkEntry::shadow-type = GTK_SHADOW_NONE
- GtkEntry::inner-border = { 6, 6, 5, 4 }
- base[NORMAL] = "#000"
- engine "pixmap"
- {
- image
- {
- function = SHADOW
- shadow = IN
- recolorable = FALSE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = SHADOW
- shadow = OUT
- recolorable = FALSE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = BOX
- shadow = IN
- recolorable = FALSE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
- image
- {
- function = BOX
- shadow = OUT
- recolorable = FALSE
- file = "null.png"
- border = { 0, 0, 0, 0 }
- stretch = TRUE
- }
-
- image
- {
- function = FLAT_BOX
- recolorable = TRUE
- state = INSENSITIVE
- detail = "entry_bg"
- file = "entry_inactive.png"
- border = { 4, 4, 5, 4 }
- stretch = TRUE
- }
-
- image
- {
- function = FLAT_BOX
- recolorable = TRUE
- state = NORMAL
- detail = "entry_bg"
- file = "entry.png"
- border = { 4, 4, 5, 4 }
- stretch = TRUE
- }
-
- }
+ image
+ {
+ function = SLIDER
+ recolorable = FALSE
+ state = INSENSITIVE
+ file = "null.png"
+ border = { 0, 0, 0, 0 }
+ stretch = TRUE
+ overlay_file = "slider-vert.png"
+ overlay_stretch = FALSE
+ orientation = VERTICAL
+ }
+ }
}
-style "scrollbar" = "default"
+
+
+### SCROLLBAR ###
+
+style "calf-scrollbar"
{
- engine "pixmap"
+ engine "pixmap"
{
-
- image
+ # backgrounds
+ image
{
function = BOX
recolorable = FALSE
@@ -1335,7 +1087,7 @@ style "scrollbar" = "default"
stretch = FALSE
orientation = HORIZONTAL
}
- image
+ image
{
function = BOX
recolorable = FALSE
@@ -1344,15 +1096,12 @@ style "scrollbar" = "default"
stretch = TRUE
orientation = VERTICAL
}
-
-
-###########x SLIDERS ##################x
-
- image
+ # slider horizontal
+ image
{
function = SLIDER
recolorable = FALSE
- state = NORMAL
+ state = NORMAL
file = "scroller-horiz.png"
border = { 24,29,1,1 }
stretch = TRUE
@@ -1360,15 +1109,12 @@ style "scrollbar" = "default"
overlay_file = "led_normal.png"
overlay_stretch = FALSE
orientation = HORIZONTAL
-
-
}
-
- image
+ image
{
function = SLIDER
recolorable = FALSE
- state = ACTIVE
+ state = ACTIVE
shadow = IN
file = "scroller-horiz.png"
border = { 24,29,1,1 }
@@ -1377,14 +1123,12 @@ style "scrollbar" = "default"
overlay_file = "led_active.png"
overlay_stretch = FALSE
orientation = HORIZONTAL
-
}
-
- image
+ image
{
function = SLIDER
recolorable = FALSE
- state = PRELIGHT
+ state = PRELIGHT
file = "scroller-horiz-prelight.png"
border = { 24,29,1,1 }
stretch = TRUE
@@ -1392,13 +1136,12 @@ style "scrollbar" = "default"
overlay_file = "led_prelight.png"
overlay_stretch = FALSE
orientation = HORIZONTAL
-
}
- image
+ image
{
function = SLIDER
recolorable = FALSE
- state = INSENSITIVE
+ state = INSENSITIVE
file = "scroller-horiz-insens.png"
border = { 24,29,1,1 }
stretch = TRUE
@@ -1406,16 +1149,13 @@ style "scrollbar" = "default"
overlay_file = "led_inactive.png"
overlay_stretch = FALSE
orientation = HORIZONTAL
-
}
-
-#############x verticals################xx
-
- image
+ # slider vertical
+ image
{
function = SLIDER
recolorable = FALSE
- state = NORMAL
+ state = NORMAL
file = "scroller-vert.png"
border = { 1,1,24,29 }
stretch = TRUE
@@ -1423,14 +1163,12 @@ style "scrollbar" = "default"
overlay_file = "led2_normal.png"
overlay_stretch = FALSE
orientation = VERTICAL
-
}
-
- image
+ image
{
function = SLIDER
recolorable = FALSE
- state = ACTIVE
+ state = ACTIVE
shadow = IN
file = "scroller-vert.png"
border = { 1,1,24,29 }
@@ -1439,14 +1177,12 @@ style "scrollbar" = "default"
overlay_file = "led2_active.png"
overlay_stretch = FALSE
orientation = VERTICAL
-
}
-
- image
+ image
{
function = SLIDER
recolorable = FALSE
- state = PRELIGHT
+ state = PRELIGHT
file = "scroller-vert-prelight.png"
border = { 1,1,24,29}
stretch = TRUE
@@ -1454,13 +1190,12 @@ style "scrollbar" = "default"
overlay_file = "led2_prelight.png"
overlay_stretch = FALSE
orientation = VERTICAL
-
}
- image
+ image
{
function = SLIDER
recolorable = FALSE
- state = INSENSITIVE
+ state = INSENSITIVE
file = "scroller-vert-insens.png"
border = { 1,1,24,29 }
stretch = TRUE
@@ -1468,15 +1203,9 @@ style "scrollbar" = "default"
overlay_file = "led2_inactive.png"
overlay_stretch = FALSE
orientation = VERTICAL
-
}
-
-
-###########x END SLIDERS ##################x
-
-########### Steppers ######################
-#### UP #######
- image
+ # buttons
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1486,7 +1215,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = UP
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1496,7 +1225,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = UP
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1506,7 +1235,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = UP
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1516,11 +1245,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = UP
}
-
- ######### DOWN ############
-
-
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1530,7 +1255,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = DOWN
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1540,7 +1265,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = DOWN
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1550,7 +1275,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = DOWN
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1560,10 +1285,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = DOWN
}
-
-############ RIGHT ################
-
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1573,7 +1295,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = RIGHT
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1583,7 +1305,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = RIGHT
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1593,7 +1315,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = RIGHT
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1603,11 +1325,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = RIGHT
}
-
-############### LEFT ###################
-
-
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1617,7 +1335,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = LEFT
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1627,7 +1345,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = LEFT
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1637,7 +1355,7 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = LEFT
}
- image
+ image
{
function = STEPPER
recolorable = FALSE
@@ -1647,123 +1365,325 @@ style "scrollbar" = "default"
stretch = TRUE
arrow_direction = LEFT
}
-
}
}
-#########################################
-# Matches
-#########################################
-# Theme radio buttons and checkmarks
-class "GtkRadio*" style "clearlooks-radiocheck"
-class "GtkCheck*" style "clearlooks-radiocheck"
+################################################################################
+# LAYOUT #
+################################################################################
+
+### NOTEBOOK ###
+
+style "calf-notebook"
+{
+ GtkNotebook::tab-overlap = -2
+ xthickness = 18
+ ythickness = 10
+ engine "pixmap"
+ {
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ state = ACTIVE
+ file = "tab_bottom_normal.png"
+ border = { 24, 24, 0, 19 }
+ stretch = TRUE
+ gap_side = TOP
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ state = ACTIVE
+ file = "tab_top_normal.png"
+ border = { 24, 24, 19, 0 }
+ stretch = TRUE
+ gap_side = BOTTOM
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ state = ACTIVE
+ file = "tab_left_normal.png"
+ border = { 19, 0, 24, 24 }
+ stretch = TRUE
+ gap_side = RIGHT
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ state = ACTIVE
+ file = "tab_right_normal.png"
+ border = { 0, 19, 24, 24 }
+ stretch = TRUE
+ gap_side = LEFT
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ file = "tab_top_prelight.png"
+ border = { 24, 24, 19, 0 }
+ stretch = TRUE
+ gap_side = BOTTOM
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ file = "tab_bottom_prelight.png"
+ border = { 24, 24, 0, 19 }
+ stretch = TRUE
+ gap_side = TOP
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ file = "tab_left_prelight.png"
+ border = { 19, 0, 24, 24 }
+ stretch = TRUE
+ gap_side = RIGHT
+ }
+ image
+ {
+ function = EXTENSION
+ recolorable = FALSE
+ file = "tab_right_prelight.png"
+ border = { 0, 19, 24, 24 }
+ stretch = TRUE
+ gap_side = LEFT
+ }
+
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook_top.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ gap_side = TOP
+ }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook_bottom.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ gap_side = BOTTOM
+ }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook_left.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ gap_side = LEFT
+ }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook_right.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ gap_side = RIGHT
+ }
+ image
+ {
+ function = BOX_GAP
+ recolorable = FALSE
+ file = "notebook.png"
+ border = { 21, 21, 21, 21 }
+ stretch = TRUE
+ }
+ }
+}
+
+
+
+### TREEVIEW ###
+
+style "calf-treeview"
+{
+# engine "clearlooks"
+# {
+# hint = "treeview"
+# }
+}
+
+style "calf-treeview-header"
+{
+ fg[NORMAL] = "#fff"
+ fg[PRELIGHT] = "#fff"
+ fg[ACTIVE] = "#fff"
+ fg[SELECTED] = "#0af"
+ fg[INSENSITIVE] = "#aaa"
+
+ bg[NORMAL] = "#465160"
+ bg[PRELIGHT] = "#000"
+ bg[ACTIVE] = shade (0.9, "#465160")
+ bg[SELECTED] = "#000" # Gnome Appearances Preferences workaround
+ bg[INSENSITIVE] = shade (0.7, "#465160")
+# engine "clearlooks"
+# {
+# hint = "treeview-header"
+# }
+}
+
+
+
+### FRAMES ###
+
+style "calf-frame"
+{
+ xthickness = 8
+ ythickness = 8
+ bg[NORMAL] = "#fff"
+# engine "clearlooks"
+# {
+# radius = 7.0
+# }
+}
+
+style "calf-frame-title"
+{
+ fg[NORMAL] = "#fff"
+ font_name = "Sans 8"
+}
+
+
+
+################################################################################
+# MISCELLANEOUS #
+################################################################################
+
+### PROGRESS BAR ###
+
+style "calf-progressbar"
+{
+ xthickness = 1
+ ythickness = 1
+ bg[NORMAL] = "#000"
+ bg[SELECTED] = "#0af"
+ fg[PRELIGHT] = "#000"
+
+# engine "clearlooks"
+# {
+# hint = "progressbar"
+# }
+}
+
+
+
+### STATUS BAR ###
+
+style "calf-statusbar"
+{
+# engine "clearlooks"
+# {
+# hint = "statusbar"
+# }
+}
+
+### TOOLTIPS ###
+
+style "calf-tooltips" = "calf-wider"
+{
+ bg[NORMAL] = @tooltip_bg_color
+ fg[NORMAL] = @tooltip_fg_color
+}
+
+
+
-# Keep proper colour for Metacity
-class "MetaFrames" style "metacity-frame"
-#class "GtkWindow" style "metacity-frame"
+################################################################################
+# MATCHES #
+################################################################################
# Theme default style is applied to every widget
-class "GtkWidget" style "clearlooks-default"
+widget "*Calf*GtkWidget" style "calf-default"
+
+# Rack
+widget "*Calf-Rack*" style "calf-rack"
+
+# Menus
+widget_class "*Calf*<GtkMenuBar>*" style "calf-menubar"
+widget "*Calf-Menu*" style "calf-menu"
+widget_class "*Calf*<GtkMenuShell>*" style "calf-menu"
+widget "*Calf*SeparatorMenuItem*" style "calf-menu-separator"
+widget_class "*Calf*<GtkMenuItem>*" style "calf-menu-item"
+
+# Notebook
+widget_class "*<GtkNotebook>" style "calf-notebook"
+
+# Frame
+widget "*Calf*GtkFrame" style "calf-frame"
+widget "*Calf*GtkFrame.GtkLabel" style "calf-frame-title"
+
+# Treeview
+widget_class "*Calf*.<GtkTreeView>*" style "calf-treeview"
+widget_class "*Calf*.<GtkTreeView>.<GtkButton>*" style "calf-treeview-header"
+widget_class "*Calf*.<GtkCTree>.<GtkButton>*" style "calf-treeview-header"
+widget_class "*Calf*.<GtkList>.<GtkButton>*" style "calf-treeview-header"
+widget_class "*Calf*.<GtkCList>.<GtkButton>*" style "calf-treeview-header"
+
+# Buttons
+widget "*Calf*Button*" style "calf-button"
+widget "*Calf*GtkToggleButton*" style "calf-toggle"
+
+widget "*Calf-Button*" style "calf-button"
+widget "*Calf-Toggle*" style "calf-toggle"
+
+widget "*Calf*GtkLinkButton*" style "calf-button"
+widget "*Calf*GtkScaleButton*" style "calf-button"
+widget "*Calf*GtkColorButton*" style "calf-button"
+widget "*Calf*FileChooserButton*" style "calf-button"
+widget "*Calf*GtkFontButton*" style "calf-button"
+
+widget "*Calf-Combobox*" style "calf-combobox"
+widget_class "*Calf-Combobox*<GtkComboBoxEntry>*" style "calf-comboboxentry"
+widget "*Calf*GtkOptionMenu*" style "calf-combobox"
+
+# Entries
+widget "*Calf-SpinButton" style "calf-spinbutton"
+widget "*Calf-Entry*" style "calf-entry"
+widget "*Calf*Entry*" style "calf-entry"
+
+# Miscellaneous
+widget_class "*Calf*<GtkStatusbar>" style "calf-statusbar"
+widget_class "*Calf*<GtkProgressBar>" style "calf-progressbar"
+
+# Scrollbars/Scales
+widget_class "*Calf*<GtkScale>" style "calf-scale"
+widget_class "*Calf*<GtkRange>" style "calf-scale"
+widget "*Calf-VScale" style "calf-vscale"
+widget "*Calf-HScale" style "calf-hscale"
+widget_class "*Calf*<GtkScrollbar>" style "calf-scrollbar"
+widget_class "*Calf*<GtkVScrollbar>" style "calf-scrollbar"
+widget_class "*Calf*<GtkHScrollbar>" style "calf-scrollbar"
# Increase the x/ythickness in some widgets
-class "GtkToolbar" style "clearlooks-default"
-class "GtkRange" style "clearlooks-wide"
-class "GtkFrame" style "clearlooks-wide"
-class "GtkSeparator" style "clearlooks-wide"
-class "GtkEntry" style "calf-entry"
-
-class "GtkSpinButton" style "clearlooks-spinbutton"
-class "GtkScale" style "clearlooks-scale"
-class "GtkRange" style "clearlooks-scale"
-class "GtkVScale" style "clearlooks-vscale"
-class "GtkHScale" style "clearlooks-hscale"
-class "GtkScrollbar" style "scrollbar"
-class "GtkVScrollbar" style "scrollbar"
-class "GtkHScrollbar" style "scrollbar"
-# General matching following, the order is choosen so that the right styles override each other
-# eg. progressbar needs to be more important then the menu match.
-
-# This is not perfect, it could be done better
-# (That is modify *every* widget in the notebook, and change those back that
-# we really don't want changed)
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "clearlooks-notebook"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "clearlooks-notebook"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "clearlooks-notebook"
-
-widget_class "*<GtkButton>*" style "clearlooks-button"
-widget_class "*<GtkToggleButton>*" style "clearlooks-toggle"
-widget_class "*<GtkNotebook>" style "clearlooks-notebook"
-widget_class "*<GtkStatusbar>*" style "clearlooks-statusbar"
-
-widget "*GtkLinkButton*" style "clearlooks-button-norm"
-widget "*GtkScaleButton*" style "clearlooks-button-norm"
-widget "*GtkColorButton*" style "clearlooks-button-norm"
-widget "*File*Button*" style "clearlooks-button-norm"
-widget "*GtkFontButton*" style "clearlooks-button-norm"
-
-widget "*GtkOptionMenu*" style "clearlooks-combobox"
-widget "*Combo*" style "clearlooks-combobox"
-widget "*<GtkComboBox>*" style "clearlooks-combobox"
-class "GtkCombo*" style "clearlooks-combobox"
-widget_class "*<GtkComboBoxEntry>*" style "clearlooks-comboboxentry"
-
-
-widget_class "*<GtkMenuBar>*" style "clearlooks-menubar"
-widget_class "*<GtkMenuShell>*" style "clearlooks-menu"
-widget_class "*<GtkMenuItem>*" style "clearlooks-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "clearlooks-separator-menu-item"
-
-widget_class "*.<GtkFrame>" style "clearlooks-frame"
-widget_class "*.<GtkFrame>.<GtkLabel>" style "clearlooks-frame-title"
-widget_class "*.<GtkTreeView>*" style "clearlooks-treeview"
-
-widget_class "*<GtkProgressBar>" style "clearlooks-progressbar"
-
-# Treeview header
-widget_class "*.<GtkTreeView>.<GtkButton>*" style "clearlooks-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>*" style "clearlooks-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>*" style "clearlooks-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>*" style "clearlooks-treeview-header"
-
-# Workarounds for Evolution
-widget_class "*.ETable.ECanvas" style "clearlooks-treeview-header"
-widget_class "*.ETree.ECanvas" style "clearlooks-treeview-header"
-
-
-# CALF stuff
-class "GtkSeparatorMenuItem" style "menu-separator"
-widget_class "*SeparatorMenuItem*" style "menu-separator"
-widget "*calf-rack*GtkMenuShell*" style "clearlooks-menubar"
-
-#widget_class "*<GtkComboBox>*" style "clearlooks-comboboxentry"
-#widget_class "*<GtkCombo>*" style "clearlooks-comboboxentry"
-
-widget "*calf-rack*" style "calf-rack"
-widget "*calf-menu*" style "clearlooks-menu"
-
-#widget "*Button*Label*" style "clearlooks-button"
-
-
-# The window of the tooltip is called "gtk-tooltip"
-################################
-# FIXME:
-# This will not work if one embeds eg. a button into the tooltip.
-# As far as I can tell right now we will need to rework the theme
-# quite a bit to get this working correctly.
-# (It will involve setting different priorities, etc.)
-################################
-widget "gtk-tooltip*" style "clearlooks-tooltips"
-
-###################################################
-# Special cases and work arounds
-###################################################
-
-# Special case the nautilus-extra-view-widget
-# ToDo: A more generic approach for all applications that have a widget like this.
-widget "*.nautilus-extra-view-widget" style : highest "clearlooks-nautilus-location"
+class "GtkToolbar" style "calf-default"
+class "GtkRange" style "calf-wide"
+class "GtkFrame" style "calf-wide"
+class "GtkSeparator" style "calf-wide"
+
+
+
+
+
+
+
+
# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
# Note that the work around assumes that the combobox is _not_ in
@@ -1771,7 +1691,7 @@ widget "*.nautilus-extra-view-widget" style : highest "clearlooks-nautilus-lo
# Similar hack also in the menuitem style.
# This style does not affect GtkComboBoxEntry, it does have an effect
# on comboboxes in appears-as-list mode though.
-style "clearlooks-combobox-text-color-workaround"
+style "calf-combobox-text-color-workaround"
{
text[NORMAL] = "#fff"
text[PRELIGHT] = "#fff"
@@ -1779,9 +1699,10 @@ style "clearlooks-combobox-text-color-workaround"
text[SELECTED] = "#fff"
text[INSENSITIVE] = "#999"
}
-#widget_class "*.<GtkComboBox>.<GtkCellView>" style "clearlooks-combobox-text-color-workaround"
-style "clearlooks-menuitem-text-is-fg-color-workaround"
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "calf-combobox-text-color-workaround"
+
+style "calf-menuitem-text-is-fg-color-workaround"
{
text[NORMAL] = "#fff"
text[PRELIGHT] = "#fff"
@@ -1789,13 +1710,12 @@ style "clearlooks-menuitem-text-is-fg-color-workaround"
text[SELECTED] = "#fff"
text[INSENSITIVE] = "#999"
}
-
-widget "*.gtk-combobox-popup-menu.*" style "clearlooks-menuitem-text-is-fg-color-workaround"
+widget "*.gtk-combobox-popup-menu.*" style "calf-menuitem-text-is-fg-color-workaround"
# Work around the usage of GtkLabel inside GtkListItems to display text.
# This breaks because the label is shown on a background that is based on the
# base color set.
-style "clearlooks-fg-is-text-color-workaround"
+style "calf-fg-is-text-color-workaround"
{
bg[SELECTED] = @selected_bg_color
fg[NORMAL] = @text_color
@@ -1805,28 +1725,8 @@ style "clearlooks-fg-is-text-color-workaround"
fg[INSENSITIVE] = darker (@bg_color)
}
-widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
+widget_class "*<GtkListItem>*" style "calf-fg-is-text-color-workaround"
# The same problem also exists for GtkCList and GtkCTree
# Only match GtkCList and not the parent widgets, because that would also change the headers.
-widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
-
-style "clearlooks-evo-new-button-workaround"
-{
-
- engine "clearlooks"
- {
- toolbarstyle = 0
- }
-}
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "clearlooks-evo-new-button-workaround"
-
-# Theme panel elements
-widget "*PanelWidget*" style "clearlooks-panel"
-widget "*PanelApplet*" style "clearlooks-panel"
-widget "*fast-user-switch*" style "clearlooks-panel"
-class "PanelApp*" style "clearlooks-panel"
-class "PanelToplevel*" style "clearlooks-panel"
-widget_class "*Mail*" style "clearlooks-panel"
-widget_class "*notif*" style "clearlooks-panel"
-widget_class "*Notif*" style "clearlooks-panel"
+widget_class "*<GtkCList>" style "calf-fg-is-text-color-workaround"
diff --git a/src/gui.cpp b/src/gui.cpp
index 3c85746..e8e2023 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -389,8 +389,6 @@ GtkWidget *plugin_gui::create_from_xml(plugin_ctl_iface *_plugin, const char *xm
// gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE);
// gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), GTK_WIDGET(decoTable));
- gtk_widget_set_name(GTK_WIDGET(decoTable), "calf-container");
-
return GTK_WIDGET(decoTable);
}
@@ -637,10 +635,10 @@ void plugin_gui_window::create(plugin_ctl_iface *_jh, const char *title, const c
{
toplevel = GTK_WINDOW(gtk_window_new (GTK_WINDOW_TOPLEVEL));
gtk_window_set_default_icon_name("calf");
- gtk_widget_set_name(GTK_WIDGET(toplevel), "calf-plugin");
gtk_window_set_type_hint(toplevel, GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_role(toplevel, "plugin_ui");
GtkVBox *vbox = GTK_VBOX(gtk_vbox_new(false, 0));
+ gtk_widget_set_name(GTK_WIDGET(vbox), "Calf-Plugin");
GtkRequisition req, req2;
gtk_window_set_title(GTK_WINDOW (toplevel), title);
@@ -663,7 +661,7 @@ void plugin_gui_window::create(plugin_ctl_iface *_jh, const char *title, const c
fill_gui_presets(false, ch);
gtk_box_pack_start(GTK_BOX(vbox), gtk_ui_manager_get_widget(ui_mgr, "/ui/menubar"), false, false, 0);
- gtk_widget_set_name(GTK_WIDGET(gtk_ui_manager_get_widget(ui_mgr, "/ui/menubar")), "calf-menu");
+ gtk_widget_set_name(GTK_WIDGET(gtk_ui_manager_get_widget(ui_mgr, "/ui/menubar")), "Calf-Menu");
// determine size without content
gtk_widget_show_all(GTK_WIDGET(vbox));
@@ -679,7 +677,7 @@ void plugin_gui_window::create(plugin_ctl_iface *_jh, const char *title, const c
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), GTK_WIDGET(container));
-
+ gtk_widget_set_name(GTK_WIDGET(sw), "Calf-Container");
gtk_box_pack_start(GTK_BOX(vbox), sw, true, true, 0);
gtk_widget_show_all(GTK_WIDGET(sw));
diff --git a/src/gui_controls.cpp b/src/gui_controls.cpp
index 8de4591..f583d3b 100644
--- a/src/gui_controls.cpp
+++ b/src/gui_controls.cpp
@@ -53,7 +53,7 @@ GtkWidget *combo_box_param_control::create(plugin_gui *_gui, int _param_no)
}
gtk_combo_box_set_model (GTK_COMBO_BOX(widget), GTK_TREE_MODEL(lstore));
gtk_signal_connect (GTK_OBJECT (widget), "changed", G_CALLBACK (combo_value_changed), (gpointer)this);
-
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Combobox");
return widget;
}
@@ -154,7 +154,7 @@ GtkWidget *hscale_param_control::create(plugin_gui *_gui, int _param_no)
if(get_int("inverted", 0) > 0) {
gtk_range_set_inverted(GTK_RANGE(widget), TRUE);
}
-
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-HScale");
return widget;
}
@@ -216,7 +216,7 @@ GtkWidget *vscale_param_control::create(plugin_gui *_gui, int _param_no)
if(get_int("inverted", 0) > 0) {
gtk_range_set_inverted(GTK_RANGE(widget), TRUE);
}
-
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-VScale");
return widget;
}
@@ -259,6 +259,7 @@ GtkWidget *label_param_control::create(plugin_gui *_gui, int _param_no)
text = attribs["text"];
widget = gtk_label_new(text.c_str());
gtk_misc_set_alignment (GTK_MISC (widget), get_float("align-x", 0.5), get_float("align-y", 0.5));
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Label");
return widget;
}
@@ -283,6 +284,7 @@ GtkWidget *value_param_control::create(plugin_gui *_gui, int _param_no)
gtk_label_set_width_chars (GTK_LABEL (widget), get_int("width"));
}
gtk_misc_set_alignment (GTK_MISC (widget), get_float("align-x", 0.5), get_float("align-y", 0.5));
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Value");
return widget;
}
@@ -314,6 +316,7 @@ GtkWidget *vumeter_param_control::create(plugin_gui *_gui, int _param_no)
calf_vumeter_set_mode (CALF_VUMETER (widget), (CalfVUMeterMode)get_int("mode", 0));
CALF_VUMETER(widget)->vumeter_hold = get_float("hold", 0);
CALF_VUMETER(widget)->vumeter_falloff = get_float("falloff", 0.f);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-VUMeter");
return widget;
}
@@ -335,6 +338,7 @@ GtkWidget *led_param_control::create(plugin_gui *_gui, int _param_no)
widget = calf_led_new ();
gtk_widget_set_name(GTK_WIDGET(widget), "calf-led");
CALF_LED(widget)->led_mode = get_int("mode", 0);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-LED");
return widget;
}
@@ -357,6 +361,7 @@ GtkWidget *tube_param_control::create(plugin_gui *_gui, int _param_no)
gtk_widget_set_name(GTK_WIDGET(widget), "calf-tube");
CALF_TUBE(widget)->size = get_int("size", 2);
CALF_TUBE(widget)->direction = get_int("direction", 2);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Tube");
return widget;
}
@@ -378,6 +383,7 @@ GtkWidget *check_param_control::create(plugin_gui *_gui, int _param_no)
widget = gtk_check_button_new ();
gtk_signal_connect (GTK_OBJECT (widget), "toggled", G_CALLBACK (check_value_changed), (gpointer)this);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Checkbox");
return widget;
}
@@ -432,6 +438,7 @@ GtkWidget *radio_param_control::create(plugin_gui *_gui, int _param_no)
gui->set_radio_group(param_no, gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget)));
gtk_signal_connect (GTK_OBJECT (widget), "clicked", G_CALLBACK (radio_clicked), (gpointer)this);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-RadioButton");
return widget;
}
@@ -471,6 +478,7 @@ GtkWidget *spin_param_control::create(plugin_gui *_gui, int _param_no)
widget = gtk_spin_button_new_with_range (props.min, props.max, 1);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON(widget), get_int("digits", 0));
gtk_signal_connect (GTK_OBJECT (widget), "value-changed", G_CALLBACK (value_changed), (gpointer)this);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-SpinButton");
return widget;
}
@@ -502,6 +510,7 @@ GtkWidget *button_param_control::create(plugin_gui *_gui, int _param_no)
widget = gtk_button_new_with_label (get_props().name);
gtk_signal_connect (GTK_OBJECT (widget), "clicked", G_CALLBACK (button_clicked), (gpointer)this);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Button");
return widget;
}
@@ -546,6 +555,7 @@ GtkWidget *knob_param_control::create(plugin_gui *_gui, int _param_no)
CALF_KNOB(widget)->knob_size = 1;
}
gtk_signal_connect(GTK_OBJECT(widget), "value-changed", G_CALLBACK(knob_value_changed), (gpointer)this);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Knob");
return widget;
}
@@ -589,6 +599,7 @@ GtkWidget *toggle_param_control::create(plugin_gui *_gui, int _param_no)
}
gtk_signal_connect (GTK_OBJECT (widget), "value-changed", G_CALLBACK (toggle_value_changed), (gpointer)this);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-ToggleButton");
return widget;
}
@@ -628,6 +639,7 @@ GtkWidget *keyboard_param_control::create(plugin_gui *_gui, int _param_no)
kb = CALF_KEYBOARD(widget);
kb->nkeys = get_int("octaves", 4) * 7 + 1;
kb->sink = new CalfKeyboard::EventAdapter;
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Keyboard");
return widget;
}
@@ -665,6 +677,7 @@ GtkWidget *curve_param_control::create(plugin_gui *_gui, int _param_no)
curve = CALF_CURVE(widget);
curve->sink = new curve_param_control_callback(this);
// gtk_curve_set_curve_type(curve, GTK_CURVE_TYPE_LINEAR);
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Curve");
return widget;
}
@@ -703,6 +716,7 @@ GtkWidget *entry_param_control::create(plugin_gui *_gui, int _param_no)
entry = GTK_ENTRY(widget);
gtk_signal_connect(GTK_OBJECT(widget), "changed", G_CALLBACK(entry_value_changed), (gpointer)this);
gtk_editable_set_editable(GTK_EDITABLE(entry), get_int("editable", 1));
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-Entry");
return widget;
}
@@ -738,6 +752,7 @@ GtkWidget *filechooser_param_control::create(plugin_gui *_gui, int _param_no)
gtk_widget_set_size_request (widget, get_int("width", 200), -1);
if (attribs.count("width_chars"))
gtk_file_chooser_button_set_width_chars (filechooser, get_int("width_chars"));
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-FileButton");
return widget;
}
@@ -781,7 +796,7 @@ GtkWidget *line_graph_param_control::create(plugin_gui *_gui, int _param_no)
calf_line_graph_set_square(clg, get_int("square", 0));
clg->source = gui->plugin->get_line_graph_iface();
clg->source_id = param_no;
-
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-LineGraph");
return widget;
}
@@ -849,7 +864,7 @@ GtkWidget *listview_param_control::create(plugin_gui *_gui, int _param_no)
gtk_tree_view_insert_column_with_attributes(tree, i, tci[i].name, cr, "text", i, NULL);
}
gtk_tree_view_set_headers_visible(tree, TRUE);
-
+ gtk_widget_set_name(GTK_WIDGET(widget), "Calf-ListView");
return widget;
}
@@ -920,6 +935,7 @@ GtkWidget *table_container::create(plugin_gui *_gui, const char *element, xml_at
gtk_table_set_homogeneous(GTK_TABLE(table), TRUE);
}
container = GTK_CONTAINER(table);
+ gtk_widget_set_name(GTK_WIDGET(table), "Calf-Table");
return table;
}
@@ -944,6 +960,7 @@ GtkWidget *alignment_container::create(plugin_gui *_gui, const char *element, xm
{
GtkWidget *align = gtk_alignment_new(get_float("align-x", 0.5), get_float("align-y", 0.5), get_float("scale-x", 0), get_float("scale-y", 0));
container = GTK_CONTAINER(align);
+ gtk_widget_set_name(GTK_WIDGET(align), "Calf-Align");
return align;
}
@@ -953,6 +970,7 @@ GtkWidget *frame_container::create(plugin_gui *_gui, const char *element, xml_at
{
GtkWidget *frame = gtk_frame_new(attribs["label"].c_str());
container = GTK_CONTAINER(frame);
+ gtk_widget_set_name(GTK_WIDGET(frame), "Calf-Frame");
return frame;
}
@@ -969,6 +987,7 @@ GtkWidget *hbox_container::create(plugin_gui *_gui, const char *element, xml_att
{
GtkWidget *hbox = gtk_hbox_new(get_int("homogeneous") >= 1, get_int("spacing", 2));
container = GTK_CONTAINER(hbox);
+ gtk_widget_set_name(GTK_WIDGET(hbox), "Calf-HBox");
return hbox;
}
@@ -978,6 +997,7 @@ GtkWidget *vbox_container::create(plugin_gui *_gui, const char *element, xml_att
{
GtkWidget *vbox = gtk_vbox_new(get_int("homogeneous") >= 1, get_int("spacing", 2));
container = GTK_CONTAINER(vbox);
+ gtk_widget_set_name(GTK_WIDGET(vbox), "Calf-VBox");
return vbox;
}
@@ -987,6 +1007,7 @@ GtkWidget *notebook_container::create(plugin_gui *_gui, const char *element, xml
{
GtkWidget *nb = gtk_notebook_new();
container = GTK_CONTAINER(nb);
+ gtk_widget_set_name(GTK_WIDGET(nb), "Calf-Notebook");
return nb;
}
@@ -1008,6 +1029,7 @@ GtkWidget *scrolled_container::create(plugin_gui *_gui, const char *element, xml
GtkWidget *sw = gtk_scrolled_window_new(horiz, vert);
gtk_widget_set_size_request(sw, get_int("req-x", -1), get_int("req-y", -1));
container = GTK_CONTAINER(sw);
+ gtk_widget_set_name(GTK_WIDGET(sw), "Calf-ScrolledWindow");
return sw;
}
diff --git a/src/jackhost.cpp b/src/jackhost.cpp
index 2202d45..31910a4 100644
--- a/src/jackhost.cpp
+++ b/src/jackhost.cpp
@@ -726,6 +726,7 @@ host_session current_session;
int main(int argc, char *argv[])
{
host_session &sess = current_session;
+ gtk_rc_add_default_file(PKGLIBDIR "calf.rc");
gtk_init(&argc, &argv);
#if USE_LASH
diff --git a/src/main_win.cpp b/src/main_win.cpp
index 03e3cf5..e804555 100644
--- a/src/main_win.cpp
+++ b/src/main_win.cpp
@@ -424,7 +424,7 @@ std::string main_window::make_plugin_list(GtkActionGroup *actions)
void main_window::create()
{
toplevel = GTK_WINDOW(gtk_window_new (GTK_WINDOW_TOPLEVEL));
- gtk_widget_set_name(GTK_WIDGET(toplevel), "calf-rack");
+ gtk_widget_set_name(GTK_WIDGET(toplevel), "Calf-Rack");
gtk_window_set_default_icon_name("calf");
is_closed = false;
gtk_window_set_resizable(toplevel, false);
@@ -441,7 +441,7 @@ void main_window::create()
gtk_widget_set_size_request(GTK_WIDGET(gtk_ui_manager_get_widget(ui_mgr, "/ui/menubar")), 640, -1);
- gtk_widget_set_name(GTK_WIDGET(gtk_ui_manager_get_widget(ui_mgr, "/ui/menubar")), "calf-menu");
+ gtk_widget_set_name(GTK_WIDGET(gtk_ui_manager_get_widget(ui_mgr, "/ui/menubar")), "Calf-Menu");
plugin_actions = gtk_action_group_new("plugins");
string plugin_xml = make_plugin_list(plugin_actions);
@@ -476,7 +476,7 @@ void main_window::create()
gtk_container_add(GTK_CONTAINER(all_vbox), strips_table);
gtk_container_add(GTK_CONTAINER(toplevel), all_vbox);
- gtk_widget_set_name(GTK_WIDGET(strips_table), "calf-container");
+ gtk_widget_set_name(GTK_WIDGET(strips_table), "Calf-Container");
gtk_widget_show_all(GTK_WIDGET(toplevel));
source_id = g_timeout_add_full(G_PRIORITY_LOW, 1000/30, on_idle, this, NULL); // 30 fps should be enough for everybody
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list