/[svn]/gigedit/trunk/src/gigedit/mainwindow.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/mainwindow.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2772 by schoenebeck, Thu Jun 11 20:29:22 2015 UTC revision 3162 by schoenebeck, Tue May 9 14:35:23 2017 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2015 Andreas Persson   * Copyright (C) 2006-2017 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 20  Line 20 
20  #include <iostream>  #include <iostream>
21  #include <cstring>  #include <cstring>
22    
23    #include <glibmmconfig.h>
24    // threads.h must be included first to be able to build with
25    // G_DISABLE_DEPRECATED
26    #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \
27        (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION > 31) || GLIBMM_MAJOR_VERSION > 2
28    #include <glibmm/threads.h>
29    #endif
30    
31  #include <glibmm/convert.h>  #include <glibmm/convert.h>
32  #include <glibmm/dispatcher.h>  #include <glibmm/dispatcher.h>
33  #include <glibmm/miscutils.h>  #include <glibmm/miscutils.h>
# Line 31  Line 39 
39  #include <gtkmm/targetentry.h>  #include <gtkmm/targetentry.h>
40  #include <gtkmm/main.h>  #include <gtkmm/main.h>
41  #include <gtkmm/toggleaction.h>  #include <gtkmm/toggleaction.h>
42    #include <gtkmm/accelmap.h>
43  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
44  #include "wrapLabel.hh"  #include "wrapLabel.hh"
45  #endif  #endif
# Line 50  Line 59 
59  #include "ReferencesView.h"  #include "ReferencesView.h"
60  #include "../../gfx/status_attached.xpm"  #include "../../gfx/status_attached.xpm"
61  #include "../../gfx/status_detached.xpm"  #include "../../gfx/status_detached.xpm"
62    #include "gfx/builtinpix.h"
63    #include "MacroEditor.h"
64    #include "MacrosSetup.h"
65    
66  MainWindow::MainWindow() :  MainWindow::MainWindow() :
67      m_DimRegionChooser(*this),      m_DimRegionChooser(*this),
68      dimreg_label(_("Changes apply to:")),      dimreg_label(_("Changes apply to:")),
69      dimreg_all_regions(_("all regions")),      dimreg_all_regions(_("all regions")),
70      dimreg_all_dimregs(_("all dimension splits")),      dimreg_all_dimregs(_("all dimension splits")),
71      dimreg_stereo(_("both channels"))      dimreg_stereo(_("both channels")),
72        labelLegend(_("Legend:")),
73        labelNoSample(_(" No Sample")),
74        labelMissingSample(_(" Missing some Sample(s)")),
75        labelLooped(_(" Looped")),
76        labelSomeLoops(_(" Some Loop(s)"))
77  {  {
78        loadBuiltInPix();
79    
80  //    set_border_width(5);  //    set_border_width(5);
81  //    set_default_size(400, 200);  //    set_default_size(400, 200);
82    
   
83      add(m_VBox);      add(m_VBox);
84    
85      // Handle selection      // Handle selection
# Line 96  MainWindow::MainWindow() : Line 113  MainWindow::MainWindow() :
113      dimreg_hbox.add(dimreg_stereo);      dimreg_hbox.add(dimreg_stereo);
114      dimreg_vbox.add(dimreg_edit);      dimreg_vbox.add(dimreg_edit);
115      dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);      dimreg_vbox.pack_start(dimreg_hbox, Gtk::PACK_SHRINK);
116        {
117            legend_hbox.add(labelLegend);
118    
119            imageNoSample.set(redDot);
120            imageNoSample.set_alignment(Gtk::ALIGN_END);
121            labelNoSample.set_alignment(Gtk::ALIGN_START);
122            legend_hbox.add(imageNoSample);
123            legend_hbox.add(labelNoSample);
124    
125            imageMissingSample.set(yellowDot);
126            imageMissingSample.set_alignment(Gtk::ALIGN_END);
127            labelMissingSample.set_alignment(Gtk::ALIGN_START);
128            legend_hbox.add(imageMissingSample);
129            legend_hbox.add(labelMissingSample);
130    
131            imageLooped.set(blackLoop);
132            imageLooped.set_alignment(Gtk::ALIGN_END);
133            labelLooped.set_alignment(Gtk::ALIGN_START);
134            legend_hbox.add(imageLooped);
135            legend_hbox.add(labelLooped);
136    
137            imageSomeLoops.set(grayLoop);
138            imageSomeLoops.set_alignment(Gtk::ALIGN_END);
139            labelSomeLoops.set_alignment(Gtk::ALIGN_START);
140            legend_hbox.add(imageSomeLoops);
141            legend_hbox.add(labelSomeLoops);
142    
143            legend_hbox.show_all_children();
144        }
145        dimreg_vbox.pack_start(legend_hbox, Gtk::PACK_SHRINK);
146      m_HPaned.add2(dimreg_vbox);      m_HPaned.add2(dimreg_vbox);
147    
148      dimreg_label.set_tooltip_text(_("To automatically apply your changes above globally to the entire instrument, check all 3 check boxes on the right."));      dimreg_label.set_tooltip_text(_("To automatically apply your changes above globally to the entire instrument, check all 3 check boxes on the right."));
# Line 156  MainWindow::MainWindow() : Line 203  MainWindow::MainWindow() :
203          sigc::mem_fun(*this, &MainWindow::show_intruments_tab)          sigc::mem_fun(*this, &MainWindow::show_intruments_tab)
204      );      );
205      actionGroup->add(      actionGroup->add(
206          Gtk::Action::create("MenuScript", _("S_cript")),          Gtk::Action::create("MenuScript", _("Scr_ipt")),
207          sigc::mem_fun(*this, &MainWindow::show_scripts_tab)          sigc::mem_fun(*this, &MainWindow::show_scripts_tab)
208      );      );
209      actionGroup->add(Gtk::Action::create("AllInstruments", _("_Select")));      actionGroup->add(Gtk::Action::create("AllInstruments", _("_Select")));
210    
211      actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));      actionGroup->add(Gtk::Action::create("MenuEdit", _("_Edit")));
212    
213        const Gdk::ModifierType primaryModifierKey =
214    #if defined(__APPLE__)
215        Gdk::META_MASK; // Cmd key on Mac
216    #else
217        Gdk::CONTROL_MASK; // Ctrl key on all other OSs
218    #endif
219    
220        actionGroup->add(Gtk::Action::create("CopyDimRgn",
221                                             _("Copy selected dimension region")),
222                         Gtk::AccelKey(GDK_KEY_c, Gdk::MOD1_MASK),
223                         sigc::mem_fun(*this, &MainWindow::copy_selected_dimrgn));
224    
225        actionGroup->add(Gtk::Action::create("PasteDimRgn",
226                                             _("Paste dimension region")),
227                         Gtk::AccelKey(GDK_KEY_v, Gdk::MOD1_MASK),
228                         sigc::mem_fun(*this, &MainWindow::paste_copied_dimrgn));
229    
230        actionGroup->add(Gtk::Action::create("AdjustClipboard",
231                                             _("Adjust Clipboard Content")),
232                         Gtk::AccelKey(GDK_KEY_x, Gdk::MOD1_MASK),
233                         sigc::mem_fun(*this, &MainWindow::adjust_clipboard_content));
234    
235        actionGroup->add(Gtk::Action::create("SelectPrevRegion",
236                                             _("Select Previous Region")),
237                         Gtk::AccelKey(GDK_KEY_Left, primaryModifierKey),
238                         sigc::mem_fun(*this, &MainWindow::select_prev_region));
239    
240        actionGroup->add(Gtk::Action::create("SelectNextRegion",
241                                             _("Select Next Region")),
242                         Gtk::AccelKey(GDK_KEY_Right, primaryModifierKey),
243                         sigc::mem_fun(*this, &MainWindow::select_next_region));
244    
245        actionGroup->add(Gtk::Action::create("SelectPrevDimRgnZone",
246                                             _("Select Previous Dimension Region Zone")),
247                         Gtk::AccelKey(GDK_KEY_Left, Gdk::MOD1_MASK),
248                         sigc::mem_fun(*this, &MainWindow::select_prev_dim_rgn_zone));
249    
250        actionGroup->add(Gtk::Action::create("SelectNextDimRgnZone",
251                                             _("Select Next Dimension Region Zone")),
252                         Gtk::AccelKey(GDK_KEY_Right, Gdk::MOD1_MASK),
253                         sigc::mem_fun(*this, &MainWindow::select_next_dim_rgn_zone));
254    
255        actionGroup->add(Gtk::Action::create("SelectPrevDimension",
256                                             _("Select Previous Dimension")),
257                         Gtk::AccelKey(GDK_KEY_Up, Gdk::MOD1_MASK),
258                         sigc::mem_fun(*this, &MainWindow::select_prev_dimension));
259    
260        actionGroup->add(Gtk::Action::create("SelectNextDimension",
261                                             _("Select Next Dimension")),
262                         Gtk::AccelKey(GDK_KEY_Down, Gdk::MOD1_MASK),
263                         sigc::mem_fun(*this, &MainWindow::select_next_dimension));
264    
265        actionGroup->add(Gtk::Action::create("SelectAddPrevDimRgnZone",
266                                             _("Add Previous Dimension Region Zone to Selection")),
267                         Gtk::AccelKey(GDK_KEY_Left, Gdk::MOD1_MASK | Gdk::SHIFT_MASK),
268                         sigc::mem_fun(*this, &MainWindow::select_add_prev_dim_rgn_zone));
269    
270        actionGroup->add(Gtk::Action::create("SelectAddNextDimRgnZone",
271                                             _("Add Next Dimension Region Zone to Selection")),
272                         Gtk::AccelKey(GDK_KEY_Right, Gdk::MOD1_MASK | Gdk::SHIFT_MASK),
273                         sigc::mem_fun(*this, &MainWindow::select_add_next_dim_rgn_zone));
274    
275      Glib::RefPtr<Gtk::ToggleAction> toggle_action =      Glib::RefPtr<Gtk::ToggleAction> toggle_action =
276          Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"));          Gtk::ToggleAction::create("CopySampleUnity", _("Copy Sample's _Unity Note"));
277      toggle_action->set_active(true);      toggle_action->set_active(true);
# Line 179  MainWindow::MainWindow() : Line 288  MainWindow::MainWindow() :
288      actionGroup->add(toggle_action);      actionGroup->add(toggle_action);
289    
290    
291      actionGroup->add(Gtk::Action::create("MenuView", _("_View")));      actionGroup->add(Gtk::Action::create("MenuMacro", _("_Macro")));
292    
293    
294        actionGroup->add(Gtk::Action::create("MenuView", _("Vie_w")));
295      toggle_action =      toggle_action =
296          Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));          Gtk::ToggleAction::create("Statusbar", _("_Statusbar"));
297      toggle_action->set_active(true);      toggle_action->set_active(true);
298      actionGroup->add(toggle_action,      actionGroup->add(toggle_action,
299                       sigc::mem_fun(                       sigc::mem_fun(
300                           *this, &MainWindow::on_action_view_status_bar));                           *this, &MainWindow::on_action_view_status_bar));
301    
302        toggle_action =
303            Gtk::ToggleAction::create("AutoRestoreWinDim", _("_Auto Restore Window Dimension"));
304        toggle_action->set_active(Settings::singleton()->autoRestoreWindowDimension);
305        actionGroup->add(toggle_action,
306                         sigc::mem_fun(
307                             *this, &MainWindow::on_auto_restore_win_dim));
308    
309        toggle_action =
310            Gtk::ToggleAction::create("SaveWithTemporaryFile", _("Save with _temporary file"));
311        toggle_action->set_active(Settings::singleton()->saveWithTemporaryFile);
312        actionGroup->add(toggle_action,
313                         sigc::mem_fun(
314                             *this, &MainWindow::on_save_with_temporary_file));
315    
316      actionGroup->add(      actionGroup->add(
317          Gtk::Action::create("RefreshAll", _("_Refresh All")),          Gtk::Action::create("RefreshAll", _("_Refresh All")),
318          sigc::mem_fun(*this, &MainWindow::on_action_refresh_all)          sigc::mem_fun(*this, &MainWindow::on_action_refresh_all)
# Line 229  MainWindow::MainWindow() : Line 356  MainWindow::MainWindow() :
356          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)          sigc::mem_fun(*this, &MainWindow::on_action_sync_sampler_instrument_selection)
357      );      );
358    
359        toggle_action =
360            Gtk::ToggleAction::create("MoveRootNoteWithRegionMoved", _("Move root note with region moved"));
361        toggle_action->set_active(Settings::singleton()->moveRootNoteWithRegionMoved);
362        actionGroup->add(
363            toggle_action,
364            sigc::mem_fun(*this, &MainWindow::on_action_move_root_note_with_region_moved)
365        );
366    
367    
368      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));      actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
369    
# Line 316  MainWindow::MainWindow() : Line 451  MainWindow::MainWindow() :
451          "      <menuitem action='Quit'/>"          "      <menuitem action='Quit'/>"
452          "    </menu>"          "    </menu>"
453          "    <menu action='MenuEdit'>"          "    <menu action='MenuEdit'>"
454            "      <menuitem action='CopyDimRgn'/>"
455            "      <menuitem action='AdjustClipboard'/>"
456            "      <menuitem action='PasteDimRgn'/>"
457            "      <separator/>"
458            "      <menuitem action='SelectPrevRegion'/>"
459            "      <menuitem action='SelectNextRegion'/>"
460            "      <separator/>"
461            "      <menuitem action='SelectPrevDimension'/>"
462            "      <menuitem action='SelectNextDimension'/>"
463            "      <menuitem action='SelectPrevDimRgnZone'/>"
464            "      <menuitem action='SelectNextDimRgnZone'/>"
465            "      <menuitem action='SelectAddPrevDimRgnZone'/>"
466            "      <menuitem action='SelectAddNextDimRgnZone'/>"
467            "      <separator/>"
468          "      <menuitem action='CopySampleUnity'/>"          "      <menuitem action='CopySampleUnity'/>"
469          "      <menuitem action='CopySampleTune'/>"          "      <menuitem action='CopySampleTune'/>"
470          "      <menuitem action='CopySampleLoop'/>"          "      <menuitem action='CopySampleLoop'/>"
471          "    </menu>"          "    </menu>"
472            "    <menu action='MenuMacro'>"
473            "    </menu>"
474          "    <menu action='MenuSample'>"          "    <menu action='MenuSample'>"
475          "      <menuitem action='SampleProperties'/>"          "      <menuitem action='SampleProperties'/>"
476          "      <menuitem action='AddGroup'/>"          "      <menuitem action='AddGroup'/>"
# Line 352  MainWindow::MainWindow() : Line 503  MainWindow::MainWindow() :
503          "    </menu>"          "    </menu>"
504          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
505          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
506            "      <menuitem action='AutoRestoreWinDim'/>"
507          "      <separator/>"          "      <separator/>"
508          "      <menuitem action='RefreshAll'/>"          "      <menuitem action='RefreshAll'/>"
509          "    </menu>"          "    </menu>"
# Line 362  MainWindow::MainWindow() : Line 514  MainWindow::MainWindow() :
514          "    <menu action='MenuSettings'>"          "    <menu action='MenuSettings'>"
515          "      <menuitem action='WarnUserOnExtensions'/>"          "      <menuitem action='WarnUserOnExtensions'/>"
516          "      <menuitem action='SyncSamplerInstrumentSelection'/>"          "      <menuitem action='SyncSamplerInstrumentSelection'/>"
517            "      <menuitem action='MoveRootNoteWithRegionMoved'/>"
518            "      <menuitem action='SaveWithTemporaryFile'/>"
519          "    </menu>"          "    </menu>"
520          "    <menu action='MenuHelp'>"          "    <menu action='MenuHelp'>"
521          "      <menuitem action='About'/>"          "      <menuitem action='About'/>"
# Line 430  MainWindow::MainWindow() : Line 584  MainWindow::MainWindow() :
584      }      }
585      {      {
586          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
587                uiManager->get_widget("/MenuBar/MenuSettings/MoveRootNoteWithRegionMoved"));
588            item->set_tooltip_text(_("If checked, and when a region is moved by dragging it around on the virtual keyboard, the keybord position dependent pitch will move exactly with the amount of semi tones the region was moved around."));
589        }
590        {
591            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
592              uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples"));              uiManager->get_widget("/MenuBar/MenuSample/RemoveUnusedSamples"));
593          item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones)."));          item->set_tooltip_text(_("Removes all samples that are not referenced by any instrument (i.e. red ones)."));
594          // copy tooltip to popup menu          // copy tooltip to popup menu
# Line 444  MainWindow::MainWindow() : Line 603  MainWindow::MainWindow() :
603      }      }
604      {      {
605          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
606                uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
607            item->set_tooltip_text(_("If checked, size and position of all windows will be saved and automatically restored next time."));
608        }
609        {
610            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
611              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
612          item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));          item->set_tooltip_text(_("Create combi sounds out of individual sounds of this .gig file."));
613      }      }
# Line 481  MainWindow::MainWindow() : Line 645  MainWindow::MainWindow() :
645      // Create the Tree model:      // Create the Tree model:
646      m_refTreeModel = Gtk::ListStore::create(m_Columns);      m_refTreeModel = Gtk::ListStore::create(m_Columns);
647      m_TreeView.set_model(m_refTreeModel);      m_TreeView.set_model(m_refTreeModel);
648        m_TreeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
649      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_tooltip_text(_("Right click here for actions on instruments & MIDI Rules. Drag & drop to change the order of instruments."));
650      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(      instrument_name_connection = m_refTreeModel->signal_row_changed().connect(
651          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)          sigc::mem_fun(*this, &MainWindow::instrument_name_changed)
652      );      );
653    
654      // Add the TreeView's view columns:      // Add the TreeView's view columns:
655      m_TreeView.append_column_editable("Instrument", m_Columns.m_col_name);      m_TreeView.append_column(_("Nr"), m_Columns.m_col_nr);
656      m_TreeView.set_headers_visible(false);      m_TreeView.append_column_editable(_("Instrument"), m_Columns.m_col_name);
657        m_TreeView.set_headers_visible(true);
658            
659      // establish drag&drop within the instrument tree view, allowing to reorder      // establish drag&drop within the instrument tree view, allowing to reorder
660      // the sequence of instruments within the gig file      // the sequence of instruments within the gig file
# Line 511  MainWindow::MainWindow() : Line 677  MainWindow::MainWindow() :
677      // create samples treeview (including its data model)      // create samples treeview (including its data model)
678      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);      m_refSamplesTreeModel = SamplesTreeStore::create(m_SamplesModel);
679      m_TreeViewSamples.set_model(m_refSamplesTreeModel);      m_TreeViewSamples.set_model(m_refSamplesTreeModel);
680        m_TreeViewSamples.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
681      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_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."));
682      // m_TreeViewSamples.set_reorderable();      // m_TreeViewSamples.set_reorderable();
683      m_TreeViewSamples.append_column_editable(_("Name"), m_SamplesModel.m_col_name);      m_TreeViewSamples.append_column_editable(_("Name"), m_SamplesModel.m_col_name);
# Line 591  MainWindow::MainWindow() : Line 758  MainWindow::MainWindow() :
758          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));          sigc::hide(sigc::mem_fun(*this, &MainWindow::file_changed)));
759      m_RegionChooser.signal_instrument_changed().connect(      m_RegionChooser.signal_instrument_changed().connect(
760          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
761        m_RegionChooser.signal_instrument_changed().connect(
762            sigc::mem_fun(*this, &MainWindow::region_changed));
763      m_DimRegionChooser.signal_region_changed().connect(      m_DimRegionChooser.signal_region_changed().connect(
764          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
765      instrumentProps.signal_changed().connect(      instrumentProps.signal_changed().connect(
# Line 660  MainWindow::MainWindow() : Line 829  MainWindow::MainWindow() :
829    
830      // select 'Instruments' tab by default      // select 'Instruments' tab by default
831      // (gtk allows this only if the tab childs are visible, thats why it's here)      // (gtk allows this only if the tab childs are visible, thats why it's here)
832      m_TreeViewNotebook.set_current_page(1);      m_TreeViewNotebook.set_current_page(1);
833    
834        Gtk::Clipboard::get()->signal_owner_change().connect(
835            sigc::mem_fun(*this, &MainWindow::on_clipboard_owner_change)
836        );
837        updateClipboardPasteAvailable();
838        updateClipboardCopyAvailable();
839    
840        // setup macros and their keyboard accelerators
841        {
842            Gtk::Menu* menuMacro = dynamic_cast<Gtk::MenuItem*>(
843                uiManager->get_widget("/MenuBar/MenuMacro")
844            )->get_submenu();
845    
846            const Gdk::ModifierType primaryModifierKey =
847    #if defined(__APPLE__)
848                Gdk::META_MASK; // Cmd key on Mac
849    #else
850                Gdk::CONTROL_MASK; // Ctrl key on all other OSs
851    #endif
852    
853            const Gdk::ModifierType noModifier = (Gdk::ModifierType)0;
854            Gtk::AccelMap::add_entry("<Macros>/macro_0", GDK_KEY_F1, noModifier);
855            Gtk::AccelMap::add_entry("<Macros>/macro_1", GDK_KEY_F2, noModifier);
856            Gtk::AccelMap::add_entry("<Macros>/macro_2", GDK_KEY_F3, noModifier);
857            Gtk::AccelMap::add_entry("<Macros>/macro_3", GDK_KEY_F4, noModifier);
858            Gtk::AccelMap::add_entry("<Macros>/macro_4", GDK_KEY_F5, noModifier);
859            Gtk::AccelMap::add_entry("<Macros>/macro_5", GDK_KEY_F6, noModifier);
860            Gtk::AccelMap::add_entry("<Macros>/macro_6", GDK_KEY_F7, noModifier);
861            Gtk::AccelMap::add_entry("<Macros>/macro_7", GDK_KEY_F8, noModifier);
862            Gtk::AccelMap::add_entry("<Macros>/macro_8", GDK_KEY_F9, noModifier);
863            Gtk::AccelMap::add_entry("<Macros>/macro_9", GDK_KEY_F10, noModifier);
864            Gtk::AccelMap::add_entry("<Macros>/macro_10", GDK_KEY_F11, noModifier);
865            Gtk::AccelMap::add_entry("<Macros>/macro_11", GDK_KEY_F12, noModifier);
866            Gtk::AccelMap::add_entry("<Macros>/SetupMacros", 'm', primaryModifierKey);
867    
868            Glib::RefPtr<Gtk::AccelGroup> accelGroup = this->get_accel_group();
869            menuMacro->set_accel_group(accelGroup);
870    
871            updateMacroMenu();
872        }
873  }  }
874    
875  MainWindow::~MainWindow()  MainWindow::~MainWindow()
876  {  {
877  }  }
878    
879    void MainWindow::updateMacroMenu() {
880        Gtk::Menu* menuMacro = dynamic_cast<Gtk::MenuItem*>(
881            uiManager->get_widget("/MenuBar/MenuMacro")
882        )->get_submenu();
883    
884        // remove all entries from "Macro" menu
885        {
886            const std::vector<Gtk::Widget*> children = menuMacro->get_children();
887            for (int i = 0; i < children.size(); ++i) {
888                Gtk::Widget* child = children[i];
889                menuMacro->remove(*child);
890                delete child;
891            }
892        }
893    
894        // (re)load all macros from config file
895        try {
896            Settings::singleton()->loadMacros(m_macros);
897        } catch (Serialization::Exception e) {
898            std::cerr << "Exception while loading macros: " << e.Message << std::endl;
899        } catch (...) {
900            std::cerr << "Unknown exception while loading macros!" << std::endl;
901        }
902    
903        // add all configured macros as menu items to the "Macro" menu
904        for (int iMacro = 0; iMacro < m_macros.size(); ++iMacro) {
905            const Serialization::Archive& macro = m_macros[iMacro];
906            std::string name =
907                macro.name().empty() ?
908                    (std::string(_("Unnamed Macro")) + " " + ToString(iMacro+1)) : macro.name();
909            Gtk::MenuItem* item = new Gtk::MenuItem(name);
910            item->signal_activate().connect(
911                sigc::bind(
912                    sigc::mem_fun(*this, &MainWindow::onMacroSelected), iMacro
913                )
914            );
915            menuMacro->append(*item);
916            item->set_accel_path("<Macros>/macro_" + ToString(iMacro));
917        }
918        // if there are no macros configured at all, then show a dummy entry instead
919        if (m_macros.empty()) {
920            Gtk::MenuItem* item = new Gtk::MenuItem(_("No Macros"));
921            item->set_sensitive(false);
922            menuMacro->append(*item);
923        }
924    
925        // add separator line to menu
926        menuMacro->append(*new Gtk::SeparatorMenuItem);
927    
928        {
929            Gtk::MenuItem* item = new Gtk::MenuItem(_("Setup Macros ..."));
930            item->signal_activate().connect(
931                sigc::mem_fun(*this, &MainWindow::setupMacros)
932            );
933            menuMacro->append(*item);
934            item->set_accel_path("<Macros>/SetupMacros");
935        }
936    
937        menuMacro->show_all_children();
938    }
939    
940    void MainWindow::onMacroSelected(int iMacro) {
941        printf("onMacroSelected(%d)\n", iMacro);
942        if (iMacro < 0 || iMacro >= m_macros.size()) return;
943        Glib::ustring errorText;
944        try {
945            applyMacro(m_macros[iMacro]);
946        } catch (Serialization::Exception e) {
947            errorText = e.Message;
948        } catch (...) {
949            errorText = _("Unknown exception while applying macro");
950        }
951        if (!errorText.empty()) {
952            Glib::ustring txt = _("Applying macro failed:\n") + errorText;
953            Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
954            msg.run();
955        }
956    }
957    
958    void MainWindow::setupMacros() {
959        MacrosSetup* setup = new MacrosSetup();
960        gig::DimensionRegion* pDimRgn = m_DimRegionChooser.get_main_dimregion();
961        setup->setMacros(m_macros, &m_serializationArchive, pDimRgn);
962        setup->signal_macros_changed().connect(
963            sigc::mem_fun(*this, &MainWindow::onMacrosSetupChanged)
964        );
965        setup->show();
966    }
967    
968    void MainWindow::onMacrosSetupChanged(const std::vector<Serialization::Archive>& macros) {
969        m_macros = macros;
970        Settings::singleton()->saveMacros(m_macros);
971        updateMacroMenu();
972    }
973    
974  bool MainWindow::on_delete_event(GdkEventAny* event)  bool MainWindow::on_delete_event(GdkEventAny* event)
975  {  {
976      return !file_is_shared && file_is_changed && !close_confirmation_dialog();      return !file_is_shared && file_is_changed && !close_confirmation_dialog();
# Line 686  void MainWindow::region_changed() Line 990  void MainWindow::region_changed()
990  gig::Instrument* MainWindow::get_instrument()  gig::Instrument* MainWindow::get_instrument()
991  {  {
992      gig::Instrument* instrument = 0;      gig::Instrument* instrument = 0;
993      Gtk::TreeModel::const_iterator it =      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
994          m_TreeView.get_selection()->get_selected();      if (rows.empty()) return NULL;
995        Gtk::TreeModel::const_iterator it = m_refTreeModel->get_iter(rows[0]);
996      if (it) {      if (it) {
997          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
998          instrument = row[m_Columns.m_col_instr];          instrument = row[m_Columns.m_col_instr];
# Line 730  void MainWindow::update_dimregs() Line 1035  void MainWindow::update_dimregs()
1035              add_region_to_dimregs(region, stereo, all_dimregs);              add_region_to_dimregs(region, stereo, all_dimregs);
1036          }          }
1037      }      }
1038    
1039        m_RegionChooser.setModifyAllRegions(all_regions);
1040        m_DimRegionChooser.setModifyAllRegions(all_regions);
1041        m_DimRegionChooser.setModifyAllDimensionRegions(all_dimregs);
1042        m_DimRegionChooser.setModifyBothChannels(stereo);
1043    
1044        updateClipboardCopyAvailable();
1045  }  }
1046    
1047  void MainWindow::dimreg_all_dimregs_toggled()  void MainWindow::dimreg_all_dimregs_toggled()
# Line 747  void MainWindow::dimreg_changed() Line 1059  void MainWindow::dimreg_changed()
1059  void MainWindow::on_sel_change()  void MainWindow::on_sel_change()
1060  {  {
1061      // select item in instrument menu      // select item in instrument menu
1062      Gtk::TreeModel::iterator it = m_TreeView.get_selection()->get_selected();      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
1063      if (it) {      if (!rows.empty()) {
1064          Gtk::TreePath path(it);          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);
1065          int index = path[0];          if (it) {
1066          const std::vector<Gtk::Widget*> children =              Gtk::TreePath path(it);
1067              instrument_menu->get_children();              int index = path[0];
1068          static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();              const std::vector<Gtk::Widget*> children =
1069                    instrument_menu->get_children();
1070                static_cast<Gtk::RadioMenuItem*>(children[index])->set_active();
1071            }
1072      }      }
1073    
1074      m_RegionChooser.set_instrument(get_instrument());      m_RegionChooser.set_instrument(get_instrument());
# Line 778  void Loader::progress_callback(float fra Line 1093  void Loader::progress_callback(float fra
1093      progress_dispatcher();      progress_dispatcher();
1094  }  }
1095    
1096    #if defined(WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
1097    // make sure stack is 16-byte aligned for SSE instructions
1098    __attribute__((force_align_arg_pointer))
1099    #endif
1100  void Loader::thread_function()  void Loader::thread_function()
1101  {  {
1102      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
1103               static_cast<void*>(Glib::Threads::Thread::self()));
1104      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
1105      try {      try {
1106          RIFF::File* riff = new RIFF::File(filename);          RIFF::File* riff = new RIFF::File(filename);
# Line 802  void Loader::thread_function() Line 1122  void Loader::thread_function()
1122  }  }
1123    
1124  Loader::Loader(const char* filename)  Loader::Loader(const char* filename)
1125      : filename(filename), thread(0), progress(0.f)      : filename(filename), gig(0), thread(0), progress(0.f)
1126  {  {
1127  }  }
1128    
# Line 813  void Loader::launch() Line 1133  void Loader::launch()
1133  #else  #else
1134      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Loader::thread_function));
1135  #endif  #endif
1136      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
1137  }  }
1138    
1139  float Loader::get_progress()  float Loader::get_progress()
# Line 856  void Saver::progress_callback(float frac Line 1176  void Saver::progress_callback(float frac
1176      progress_dispatcher.emit();      progress_dispatcher.emit();
1177  }  }
1178    
1179    #if defined(WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
1180    // make sure stack is 16-byte aligned for SSE instructions
1181    __attribute__((force_align_arg_pointer))
1182    #endif
1183  void Saver::thread_function()  void Saver::thread_function()
1184  {  {
1185      printf("thread_function self=%x\n", Glib::Threads::Thread::self());      printf("thread_function self=%p\n",
1186               static_cast<void*>(Glib::Threads::Thread::self()));
1187      printf("Start %s\n", filename.c_str());      printf("Start %s\n", filename.c_str());
1188      try {      try {
1189          gig::progress_t progress;          gig::progress_t progress;
# Line 867  void Saver::thread_function() Line 1192  void Saver::thread_function()
1192    
1193          // if no filename was provided, that means "save", if filename was provided means "save as"          // if no filename was provided, that means "save", if filename was provided means "save as"
1194          if (filename.empty()) {          if (filename.empty()) {
1195              gig->Save(&progress);              if (!Settings::singleton()->saveWithTemporaryFile) {
1196                    // save directly over the existing .gig file
1197                    // (requires less disk space than solution below
1198                    // but may be slower)
1199                    gig->Save(&progress);
1200                } else {
1201                    // save the file as separate temporary file first,
1202                    // then move the saved file over the old file
1203                    // (may result in performance speedup during save)
1204                    String tmpname = filename + ".TMP";
1205                    gig->Save(tmpname, &progress);
1206                    #if defined(WIN32)
1207                    if (!DeleteFile(filename.c_str())) {
1208                        throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file).");
1209                    }
1210                    #else // POSIX ...
1211                    if (unlink(filename.c_str())) {
1212                        throw RIFF::Exception("Could not replace original file with temporary file (unable to remove original file): " + String(strerror(errno)));
1213                    }
1214                    #endif
1215                    if (rename(tmpname.c_str(), filename.c_str())) {
1216                        #if defined(WIN32)
1217                        throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file).");
1218                        #else
1219                        throw RIFF::Exception("Could not replace original file with temporary file (unable to rename temp file): " + String(strerror(errno)));
1220                        #endif
1221                    }
1222                }
1223          } else {          } else {
1224              gig->Save(filename, &progress);              gig->Save(filename, &progress);
1225          }          }
# Line 895  void Saver::launch() Line 1247  void Saver::launch()
1247  #else  #else
1248      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));      thread = Glib::Threads::Thread::create(sigc::mem_fun(*this, &Saver::thread_function));
1249  #endif  #endif
1250      printf("launch thread=%x\n", thread);      printf("launch thread=%p\n", static_cast<void*>(thread));
1251  }  }
1252    
1253  float Saver::get_progress()  float Saver::get_progress()
# Line 1055  void MainWindow::on_action_file_open() Line 1407  void MainWindow::on_action_file_open()
1407      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
1408          std::string filename = dialog.get_filename();          std::string filename = dialog.get_filename();
1409          printf("filename=%s\n", filename.c_str());          printf("filename=%s\n", filename.c_str());
1410          printf("on_action_file_open self=%x\n", Glib::Threads::Thread::self());          printf("on_action_file_open self=%p\n",
1411                   static_cast<void*>(Glib::Threads::Thread::self()));
1412          load_file(filename.c_str());          load_file(filename.c_str());
1413          current_gig_dir = Glib::path_get_dirname(filename);          current_gig_dir = Glib::path_get_dirname(filename);
1414      }      }
# Line 1125  void MainWindow::on_loader_progress() Line 1478  void MainWindow::on_loader_progress()
1478  void MainWindow::on_loader_finished()  void MainWindow::on_loader_finished()
1479  {  {
1480      printf("Loader finished!\n");      printf("Loader finished!\n");
1481      printf("on_loader_finished self=%x\n", Glib::Threads::Thread::self());      printf("on_loader_finished self=%p\n",
1482               static_cast<void*>(Glib::Threads::Thread::self()));
1483      load_gig(loader->gig, loader->filename.c_str());      load_gig(loader->gig, loader->filename.c_str());
1484      progress_dialog->hide();      progress_dialog->hide();
1485  }  }
# Line 1265  bool MainWindow::file_save_as() Line 1619  bool MainWindow::file_save_as()
1619      // show warning in the dialog      // show warning in the dialog
1620      Gtk::HBox descriptionArea;      Gtk::HBox descriptionArea;
1621      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
1622      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon;
1623        warningIcon.set_from_icon_name("dialog-warning",
1624                                       Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
1625      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
1626  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
1627      view::WrapLabel description;      view::WrapLabel description;
# Line 1317  bool MainWindow::file_save_as() Line 1673  bool MainWindow::file_save_as()
1673  void MainWindow::__import_queued_samples() {  void MainWindow::__import_queued_samples() {
1674      std::cout << "Starting sample import\n" << std::flush;      std::cout << "Starting sample import\n" << std::flush;
1675      Glib::ustring error_files;      Glib::ustring error_files;
1676      printf("Samples to import: %d\n", m_SampleImportQueue.size());      printf("Samples to import: %d\n", int(m_SampleImportQueue.size()));
1677      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();      for (std::map<gig::Sample*, SampleImportItem>::iterator iter = m_SampleImportQueue.begin();
1678           iter != m_SampleImportQueue.end(); ) {           iter != m_SampleImportQueue.end(); ) {
1679          printf("Importing sample %s\n",(*iter).sample_path.c_str());          printf("Importing sample %s\n",iter->second.sample_path.c_str());
1680          SF_INFO info;          SF_INFO info;
1681          info.format = 0;          info.format = 0;
1682          SNDFILE* hFile = sf_open((*iter).sample_path.c_str(), SFM_READ, &info);          SNDFILE* hFile = sf_open(iter->second.sample_path.c_str(), SFM_READ, &info);
1683          sf_command(hFile, SFC_SET_SCALE_FLOAT_INT_READ, 0, SF_TRUE);          sf_command(hFile, SFC_SET_SCALE_FLOAT_INT_READ, 0, SF_TRUE);
1684          try {          try {
1685              if (!hFile) throw std::string(_("could not open file"));              if (!hFile) throw std::string(_("could not open file"));
# Line 1346  void MainWindow::__import_queued_samples Line 1702  void MainWindow::__import_queued_samples
1702                      throw std::string(_("format not supported")); // unsupported subformat (yet?)                      throw std::string(_("format not supported")); // unsupported subformat (yet?)
1703              }              }
1704    
1705                // reset write position for sample
1706                iter->first->SetPos(0);
1707    
1708              const int bufsize = 10000;              const int bufsize = 10000;
1709              switch (bitdepth) {              switch (bitdepth) {
1710                  case 16: {                  case 16: {
# Line 1355  void MainWindow::__import_queued_samples Line 1714  void MainWindow::__import_queued_samples
1714                          // libsndfile does the conversion for us (if needed)                          // libsndfile does the conversion for us (if needed)
1715                          int n = sf_readf_short(hFile, buffer, bufsize);                          int n = sf_readf_short(hFile, buffer, bufsize);
1716                          // write from buffer directly (physically) into .gig file                          // write from buffer directly (physically) into .gig file
1717                          iter->gig_sample->Write(buffer, n);                          iter->first->Write(buffer, n);
1718                          cnt -= n;                          cnt -= n;
1719                      }                      }
1720                      delete[] buffer;                      delete[] buffer;
# Line 1375  void MainWindow::__import_queued_samples Line 1734  void MainWindow::__import_queued_samples
1734                              dstbuf[j++] = srcbuf[i] >> 24;                              dstbuf[j++] = srcbuf[i] >> 24;
1735                          }                          }
1736                          // write from buffer directly (physically) into .gig file                          // write from buffer directly (physically) into .gig file
1737                          iter->gig_sample->Write(dstbuf, n);                          iter->first->Write(dstbuf, n);
1738                          cnt -= n;                          cnt -= n;
1739                      }                      }
1740                      delete[] srcbuf;                      delete[] srcbuf;
# Line 1386  void MainWindow::__import_queued_samples Line 1745  void MainWindow::__import_queued_samples
1745              // cleanup              // cleanup
1746              sf_close(hFile);              sf_close(hFile);
1747              // let the sampler re-cache the sample if needed              // let the sampler re-cache the sample if needed
1748              sample_changed_signal.emit(iter->gig_sample);              sample_changed_signal.emit(iter->first);
1749              // on success we remove the sample from the import queue,              // on success we remove the sample from the import queue,
1750              // otherwise keep it, maybe it works the next time ?              // otherwise keep it, maybe it works the next time ?
1751              std::list<SampleImportItem>::iterator cur = iter;              std::map<gig::Sample*, SampleImportItem>::iterator cur = iter;
1752              ++iter;              ++iter;
1753              m_SampleImportQueue.erase(cur);              m_SampleImportQueue.erase(cur);
1754          } catch (std::string what) {          } catch (std::string what) {
1755              // remember the files that made trouble (and their cause)              // remember the files that made trouble (and their cause)
1756              if (!error_files.empty()) error_files += "\n";              if (!error_files.empty()) error_files += "\n";
1757              error_files += (*iter).sample_path += " (" + what + ")";              error_files += iter->second.sample_path += " (" + what + ")";
1758              ++iter;              ++iter;
1759          }          }
1760      }      }
# Line 1423  void MainWindow::on_action_sync_sampler_ Line 1782  void MainWindow::on_action_sync_sampler_
1782          !Settings::singleton()->syncSamplerInstrumentSelection;          !Settings::singleton()->syncSamplerInstrumentSelection;
1783  }  }
1784    
1785    void MainWindow::on_action_move_root_note_with_region_moved() {
1786        Settings::singleton()->moveRootNoteWithRegionMoved =
1787            !Settings::singleton()->moveRootNoteWithRegionMoved;
1788    }
1789    
1790  void MainWindow::on_action_help_about()  void MainWindow::on_action_help_about()
1791  {  {
1792      Gtk::AboutDialog dialog;      Gtk::AboutDialog dialog;
# Line 1432  void MainWindow::on_action_help_about() Line 1796  void MainWindow::on_action_help_about()
1796      dialog.set_name("Gigedit");      dialog.set_name("Gigedit");
1797  #endif  #endif
1798      dialog.set_version(VERSION);      dialog.set_version(VERSION);
1799      dialog.set_copyright("Copyright (C) 2006-2015 Andreas Persson");      dialog.set_copyright("Copyright (C) 2006-2017 Andreas Persson");
1800      const std::string sComment =      const std::string sComment =
1801          _("Built " __DATE__ "\nUsing ") +          _("Built " __DATE__ "\nUsing ") +
1802          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +          ::gig::libraryName() + " " + ::gig::libraryVersion() + "\n\n" +
# Line 1727  void MainWindow::load_gig(gig::File* gig Line 2091  void MainWindow::load_gig(gig::File* gig
2091      propDialog.set_info(gig->pInfo);      propDialog.set_info(gig->pInfo);
2092    
2093      instrument_name_connection.block();      instrument_name_connection.block();
2094        int index = 0;
2095      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;      for (gig::Instrument* instrument = gig->GetFirstInstrument() ; instrument ;
2096           instrument = gig->GetNextInstrument()) {           instrument = gig->GetNextInstrument(), ++index) {
2097          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));          Glib::ustring name(gig_to_utf8(instrument->pInfo->Name));
2098    
2099          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
2100          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
2101            row[m_Columns.m_col_nr] = index;
2102          row[m_Columns.m_col_name] = name;          row[m_Columns.m_col_name] = name;
2103          row[m_Columns.m_col_instr] = instrument;          row[m_Columns.m_col_instr] = instrument;
2104    
# Line 1805  bool MainWindow::instr_props_set_instrum Line 2171  bool MainWindow::instr_props_set_instrum
2171  {  {
2172      instrumentProps.signal_name_changed().clear();      instrumentProps.signal_name_changed().clear();
2173    
2174      Gtk::TreeModel::const_iterator it =      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
2175          m_TreeView.get_selection()->get_selected();      if (rows.empty()) {
2176            instrumentProps.hide();
2177            return false;
2178        }
2179        Gtk::TreeModel::const_iterator it = m_refTreeModel->get_iter(rows[0]);
2180      if (it) {      if (it) {
2181          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
2182          gig::Instrument* instrument = row[m_Columns.m_col_instr];          gig::Instrument* instrument = row[m_Columns.m_col_instr];
# Line 1859  void MainWindow::show_midi_rules() Line 2229  void MainWindow::show_midi_rules()
2229  void MainWindow::show_script_slots() {  void MainWindow::show_script_slots() {
2230      if (!file) return;      if (!file) return;
2231      // get selected instrument      // get selected instrument
2232      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      std::vector<Gtk::TreeModel::Path> rows = m_TreeView.get_selection()->get_selected_rows();
2233      Gtk::TreeModel::iterator it = sel->get_selected();      if (rows.empty()) return;
2234        Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);
2235      if (!it) return;      if (!it) return;
2236      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
2237      gig::Instrument* instrument = row[m_Columns.m_col_instr];      gig::Instrument* instrument = row[m_Columns.m_col_instr];
# Line 1887  void MainWindow::on_action_view_status_b Line 2258  void MainWindow::on_action_view_status_b
2258      else                    m_StatusBar.hide();      else                    m_StatusBar.hide();
2259  }  }
2260    
2261    void MainWindow::on_auto_restore_win_dim() {
2262        Gtk::CheckMenuItem* item =
2263            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/AutoRestoreWinDim"));
2264        if (!item) {
2265            std::cerr << "/MenuBar/MenuView/AutoRestoreWinDim == NULL\n";
2266            return;
2267        }
2268        Settings::singleton()->autoRestoreWindowDimension = item->get_active();
2269    }
2270    
2271    void MainWindow::on_save_with_temporary_file() {
2272        Gtk::CheckMenuItem* item =
2273            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuSettings/SaveWithTemporaryFile"));
2274        if (!item) {
2275            std::cerr << "/MenuBar/MenuSettings/SaveWithTemporaryFile == NULL\n";
2276            return;
2277        }
2278        Settings::singleton()->saveWithTemporaryFile = item->get_active();
2279    }
2280    
2281  bool MainWindow::is_copy_samples_unity_note_enabled() const {  bool MainWindow::is_copy_samples_unity_note_enabled() const {
2282      Gtk::CheckMenuItem* item =      Gtk::CheckMenuItem* item =
2283          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));          dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuEdit/CopySampleUnity"));
# Line 1960  void MainWindow::select_instrument(gig:: Line 2351  void MainWindow::select_instrument(gig::
2351          if (row[m_Columns.m_col_instr] == instrument) {          if (row[m_Columns.m_col_instr] == instrument) {
2352              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
2353              show_intruments_tab();              show_intruments_tab();
2354                m_TreeView.get_selection()->unselect_all();
2355              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeView.get_selection()->select(model->children()[i]);
2356              Gtk::TreePath path(              std::vector<Gtk::TreeModel::Path> rows =
2357                  m_TreeView.get_selection()->get_selected()                  m_TreeView.get_selection()->get_selected_rows();
2358              );              if (!rows.empty())
2359              m_TreeView.scroll_to_row(path);                  m_TreeView.scroll_to_row(rows[0]);
2360              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
2361          }          }
2362      }      }
# Line 1981  bool MainWindow::select_dimension_region Line 2373  bool MainWindow::select_dimension_region
2373          if (row[m_Columns.m_col_instr] == pInstrument) {          if (row[m_Columns.m_col_instr] == pInstrument) {
2374              // select and show the respective instrument in the list view              // select and show the respective instrument in the list view
2375              show_intruments_tab();              show_intruments_tab();
2376                m_TreeView.get_selection()->unselect_all();
2377              m_TreeView.get_selection()->select(model->children()[i]);              m_TreeView.get_selection()->select(model->children()[i]);
2378              Gtk::TreePath path(              std::vector<Gtk::TreeModel::Path> rows =
2379                  m_TreeView.get_selection()->get_selected()                  m_TreeView.get_selection()->get_selected_rows();
2380              );              if (!rows.empty())
2381              m_TreeView.scroll_to_row(path);                  m_TreeView.scroll_to_row(rows[0]);
2382              on_sel_change(); // the regular instrument selection change callback              on_sel_change(); // the regular instrument selection change callback
2383    
2384              // select respective region in the region selector              // select respective region in the region selector
# Line 2011  void MainWindow::select_sample(gig::Samp Line 2404  void MainWindow::select_sample(gig::Samp
2404              Gtk::TreeModel::Row rowSample = rowGroup.children()[s];              Gtk::TreeModel::Row rowSample = rowGroup.children()[s];
2405              if (rowSample[m_SamplesModel.m_col_sample] == sample) {              if (rowSample[m_SamplesModel.m_col_sample] == sample) {
2406                  show_samples_tab();                  show_samples_tab();
2407                    m_TreeViewSamples.get_selection()->unselect_all();
2408                  m_TreeViewSamples.get_selection()->select(rowGroup.children()[s]);                  m_TreeViewSamples.get_selection()->select(rowGroup.children()[s]);
2409                  Gtk::TreePath path(                  std::vector<Gtk::TreeModel::Path> rows =
2410                      m_TreeViewSamples.get_selection()->get_selected()                      m_TreeViewSamples.get_selection()->get_selected_rows();
2411                  );                  if (rows.empty()) return;
2412                  m_TreeViewSamples.scroll_to_row(path);                  m_TreeViewSamples.scroll_to_row(rows[0]);
2413                  return;                  return;
2414              }              }
2415          }          }
# Line 2024  void MainWindow::select_sample(gig::Samp Line 2418  void MainWindow::select_sample(gig::Samp
2418    
2419  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {  void MainWindow::on_sample_treeview_button_release(GdkEventButton* button) {
2420      if (button->type == GDK_BUTTON_PRESS && button->button == 3) {      if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
2421            // by default if Ctrl keys is pressed down, then a mouse right-click
2422            // does not select the respective row, so we must assure this
2423            // programmatically ...
2424            /*{
2425                Gtk::TreeModel::Path path;
2426                Gtk::TreeViewColumn* pColumn = NULL;
2427                int cellX, cellY;
2428                bool bSuccess = m_TreeViewSamples.get_path_at_pos(
2429                    (int)button->x, (int)button->y,
2430                    path, pColumn, cellX, cellY
2431                );
2432                if (bSuccess) {
2433                    if (m_TreeViewSamples.get_selection()->count_selected_rows() <= 0) {
2434                        printf("not selected !!!\n");
2435                        m_TreeViewSamples.get_selection()->select(path);
2436                    }
2437                }
2438            }*/
2439    
2440          Gtk::Menu* sample_popup =          Gtk::Menu* sample_popup =
2441              dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/SamplePopupMenu"));              dynamic_cast<Gtk::Menu*>(uiManager->get_widget("/SamplePopupMenu"));
2442          // update enabled/disabled state of sample popup items          // update enabled/disabled state of sample popup items
2443          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
2444          Gtk::TreeModel::iterator it = sel->get_selected();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2445          bool group_selected  = false;          const int n = rows.size();
2446          bool sample_selected = false;          int nGroups  = 0;
2447          if (it) {          int nSamples = 0;
2448            for (int r = 0; r < n; ++r) {
2449                Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[r]);
2450                if (!it) continue;
2451              Gtk::TreeModel::Row row = *it;              Gtk::TreeModel::Row row = *it;
2452              group_selected  = row[m_SamplesModel.m_col_group];              if (row[m_SamplesModel.m_col_group]) nGroups++;
2453              sample_selected = row[m_SamplesModel.m_col_sample];              if (row[m_SamplesModel.m_col_sample]) nSamples++;
2454          }          }
2455            
               
2456          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/SampleProperties"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/SampleProperties"))->
2457              set_sensitive(group_selected || sample_selected);              set_sensitive(n == 1);
2458          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddSample"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddSample"))->
2459              set_sensitive(group_selected || sample_selected);              set_sensitive(n);
2460          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddGroup"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/AddGroup"))->
2461              set_sensitive(file);              set_sensitive(file);
2462          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/ShowSampleRefs"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/ShowSampleRefs"))->
2463              set_sensitive(sample_selected);              set_sensitive(nSamples == 1);
2464          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/RemoveSample"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/SamplePopupMenu/RemoveSample"))->
2465              set_sensitive(group_selected || sample_selected);              set_sensitive(n);
2466          // show sample popup          // show sample popup
2467          sample_popup->popup(button->button, button->time);          sample_popup->popup(button->button, button->time);
2468    
2469          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/SampleProperties"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/SampleProperties"))->
2470              set_sensitive(group_selected || sample_selected);              set_sensitive(n == 1);
2471          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddSample"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddSample"))->
2472              set_sensitive(group_selected || sample_selected);              set_sensitive(n);
2473          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddGroup"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/AddGroup"))->
2474              set_sensitive(file);              set_sensitive(file);
2475          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/ShowSampleRefs"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/ShowSampleRefs"))->
2476              set_sensitive(sample_selected);              set_sensitive(nSamples == 1);
2477          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/RemoveSample"))->          dynamic_cast<Gtk::MenuItem*>(uiManager->get_widget("/MenuBar/MenuSample/RemoveSample"))->
2478              set_sensitive(group_selected || sample_selected);              set_sensitive(n);
2479      }      }
2480  }  }
2481    
# Line 2139  void MainWindow::add_instrument(gig::Ins Line 2554  void MainWindow::add_instrument(gig::Ins
2554      instrument_name_connection.block();      instrument_name_connection.block();
2555      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();      Gtk::TreeModel::iterator iterInstr = m_refTreeModel->append();
2556      Gtk::TreeModel::Row rowInstr = *iterInstr;      Gtk::TreeModel::Row rowInstr = *iterInstr;
2557        rowInstr[m_Columns.m_col_nr] = m_refTreeModel->children().size() - 1;
2558      rowInstr[m_Columns.m_col_name] = name;      rowInstr[m_Columns.m_col_name] = name;
2559      rowInstr[m_Columns.m_col_instr] = instrument;      rowInstr[m_Columns.m_col_instr] = instrument;
2560      instrument_name_connection.unblock();      instrument_name_connection.unblock();
# Line 2167  void MainWindow::on_action_duplicate_ins Line 2583  void MainWindow::on_action_duplicate_ins
2583      // retrieve the currently selected instrument      // retrieve the currently selected instrument
2584      // (being the original instrument to be duplicated)      // (being the original instrument to be duplicated)
2585      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
2586      Gtk::TreeModel::iterator itSelection = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2587      if (!itSelection) return;      for (int r = 0; r < rows.size(); ++r) {
2588      Gtk::TreeModel::Row row = *itSelection;          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);
2589      gig::Instrument* instrOrig = row[m_Columns.m_col_instr];          if (it) {
2590      if (!instrOrig) return;              Gtk::TreeModel::Row row = *it;
2591                gig::Instrument* instrOrig = row[m_Columns.m_col_instr];
2592      // duplicate the orginal instrument              if (instrOrig) {
2593      gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);                  // duplicate the orginal instrument
2594      instrNew->pInfo->Name =                  gig::Instrument* instrNew = file->AddDuplicateInstrument(instrOrig);
2595          instrOrig->pInfo->Name +                  instrNew->pInfo->Name =
2596          gig_from_utf8(Glib::ustring(" (") + _("Copy") + ")");                      instrOrig->pInfo->Name +
2597                        gig_from_utf8(Glib::ustring(" (") + _("Copy") + ")");
2598    
2599      add_instrument(instrNew);                  add_instrument(instrNew);
2600                }
2601            }
2602        }
2603  }  }
2604    
2605  void MainWindow::on_action_remove_instrument() {  void MainWindow::on_action_remove_instrument() {
# Line 2196  void MainWindow::on_action_remove_instru Line 2616  void MainWindow::on_action_remove_instru
2616      }      }
2617    
2618      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
2619      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2620      if (it) {      for (int r = rows.size() - 1; r >= 0; --r) {
2621            Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[r]);
2622            if (!it) continue;
2623          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
2624          gig::Instrument* instr = row[m_Columns.m_col_instr];          gig::Instrument* instr = row[m_Columns.m_col_instr];
2625          try {          try {
# Line 2212  void MainWindow::on_action_remove_instru Line 2634  void MainWindow::on_action_remove_instru
2634    
2635              // remove row from instruments tree view              // remove row from instruments tree view
2636              m_refTreeModel->erase(it);              m_refTreeModel->erase(it);
2637                // update "Nr" column of all instrument rows
2638                {
2639                    int index = 0;
2640                    for (Gtk::TreeModel::iterator it = m_refTreeModel->children().begin();
2641                         it != m_refTreeModel->children().end(); ++it, ++index)
2642                    {
2643                        Gtk::TreeModel::Row row = *it;
2644                        row[m_Columns.m_col_nr] = index;
2645                    }
2646                }
2647    
2648  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
2649              // select another instrument (in gtk3 this is done              // select another instrument (in gtk3 this is done
# Line 2309  void MainWindow::on_action_edit_script() Line 2741  void MainWindow::on_action_edit_script()
2741      if (!script) return;      if (!script) return;
2742    
2743      ScriptEditor* editor = new ScriptEditor;      ScriptEditor* editor = new ScriptEditor;
2744        editor->signal_script_to_be_changed.connect(
2745            signal_script_to_be_changed.make_slot()
2746        );
2747        editor->signal_script_changed.connect(
2748            signal_script_changed.make_slot()
2749        );
2750      editor->setScript(script);      editor->setScript(script);
2751      //editor->reparent(*this);      //editor->reparent(*this);
2752      editor->show();      editor->show();
# Line 2387  void MainWindow::add_or_replace_sample(b Line 2825  void MainWindow::add_or_replace_sample(b
2825    
2826      // get selected group (and probably selected sample)      // get selected group (and probably selected sample)
2827      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
2828      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
2829        if (rows.empty()) return;
2830        Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[0]);
2831      if (!it) return;      if (!it) return;
2832      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
2833      gig::Sample* sample = NULL;      gig::Sample* sample = NULL;
# Line 2536  void MainWindow::add_or_replace_sample(b Line 2976  void MainWindow::add_or_replace_sample(b
2976                  SampleImportItem sched_item;                  SampleImportItem sched_item;
2977                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
2978                  sched_item.sample_path = *iter;                  sched_item.sample_path = *iter;
2979                  m_SampleImportQueue.push_back(sched_item);                  m_SampleImportQueue[sample] = sched_item;
2980                  // add sample to the tree view                  // add sample to the tree view
2981                  if (replace) {                  if (replace) {
2982                      row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name);                      row[m_SamplesModel.m_col_name] = gig_to_utf8(sample->pInfo->Name);
# Line 2630  void MainWindow::on_action_replace_all_s Line 3070  void MainWindow::on_action_replace_all_s
3070              try              try
3071              {              {
3072                  if (!hFile) throw std::string(_("could not open file"));                  if (!hFile) throw std::string(_("could not open file"));
                 int bitdepth;  
3073                  switch (info.format & 0xff) {                  switch (info.format & 0xff) {
3074                      case SF_FORMAT_PCM_S8:                      case SF_FORMAT_PCM_S8:
3075                      case SF_FORMAT_PCM_16:                      case SF_FORMAT_PCM_16:
3076                      case SF_FORMAT_PCM_U8:                      case SF_FORMAT_PCM_U8:
                         bitdepth = 16;  
                         break;  
3077                      case SF_FORMAT_PCM_24:                      case SF_FORMAT_PCM_24:
3078                      case SF_FORMAT_PCM_32:                      case SF_FORMAT_PCM_32:
3079                      case SF_FORMAT_FLOAT:                      case SF_FORMAT_FLOAT:
3080                      case SF_FORMAT_DOUBLE:                      case SF_FORMAT_DOUBLE:
                         bitdepth = 24;  
3081                          break;                          break;
3082                      default:                      default:
3083                          sf_close(hFile);                          sf_close(hFile);
# Line 2650  void MainWindow::on_action_replace_all_s Line 3086  void MainWindow::on_action_replace_all_s
3086                  SampleImportItem sched_item;                  SampleImportItem sched_item;
3087                  sched_item.gig_sample  = sample;                  sched_item.gig_sample  = sample;
3088                  sched_item.sample_path = filename;                  sched_item.sample_path = filename;
3089                  m_SampleImportQueue.push_back(sched_item);                  m_SampleImportQueue[sample] = sched_item;
3090                  sf_close(hFile);                  sf_close(hFile);
3091                  file_changed();                  file_changed();
3092              }              }
# Line 2674  void MainWindow::on_action_replace_all_s Line 3110  void MainWindow::on_action_replace_all_s
3110  void MainWindow::on_action_remove_sample() {  void MainWindow::on_action_remove_sample() {
3111      if (!file) return;      if (!file) return;
3112      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
3113      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
3114      if (it) {      for (int r = rows.size() - 1; r >= 0; --r) {
3115            Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[r]);
3116            if (!it) continue;
3117          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::Row row = *it;
3118          gig::Group* group   = row[m_SamplesModel.m_col_group];          gig::Group* group   = row[m_SamplesModel.m_col_group];
3119          gig::Sample* sample = row[m_SamplesModel.m_col_sample];          gig::Sample* sample = row[m_SamplesModel.m_col_sample];
# Line 2700  void MainWindow::on_action_remove_sample Line 3138  void MainWindow::on_action_remove_sample
3138                  // if sample(s) were just previously added, remove                  // if sample(s) were just previously added, remove
3139                  // them from the import queue                  // them from the import queue
3140                  for (std::list<gig::Sample*>::iterator member = members.begin();                  for (std::list<gig::Sample*>::iterator member = members.begin();
3141                       member != members.end(); ++member) {                       member != members.end(); ++member)
3142                      for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();                  {
3143                           iter != m_SampleImportQueue.end(); ++iter) {                      if (m_SampleImportQueue.count(*member)) {
3144                          if ((*iter).gig_sample == *member) {                          printf("Removing previously added sample '%s' from group '%s'\n",
3145                              printf("Removing previously added sample '%s' from group '%s'\n",                                 m_SampleImportQueue[sample].sample_path.c_str(), name.c_str());
3146                                     (*iter).sample_path.c_str(), name.c_str());                          m_SampleImportQueue.erase(*member);
                             m_SampleImportQueue.erase(iter);  
                             break;  
                         }  
3147                      }                      }
3148                  }                  }
3149                  file_changed();                  file_changed();
# Line 2723  void MainWindow::on_action_remove_sample Line 3158  void MainWindow::on_action_remove_sample
3158                  samples_removed_signal.emit();                  samples_removed_signal.emit();
3159                  // if sample was just previously added, remove it from                  // if sample was just previously added, remove it from
3160                  // the import queue                  // the import queue
3161                  for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();                  if (m_SampleImportQueue.count(sample)) {
3162                       iter != m_SampleImportQueue.end(); ++iter) {                      printf("Removing previously added sample '%s'\n",
3163                      if ((*iter).gig_sample == sample) {                             m_SampleImportQueue[sample].sample_path.c_str());
3164                          printf("Removing previously added sample '%s'\n",                      m_SampleImportQueue.erase(sample);
                                (*iter).sample_path.c_str());  
                         m_SampleImportQueue.erase(iter);  
                         break;  
                     }  
3165                  }                  }
3166                  dimreg_changed();                  dimreg_changed();
3167                  file_changed();                  file_changed();
# Line 2786  void MainWindow::on_action_remove_unused Line 3217  void MainWindow::on_action_remove_unused
3217              gig::Sample* sample = *itSample;              gig::Sample* sample = *itSample;
3218              // remove sample from the .gig file              // remove sample from the .gig file
3219              file->DeleteSample(sample);              file->DeleteSample(sample);
3220              // if sample was just previously added, remove it fro the import queue              // if sample was just previously added, remove it from the import queue
3221              for (std::list<SampleImportItem>::iterator iter = m_SampleImportQueue.begin();              if (m_SampleImportQueue.count(sample)) {
3222                   iter != m_SampleImportQueue.end(); ++iter)                  printf("Removing previously added sample '%s'\n",
3223              {                         m_SampleImportQueue[sample].sample_path.c_str());
3224                  if ((*iter).gig_sample == sample) {                  m_SampleImportQueue.erase(sample);
                     printf("Removing previously added sample '%s'\n",  
                            (*iter).sample_path.c_str());  
                     m_SampleImportQueue.erase(iter);  
                     break;  
                 }  
3225              }              }
3226          }          }
3227      } catch (RIFF::Exception e) {      } catch (RIFF::Exception e) {
# Line 2854  void MainWindow::on_instruments_treeview Line 3280  void MainWindow::on_instruments_treeview
3280      gig::Instrument* src = NULL;      gig::Instrument* src = NULL;
3281      {      {
3282          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();          Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeView.get_selection();
3283          Gtk::TreeModel::iterator it = sel->get_selected();          std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
3284          if (it) {          if (!rows.empty()) {
3285              Gtk::TreeModel::Row row = *it;              Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(rows[0]);
3286              src = row[m_Columns.m_col_instr];              if (it) {
3287                    Gtk::TreeModel::Row row = *it;
3288                    src = row[m_Columns.m_col_instr];
3289                }
3290          }          }
3291      }      }
3292      if (!src) return;      if (!src) return;
# Line 2912  void MainWindow::on_sample_treeview_drag Line 3341  void MainWindow::on_sample_treeview_drag
3341      // get selected sample      // get selected sample
3342      gig::Sample* sample = NULL;      gig::Sample* sample = NULL;
3343      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
3344      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
3345      if (it) {      if (!rows.empty()) {
3346          Gtk::TreeModel::Row row = *it;          Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[0]);
3347          sample = row[m_SamplesModel.m_col_sample];          if (it) {
3348                Gtk::TreeModel::Row row = *it;
3349                sample = row[m_SamplesModel.m_col_sample];
3350            }
3351      }      }
3352      // pass the gig::Sample as pointer      // pass the gig::Sample as pointer
3353      selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&sample,      selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&sample,
# Line 3055  void MainWindow::script_double_clicked(c Line 3487  void MainWindow::script_double_clicked(c
3487      if (!script) return;      if (!script) return;
3488    
3489      ScriptEditor* editor = new ScriptEditor;      ScriptEditor* editor = new ScriptEditor;
3490        editor->signal_script_to_be_changed.connect(
3491            signal_script_to_be_changed.make_slot()
3492        );
3493        editor->signal_script_changed.connect(
3494            signal_script_changed.make_slot()
3495        );
3496      editor->setScript(script);      editor->setScript(script);
3497      //editor->reparent(*this);      //editor->reparent(*this);
3498      editor->show();      editor->show();
# Line 3108  void MainWindow::on_action_combine_instr Line 3546  void MainWindow::on_action_combine_instr
3546    
3547  void MainWindow::on_action_view_references() {  void MainWindow::on_action_view_references() {
3548      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();      Glib::RefPtr<Gtk::TreeSelection> sel = m_TreeViewSamples.get_selection();
3549      Gtk::TreeModel::iterator it = sel->get_selected();      std::vector<Gtk::TreeModel::Path> rows = sel->get_selected_rows();
3550        if (rows.empty()) return;
3551        Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[0]);
3552      if (!it) return;      if (!it) return;
3553      Gtk::TreeModel::Row row = *it;      Gtk::TreeModel::Row row = *it;
3554      gig::Sample* sample = row[m_SamplesModel.m_col_sample];      gig::Sample* sample = row[m_SamplesModel.m_col_sample];
# Line 3249  void MainWindow::on_action_merge_files() Line 3689  void MainWindow::on_action_merge_files()
3689      // show warning in the file picker dialog      // show warning in the file picker dialog
3690      Gtk::HBox descriptionArea;      Gtk::HBox descriptionArea;
3691      descriptionArea.set_spacing(15);      descriptionArea.set_spacing(15);
3692      Gtk::Image warningIcon(Gtk::Stock::DIALOG_WARNING, Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));      Gtk::Image warningIcon;
3693        warningIcon.set_from_icon_name("dialog-warning",
3694                                       Gtk::IconSize(Gtk::ICON_SIZE_DIALOG));
3695      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);      descriptionArea.pack_start(warningIcon, Gtk::PACK_SHRINK);
3696  #if GTKMM_MAJOR_VERSION < 3  #if GTKMM_MAJOR_VERSION < 3
3697      view::WrapLabel description;      view::WrapLabel description;
# Line 3272  void MainWindow::on_action_merge_files() Line 3714  void MainWindow::on_action_merge_files()
3714      descriptionArea.show_all();      descriptionArea.show_all();
3715    
3716      if (dialog.run() == Gtk::RESPONSE_OK) {      if (dialog.run() == Gtk::RESPONSE_OK) {
3717          printf("on_action_merge_files self=%x\n", Glib::Threads::Thread::self());          printf("on_action_merge_files self=%p\n",
3718                   static_cast<void*>(Glib::Threads::Thread::self()));
3719          std::vector<std::string> filenames = dialog.get_filenames();          std::vector<std::string> filenames = dialog.get_filenames();
3720    
3721          // merge the selected files to the currently open .gig file          // merge the selected files to the currently open .gig file
# Line 3354  void MainWindow::show_scripts_tab() { Line 3797  void MainWindow::show_scripts_tab() {
3797      m_TreeViewNotebook.set_current_page(2);      m_TreeViewNotebook.set_current_page(2);
3798  }  }
3799    
3800    void MainWindow::select_prev_region() {
3801        m_RegionChooser.select_prev_region();
3802    }
3803    
3804    void MainWindow::select_next_region() {
3805        m_RegionChooser.select_next_region();
3806    }
3807    
3808    void MainWindow::select_next_dim_rgn_zone() {
3809        if (m_DimRegionChooser.has_focus()) return; // avoid conflict with key stroke handler of DimenionRegionChooser
3810        m_DimRegionChooser.select_next_dimzone();
3811    }
3812    
3813    void MainWindow::select_prev_dim_rgn_zone() {
3814        if (m_DimRegionChooser.has_focus()) return; // avoid conflict with key stroke handler of DimenionRegionChooser
3815        m_DimRegionChooser.select_prev_dimzone();
3816    }
3817    
3818    void MainWindow::select_add_next_dim_rgn_zone() {
3819        m_DimRegionChooser.select_next_dimzone(true);
3820    }
3821    
3822    void MainWindow::select_add_prev_dim_rgn_zone() {
3823        m_DimRegionChooser.select_prev_dimzone(true);
3824    }
3825    
3826    void MainWindow::select_prev_dimension() {
3827        if (m_DimRegionChooser.has_focus()) return; // avoid conflict with key stroke handler of DimenionRegionChooser
3828        m_DimRegionChooser.select_prev_dimension();
3829    }
3830    
3831    void MainWindow::select_next_dimension() {
3832        if (m_DimRegionChooser.has_focus()) return; // avoid conflict with key stroke handler of DimenionRegionChooser
3833        m_DimRegionChooser.select_next_dimension();
3834    }
3835    
3836    #define CLIPBOARD_DIMENSIONREGION_TARGET \
3837        ("libgig.DimensionRegion." + m_serializationArchive.rawDataFormat())
3838    
3839    void MainWindow::copy_selected_dimrgn() {
3840        gig::DimensionRegion* pDimRgn = m_DimRegionChooser.get_main_dimregion();
3841        if (!pDimRgn) {
3842            updateClipboardPasteAvailable();
3843            updateClipboardCopyAvailable();
3844            return;
3845        }
3846    
3847        std::vector<Gtk::TargetEntry> targets;
3848        targets.push_back( Gtk::TargetEntry(CLIPBOARD_DIMENSIONREGION_TARGET) );
3849    
3850        Glib::RefPtr<Gtk::Clipboard> clipboard = Gtk::Clipboard::get();
3851        clipboard->set(
3852            targets,
3853            sigc::mem_fun(*this, &MainWindow::on_clipboard_get),
3854            sigc::mem_fun(*this, &MainWindow::on_clipboard_clear)
3855        );
3856    
3857        m_serializationArchive.serialize(pDimRgn);
3858    
3859        updateClipboardPasteAvailable();
3860    }
3861    
3862    void MainWindow::paste_copied_dimrgn() {
3863        Glib::RefPtr<Gtk::Clipboard> clipboard = Gtk::Clipboard::get();
3864        clipboard->request_contents(
3865            CLIPBOARD_DIMENSIONREGION_TARGET,
3866            sigc::mem_fun(*this, &MainWindow::on_clipboard_received)
3867        );
3868        updateClipboardPasteAvailable();
3869    }
3870    
3871    void MainWindow::adjust_clipboard_content() {
3872        MacroEditor* editor = new MacroEditor();
3873        editor->setMacro(&m_serializationArchive, true);
3874        editor->show();
3875    }
3876    
3877    void MainWindow::updateClipboardPasteAvailable() {
3878        Glib::RefPtr<Gtk::Clipboard> clipboard = Gtk::Clipboard::get();
3879        clipboard->request_targets(
3880            sigc::mem_fun(*this, &MainWindow::on_clipboard_received_targets)
3881        );
3882    }
3883    
3884    void MainWindow::updateClipboardCopyAvailable() {
3885        bool bDimensionRegionCopyIsPossible = m_DimRegionChooser.get_main_dimregion();
3886        static_cast<Gtk::MenuItem*>(
3887            uiManager->get_widget("/MenuBar/MenuEdit/CopyDimRgn")
3888        )->set_sensitive(bDimensionRegionCopyIsPossible);
3889    }
3890    
3891    void MainWindow::on_clipboard_owner_change(GdkEventOwnerChange* event) {
3892        updateClipboardPasteAvailable();
3893    }
3894    
3895    void MainWindow::on_clipboard_get(Gtk::SelectionData& selection_data, guint /*info*/) {
3896        const std::string target = selection_data.get_target();
3897        if (target == CLIPBOARD_DIMENSIONREGION_TARGET) {
3898            selection_data.set(
3899                CLIPBOARD_DIMENSIONREGION_TARGET, 8 /* "format": probably unused*/,
3900                &m_serializationArchive.rawData()[0],
3901                m_serializationArchive.rawData().size()
3902            );
3903        } else {
3904            std::cerr << "Clipboard: content for unknown target '" << target << "' requested\n";
3905        }
3906    }
3907    
3908    void MainWindow::on_clipboard_clear() {
3909        m_serializationArchive.clear();
3910        updateClipboardPasteAvailable();
3911        updateClipboardCopyAvailable();
3912    }
3913    
3914    //NOTE: Might throw exception !!!
3915    void MainWindow::applyMacro(Serialization::Archive& macro) {
3916        gig::DimensionRegion* pDimRgn = m_DimRegionChooser.get_main_dimregion();
3917        if (!pDimRgn) return;
3918    
3919        for (std::set<gig::DimensionRegion*>::iterator itDimReg = dimreg_edit.dimregs.begin();
3920             itDimReg != dimreg_edit.dimregs.end(); ++itDimReg)
3921        {
3922            gig::DimensionRegion* pDimRgn = *itDimReg;
3923            dimreg_to_be_changed_signal.emit(pDimRgn);
3924            macro.deserialize(pDimRgn);
3925            dimreg_changed_signal.emit(pDimRgn);
3926        }
3927        //region_changed()
3928        file_changed();
3929        dimreg_changed();
3930    }
3931    
3932    void MainWindow::on_clipboard_received(const Gtk::SelectionData& selection_data) {
3933        const std::string target = selection_data.get_target();
3934        if (target == CLIPBOARD_DIMENSIONREGION_TARGET) {
3935            Glib::ustring errorText;
3936            try {
3937                m_serializationArchive.decode(
3938                    selection_data.get_data(), selection_data.get_length()
3939                );
3940                applyMacro(m_serializationArchive);
3941            } catch (Serialization::Exception e) {
3942                errorText = e.Message;
3943            } catch (...) {
3944                errorText = _("Unknown exception while pasting DimensionRegion");
3945            }
3946            if (!errorText.empty()) {
3947                Glib::ustring txt = _("Pasting DimensionRegion failed:\n") + errorText;
3948                Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
3949                msg.run();
3950            }
3951        }
3952    }
3953    
3954    void MainWindow::on_clipboard_received_targets(const std::vector<Glib::ustring>& targets) {
3955        const bool bDimensionRegionPasteIsPossible =
3956            std::find(targets.begin(), targets.end(),
3957                      CLIPBOARD_DIMENSIONREGION_TARGET) != targets.end();
3958    
3959        static_cast<Gtk::MenuItem*>(
3960            uiManager->get_widget("/MenuBar/MenuEdit/PasteDimRgn")
3961        )->set_sensitive(bDimensionRegionPasteIsPossible);
3962    
3963        static_cast<Gtk::MenuItem*>(
3964            uiManager->get_widget("/MenuBar/MenuEdit/AdjustClipboard")
3965        )->set_sensitive(bDimensionRegionPasteIsPossible);
3966    }
3967    
3968  sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_to_be_changed() {  sigc::signal<void, gig::File*>& MainWindow::signal_file_structure_to_be_changed() {
3969      return file_structure_to_be_changed_signal;      return file_structure_to_be_changed_signal;
3970  }  }
Legend:
Removed from v.2772  
changed lines
  Added in v.3162
  ViewVC Help
Powered by ViewVC