--- gigedit/trunk/src/gigedit/paramedit.cpp	2007/10/27 12:28:33	1460
+++ gigedit/trunk/src/gigedit/paramedit.cpp	2009/02/03 19:38:19	1831
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Andreas Persson
+ * Copyright (C) 2006-2009 Andreas Persson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -17,43 +17,47 @@
  * 02110-1301 USA.
  */
 
+#include <cstring>
+
 #include "paramedit.h"
 
+#include "global.h"
+
 namespace {
     const char* const controlChangeTexts[] = {
-        "none", "channelaftertouch", "velocity",
+        _("none"), _("channelaftertouch"), _("velocity"),
         0,
-        "modwheel", // "Modulation Wheel or Lever",
-        "breath", // "Breath Controller",
+        _("modwheel"), // "Modulation Wheel or Lever",
+        _("breath"), // "Breath Controller",
         0,
-        "foot", // "Foot Controller",
-        "portamentotime", // "Portamento Time",
+        _("foot"), // "Foot Controller",
+        _("portamentotime"), // "Portamento Time",
         0, 0, 0, 0, 0, 0,
-        "effect1", // "Effect Control 1",
-        "effect2", // "Effect Control 2",
+        _("effect1"), // "Effect Control 1",
+        _("effect2"), // "Effect Control 2",
         0, 0,
-        "genpurpose1", // "General Purpose Controller 1",
-        "genpurpose2", // "General Purpose Controller 2",
-        "genpurpose3", // "General Purpose Controller 3",
-        "genpurpose4", // "General Purpose Controller 4",
+        _("genpurpose1"), // "General Purpose Controller 1",
+        _("genpurpose2"), // "General Purpose Controller 2",
+        _("genpurpose3"), // "General Purpose Controller 3",
+        _("genpurpose4"), // "General Purpose Controller 4",
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0,
-        "sustainpedal", // "Damper Pedal on/off (Sustain)",
-        "portamento", // "Portamento On/Off",
-        "sostenuto", // "Sustenuto On/Off",
-        "softpedal", // "Soft Pedal On/Off",
+        _("sustainpedal"), // "Damper Pedal on/off (Sustain)",
+        _("portamento"), // "Portamento On/Off",
+        _("sostenuto"), // "Sustenuto On/Off",
+        _("softpedal"), // "Soft Pedal On/Off",
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        "genpurpose5", // "General Purpose Controller 5",
-        "genpurpose6", // "General Purpose Controller 6",
-        "genpurpose7", // "General Purpose Controller 7",
-        "genpurpose8", // "General Purpose Controller 8",
+        _("genpurpose5"), // "General Purpose Controller 5",
+        _("genpurpose6"), // "General Purpose Controller 6",
+        _("genpurpose7"), // "General Purpose Controller 7",
+        _("genpurpose8"), // "General Purpose Controller 8",
         0, 0, 0, 0, 0, 0, 0,
-        "effect1depth", // "Effects 1 Depth",
-        "effect2depth", // "Effects 2 Depth",
-        "effect3depth", // "Effects 3 Depth",
-        "effect4depth", // "Effects 4 Depth",
-        "effect5depth", // "Effects 5 Depth"
+        _("effect1depth"), // "Effects 1 Depth",
+        _("effect2depth"), // "Effects 2 Depth",
+        _("effect3depth"), // "Effects 3 Depth",
+        _("effect4depth"), // "Effects 4 Depth",
+        _("effect5depth"), // "Effects 5 Depth"
     };
 }
 
@@ -186,7 +190,8 @@
 }
 
 const char* notes[] = {
-    "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"
+    _("C"), _("C#"), _("D"), _("D#"), _("E"), _("F"),_("F#"),
+    _("G"), _("G#"), _("A"), _("A#"), _("B")
 };
 
 
@@ -314,21 +319,29 @@
 StringEntry::StringEntry(const char* labelText) :
     LabelWidget(labelText, entry)
 {
-    entry.signal_changed().connect(
-        sigc::mem_fun(*this, &StringEntry::value_changed));
+    entry.signal_changed().connect(sig_changed.make_slot());
 }
 
-void StringEntry::value_changed()
+StringEntryMultiLine::StringEntryMultiLine(const char* labelText) :
+    LabelWidget(labelText, frame)
 {
-    if (ptr) {
-        *ptr = entry.get_text();
-        sig_changed();
-    }
+    text_buffer = text_view.get_buffer();
+    frame.set_shadow_type(Gtk::SHADOW_IN);
+    frame.add(text_view);
+    text_buffer->signal_changed().connect(sig_changed.make_slot());
+}
+
+gig::String StringEntryMultiLine::get_value() const
+{
+    Glib::ustring value = text_buffer->get_text();
+    for (int i = 0 ; (i = value.find("\x0a", i)) >= 0 ; i += 2)
+        value.replace(i, 1, "\x0d\x0a");
+    return value;
 }
 
-void StringEntry::set_ptr(gig::String* ptr)
+void StringEntryMultiLine::set_value(gig::String value)
 {
-    this->ptr = 0;
-    entry.set_text(*ptr);
-    this->ptr = ptr;
+    for (int i = 0 ; (i = value.find("\x0d\x0a", i, 2)) >= 0 ; i++)
+        value.replace(i, 2, "\x0a");
+    text_buffer->set_text(value);
 }