# HG changeset patch
# User Drew Perttula <drewp@bigasterisk.com>
# Date 2012-06-10 08:54:17
# Node ID c4a38a247b26d79e3f317a7f606fd4e3d4ed69c8
# Parent  16042667ab5136406edd02bba5b7bcaa40d6c768

cleanup. 'create' menu
Ignore-this: 1b265046817739a4271d079f5254b77f

diff --git a/bin/curvecalc b/bin/curvecalc
--- a/bin/curvecalc
+++ b/bin/curvecalc
@@ -72,25 +72,23 @@ class Main(object):
         self.makeStatusLines(wtree.get_object("status"))
 
     def onNewCurve(self, *args):
-        nc = self.wtree.get_object("newCurve")
+        dialog = 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:
+        if dialog.run() == 1:
             self.curveset.new_curve(entry.get_text())
-        nc.hide()
+        dialog.hide()
 
     def onNewSubterm(self, *args):
-        ns = self.wtree.get_object("newSubterm")
+        dialog = self.wtree.get_object("newSubterm")
         # the plan is to autocomplete this on existing subterm names
         # (but let you make one up, too)
         entry = self.wtree.get_object("newSubtermName").get_children()[0]
         entry.set_text("")
-        if ns.run() == 1:
+        entry.grab_focus()
+        if dialog.run() == 1:
             newname = entry.get_text()
-            makeCurve = self.wtree.get_object("newSubtermMakeCurve").get_active()
-
             uri = L9['sub/%s' % newname]
             self.graph.add((uri, RDF.type, L9.Subterm))
             self.graph.add((uri, RDFS.label, Literal(newname)))
@@ -98,10 +96,10 @@ class Main(object):
                             self.curveset, self.subterms,
                             self.wtree.get_object("subterms"),
                             None, show=True)
-            if makeCurve:
+            if self.wtree.get_object("newSubtermMakeCurve").get_active():
                 self.curveset.new_curve(newname)
             
-        ns.hide()
+        dialog.hide()
 
     def refreshTheme(self):
         gtk.rc_reparse_all()
diff --git a/light9/curvecalc/curvecalc.glade b/light9/curvecalc/curvecalc.glade
--- a/light9/curvecalc/curvecalc.glade
+++ b/light9/curvecalc/curvecalc.glade
@@ -101,7 +101,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="label" translatable="yes">_Curves</property>
+                <property name="label" translatable="yes">_Create</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu6">
@@ -113,12 +113,22 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="label" translatable="yes">Add...</property>
+                        <property name="label" translatable="yes">Curve...</property>
                         <property name="use_underline">True</property>
                         <accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="onNewCurve" swapped="no"/>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem15">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Subterm...</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="onNewSubterm" swapped="no"/>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
diff --git a/light9/curvecalc/curveview.py b/light9/curvecalc/curveview.py
--- a/light9/curvecalc/curveview.py
+++ b/light9/curvecalc/curveview.py
@@ -719,15 +719,6 @@ class Curvesetview(object):
         
         self.newcurvename = gtk.EntryBuffer("", 0)
         
-        return
-
-        entry = tk.Entry(f, textvariable=self.newcurvename)
-        entry.pack(side='left', fill='x',exp=1)        
-        entry.bind("<Key-Return>", self.new_curve)
-        self.entry = entry
-        
-        dispatcher.connect(self.focus_entry, "focus new curve")
-
     def focus_entry(self):
         self.entry.focus()
 
diff --git a/light9/curvecalc/subtermview.py b/light9/curvecalc/subtermview.py
--- a/light9/curvecalc/subtermview.py
+++ b/light9/curvecalc/subtermview.py
@@ -20,8 +20,8 @@ class Subexprview(object):
 
         self.entry.set_buffer(self.entryBuffer)
         self.expr_changed()
-        self.entryBuffer.connect("deleted-text", self.evar_changed)
-        self.entryBuffer.connect("inserted-text", self.evar_changed)
+        self.entryBuffer.connect("deleted-text", self.entry_changed)
+        self.entryBuffer.connect("inserted-text", self.entry_changed)
         dispatcher.connect(self.expr_changed,"expr_changed",
                            sender=self.subexpr)
 
@@ -33,8 +33,7 @@ class Subexprview(object):
         if e != self.entryBuffer.get_text():
             self.entryBuffer.set_text(e, len(e))
             
-    def evar_changed(self,*args):
-        print "hi change"
+    def entry_changed(self, *args):
         self.subexpr.expr = self.entryBuffer.get_text()
 
 class Subtermview(object):