--- gigedit/trunk/src/gigedit/mainwindow.cpp	2018/01/23 16:30:56	3409
+++ gigedit/trunk/src/gigedit/mainwindow.cpp	2018/02/10 12:01:09	3419
@@ -1356,7 +1356,10 @@
     m_TreeView.set_model(m_refTreeModelFilter);
 
     m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
-    m_TreeView.set_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments."));
+    m_TreeView.set_has_tooltip(true);
+    m_TreeView.signal_query_tooltip().connect(
+        sigc::mem_fun(*this, &MainWindow::onQueryTreeViewTooltip)
+    );
     instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
         sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
     );
@@ -1597,6 +1600,13 @@
         Gtk::AccelMap::add_entry("<Macros>/macro_9", GDK_KEY_F10, noModifier);
         Gtk::AccelMap::add_entry("<Macros>/macro_10", GDK_KEY_F11, noModifier);
         Gtk::AccelMap::add_entry("<Macros>/macro_11", GDK_KEY_F12, noModifier);
+        Gtk::AccelMap::add_entry("<Macros>/macro_12", GDK_KEY_F13, noModifier);
+        Gtk::AccelMap::add_entry("<Macros>/macro_13", GDK_KEY_F14, noModifier);
+        Gtk::AccelMap::add_entry("<Macros>/macro_14", GDK_KEY_F15, noModifier);
+        Gtk::AccelMap::add_entry("<Macros>/macro_15", GDK_KEY_F16, noModifier);
+        Gtk::AccelMap::add_entry("<Macros>/macro_16", GDK_KEY_F17, noModifier);
+        Gtk::AccelMap::add_entry("<Macros>/macro_17", GDK_KEY_F18, noModifier);
+        Gtk::AccelMap::add_entry("<Macros>/macro_18", GDK_KEY_F19, noModifier);
         Gtk::AccelMap::add_entry("<Macros>/SetupMacros", 'm', primaryModifierKey);
 
         Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();
@@ -1619,6 +1629,14 @@
         Gtk::AccelMap::add_entry("<Scripts>/script_9", GDK_KEY_F10, Gdk::SHIFT_MASK);
         Gtk::AccelMap::add_entry("<Scripts>/script_10", GDK_KEY_F11, Gdk::SHIFT_MASK);
         Gtk::AccelMap::add_entry("<Scripts>/script_11", GDK_KEY_F12, Gdk::SHIFT_MASK);
+        Gtk::AccelMap::add_entry("<Scripts>/script_12", GDK_KEY_F13, Gdk::SHIFT_MASK);
+        Gtk::AccelMap::add_entry("<Scripts>/script_13", GDK_KEY_F14, Gdk::SHIFT_MASK);
+        Gtk::AccelMap::add_entry("<Scripts>/script_14", GDK_KEY_F15, Gdk::SHIFT_MASK);
+        Gtk::AccelMap::add_entry("<Scripts>/script_15", GDK_KEY_F16, Gdk::SHIFT_MASK);
+        Gtk::AccelMap::add_entry("<Scripts>/script_16", GDK_KEY_F17, Gdk::SHIFT_MASK);
+        Gtk::AccelMap::add_entry("<Scripts>/script_17", GDK_KEY_F18, Gdk::SHIFT_MASK);
+        Gtk::AccelMap::add_entry("<Scripts>/script_18", GDK_KEY_F19, Gdk::SHIFT_MASK);
+        Gtk::AccelMap::add_entry("<Scripts>/DropAllScriptSlots", GDK_KEY_BackSpace, Gdk::SHIFT_MASK);
 
         Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();
         assign_scripts_menu->set_accel_group(accelGroup);
@@ -2622,7 +2640,10 @@
     dimreg_all_regions.set_has_tooltip(b);
     dimreg_all_dimregs.set_has_tooltip(b);
     dimreg_stereo.set_has_tooltip(b);
-    m_TreeView.set_has_tooltip(b);
+
+    // Not doing this here, we let onQueryTreeViewTooltip() handle this per cell
+    //m_TreeView.set_has_tooltip(b);
+
     m_TreeViewSamples.set_has_tooltip(b);
     m_TreeViewScripts.set_has_tooltip(b);
 
@@ -2974,6 +2995,53 @@
     }
 }
 
+bool MainWindow::onQueryTreeViewTooltip(int x, int y, bool keyboardTip, const Glib::RefPtr<Gtk::Tooltip>& tooltip) {
+    Gtk::TreeModel::iterator iter;
+    m_TreeView.get_tooltip_context_iter(x, y, keyboardTip, iter);
+    Gtk::TreeModel::Path path(iter);
+    Gtk::TreeModel::Row row = *iter;
+    Gtk::TreeViewColumn* pointedColumn = NULL;
+    // resolve the precise table column the mouse points to
+    {
+        Gtk::TreeModel::Path path; // unused
+        int cellX, cellY; // unused
+        m_TreeView.get_path_at_pos(x, y, path, pointedColumn, cellX, cellY);
+    }
+    Gtk::TreeViewColumn* scriptsColumn = m_TreeView.get_column(2);
+    if (pointedColumn == scriptsColumn) { // mouse hovers scripts column ...
+        // show the script(s) assigned to the hovered instrument as tooltip
+        tooltip->set_markup( row[m_Columns.m_col_tooltip] );
+        m_TreeView.set_tooltip_cell(tooltip, &path, scriptsColumn, NULL);
+    } else {
+        // if beginners' tooltips is disabled then don't show the following one
+        if (!Settings::singleton()->showTooltips)
+            return false;
+        // yeah, a beginners tooltip
+        tooltip->set_text(_(
+            "Right click here for actions on instruments & MIDI Rules. "
+            "Drag & drop to change the order of instruments."
+        ));
+        m_TreeView.set_tooltip_cell(tooltip, &path, pointedColumn, NULL);
+    }
+    return true;
+}
+
+static Glib::ustring scriptTooltipFor(gig::Instrument* instrument, int index) {
+    Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
+    const int iScriptSlots = instrument->ScriptSlotCount();
+    Glib::ustring tooltip = "<u>(" + ToString(index) + ") „"  + name + "”</u>\n\n";
+    if (!iScriptSlots)
+        tooltip += "<span foreground='red'><i>No script assigned</i></span>";
+    else {
+        for (int i = 0; i < iScriptSlots; ++i) {
+            tooltip += "• " + ToString(i+1) + ". Script:  „<span foreground='#46DEFF'><b>" +
+                       instrument->GetScriptOfSlot(i)->Name + "</b></span>”";
+            if (i + 1 < iScriptSlots) tooltip += "\n\n";
+        }
+    }
+    return tooltip;
+}
+
 void MainWindow::load_gig(gig::File* gig, const char* filename, bool isSharedInstrument)
 {
     file = 0;
@@ -3003,6 +3071,7 @@
         row[m_Columns.m_col_name] = name;
         row[m_Columns.m_col_instr] = instrument;
         row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
+        row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);
 
 #if !USE_GTKMM_BUILDER
         add_instrument_to_menu(name);
@@ -3120,7 +3189,10 @@
     gig::Instrument* instrument = row[m_Columns.m_col_instr];
     Glib::ustring gigname(gig_to_utf8(instrument->pInfo->Name));
     if (gigname != name) {
+        Gtk::TreeModel::Path path(*it);
+        const int index = path[0];
         row[m_Columns.m_col_name] = gigname;
+        row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);
     }
 }
 
@@ -3166,6 +3238,7 @@
         Gtk::TreeModel::Row row = model->children()[i];
         if (row[m_Columns.m_col_instr] != pInstrument) continue;
         row[m_Columns.m_col_scripts] = iScriptSlots ? ToString(iScriptSlots) : "";
+        row[m_Columns.m_col_tooltip] = scriptTooltipFor(pInstrument, i);
         break;
     }
 
@@ -3191,6 +3264,20 @@
     onScriptSlotsModified(pInstrument);
 }
 
+void MainWindow::dropAllScriptSlots() {
+    gig::Instrument* pInstrument = get_instrument();
+    if (!pInstrument) {
+        printf("!instrument\n");
+        return;
+    }
+
+    const int iScriptSlots = pInstrument->ScriptSlotCount();
+    for (int i = iScriptSlots - 1; i >= 0; --i)
+        pInstrument->RemoveScriptSlot(i);
+
+    onScriptSlotsModified(pInstrument);
+}
+
 void MainWindow::on_action_refresh_all() {
     __refreshEntireGUI();
 }
@@ -3631,6 +3718,18 @@
         assign_scripts_menu->append(*item);
     }
 
+    // add separator line to menu
+    assign_scripts_menu->append(*new Gtk::SeparatorMenuItem);
+
+    {
+        Gtk::MenuItem* item = new Gtk::MenuItem(_("Unassign All Scripts"));
+        item->signal_activate().connect(
+            sigc::mem_fun(*this, &MainWindow::dropAllScriptSlots)
+        );
+        assign_scripts_menu->append(*item);
+        item->set_accel_path("<Scripts>/DropAllScriptSlots");
+    }
+
 #if HAS_GTKMM_SHOW_ALL_CHILDREN
     assign_scripts_menu->show_all_children();
 #endif
@@ -3679,10 +3778,12 @@
     instrument_name_connection.block();
     Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
     Gtk::TreeModel::Row rowInstr = *iterInstr;
-    rowInstr[m_Columns.m_col_nr] = m_refTreeModel->children().size() - 1;
+    const int index = m_refTreeModel->children().size() - 1;
+    rowInstr[m_Columns.m_col_nr] = index;
     rowInstr[m_Columns.m_col_name] = name;
     rowInstr[m_Columns.m_col_instr] = instrument;
     rowInstr[m_Columns.m_col_scripts] = "";
+    rowInstr[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);
     instrument_name_connection.unblock();
 
 #if !USE_GTKMM_BUILDER
@@ -3769,7 +3870,9 @@
                      it != m_refTreeModel->children().end(); ++it, ++index)
                 {
                     Gtk::TreeModel::Row row = *it;
+                    gig::Instrument* instrument = row[m_Columns.m_col_instr];
                     row[m_Columns.m_col_nr] = index;
+                    row[m_Columns.m_col_tooltip] = scriptTooltipFor(instrument, index);
                 }
             }