[SCM] calf/master: Theme fixes
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:45 UTC 2013
The following commit has been merged in the master branch:
commit 7d6aa17562636480d5d088478d11367f50e1e743
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Sat Dec 17 11:07:01 2011 +0000
Theme fixes
diff --git a/gui/button.png b/gui/button.png
index fa1f3df..241a88c 100644
Binary files a/gui/button.png and b/gui/button.png differ
diff --git a/gui/button_active.png b/gui/button_active.png
index 74831b0..159a89f 100644
Binary files a/gui/button_active.png and b/gui/button_active.png differ
diff --git a/gui/button_default.png b/gui/button_default.png
index 2b15713..92b4175 100644
Binary files a/gui/button_default.png and b/gui/button_default.png differ
diff --git a/gui/button_default_active.png b/gui/button_default_active.png
index 2e4e186..1ae77cd 100644
Binary files a/gui/button_default_active.png and b/gui/button_default_active.png differ
diff --git a/gui/button_default_prelight.png b/gui/button_default_prelight.png
index 6d65189..75e8b1f 100644
Binary files a/gui/button_default_prelight.png and b/gui/button_default_prelight.png differ
diff --git a/gui/button_insens.png b/gui/button_insens.png
index 55cfcda..218856b 100644
Binary files a/gui/button_insens.png and b/gui/button_insens.png differ
diff --git a/gui/button_normal.png b/gui/button_normal.png
index 1c968a5..f1aa8fe 100644
Binary files a/gui/button_normal.png and b/gui/button_normal.png differ
diff --git a/gui/button_prelight.png b/gui/button_prelight.png
index fa64f02..390e455 100644
Binary files a/gui/button_prelight.png and b/gui/button_prelight.png differ
diff --git a/gui/calf.rc.in b/gui/calf.rc.in
index b7e4fee..63c229f 100644
--- a/gui/calf.rc.in
+++ b/gui/calf.rc.in
@@ -291,12 +291,12 @@ style "calf-wider"
style "calf-rack"
{
- fg[NORMAL] = "#111"
+ fg[NORMAL] = "#000"
fg[PRELIGHT] = "#000"
fg[ACTIVE] = "#000"
fg[SELECTED] = "#000"
- fg[INSENSITIVE] = "#666"
-
+ fg[INSENSITIVE] = "#000"
+
bg[NORMAL] = "#e8e7e2"
bg[PRELIGHT] = "#000"
bg[ACTIVE] = shade (0.9, "#e8e7e2")
@@ -307,8 +307,21 @@ style "calf-rack"
bg_pixmap[SELECTED] = "background_fur_white.png"
bg_pixmap[ACTIVE] = "background_fur_white.png"
bg_pixmap[INSENSITIVE] = "background_fur_white.png"
+
+ font_name = "Sans 8"
+}
+style "calf-rack-title"
+{
+ fg[NORMAL] = "#000"
+ fg[PRELIGHT] = "#000"
+ fg[ACTIVE] = "#000"
+ fg[SELECTED] = "#000"
+ fg[INSENSITIVE] = "#000"
+ font_name = "Sans Bold 10"
+
+ xthickness = 7
+ ythickness = 3
}
-
style "calf-label" {
font_name = "Sans 7"
@@ -329,18 +342,30 @@ style "calf-button"
xthickness = 2
ythickness = 1
- fg[NORMAL] = "#0385CD"
- fg[PRELIGHT] = "#49DBE8"
- fg[SELECTED] = "#0385CD"
- fg[ACTIVE] = "#49DBE8"
+ fg[NORMAL] = "#001144"
+ fg[PRELIGHT] = "#115588"
+ fg[SELECTED] = "#001144"
+ fg[ACTIVE] = "#2288aa"
fg[INSENSITIVE] = "#aaa"
- text[NORMAL] = "#0385CD"
- text[PRELIGHT] = "#49DBE8"
- text[SELECTED] = "#0385CD"
- text[ACTIVE] = "#49DBE8"
+ text[NORMAL] = "#001144"
+ text[PRELIGHT] = "#115588"
+ text[SELECTED] = "#001144"
+ text[ACTIVE] = "#2288aa"
text[INSENSITIVE] = "#aaa"
+# fg[NORMAL] = "#0385CD"
+# fg[PRELIGHT] = "#49DBE8"
+# fg[SELECTED] = "#0385CD"
+# fg[ACTIVE] = "#49DBE8"
+# fg[INSENSITIVE] = "#aaa"
+#
+# text[NORMAL] = "#0385CD"
+# text[PRELIGHT] = "#49DBE8"
+# text[SELECTED] = "#0385CD"
+# text[ACTIVE] = "#49DBE8"
+# text[INSENSITIVE] = "#aaa"
+
bg[NORMAL] = "#DADADA"
bg[PRELIGHT] = shade (1.4, "#D1D1D1")
bg[ACTIVE] = shade (1.4, "#D1D1D1")
@@ -407,23 +432,35 @@ style "calf-toggle"
{
GtkButton ::child-displacement-x = 0
GtkButton ::child-displacement-y = 0
- GtkButton ::inner-border = { 8, 26, 2, 2}
+ GtkButton ::inner-border = { 8, 33, 2, 2}
xthickness = 2
ythickness = 1
- fg[NORMAL] = "#0385CD"
- fg[PRELIGHT] = "#49DBE8"
- fg[SELECTED] = "#0385CD"
- fg[ACTIVE] = "#49DBE8"
+ fg[NORMAL] = "#001144"
+ fg[PRELIGHT] = "#115588"
+ fg[SELECTED] = "#001144"
+ fg[ACTIVE] = "#2288aa"
fg[INSENSITIVE] = "#aaa"
- text[NORMAL] = "#0385CD"
- text[PRELIGHT] = "#49DBE8"
- text[SELECTED] = "#0385CD"
- text[ACTIVE] = "#49DBE8"
+ text[NORMAL] = "#001144"
+ text[PRELIGHT] = "#115588"
+ text[SELECTED] = "#001144"
+ text[ACTIVE] = "#2288aa"
text[INSENSITIVE] = "#aaa"
+# fg[NORMAL] = "#0385CD"
+# fg[PRELIGHT] = "#49DBE8"
+# fg[SELECTED] = "#0385CD"
+# fg[ACTIVE] = "#49DBE8"
+# fg[INSENSITIVE] = "#aaa"
+#
+# text[NORMAL] = "#0385CD"
+# text[PRELIGHT] = "#49DBE8"
+# text[SELECTED] = "#0385CD"
+# text[ACTIVE] = "#49DBE8"
+# text[INSENSITIVE] = "#aaa"
+
bg[NORMAL] = "#DADADA"
bg[PRELIGHT] = shade (1.4, "#D1D1D1")
bg[ACTIVE] = shade (1.4, "#D1D1D1")
@@ -444,7 +481,7 @@ style "calf-toggle"
detail = "buttondefault"
recolorable = FALSE
file = "button_normal.png"
- border = {6, 24, 6, 6}
+ border = {6, 27, 6, 6}
stretch = TRUE
}
image
@@ -453,7 +490,7 @@ style "calf-toggle"
state = PRELIGHT
recolorable = FALSE
file = "button_prelight.png"
- border = {6, 24, 6, 6}
+ border = {6, 27, 6, 6}
stretch = TRUE
}
image
@@ -461,7 +498,7 @@ style "calf-toggle"
function = BOX
state = ACTIVE
file = "button_active.png"
- border = {6, 24, 6, 6}
+ border = {6, 27, 6, 6}
stretch = TRUE
}
image
@@ -469,14 +506,14 @@ style "calf-toggle"
function = BOX
state = INSENSITIVE
file = "button_insens.png"
- border = {6, 24, 6, 6}
+ border = {6, 27, 6, 6}
stretch = TRUE
}
image
{
function = BOX
file = "button_normal.png"
- border = {6, 24, 6, 6}
+ border = {6, 27, 6, 6}
stretch = TRUE
}
@@ -496,18 +533,30 @@ style "calf-button-norm"
xthickness = 2
ythickness = 1
- fg[NORMAL] = "#0385CD"
- fg[PRELIGHT] = "#49DBE8"
- fg[SELECTED] = "#0385CD"
- fg[ACTIVE] = "#49DBE8"
+ fg[NORMAL] = "#001144"
+ fg[PRELIGHT] = "#115588"
+ fg[SELECTED] = "#001144"
+ fg[ACTIVE] = "#2288aa"
fg[INSENSITIVE] = "#aaa"
- text[NORMAL] = "#0385CD"
- text[PRELIGHT] = "#49DBE8"
- text[SELECTED] = "#0385CD"
- text[ACTIVE] = "#49DBE8"
+ text[NORMAL] = "#001144"
+ text[PRELIGHT] = "#115588"
+ text[SELECTED] = "#001144"
+ text[ACTIVE] = "#2288aa"
text[INSENSITIVE] = "#aaa"
+# fg[NORMAL] = "#0385CD"
+# fg[PRELIGHT] = "#49DBE8"
+# fg[SELECTED] = "#0385CD"
+# fg[ACTIVE] = "#49DBE8"
+# fg[INSENSITIVE] = "#aaa"
+#
+# text[NORMAL] = "#0385CD"
+# text[PRELIGHT] = "#49DBE8"
+# text[SELECTED] = "#0385CD"
+# text[ACTIVE] = "#49DBE8"
+# text[INSENSITIVE] = "#aaa"
+
bg[NORMAL] = "#DADADA"
bg[PRELIGHT] = shade (1.4, "#D1D1D1")
bg[ACTIVE] = shade (1.4, "#D1D1D1")
@@ -598,7 +647,7 @@ style "calf-combobox"
GtkButton ::child-displacement-x = 0
GtkButton ::child-displacement-y = 0
# GtkButton ::default-border = { 6, 24, 5, 5 }
- GtkButton ::inner-border = { 8, 29, 1, 1}
+ GtkButton ::inner-border = { 8, 30, 1, 1}
xthickness = 2
ythickness = 1
@@ -1776,6 +1825,7 @@ widget "*Calf*" style : highest "calf-default"
# Rack
widget "*Calf-Rack*" style : highest "calf-rack"
+widget "Calf-Rack*Calf-Rack-Title" style : highest "calf-rack-title"
# Labels
widget "*Calf-Label" style : highest "calf-label"
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list