[SCM] calf/master: New knobs, new scollbars
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:39:41 UTC 2013
The following commit has been merged in the master branch:
commit 1ea5a0a9ebc0677e18202e2fe7d7be9e47fb93b3
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Sun Oct 25 02:17:29 2009 +0100
New knobs, new scollbars
diff --git a/gui/calf.rc b/gui/calf.rc
index 86f297e..ffa7924 100644
--- a/gui/calf.rc
+++ b/gui/calf.rc
@@ -1247,7 +1247,7 @@ style "scrollbar" = "default"
function = BOX
recolorable = TRUE
detail = "trough"
- file = "trough-scrollbar-horiz.png"
+ file = "background_black.png"
stretch = FALSE
orientation = HORIZONTAL
}
@@ -1256,7 +1256,7 @@ style "scrollbar" = "default"
function = BOX
recolorable = TRUE
detail = "trough"
- file = "trough-scrollbar-vert.png"
+ file = "background_black.png"
stretch = TRUE
orientation = VERTICAL
}
@@ -1270,10 +1270,10 @@ style "scrollbar" = "default"
recolorable = TRUE
state = NORMAL
file = "scroller-horiz.png"
- border = { 2, 2, 2, 2 }
+ border = { 24,29,1,1 }
stretch = TRUE
orientation = HORIZONTAL
- overlay_file = "scroll-thumb-horiz.png"
+ overlay_file = "led_normal.png"
overlay_stretch = FALSE
orientation = HORIZONTAL
@@ -1287,10 +1287,10 @@ style "scrollbar" = "default"
state = ACTIVE
shadow = IN
file = "scroller-horiz.png"
- border = { 2, 2, 2, 2 }
+ border = { 24,29,1,1 }
stretch = TRUE
orientation = HORIZONTAL
- overlay_file = "scroll-thumb-horiz.png"
+ overlay_file = "led_active.png"
overlay_stretch = FALSE
orientation = HORIZONTAL
@@ -1302,10 +1302,10 @@ style "scrollbar" = "default"
recolorable = TRUE
state = PRELIGHT
file = "scroller-horiz-prelight.png"
- border = { 2, 2, 2, 2 }
+ border = { 24,29,1,1 }
stretch = TRUE
orientation = HORIZONTAL
- overlay_file = "scroll-thumb-horiz.png"
+ overlay_file = "led_prelight.png"
overlay_stretch = FALSE
orientation = HORIZONTAL
@@ -1316,10 +1316,10 @@ style "scrollbar" = "default"
recolorable = TRUE
state = INSENSITIVE
file = "scroller-horiz-insens.png"
- border = { 2, 2, 2, 2 }
+ border = { 24,29,1,1 }
stretch = TRUE
orientation = HORIZONTAL
- overlay_file = "scroll-thumb-horiz.png"
+ overlay_file = "led_inactive.png"
overlay_stretch = FALSE
orientation = HORIZONTAL
@@ -1333,10 +1333,10 @@ style "scrollbar" = "default"
recolorable = TRUE
state = NORMAL
file = "scroller-vert.png"
- border = { 2, 2, 2, 2 }
+ border = { 1,1,24,29 }
stretch = TRUE
orientation = VERTICAL
- overlay_file = "scroll-thumb-vert.png"
+ overlay_file = "led2_normal.png"
overlay_stretch = FALSE
orientation = VERTICAL
@@ -1349,10 +1349,10 @@ style "scrollbar" = "default"
state = ACTIVE
shadow = IN
file = "scroller-vert.png"
- border = { 2, 2, 2, 2 }
+ border = { 1,1,24,29 }
stretch = TRUE
orientation = VERTICAL
- overlay_file = "scroll-thumb-vert.png"
+ overlay_file = "led2_active.png"
overlay_stretch = FALSE
orientation = VERTICAL
@@ -1364,10 +1364,10 @@ style "scrollbar" = "default"
recolorable = TRUE
state = PRELIGHT
file = "scroller-vert-prelight.png"
- border = { 2, 2, 2, 2 }
+ border = { 1,1,24,29}
stretch = TRUE
orientation = VERTICAL
- overlay_file = "scroll-thumb-vert.png"
+ overlay_file = "led2_prelight.png"
overlay_stretch = FALSE
orientation = VERTICAL
@@ -1378,10 +1378,10 @@ style "scrollbar" = "default"
recolorable = TRUE
state = INSENSITIVE
file = "scroller-vert-insens.png"
- border = { 2, 2, 2, 2 }
+ border = { 1,1,24,29 }
stretch = TRUE
orientation = VERTICAL
- overlay_file = "scroll-thumb-vert.png"
+ overlay_file = "led2_inactive.png"
overlay_stretch = FALSE
orientation = VERTICAL
@@ -1397,7 +1397,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = NORMAL
- file = "stepper-up.png"
+ file = "screw2.png"
#border = { 12, 2, 2, 9 }
stretch = TRUE
arrow_direction = UP
@@ -1407,7 +1407,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = PRELIGHT
- file = "stepper-up-prelight.png"
+ file = "screw2.png"
#border = { 12, 2, 2, 9 }
stretch = TRUE
arrow_direction = UP
@@ -1417,7 +1417,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = ACTIVE
- file = "stepper-up-prelight.png"
+ file = "screw2.png"
#border = { 12, 2, 2, 9 }
stretch = TRUE
arrow_direction = UP
@@ -1427,7 +1427,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = INSENSITIVE
- file = "stepper-up-insens.png"
+ file = "screw2.png"
#border = { 12, 2, 2, 9 }
stretch = TRUE
arrow_direction = UP
@@ -1441,7 +1441,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = NORMAL
- file = "stepper-down.png"
+ file = "screw1.png"
#border = { 12, 2, 10, 2 }
stretch = TRUE
arrow_direction = DOWN
@@ -1451,7 +1451,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = PRELIGHT
- file = "stepper-down-prelight.png"
+ file = "screw1.png"
#border = { 12, 2, 10, 2 }
stretch = TRUE
arrow_direction = DOWN
@@ -1461,7 +1461,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = ACTIVE
- file = "stepper-down-prelight.png"
+ file = "screw1.png"
#border = { 12, 2, 10, 2 }
stretch = TRUE
arrow_direction = DOWN
@@ -1471,7 +1471,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = INSENSITIVE
- file = "stepper-down-insens.png"
+ file = "screw1.png"
#border = { 12, 2, 10, 2 }
stretch = TRUE
arrow_direction = DOWN
@@ -1484,7 +1484,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = NORMAL
- file = "stepper-right.png"
+ file = "screw2.png"
#border = { 2, 9, 2, 13 }
stretch = TRUE
arrow_direction = RIGHT
@@ -1494,7 +1494,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = PRELIGHT
- file = "stepper-right-prelight.png"
+ file = "screw2.png"
#border = { 2, 9, 2, 13 }
stretch = TRUE
arrow_direction = RIGHT
@@ -1504,7 +1504,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = ACTIVE
- file = "stepper-right-prelight.png"
+ file = "screw2.png"
#border = { 2, 9, 2, 13 }
stretch = TRUE
arrow_direction = RIGHT
@@ -1514,7 +1514,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = INSENSITIVE
- file = "stepper-right-insens.png"
+ file = "screw2.png"
#border = { 2, 9, 2, 13 }
stretch = TRUE
arrow_direction = RIGHT
@@ -1528,7 +1528,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = NORMAL
- file = "stepper-left.png"
+ file = "screw1.png"
#border = { 2, 9, 2, 13 }
stretch = TRUE
arrow_direction = LEFT
@@ -1538,7 +1538,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = PRELIGHT
- file = "stepper-left-prelight.png"
+ file = "screw1.png"
#border = { 2, 9, 2, 13 }
stretch = TRUE
arrow_direction = LEFT
@@ -1548,7 +1548,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = ACTIVE
- file = "stepper-left-prelight.png"
+ file = "screw1.png"
#border = { 2, 9, 2, 13 }
stretch = TRUE
arrow_direction = LEFT
@@ -1558,7 +1558,7 @@ style "scrollbar" = "default"
function = STEPPER
recolorable = TRUE
state = INSENSITIVE
- file = "stepper-left-insens.png"
+ file = "screw1.png"
#border = { 2, 9, 2, 13 }
stretch = TRUE
arrow_direction = LEFT
diff --git a/gui/knob1.png b/gui/knob1.png
index ec9792e..8f63614 100644
Binary files a/gui/knob1.png and b/gui/knob1.png differ
diff --git a/gui/knob2.png b/gui/knob2.png
index b9b0597..709c94e 100644
Binary files a/gui/knob2.png and b/gui/knob2.png differ
diff --git a/gui/knob3.png b/gui/knob3.png
index fb46bf4..e9e438c 100644
Binary files a/gui/knob3.png and b/gui/knob3.png differ
diff --git a/gui/knob4.png b/gui/knob4.png
index 3da6e84..2ecd0ca 100644
Binary files a/gui/knob4.png and b/gui/knob4.png differ
diff --git a/gui/led2_active.png b/gui/led2_active.png
new file mode 100644
index 0000000..8b2da70
Binary files /dev/null and b/gui/led2_active.png differ
diff --git a/gui/led2_inactive.png b/gui/led2_inactive.png
new file mode 100644
index 0000000..9e21ceb
Binary files /dev/null and b/gui/led2_inactive.png differ
diff --git a/gui/led2_normal.png b/gui/led2_normal.png
new file mode 100644
index 0000000..f61f061
Binary files /dev/null and b/gui/led2_normal.png differ
diff --git a/gui/led2_prelight.png b/gui/led2_prelight.png
new file mode 100644
index 0000000..193a9ae
Binary files /dev/null and b/gui/led2_prelight.png differ
diff --git a/gui/scroller-horiz-insens.png b/gui/scroller-horiz-insens.png
index 7758f98..5196a3a 100644
Binary files a/gui/scroller-horiz-insens.png and b/gui/scroller-horiz-insens.png differ
diff --git a/gui/scroller-horiz-prelight.png b/gui/scroller-horiz-prelight.png
index 4c5ecec..6027e71 100644
Binary files a/gui/scroller-horiz-prelight.png and b/gui/scroller-horiz-prelight.png differ
diff --git a/gui/scroller-horiz.png b/gui/scroller-horiz.png
index a0ec27d..6027e71 100644
Binary files a/gui/scroller-horiz.png and b/gui/scroller-horiz.png differ
diff --git a/gui/scroller-vert-insens.png b/gui/scroller-vert-insens.png
index 064364e..803c0a3 100644
Binary files a/gui/scroller-vert-insens.png and b/gui/scroller-vert-insens.png differ
diff --git a/gui/scroller-vert-prelight.png b/gui/scroller-vert-prelight.png
index 6cf649d..7d5af38 100644
Binary files a/gui/scroller-vert-prelight.png and b/gui/scroller-vert-prelight.png differ
diff --git a/gui/scroller-vert.png b/gui/scroller-vert.png
index df1805c..7d5af38 100644
Binary files a/gui/scroller-vert.png and b/gui/scroller-vert.png differ
diff --git a/gui/trough-horizontal.png b/gui/trough-horizontal.png
index 2241c99..9651a3d 100644
Binary files a/gui/trough-horizontal.png and b/gui/trough-horizontal.png differ
diff --git a/gui/trough-scrollbar-horiz.png b/gui/trough-scrollbar-horiz.png
deleted file mode 100644
index 21dfbe9..0000000
Binary files a/gui/trough-scrollbar-horiz.png and /dev/null differ
diff --git a/gui/trough-scrollbar-vert.png b/gui/trough-scrollbar-vert.png
deleted file mode 100644
index dcf5619..0000000
Binary files a/gui/trough-scrollbar-vert.png and /dev/null differ
diff --git a/gui/trough-vertical.png b/gui/trough-vertical.png
index f67e2e0..c5ff82e 100644
Binary files a/gui/trough-vertical.png and b/gui/trough-vertical.png differ
diff --git a/knobs/knob1.png b/knobs/knob1.png
index ec9792e..8f63614 100644
Binary files a/knobs/knob1.png and b/knobs/knob1.png differ
diff --git a/knobs/knob1.py b/knobs/knob1.py
index bca1b95..7f26172 100755
--- a/knobs/knob1.py
+++ b/knobs/knob1.py
@@ -108,8 +108,8 @@ for variant in range(0, 4):
ctx.arc(x, y, radius, sangle + adelta * led, sangle + adelta * led + spacing)
ctx.stroke()
- ctx.set_source_rgba(0, 0, 0, 0.8)
- ctx.set_line_width(1)
+ ctx.set_source_rgba(0, 0, 0, 1)
+ ctx.set_line_width(1.5)
mtx = ctx.get_matrix()
ctx.translate(x + radiusminus2 * c, y + radiusminus2 * s)
ctx.rotate(vangle)
diff --git a/knobs/knob1_bg.png b/knobs/knob1_bg.png
index 1e4cbef..d670151 100644
Binary files a/knobs/knob1_bg.png and b/knobs/knob1_bg.png differ
diff --git a/knobs/knob2.png b/knobs/knob2.png
index b9b0597..709c94e 100644
Binary files a/knobs/knob2.png and b/knobs/knob2.png differ
diff --git a/knobs/knob2.py b/knobs/knob2.py
index 64c8297..6dc5824 100755
--- a/knobs/knob2.py
+++ b/knobs/knob2.py
@@ -10,7 +10,7 @@ x, y = WIDTH / 2, HEIGHT / 2
lwidth = WIDTH / 10
radius = WIDTH / 2 - lwidth
radiusplus = radius + lwidth / 2
-radiusminus = radius - lwidth / 2
+radiusminus = radius - lwidth / 1.0
radiusminus2 = radius - lwidth
radiusminus3 = radius - lwidth * 3 / 2
radiusint = (radius - lwidth / 2) * 0.25
@@ -108,7 +108,7 @@ for variant in range(0, 4):
ctx.arc(x, y, radius, sangle + adelta * led, sangle + adelta * led + spacing)
ctx.stroke()
- ctx.set_source_rgba(1, 1, 1, 1)
+ ctx.set_source_rgba(0, 0, 0, 1)
ctx.set_line_width(1)
mtx = ctx.get_matrix()
ctx.translate(x + radiusminus * c, y + radiusminus * s)
diff --git a/knobs/knob2_bg.png b/knobs/knob2_bg.png
index 92049c0..7d26510 100644
Binary files a/knobs/knob2_bg.png and b/knobs/knob2_bg.png differ
diff --git a/knobs/knob3.png b/knobs/knob3.png
index fb46bf4..e9e438c 100644
Binary files a/knobs/knob3.png and b/knobs/knob3.png differ
diff --git a/knobs/knob3_bg.png b/knobs/knob3_bg.png
index 9b33d4d..4dd40a2 100644
Binary files a/knobs/knob3_bg.png and b/knobs/knob3_bg.png differ
diff --git a/knobs/knob4.png b/knobs/knob4.png
index 3da6e84..2ecd0ca 100644
Binary files a/knobs/knob4.png and b/knobs/knob4.png differ
diff --git a/knobs/knob4.py b/knobs/knob4.py
index e9178a7..b949596 100755
--- a/knobs/knob4.py
+++ b/knobs/knob4.py
@@ -9,7 +9,7 @@ output = "knob4.png"
x, y = WIDTH / 2, HEIGHT / 2
lwidth = WIDTH / 15
radius = WIDTH / 2 - lwidth
-radiusplus = radius + lwidth / 2
+radiusplus = radius + lwidth / 3
radiusminus = radius - lwidth / 2
radiusminus2 = radius - lwidth
radiusminus3 = radius - lwidth * 3 / 2
diff --git a/knobs/knob4_bg.png b/knobs/knob4_bg.png
index 51376df..63af6d9 100644
Binary files a/knobs/knob4_bg.png and b/knobs/knob4_bg.png differ
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list