diff --git a/bin/curvecalc b/bin/curvecalc --- a/bin/curvecalc +++ b/bin/curvecalc @@ -75,6 +75,16 @@ class Main(object): self.makeStatusLines(wtree.get_object("status")) + def onNewCurve(self, *args): + nc = self.wtree.get_object("newCurve") + entry = self.wtree.get_object("newCurveName") + # if you don't have songx, that should be the suggested name + entry.set_text("") + response = nc.run() + if response == 1: + self.curveset.new_curve(entry.get_text()) + nc.hide() + def refreshTheme(self): gtk.rc_reparse_all() reactor.callLater(1, self.refreshTheme) diff --git a/light9/curvecalc/curvecalc.glade b/light9/curvecalc/curvecalc.glade --- a/light9/curvecalc/curvecalc.glade +++ b/light9/curvecalc/curvecalc.glade @@ -97,6 +97,33 @@ + + True + False + False + _Curves + True + + + True + False + True + + + True + False + False + Add... + True + + + + + + + + + True False @@ -236,42 +263,35 @@ True False - + True False - + + gtk-add True - False - new curve named (C-N): + True + True + False + True + - True - True + False + False 0 - - True - True - ● - True - False - False - True - True - - - True - True - 1 - + + + + False - True + False 0 @@ -592,6 +612,101 @@ Available in functions: nsin/ncos period False gtk-refresh + + False + 5 + popup + New curve + True + mouse + normal + + + True + False + 2 + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-add + True + True + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + Name for new curve + + + True + True + 1 + + + + + True + True + True + ● + True + False + False + True + True + + + True + True + 2 + + + + + + button12 + button2 + + song01(t) diff --git a/light9/curvecalc/curveview.py b/light9/curvecalc/curveview.py --- a/light9/curvecalc/curveview.py +++ b/light9/curvecalc/curveview.py @@ -74,10 +74,10 @@ class Curveview(object): def __init__(self, curve, knobEnabled=False, isMusic=False, zoomControl=None, **kw): """knobEnabled=True highlights the previous key and ties it to a hardware knob""" - print "new curveview" self.widget = goocanvas.Canvas() self.widget.set_property("background-color", "black") self.widget.set_size_request(-1, 100) + self.size = self.widget.get_allocation() self.root = self.widget.get_root_item() self.redrawsEnabled = False