--- gigedit/trunk/src/gigedit/mainwindow.cpp 2014/05/20 14:35:36 2566
+++ gigedit/trunk/src/gigedit/mainwindow.cpp 2014/06/11 16:46:27 2621
@@ -45,6 +45,8 @@
#include "mainwindow.h"
#include "Settings.h"
#include "CombineInstrumentsDialog.h"
+#include "scripteditor.h"
+#include "scriptslots.h"
#include "../../gfx/status_attached.xpm"
#include "../../gfx/status_detached.xpm"
@@ -78,6 +80,9 @@
m_ScrolledWindowSamples.add(m_TreeViewSamples);
m_ScrolledWindowSamples.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ m_ScrolledWindowScripts.add(m_TreeViewScripts);
+ m_ScrolledWindowScripts.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+
m_TreeViewNotebook.set_size_request(300);
@@ -98,7 +103,7 @@
m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, _("Samples"));
m_TreeViewNotebook.append_page(m_ScrolledWindow, _("Instruments"));
-
+ m_TreeViewNotebook.append_page(m_ScrolledWindowScripts, _("Scripts"));
actionGroup = Gtk::ActionGroup::create();
@@ -130,9 +135,13 @@
sigc::mem_fun(
*this, &MainWindow::show_instr_props));
actionGroup->add(Gtk::Action::create("MidiRules",
- _("_Midi Rules")),
+ _("_Midi Rules...")),
sigc::mem_fun(
*this, &MainWindow::show_midi_rules));
+ actionGroup->add(Gtk::Action::create("ScriptSlots",
+ _("_Script Slots...")),
+ sigc::mem_fun(
+ *this, &MainWindow::show_script_slots));
actionGroup->add(Gtk::Action::create("Quit", Gtk::Stock::QUIT),
sigc::mem_fun(
*this, &MainWindow::on_action_quit));
@@ -231,6 +240,24 @@
_("Replace All Samples in All Groups...")),
sigc::mem_fun(*this, &MainWindow::on_action_replace_all_samples_in_all_groups)
);
+
+ // script right-click popup actions
+ actionGroup->add(
+ Gtk::Action::create("AddScriptGroup", _("Add _Group")),
+ sigc::mem_fun(*this, &MainWindow::on_action_add_script_group)
+ );
+ actionGroup->add(
+ Gtk::Action::create("AddScript", _("Add _Script")),
+ sigc::mem_fun(*this, &MainWindow::on_action_add_script)
+ );
+ actionGroup->add(
+ Gtk::Action::create("EditScript", _("_Edit Script...")),
+ sigc::mem_fun(*this, &MainWindow::on_action_edit_script)
+ );
+ actionGroup->add(
+ Gtk::Action::create("RemoveScript", Gtk::Stock::REMOVE),
+ sigc::mem_fun(*this, &MainWindow::on_action_remove_script)
+ );
uiManager = Gtk::UIManager::create();
uiManager->insert_action_group(actionGroup);
@@ -274,6 +301,7 @@
" "
" "
" "
+ " "
" "
" "
" "
@@ -287,6 +315,13 @@
" "
" "
" "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
"";
uiManager->add_ui_from_string(ui_info);
@@ -369,8 +404,25 @@
m_TreeViewSamples.set_model(m_refSamplesTreeModel);
m_TreeViewSamples.set_tooltip_text(_("To actually use a sample, drag it from this list view to \"Sample\" -> \"Sample:\" on the region's settings pane on the right.\n\nRight click here for more actions on samples."));
// m_TreeViewSamples.set_reorderable();
- m_TreeViewSamples.append_column_editable("Samples", m_SamplesModel.m_col_name);
- m_TreeViewSamples.set_headers_visible(false);
+ m_TreeViewSamples.append_column_editable(_("Name"), m_SamplesModel.m_col_name);
+ m_TreeViewSamples.append_column(_("Referenced"), m_SamplesModel.m_col_refcount);
+ {
+ Gtk::TreeViewColumn* column = m_TreeViewSamples.get_column(0);
+ Gtk::CellRendererText* cellrenderer =
+ dynamic_cast(column->get_first_cell_renderer());
+ column->add_attribute(
+ cellrenderer->property_foreground(), m_SamplesModel.m_color
+ );
+ }
+ {
+ Gtk::TreeViewColumn* column = m_TreeViewSamples.get_column(1);
+ Gtk::CellRendererText* cellrenderer =
+ dynamic_cast(column->get_first_cell_renderer());
+ column->add_attribute(
+ cellrenderer->property_foreground(), m_SamplesModel.m_color
+ );
+ }
+ m_TreeViewSamples.set_headers_visible(true);
m_TreeViewSamples.signal_button_press_event().connect_notify(
sigc::mem_fun(*this, &MainWindow::on_sample_treeview_button_release)
);
@@ -378,6 +430,34 @@
sigc::mem_fun(*this, &MainWindow::sample_name_changed)
);
+ // create scripts treeview (including its data model)
+ m_refScriptsTreeModel = ScriptsTreeStore::create(m_ScriptsModel);
+ m_TreeViewScripts.set_model(m_refScriptsTreeModel);
+ m_TreeViewScripts.set_tooltip_text(_(
+ "Note: instrument scripts are a LinuxSampler extension of the gig "
+ "format. This feature will not work with the GigaStudio software!"
+ ));
+ // m_TreeViewScripts.set_reorderable();
+ m_TreeViewScripts.append_column_editable("Samples", m_ScriptsModel.m_col_name);
+ m_TreeViewScripts.set_headers_visible(false);
+ m_TreeViewScripts.signal_button_press_event().connect_notify(
+ sigc::mem_fun(*this, &MainWindow::on_script_treeview_button_release)
+ );
+ m_refScriptsTreeModel->signal_row_changed().connect(
+ sigc::mem_fun(*this, &MainWindow::script_name_changed)
+ );
+
+ // establish drag&drop between scripts tree view and ScriptSlots window
+ std::vector drag_target_gig_script;
+ drag_target_gig_script.push_back(Gtk::TargetEntry("gig::Script"));
+ m_TreeViewScripts.drag_source_set(drag_target_gig_script);
+ m_TreeViewScripts.signal_drag_begin().connect(
+ sigc::mem_fun(*this, &MainWindow::on_scripts_treeview_drag_begin)
+ );
+ m_TreeViewScripts.signal_drag_data_get().connect(
+ sigc::mem_fun(*this, &MainWindow::on_scripts_treeview_drag_data_get)
+ );
+
// establish drag&drop between samples tree view and dimension region 'Sample' text entry
std::vector drag_target_gig_sample;
drag_target_gig_sample.push_back(Gtk::TargetEntry("gig::Sample"));
@@ -411,6 +491,12 @@
dimreg_changed_signal.make_slot());
dimreg_edit.signal_sample_ref_changed().connect(
sample_ref_changed_signal.make_slot());
+ sample_ref_changed_signal.connect(
+ sigc::mem_fun(*this, &MainWindow::on_sample_ref_changed)
+ );
+ samples_to_be_removed_signal.connect(
+ sigc::mem_fun(*this, &MainWindow::on_samples_to_be_removed)
+ );
m_RegionChooser.signal_instrument_struct_to_be_changed().connect(
sigc::hide(
@@ -634,6 +720,7 @@
// clear the samples and instruments tree views
m_refTreeModel->clear();
m_refSamplesTreeModel->clear();
+ m_refScriptsTreeModel->clear();
// remove all entries from "Instrument" menu
while (!instrument_menu->get_children().empty()) {
remove_instrument_from_menu(0);
@@ -648,6 +735,7 @@
// clear the samples and instruments tree views
m_refTreeModel->clear();
m_refSamplesTreeModel->clear();
+ m_refScriptsTreeModel->clear();
// remove all entries from "Instrument" menu
while (!instrument_menu->get_children().empty()) {
remove_instrument_from_menu(0);
@@ -1154,7 +1242,7 @@
}
std::vector texts;
for (int i = 0; i < txts.size(); ++i) texts.push_back(txts[i].c_str());
- texts.push_back(NULL); values.push_back(NULL);
+ texts.push_back(NULL); values.push_back(0);
eFileFormat.set_choices(&texts[0], &values[0]);
eFileFormat.set_value(major);
}
@@ -1295,6 +1383,27 @@
}
}
+void MainWindow::updateSampleRefCountMap(gig::File* gig) {
+ sample_ref_count.clear();
+
+ if (!gig) return;
+
+ for (gig::Instrument* instrument = gig->GetFirstInstrument(); instrument;
+ instrument = gig->GetNextInstrument())
+ {
+ for (gig::Region* rgn = instrument->GetFirstRegion(); rgn;
+ rgn = instrument->GetNextRegion())
+ {
+ for (int i = 0; i < 256; ++i) {
+ if (!rgn->pDimensionRegions[i]) continue;
+ if (rgn->pDimensionRegions[i]->pSample) {
+ sample_ref_count[rgn->pDimensionRegions[i]->pSample]++;
+ }
+ }
+ }
+ }
+}
+
void MainWindow::load_gig(gig::File* gig, const char* filename, bool isSharedInstrument)
{
file = 0;
@@ -1323,6 +1432,8 @@
instrument_name_connection.unblock();
uiManager->get_widget("/MenuBar/MenuInstrument")->show();
+ updateSampleRefCountMap(gig);
+
for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {
if (group->Name != "") {
Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
@@ -1339,9 +1450,34 @@
gig_to_utf8(sample->pInfo->Name);
rowSample[m_SamplesModel.m_col_sample] = sample;
rowSample[m_SamplesModel.m_col_group] = NULL;
+ int refcount = sample_ref_count.count(sample) ? sample_ref_count[sample] : 0;
+ rowSample[m_SamplesModel.m_col_refcount] = ToString(refcount) + " " + _("Refs.");
+ rowSample[m_SamplesModel.m_color] = refcount ? "black" : "gray";
}
}
}
+
+ for (int i = 0; gig->GetScriptGroup(i); ++i) {
+ gig::ScriptGroup* group = gig->GetScriptGroup(i);
+
+ Gtk::TreeModel::iterator iterGroup = m_refScriptsTreeModel->append();
+ Gtk::TreeModel::Row rowGroup = *iterGroup;
+ rowGroup[m_ScriptsModel.m_col_name] = gig_to_utf8(group->Name);
+ rowGroup[m_ScriptsModel.m_col_group] = group;
+ rowGroup[m_ScriptsModel.m_col_script] = NULL;
+ for (int s = 0; group->GetScript(s); ++s) {
+ gig::Script* script = group->GetScript(s);
+
+ Gtk::TreeModel::iterator iterScript =
+ m_refScriptsTreeModel->append(rowGroup.children());
+ Gtk::TreeModel::Row rowScript = *iterScript;
+ rowScript[m_ScriptsModel.m_col_name] = gig_to_utf8(script->Name);
+ rowScript[m_ScriptsModel.m_col_script] = script;
+ rowScript[m_ScriptsModel.m_col_group] = NULL;
+ }
+ }
+ // unfold all script groups by default
+ m_TreeViewScripts.expand_all();
file = gig;
@@ -1410,6 +1546,22 @@
}
}
+void MainWindow::show_script_slots() {
+ if (!file) return;
+ // get selected instrument
+ Glib::RefPtr sel = m_TreeView.get_selection();
+ Gtk::TreeModel::iterator it = sel->get_selected();
+ if (!it) return;
+ Gtk::TreeModel::Row row = *it;
+ gig::Instrument* instrument = row[m_Columns.m_col_instr];
+ if (!instrument) return;
+
+ ScriptSlots* window = new ScriptSlots;
+ window->setInstrument(instrument);
+ //window->reparent(*this);
+ window->show();
+}
+
void MainWindow::on_action_view_status_bar() {
Gtk::CheckMenuItem* item =
dynamic_cast(uiManager->get_widget("/MenuBar/MenuView/Statusbar"));
@@ -1506,6 +1658,32 @@
}
}
+void MainWindow::on_script_treeview_button_release(GdkEventButton* button) {
+ if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
+ Gtk::Menu* script_popup =
+ dynamic_cast(uiManager->get_widget("/ScriptPopupMenu"));
+ // update enabled/disabled state of sample popup items
+ Glib::RefPtr sel = m_TreeViewScripts.get_selection();
+ Gtk::TreeModel::iterator it = sel->get_selected();
+ bool group_selected = false;
+ bool script_selected = false;
+ if (it) {
+ Gtk::TreeModel::Row row = *it;
+ group_selected = row[m_ScriptsModel.m_col_group];
+ script_selected = row[m_ScriptsModel.m_col_script];
+ }
+ dynamic_cast(uiManager->get_widget("/ScriptPopupMenu/AddScript"))->
+ set_sensitive(group_selected || script_selected);
+ dynamic_cast(uiManager->get_widget("/ScriptPopupMenu/AddScriptGroup"))->
+ set_sensitive(file);
+ dynamic_cast(uiManager->get_widget("/ScriptPopupMenu/EditScript"))->
+ set_sensitive(script_selected);
+ dynamic_cast(uiManager->get_widget("/ScriptPopupMenu/RemoveScript"))->
+ set_sensitive(group_selected || script_selected);
+ // show sample popup
+ script_popup->popup(button->button, button->time);
+ }
+}
Gtk::RadioMenuItem* MainWindow::add_instrument_to_menu(
const Glib::ustring& name, int position) {
@@ -1653,6 +1831,118 @@
msg.run();
}
+void MainWindow::on_action_add_script_group() {
+ static int __script_indexer = 0;
+ if (!file) return;
+ gig::ScriptGroup* group = file->AddScriptGroup();
+ group->Name = gig_from_utf8(_("Unnamed Group"));
+ if (__script_indexer) group->Name += " " + ToString(__script_indexer);
+ __script_indexer++;
+ // update sample tree view
+ Gtk::TreeModel::iterator iterGroup = m_refScriptsTreeModel->append();
+ Gtk::TreeModel::Row rowGroup = *iterGroup;
+ rowGroup[m_ScriptsModel.m_col_name] = gig_to_utf8(group->Name);
+ rowGroup[m_ScriptsModel.m_col_script] = NULL;
+ rowGroup[m_ScriptsModel.m_col_group] = group;
+ file_changed();
+}
+
+void MainWindow::on_action_add_script() {
+ if (!file) return;
+ // get selected group
+ Glib::RefPtr sel = m_TreeViewScripts.get_selection();
+ Gtk::TreeModel::iterator it = sel->get_selected();
+ if (!it) return;
+ Gtk::TreeModel::Row row = *it;
+ gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group];
+ if (!group) { // not a group, but a script is selected (probably)
+ gig::Script* script = row[m_ScriptsModel.m_col_script];
+ if (!script) return;
+ it = row.parent(); // resolve parent (that is the script's group)
+ if (!it) return;
+ row = *it;
+ group = row[m_ScriptsModel.m_col_group];
+ if (!group) return;
+ }
+
+ // add a new script to the .gig file
+ gig::Script* script = group->AddScript();
+ Glib::ustring name = _("Unnamed Script");
+ script->Name = gig_from_utf8(name);
+
+ // add script to the tree view
+ Gtk::TreeModel::iterator iterScript =
+ m_refScriptsTreeModel->append(row.children());
+ Gtk::TreeModel::Row rowScript = *iterScript;
+ rowScript[m_ScriptsModel.m_col_name] = name;
+ rowScript[m_ScriptsModel.m_col_script] = script;
+ rowScript[m_ScriptsModel.m_col_group] = NULL;
+
+ // unfold group of new script item in treeview
+ Gtk::TreeModel::Path path(iterScript);
+ m_TreeViewScripts.expand_to_path(path);
+}
+
+void MainWindow::on_action_edit_script() {
+ if (!file) return;
+ // get selected script
+ Glib::RefPtr sel = m_TreeViewScripts.get_selection();
+ Gtk::TreeModel::iterator it = sel->get_selected();
+ if (!it) return;
+ Gtk::TreeModel::Row row = *it;
+ gig::Script* script = row[m_ScriptsModel.m_col_script];
+ if (!script) return;
+
+ ScriptEditor* editor = new ScriptEditor;
+ editor->setScript(script);
+ //editor->reparent(*this);
+ editor->show();
+}
+
+void MainWindow::on_action_remove_script() {
+ if (!file) return;
+ Glib::RefPtr sel = m_TreeViewScripts.get_selection();
+ Gtk::TreeModel::iterator it = sel->get_selected();
+ if (it) {
+ Gtk::TreeModel::Row row = *it;
+ gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group];
+ gig::Script* script = row[m_ScriptsModel.m_col_script];
+ Glib::ustring name = row[m_ScriptsModel.m_col_name];
+ try {
+ // remove script group or script from the gig file
+ if (group) {
+ // notify everybody that we're going to remove these samples
+//TODO: scripts_to_be_removed_signal.emit(members);
+ // delete the group in the .gig file including the
+ // samples that belong to the group
+ file->DeleteScriptGroup(group);
+ // notify that we're done with removal
+//TODO: scripts_removed_signal.emit();
+ file_changed();
+ } else if (script) {
+ // notify everybody that we're going to remove this sample
+//TODO: std::list lscripts;
+//TODO: lscripts.push_back(script);
+//TODO: scripts_to_be_removed_signal.emit(lscripts);
+ // remove sample from the .gig file
+ script->GetGroup()->DeleteScript(script);
+ // notify that we're done with removal
+//TODO: scripts_removed_signal.emit();
+ dimreg_changed();
+ file_changed();
+ }
+ // remove respective row(s) from samples tree view
+ m_refScriptsTreeModel->erase(it);
+ } catch (RIFF::Exception e) {
+ // pretend we're done with removal (i.e. to avoid dead locks)
+//TODO: scripts_removed_signal.emit();
+ // show error message
+ Gtk::MessageDialog msg(*this, e.Message.c_str(), false, Gtk::MESSAGE_ERROR);
+ msg.run();
+ }
+ }
+}
+
void MainWindow::on_action_add_group() {
static int __sample_indexer = 0;
if (!file) return;
@@ -2022,6 +2312,32 @@
}
}
+// see comment on on_sample_treeview_drag_begin()
+void MainWindow::on_scripts_treeview_drag_begin(const Glib::RefPtr& context)
+{
+ first_call_to_drag_data_get = true;
+}
+
+void MainWindow::on_scripts_treeview_drag_data_get(const Glib::RefPtr&,
+ Gtk::SelectionData& selection_data, guint, guint)
+{
+ if (!first_call_to_drag_data_get) return;
+ first_call_to_drag_data_get = false;
+
+ // get selected script
+ gig::Script* script = NULL;
+ Glib::RefPtr sel = m_TreeViewScripts.get_selection();
+ Gtk::TreeModel::iterator it = sel->get_selected();
+ if (it) {
+ Gtk::TreeModel::Row row = *it;
+ script = row[m_ScriptsModel.m_col_script];
+ }
+ // pass the gig::Script as pointer
+ selection_data.set(selection_data.get_target(), 0/*unused*/,
+ (const guchar*)&script,
+ sizeof(script)/*length of data in bytes*/);
+}
+
// For some reason drag_data_get gets called two times for each
// drag'n'drop (at least when target is an Entry). This work-around
// makes sure the code in drag_data_get and drop_drag_data_received is
@@ -2150,6 +2466,29 @@
}
}
+void MainWindow::script_name_changed(const Gtk::TreeModel::Path& path,
+ const Gtk::TreeModel::iterator& iter) {
+ if (!iter) return;
+ Gtk::TreeModel::Row row = *iter;
+ Glib::ustring name = row[m_ScriptsModel.m_col_name];
+ gig::ScriptGroup* group = row[m_ScriptsModel.m_col_group];
+ gig::Script* script = row[m_ScriptsModel.m_col_script];
+ gig::String gigname(gig_from_utf8(name));
+ if (group) {
+ if (group->Name != gigname) {
+ group->Name = gigname;
+ printf("script group name changed\n");
+ file_changed();
+ }
+ } else if (script) {
+ if (script->Name != gigname) {
+ script->Name = gigname;
+ printf("script name changed\n");
+ file_changed();
+ }
+ }
+}
+
void MainWindow::instrument_name_changed(const Gtk::TreeModel::Path& path,
const Gtk::TreeModel::iterator& iter) {
if (!iter) return;
@@ -2356,6 +2695,38 @@
}
}
+void MainWindow::on_sample_ref_count_incremented(gig::Sample* sample, int offset) {
+ if (!sample) return;
+ sample_ref_count[sample] += offset;
+ const int refcount = sample_ref_count[sample];
+
+ Glib::RefPtr model = m_TreeViewSamples.get_model();
+ for (int g = 0; g < model->children().size(); ++g) {
+ Gtk::TreeModel::Row rowGroup = model->children()[g];
+ for (int s = 0; s < rowGroup.children().size(); ++s) {
+ Gtk::TreeModel::Row rowSample = rowGroup.children()[s];
+ if (rowSample[m_SamplesModel.m_col_sample] != sample) continue;
+ rowSample[m_SamplesModel.m_col_refcount] = ToString(refcount) + " " + _("Refs.");
+ rowSample[m_SamplesModel.m_color] = refcount ? "black" : "gray";
+ }
+ }
+}
+
+void MainWindow::on_sample_ref_changed(gig::Sample* oldSample, gig::Sample* newSample) {
+ on_sample_ref_count_incremented(oldSample, -1);
+ on_sample_ref_count_incremented(newSample, +1);
+}
+
+void MainWindow::on_samples_to_be_removed(std::list samples) {
+ // just in case a new sample is added later with exactly the same memory
+ // address, which would lead to incorrect refcount if not deleted here
+ for (std::list::const_iterator it = samples.begin();
+ it != samples.end(); it != samples.end())
+ {
+ sample_ref_count.erase(*it);
+ }
+}
+
sigc::signal& MainWindow::signal_file_structure_to_be_changed() {
return file_structure_to_be_changed_signal;
}