/[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 3619 by schoenebeck, Tue Oct 1 16:21:28 2019 UTC revision 3737 by schoenebeck, Sat Feb 1 20:39:39 2020 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006-2019 Andreas Persson   * Copyright (C) 2006-2020 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 96  MainWindow::MainWindow() : Line 96  MainWindow::MainWindow() :
96    
97      if (!Settings::singleton()->autoRestoreWindowDimension) {      if (!Settings::singleton()->autoRestoreWindowDimension) {
98  #if GTKMM_MAJOR_VERSION >= 3  #if GTKMM_MAJOR_VERSION >= 3
99          set_default_size(960, 600);          set_default_size(1010, -1);
100  #else  #else
101          set_default_size(865, 600);          set_default_size(915, -1);
102  #endif  #endif
103          set_position(Gtk::WIN_POS_CENTER);          set_position(Gtk::WIN_POS_CENTER);
104      }      }
# Line 451  MainWindow::MainWindow() : Line 451  MainWindow::MainWindow() :
451          m_actionGroup->add_action_bool("Statusbar", sigc::mem_fun(*this, &MainWindow::on_action_view_status_bar), true);          m_actionGroup->add_action_bool("Statusbar", sigc::mem_fun(*this, &MainWindow::on_action_view_status_bar), true);
452      m_actionToggleRestoreWinDim =      m_actionToggleRestoreWinDim =
453          m_actionGroup->add_action_bool("AutoRestoreWinDim", sigc::mem_fun(*this, &MainWindow::on_auto_restore_win_dim), Settings::singleton()->autoRestoreWindowDimension);          m_actionGroup->add_action_bool("AutoRestoreWinDim", sigc::mem_fun(*this, &MainWindow::on_auto_restore_win_dim), Settings::singleton()->autoRestoreWindowDimension);
454        m_actionInstrDoubleClickOpensProps =
455            m_actionGroup->add_action_bool(
456                "OpenInstrPropsByDoubleClick",
457                sigc::mem_fun(*this, &MainWindow::on_instr_double_click_opens_props),
458                Settings::singleton()->instrumentDoubleClickOpensProps
459            );
460      m_actionToggleShowTooltips = m_actionGroup->add_action_bool(      m_actionToggleShowTooltips = m_actionGroup->add_action_bool(
461          "ShowTooltips", sigc::mem_fun(*this, &MainWindow::on_action_show_tooltips),          "ShowTooltips", sigc::mem_fun(*this, &MainWindow::on_action_show_tooltips),
462          Settings::singleton()->showTooltips          Settings::singleton()->showTooltips
# Line 478  MainWindow::MainWindow() : Line 484  MainWindow::MainWindow() :
484                           *this, &MainWindow::on_auto_restore_win_dim));                           *this, &MainWindow::on_auto_restore_win_dim));
485    
486      toggle_action =      toggle_action =
487            Gtk::ToggleAction::create("OpenInstrPropsByDoubleClick", _("Instrument Properties by Double Click"));
488        toggle_action->set_active(Settings::singleton()->instrumentDoubleClickOpensProps);
489        actionGroup->add(toggle_action,
490                         sigc::mem_fun(
491                             *this, &MainWindow::on_instr_double_click_opens_props));
492    
493        toggle_action =
494          Gtk::ToggleAction::create("ShowTooltips", _("Tooltips for Beginners"));          Gtk::ToggleAction::create("ShowTooltips", _("Tooltips for Beginners"));
495      toggle_action->set_active(Settings::singleton()->showTooltips);      toggle_action->set_active(Settings::singleton()->showTooltips);
496      actionGroup->add(      actionGroup->add(
# Line 509  MainWindow::MainWindow() : Line 522  MainWindow::MainWindow() :
522          "DupInstrument", sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)          "DupInstrument", sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
523      );      );
524      m_actionGroup->add_action(      m_actionGroup->add_action(
525            "MoveInstrument", sigc::mem_fun(*this, &MainWindow::on_action_move_instr)
526        );
527        m_actionGroup->add_action(
528          "CombInstruments", sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)          "CombInstruments", sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
529      );      );
530      m_actionGroup->add_action(      m_actionGroup->add_action(
# Line 530  MainWindow::MainWindow() : Line 546  MainWindow::MainWindow() :
546          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)          sigc::mem_fun(*this, &MainWindow::on_action_duplicate_instrument)
547      );      );
548      actionGroup->add(      actionGroup->add(
549            Gtk::Action::create("MoveInstrument", _("Move _Instrument To ...")),
550            Gtk::AccelKey(GDK_KEY_i, primaryModifierKey),
551            sigc::mem_fun(*this, &MainWindow::on_action_move_instr)
552        );
553        actionGroup->add(
554          Gtk::Action::create("CombInstruments", _("_Combine Instruments ...")),          Gtk::Action::create("CombInstruments", _("_Combine Instruments ...")),
555          Gtk::AccelKey(GDK_KEY_j, primaryModifierKey),          Gtk::AccelKey(GDK_KEY_j, primaryModifierKey),
556          sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)          sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
# Line 885  MainWindow::MainWindow() : Line 906  MainWindow::MainWindow() :
906          "          <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"          "          <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"
907          "          <attribute name='action'>AppMenu.DupInstrument</attribute>"          "          <attribute name='action'>AppMenu.DupInstrument</attribute>"
908          "        </item>"          "        </item>"
909            "        <item id='MoveInstrument'>"
910            "          <attribute name='label' translatable='yes'>Move Instrument To ...</attribute>"
911            "          <attribute name='action'>AppMenu.MoveInstrument</attribute>"
912            "        </item>"
913          "        <item id='CombInstruments'>"          "        <item id='CombInstruments'>"
914          "          <attribute name='label' translatable='yes'>Combine Instrument</attribute>"          "          <attribute name='label' translatable='yes'>Combine Instrument</attribute>"
915          "          <attribute name='action'>AppMenu.CombInstruments</attribute>"          "          <attribute name='action'>AppMenu.CombInstruments</attribute>"
# Line 935  MainWindow::MainWindow() : Line 960  MainWindow::MainWindow() :
960          "          <attribute name='label' translatable='yes'>Auto restore Window Dimensions</attribute>"          "          <attribute name='label' translatable='yes'>Auto restore Window Dimensions</attribute>"
961          "          <attribute name='action'>AppMenu.AutoRestoreWinDim</attribute>"          "          <attribute name='action'>AppMenu.AutoRestoreWinDim</attribute>"
962          "        </item>"          "        </item>"
963            "        <item id='OpenInstrPropsByDoubleClick'>"
964            "          <attribute name='label' translatable='yes'>Instrument Properties by Double Click</attribute>"
965            "          <attribute name='action'>AppMenu.OpenInstrPropsByDoubleClick</attribute>"
966            "        </item>"
967          "      </section>"          "      </section>"
968          "      <section>"          "      <section>"
969          "        <item id='RefreshAll'>"          "        <item id='RefreshAll'>"
# Line 1010  MainWindow::MainWindow() : Line 1039  MainWindow::MainWindow() :
1039          "        <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"          "        <attribute name='label' translatable='yes'>Duplicate Instrument</attribute>"
1040          "        <attribute name='action'>AppMenu.DupInstrument</attribute>"          "        <attribute name='action'>AppMenu.DupInstrument</attribute>"
1041          "      </item>"          "      </item>"
1042            "      <item id='MoveInstrument'>"
1043            "        <attribute name='label' translatable='yes'>Move Instrument To ...</attribute>"
1044            "        <attribute name='action'>AppMenu.MoveInstrument</attribute>"
1045            "      </item>"
1046          "      <item id='CombInstruments'>"          "      <item id='CombInstruments'>"
1047          "        <attribute name='label' translatable='yes'>Combine Instruments</attribute>"          "        <attribute name='label' translatable='yes'>Combine Instruments</attribute>"
1048          "        <attribute name='action'>AppMenu.CombInstruments</attribute>"          "        <attribute name='action'>AppMenu.CombInstruments</attribute>"
# Line 1148  MainWindow::MainWindow() : Line 1181  MainWindow::MainWindow() :
1181          "      <menu action='AssignScripts'/>"          "      <menu action='AssignScripts'/>"
1182          "      <menuitem action='AddInstrument'/>"          "      <menuitem action='AddInstrument'/>"
1183          "      <menuitem action='DupInstrument'/>"          "      <menuitem action='DupInstrument'/>"
1184            "      <menuitem action='MoveInstrument'/>"
1185          "      <menuitem action='CombInstruments'/>"          "      <menuitem action='CombInstruments'/>"
1186          "      <separator/>"          "      <separator/>"
1187          "      <menuitem action='RemoveInstrument'/>"          "      <menuitem action='RemoveInstrument'/>"
# Line 1163  MainWindow::MainWindow() : Line 1197  MainWindow::MainWindow() :
1197          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
1198          "      <menuitem action='ShowTooltips'/>"          "      <menuitem action='ShowTooltips'/>"
1199          "      <menuitem action='AutoRestoreWinDim'/>"          "      <menuitem action='AutoRestoreWinDim'/>"
1200            "      <menuitem action='OpenInstrPropsByDoubleClick'/>"
1201          "      <separator/>"          "      <separator/>"
1202          "      <menuitem action='RefreshAll'/>"          "      <menuitem action='RefreshAll'/>"
1203          "    </menu>"          "    </menu>"
# Line 1186  MainWindow::MainWindow() : Line 1221  MainWindow::MainWindow() :
1221          "    <menuitem action='ScriptSlots'/>"          "    <menuitem action='ScriptSlots'/>"
1222          "    <menuitem action='AddInstrument'/>"          "    <menuitem action='AddInstrument'/>"
1223          "    <menuitem action='DupInstrument'/>"          "    <menuitem action='DupInstrument'/>"
1224            "    <menuitem action='MoveInstrument'/>"
1225          "    <menuitem action='CombInstruments'/>"          "    <menuitem action='CombInstruments'/>"
1226          "    <separator/>"          "    <separator/>"
1227          "    <menuitem action='RemoveInstrument'/>"          "    <menuitem action='RemoveInstrument'/>"
# Line 1286  MainWindow::MainWindow() : Line 1322  MainWindow::MainWindow() :
1322      }      }
1323      {      {
1324          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
1325                uiManager->get_widget("/MenuBar/MenuView/OpenInstrPropsByDoubleClick"));
1326            item->set_tooltip_text(_("If checked, double clicking an instrument opens its properties dialog."));
1327        }
1328        {
1329            Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
1330              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));              uiManager->get_widget("/MenuBar/MenuTools/CombineInstruments"));
1331          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."));
1332      }      }
# Line 1484  MainWindow::MainWindow() : Line 1525  MainWindow::MainWindow() :
1525          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
1526      instrumentProps.signal_changed().connect(      instrumentProps.signal_changed().connect(
1527          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
1528      propDialog.signal_changed().connect(      sampleProps.signal_changed().connect(
1529            sigc::mem_fun(*this, &MainWindow::file_changed));
1530        fileProps.signal_changed().connect(
1531          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
1532      midiRules.signal_changed().connect(      midiRules.signal_changed().connect(
1533          sigc::mem_fun(*this, &MainWindow::file_changed));          sigc::mem_fun(*this, &MainWindow::file_changed));
# Line 1506  MainWindow::MainWindow() : Line 1549  MainWindow::MainWindow() :
1549          sigc::mem_fun(*this, &MainWindow::select_sample)          sigc::mem_fun(*this, &MainWindow::select_sample)
1550      );      );
1551    
1552        dimreg_edit.editScriptSlotsButton.signal_clicked().connect(
1553            sigc::mem_fun(*this, &MainWindow::show_script_slots)
1554        );
1555        // simply sending the same signal (pair) to the sampler on 'patch' variable
1556        // changes as the already existing signal (pair) when the user edits the
1557        // script's source code, because the sampler would reload the source code
1558        // and the 'patch' variables from the instrument on this signal anyway
1559        dimreg_edit.scriptVars.signal_vars_to_be_changed.connect(
1560            [this](gig::Instrument* instr) {
1561                for (int i = 0; i < instr->ScriptSlotCount(); ++i) {
1562                    gig::Script* script = instr->GetScriptOfSlot(i);
1563                    signal_script_to_be_changed.emit(script);
1564                }
1565            }
1566        );
1567        dimreg_edit.scriptVars.signal_vars_changed.connect(
1568            [this](gig::Instrument* instr) {
1569                for (int i = 0; i < instr->ScriptSlotCount(); ++i) {
1570                    gig::Script* script = instr->GetScriptOfSlot(i);
1571                    signal_script_changed.emit(script);
1572                }
1573            }
1574        );
1575    
1576      m_RegionChooser.signal_instrument_struct_to_be_changed().connect(      m_RegionChooser.signal_instrument_struct_to_be_changed().connect(
1577          sigc::hide(          sigc::hide(
1578              sigc::bind(              sigc::bind(
# Line 1879  void MainWindow::on_sel_change() Line 1946  void MainWindow::on_sel_change()
1946    
1947      updateScriptListOfMenu();      updateScriptListOfMenu();
1948    
1949      m_RegionChooser.set_instrument(get_instrument());      gig::Instrument* instr = get_instrument();
1950    
1951        m_RegionChooser.set_instrument(instr);
1952        dimreg_edit.scriptVars.setInstrument(instr, true/*force update*/);
1953    
1954      if (Settings::singleton()->syncSamplerInstrumentSelection) {      if (Settings::singleton()->syncSamplerInstrumentSelection) {
1955          switch_sampler_instrument_signal.emit(get_instrument());          switch_sampler_instrument_signal.emit(get_instrument());
# Line 2603  void MainWindow::__import_queued_samples Line 2673  void MainWindow::__import_queued_samples
2673    
2674  void MainWindow::on_action_file_properties()  void MainWindow::on_action_file_properties()
2675  {  {
2676      propDialog.show();      fileProps.show();
2677      propDialog.deiconify();      fileProps.deiconify();
2678  }  }
2679    
2680  void MainWindow::on_action_warn_user_on_extensions() {  void MainWindow::on_action_warn_user_on_extensions() {
# Line 2675  void MainWindow::on_action_help_about() Line 2745  void MainWindow::on_action_help_about()
2745      dialog.run();      dialog.run();
2746  }  }
2747    
2748  PropDialog::PropDialog()  FilePropDialog::FilePropDialog()
2749      : eFileFormat(_("File Format")),      : eFileFormat(_("File Format")),
2750        eName(_("Name")),        eName(_("Name")),
2751        eCreationDate(_("Creation date")),        eCreationDate(_("Creation date")),
# Line 2709  PropDialog::PropDialog() Line 2779  PropDialog::PropDialog()
2779      set_title(_("File Properties"));      set_title(_("File Properties"));
2780      eName.set_width_chars(50);      eName.set_width_chars(50);
2781    
2782      connect(eFileFormat, &PropDialog::set_FileFormat);      connect(eFileFormat, &FilePropDialog::set_FileFormat);
2783      connect(eName, &DLS::Info::Name);      connect(eName, &DLS::Info::Name);
2784      connect(eCreationDate, &DLS::Info::CreationDate);      connect(eCreationDate, &DLS::Info::CreationDate);
2785      connect(eComments, &DLS::Info::Comments);      connect(eComments, &DLS::Info::Comments);
# Line 2770  PropDialog::PropDialog() Line 2840  PropDialog::PropDialog()
2840      quitButton.set_can_default();      quitButton.set_can_default();
2841      quitButton.grab_focus();      quitButton.grab_focus();
2842      quitButton.signal_clicked().connect(      quitButton.signal_clicked().connect(
2843          sigc::mem_fun(*this, &PropDialog::hide));          sigc::mem_fun(*this, &FilePropDialog::hide));
2844    
2845      quitButton.show();      quitButton.show();
2846      vbox.show();      vbox.show();
# Line 2779  PropDialog::PropDialog() Line 2849  PropDialog::PropDialog()
2849  #endif  #endif
2850  }  }
2851    
2852  void PropDialog::set_file(gig::File* file)  void FilePropDialog::set_file(gig::File* file)
2853  {  {
2854      m_file = file;      m_file = file;
2855      update(file->pInfo);      update(file->pInfo);
# Line 2805  void PropDialog::set_file(gig::File* fil Line 2875  void PropDialog::set_file(gig::File* fil
2875      update_model--;      update_model--;
2876  }  }
2877    
2878  void PropDialog::set_FileFormat(int value)  void FilePropDialog::set_FileFormat(int value)
2879  {  {
2880      m_file->pVersion->major = value;      m_file->pVersion->major = value;
2881  }  }
# Line 2849  InstrumentProps::InstrumentProps() : Line 2919  InstrumentProps::InstrumentProps() :
2919      eIsDrum(_("Is drum")),      eIsDrum(_("Is drum")),
2920      eMIDIBank(_("MIDI bank"), 0, 16383),      eMIDIBank(_("MIDI bank"), 0, 16383),
2921      eMIDIProgram(_("MIDI program")),      eMIDIProgram(_("MIDI program")),
2922      eAttenuation(_("Attenuation"), 0, 96, 0, 1),      eAttenuation(_("Attenuation (dB)"), -96, +96, 0, 1),
     eGainPlus6(_("Gain +6dB"), eAttenuation, -6),  
2923      eEffectSend(_("Effect send"), 0, 65535),      eEffectSend(_("Effect send"), 0, 65535),
2924      eFineTune(_("Fine tune"), -8400, 8400),      eFineTune(_("Fine tune"), -8400, 8400),
2925      ePitchbendRange(_("Pitchbend range"), 0, 48),      ePitchbendRange(_("Pitchbend range (halftones)"), 0, 48),
2926      ePianoReleaseMode(_("Piano release mode")),      ePianoReleaseMode(_("Piano release mode")),
2927      eDimensionKeyRangeLow(_("Keyswitching range low")),      eDimensionKeyRangeLow(_("Keyswitching range low")),
2928      eDimensionKeyRangeHigh(_("Keyswitching range high"))      eDimensionKeyRangeHigh(_("Keyswitching range high")),
2929        table2(2,1),
2930        eName2(_("Name")),
2931        eCreationDate(_("Creation date")),
2932        eComments(_("Comments")),
2933        eProduct(_("Product")),
2934        eCopyright(_("Copyright")),
2935        eArtists(_("Artists")),
2936        eGenre(_("Genre")),
2937        eKeywords(_("Keywords")),
2938        eEngineer(_("Engineer")),
2939        eTechnician(_("Technician")),
2940        eSoftware(_("Software")),
2941        eMedium(_("Medium")),
2942        eSource(_("Source")),
2943        eSourceForm(_("Source form")),
2944        eCommissioned(_("Commissioned")),
2945        eSubject(_("Subject"))
2946  {  {
2947      if (!Settings::singleton()->autoRestoreWindowDimension) {      if (!Settings::singleton()->autoRestoreWindowDimension) {
2948          //set_default_size(470, 390);          //set_default_size(470, 390);
# Line 2865  InstrumentProps::InstrumentProps() : Line 2951  InstrumentProps::InstrumentProps() :
2951    
2952      set_title(_("Instrument Properties"));      set_title(_("Instrument Properties"));
2953    
2954        tabs.append_page(vbox[1], _("Settings"));
2955        tabs.append_page(vbox[2], _("Info"));
2956    
2957      eDimensionKeyRangeLow.set_tip(      eDimensionKeyRangeLow.set_tip(
2958          _("start of the keyboard area which should switch the "          _("start of the keyboard area which should switch the "
2959            "\"keyswitching\" dimension")            "\"keyswitching\" dimension")
# Line 2879  InstrumentProps::InstrumentProps() : Line 2968  InstrumentProps::InstrumentProps() :
2968      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);      connect(eMIDIBank, &InstrumentProps::set_MIDIBank);
2969      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);      connect(eMIDIProgram, &InstrumentProps::set_MIDIProgram);
2970      connect(eAttenuation, &gig::Instrument::Attenuation);      connect(eAttenuation, &gig::Instrument::Attenuation);
     connect(eGainPlus6, &gig::Instrument::Attenuation);  
2971      connect(eEffectSend, &gig::Instrument::EffectSend);      connect(eEffectSend, &gig::Instrument::EffectSend);
2972      connect(eFineTune, &gig::Instrument::FineTune);      connect(eFineTune, &gig::Instrument::FineTune);
2973      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);      connect(ePitchbendRange, &gig::Instrument::PitchbendRange);
# Line 2889  InstrumentProps::InstrumentProps() : Line 2977  InstrumentProps::InstrumentProps() :
2977    
2978      eName.signal_value_changed().connect(sig_name_changed.make_slot());      eName.signal_value_changed().connect(sig_name_changed.make_slot());
2979    
2980        connect(eName2, &InstrumentProps::set_Name);
2981        connectLambda(eCreationDate, [this](gig::String s) {
2982            m->pInfo->CreationDate = s;
2983        });
2984        connectLambda(eComments, [this](gig::String s) {
2985            m->pInfo->Comments = s;
2986        });
2987        connectLambda(eProduct, [this](gig::String s) {
2988            m->pInfo->Product = s;
2989        });
2990        connectLambda(eCopyright, [this](gig::String s) {
2991            m->pInfo->Copyright = s;
2992        });
2993        connectLambda(eArtists, [this](gig::String s) {
2994            m->pInfo->Artists = s;
2995        });
2996        connectLambda(eGenre, [this](gig::String s) {
2997            m->pInfo->Genre = s;
2998        });
2999        connectLambda(eKeywords, [this](gig::String s) {
3000            m->pInfo->Keywords = s;
3001        });
3002        connectLambda(eEngineer, [this](gig::String s) {
3003            m->pInfo->Engineer = s;
3004        });
3005        connectLambda(eTechnician, [this](gig::String s) {
3006            m->pInfo->Technician = s;
3007        });
3008        connectLambda(eSoftware, [this](gig::String s) {
3009            m->pInfo->Software = s;
3010        });
3011        connectLambda(eMedium, [this](gig::String s) {
3012            m->pInfo->Medium = s;
3013        });
3014        connectLambda(eSource, [this](gig::String s) {
3015            m->pInfo->Source = s;
3016        });
3017        connectLambda(eSourceForm, [this](gig::String s) {
3018            m->pInfo->SourceForm = s;
3019        });
3020        connectLambda(eCommissioned, [this](gig::String s) {
3021            m->pInfo->Commissioned = s;
3022        });
3023        connectLambda(eSubject, [this](gig::String s) {
3024            m->pInfo->Subject = s;
3025        });
3026    
3027        // tab 1
3028  #if USE_GTKMM_GRID  #if USE_GTKMM_GRID
3029      table.set_column_spacing(5);      table.set_column_spacing(5);
3030  #else  #else
3031      table.set_col_spacings(5);      table.set_col_spacings(5);
3032  #endif  #endif
   
3033      table.add(eName);      table.add(eName);
3034      table.add(eIsDrum);      table.add(eIsDrum);
3035      table.add(eMIDIBank);      table.add(eMIDIBank);
3036      table.add(eMIDIProgram);      table.add(eMIDIProgram);
3037      table.add(eAttenuation);      table.add(eAttenuation);
     table.add(eGainPlus6);  
3038      table.add(eEffectSend);      table.add(eEffectSend);
3039      table.add(eFineTune);      table.add(eFineTune);
3040      table.add(ePitchbendRange);      table.add(ePitchbendRange);
# Line 2908  InstrumentProps::InstrumentProps() : Line 3042  InstrumentProps::InstrumentProps() :
3042      table.add(eDimensionKeyRangeLow);      table.add(eDimensionKeyRangeLow);
3043      table.add(eDimensionKeyRangeHigh);      table.add(eDimensionKeyRangeHigh);
3044    
3045      add(vbox);      // tab 2
3046    #if USE_GTKMM_GRID
3047        table2.set_column_spacing(5);
3048    #else
3049        table2.set_col_spacings(5);
3050    #endif
3051        table2.add(eName2);
3052        table2.add(eCreationDate);
3053        table2.add(eComments);
3054        table2.add(eProduct);
3055        table2.add(eCopyright);
3056        table2.add(eArtists);
3057        table2.add(eGenre);
3058        table2.add(eKeywords);
3059        table2.add(eEngineer);
3060        table2.add(eTechnician);
3061        table2.add(eSoftware);
3062        table2.add(eMedium);
3063        table2.add(eSource);
3064        table2.add(eSourceForm);
3065        table2.add(eCommissioned);
3066        table2.add(eSubject);
3067    
3068        add(vbox[0]);
3069  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3070      table.set_margin(5);      table.set_margin(5);
3071  #else  #else
3072      table.set_border_width(5);      table.set_border_width(5);
3073  #endif  #endif
3074      vbox.pack_start(table);      vbox[1].pack_start(table);
3075        vbox[2].pack_start(table2);
3076      table.show();      table.show();
3077      vbox.pack_start(buttonBox, Gtk::PACK_SHRINK);      table2.show();
3078        vbox[0].pack_start(tabs);
3079        vbox[0].pack_start(buttonBox, Gtk::PACK_SHRINK);
3080      buttonBox.set_layout(Gtk::BUTTONBOX_END);      buttonBox.set_layout(Gtk::BUTTONBOX_END);
3081  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)  #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3082      buttonBox.set_margin(5);      buttonBox.set_margin(5);
# Line 2932  InstrumentProps::InstrumentProps() : Line 3092  InstrumentProps::InstrumentProps() :
3092          sigc::mem_fun(*this, &InstrumentProps::hide));          sigc::mem_fun(*this, &InstrumentProps::hide));
3093    
3094      quitButton.show();      quitButton.show();
3095      vbox.show();      vbox[0].show();
3096  #if HAS_GTKMM_SHOW_ALL_CHILDREN  #if HAS_GTKMM_SHOW_ALL_CHILDREN
3097      show_all_children();      show_all_children();
3098  #endif  #endif
# Line 2943  void InstrumentProps::set_instrument(gig Line 3103  void InstrumentProps::set_instrument(gig
3103      update(instrument);      update(instrument);
3104    
3105      update_model++;      update_model++;
3106    
3107        // tab 1
3108      eName.set_value(instrument->pInfo->Name);      eName.set_value(instrument->pInfo->Name);
3109      eIsDrum.set_value(instrument->IsDrum);      eIsDrum.set_value(instrument->IsDrum);
3110      eMIDIBank.set_value(instrument->MIDIBank);      eMIDIBank.set_value(instrument->MIDIBank);
3111      eMIDIProgram.set_value(instrument->MIDIProgram);      eMIDIProgram.set_value(instrument->MIDIProgram);
3112        // tab 2
3113        eName2.set_value(instrument->pInfo->Name);
3114        eCreationDate.set_value(instrument->pInfo->CreationDate);
3115        eComments.set_value(instrument->pInfo->Comments);
3116        eProduct.set_value(instrument->pInfo->Product);
3117        eCopyright.set_value(instrument->pInfo->Copyright);
3118        eArtists.set_value(instrument->pInfo->Artists);
3119        eGenre.set_value(instrument->pInfo->Genre);
3120        eKeywords.set_value(instrument->pInfo->Keywords);
3121        eEngineer.set_value(instrument->pInfo->Engineer);
3122        eTechnician.set_value(instrument->pInfo->Technician);
3123        eSoftware.set_value(instrument->pInfo->Software);
3124        eMedium.set_value(instrument->pInfo->Medium);
3125        eSource.set_value(instrument->pInfo->Source);
3126        eSourceForm.set_value(instrument->pInfo->SourceForm);
3127        eCommissioned.set_value(instrument->pInfo->Commissioned);
3128        eSubject.set_value(instrument->pInfo->Subject);
3129    
3130        update_model--;
3131    }
3132    
3133    
3134    SampleProps::SampleProps() :
3135    #if HAS_GTKMM_STOCK
3136        quitButton(Gtk::Stock::CLOSE),
3137    #else
3138        quitButton(_("_Close")),
3139    #endif
3140        table(2,1),
3141        eName(_("Name")),
3142        eUnityNote(_("Unity Note")),
3143        eSampleGroup(_("Sample Group")),
3144        eSampleFormatInfo(_("Sample Format")),
3145        eSampleID("Sample ID"),
3146        eChecksum("Wave Data CRC-32"),
3147        eLoopsCount(_("Loops"), 0, 1), // we might support more than 1 loop in future
3148        eLoopStart(_("Loop start position"), 0, 9999999),
3149        eLoopLength(_("Loop size"), 0, 9999999),
3150        eLoopType(_("Loop type")),
3151        eLoopPlayCount(_("Playback count")),
3152        table2(2,1),
3153        eName2(_("Name")),
3154        eCreationDate(_("Creation date")),
3155        eComments(_("Comments")),
3156        eProduct(_("Product")),
3157        eCopyright(_("Copyright")),
3158        eArtists(_("Artists")),
3159        eGenre(_("Genre")),
3160        eKeywords(_("Keywords")),
3161        eEngineer(_("Engineer")),
3162        eTechnician(_("Technician")),
3163        eSoftware(_("Software")),
3164        eMedium(_("Medium")),
3165        eSource(_("Source")),
3166        eSourceForm(_("Source form")),
3167        eCommissioned(_("Commissioned")),
3168        eSubject(_("Subject"))
3169    {
3170        if (!Settings::singleton()->autoRestoreWindowDimension) {
3171            //set_default_size(470, 390);
3172            set_position(Gtk::WIN_POS_MOUSE);
3173        }
3174    
3175        set_title(_("Sample Properties"));
3176    
3177        tabs.append_page(vbox[1], _("Settings"));
3178        tabs.append_page(vbox[2], _("Info"));
3179    
3180        connect(eName, &SampleProps::set_Name);
3181        connect(eUnityNote, &gig::Sample::MIDIUnityNote);
3182        connect(eLoopsCount, &gig::Sample::Loops);
3183        connectLambda(eLoopStart, [this](uint32_t start){
3184            m->LoopStart = start;
3185            m->LoopEnd = start + m->LoopSize;
3186        });
3187        connectLambda(eLoopLength, [this](uint32_t length){
3188            m->LoopSize = length;
3189            m->LoopEnd = m->LoopStart + length;
3190        });
3191        {
3192            const char* choices[] = { _("normal"), _("bidirectional"), _("backward"), 0 };
3193            static const gig::loop_type_t values[] = {
3194                gig::loop_type_normal,
3195                gig::loop_type_bidirectional,
3196                gig::loop_type_backward
3197            };
3198            eLoopType.set_choices(choices, values);
3199        }
3200        connect(eLoopType, &gig::Sample::LoopType);
3201        connect(eLoopPlayCount, &gig::Sample::LoopPlayCount);
3202    
3203        eName.signal_value_changed().connect(sig_name_changed.make_slot());
3204    
3205        connect(eName2, &SampleProps::set_Name);
3206        connectLambda(eCreationDate, [this](gig::String s) {
3207            m->pInfo->CreationDate = s;
3208        });
3209        connectLambda(eComments, [this](gig::String s) {
3210            m->pInfo->Comments = s;
3211        });
3212        connectLambda(eProduct, [this](gig::String s) {
3213            m->pInfo->Product = s;
3214        });
3215        connectLambda(eCopyright, [this](gig::String s) {
3216            m->pInfo->Copyright = s;
3217        });
3218        connectLambda(eArtists, [this](gig::String s) {
3219            m->pInfo->Artists = s;
3220        });
3221        connectLambda(eGenre, [this](gig::String s) {
3222            m->pInfo->Genre = s;
3223        });
3224        connectLambda(eKeywords, [this](gig::String s) {
3225            m->pInfo->Keywords = s;
3226        });
3227        connectLambda(eEngineer, [this](gig::String s) {
3228            m->pInfo->Engineer = s;
3229        });
3230        connectLambda(eTechnician, [this](gig::String s) {
3231            m->pInfo->Technician = s;
3232        });
3233        connectLambda(eSoftware, [this](gig::String s) {
3234            m->pInfo->Software = s;
3235        });
3236        connectLambda(eMedium, [this](gig::String s) {
3237            m->pInfo->Medium = s;
3238        });
3239        connectLambda(eSource, [this](gig::String s) {
3240            m->pInfo->Source = s;
3241        });
3242        connectLambda(eSourceForm, [this](gig::String s) {
3243            m->pInfo->SourceForm = s;
3244        });
3245        connectLambda(eCommissioned, [this](gig::String s) {
3246            m->pInfo->Commissioned = s;
3247        });
3248        connectLambda(eSubject, [this](gig::String s) {
3249            m->pInfo->Subject = s;
3250        });
3251    
3252        // tab 1
3253    #if USE_GTKMM_GRID
3254        table.set_column_spacing(5);
3255    #else
3256        table.set_col_spacings(5);
3257    #endif
3258        table.add(eName);
3259        table.add(eUnityNote);
3260        table.add(eSampleGroup);
3261        table.add(eSampleFormatInfo);
3262        table.add(eSampleID);
3263        table.add(eChecksum);
3264        table.add(eLoopsCount);
3265        table.add(eLoopStart);
3266        table.add(eLoopLength);
3267        table.add(eLoopType);
3268        table.add(eLoopPlayCount);
3269    
3270        // tab 2
3271    #if USE_GTKMM_GRID
3272        table2.set_column_spacing(5);
3273    #else
3274        table2.set_col_spacings(5);
3275    #endif
3276        table2.add(eName2);
3277        table2.add(eCreationDate);
3278        table2.add(eComments);
3279        table2.add(eProduct);
3280        table2.add(eCopyright);
3281        table2.add(eArtists);
3282        table2.add(eGenre);
3283        table2.add(eKeywords);
3284        table2.add(eEngineer);
3285        table2.add(eTechnician);
3286        table2.add(eSoftware);
3287        table2.add(eMedium);
3288        table2.add(eSource);
3289        table2.add(eSourceForm);
3290        table2.add(eCommissioned);
3291        table2.add(eSubject);
3292    
3293        add(vbox[0]);
3294    #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3295        table.set_margin(5);
3296    #else
3297        table.set_border_width(5);
3298    #endif
3299        vbox[1].pack_start(table);
3300        vbox[2].pack_start(table2);
3301        table.show();
3302        table2.show();
3303        vbox[0].pack_start(tabs);
3304        vbox[0].pack_start(buttonBox, Gtk::PACK_SHRINK);
3305        buttonBox.set_layout(Gtk::BUTTONBOX_END);
3306    #if GTKMM_MAJOR_VERSION > 3 || (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION > 24)
3307        buttonBox.set_margin(5);
3308    #else
3309        buttonBox.set_border_width(5);
3310    #endif
3311        buttonBox.show();
3312        buttonBox.pack_start(quitButton);
3313        quitButton.set_can_default();
3314        quitButton.grab_focus();
3315    
3316        quitButton.signal_clicked().connect(
3317            sigc::mem_fun(*this, &SampleProps::hide));
3318    
3319        quitButton.show();
3320        vbox[0].show();
3321    #if HAS_GTKMM_SHOW_ALL_CHILDREN
3322        show_all_children();
3323    #endif
3324    }
3325    
3326    void SampleProps::set_sample(gig::Sample* sample)
3327    {
3328        update(sample);
3329    
3330        update_model++;
3331    
3332        // tab 1
3333        eName.set_value(sample->pInfo->Name);
3334        eUnityNote.set_value(sample->MIDIUnityNote);
3335        // show sample group name
3336        {
3337            Glib::ustring s = "---";
3338            if (sample && sample->GetGroup())
3339                s = sample->GetGroup()->Name;
3340            eSampleGroup.text.set_text(s);
3341        }
3342        // assemble sample format info string
3343        {
3344            Glib::ustring s;
3345            if (sample) {
3346                switch (sample->Channels) {
3347                    case 1: s = _("Mono"); break;
3348                    case 2: s = _("Stereo"); break;
3349                    default:
3350                        s = ToString(sample->Channels) + _(" audio channels");
3351                        break;
3352                }
3353                s += " " + ToString(sample->BitDepth) + " Bits";
3354                s += " " + ToString(sample->SamplesPerSecond/1000) + "."
3355                         + ToString((sample->SamplesPerSecond%1000)/100) + " kHz";
3356            } else {
3357                s = _("No sample assigned to this dimension region.");
3358            }
3359            eSampleFormatInfo.text.set_text(s);
3360        }
3361        // generate sample's memory address pointer string
3362        {
3363            Glib::ustring s;
3364            if (sample) {
3365                char buf[64] = {};
3366                snprintf(buf, sizeof(buf), "%p", sample);
3367                s = buf;
3368            } else {
3369                s = "---";
3370            }
3371            eSampleID.text.set_text(s);
3372        }
3373        // generate raw wave form data CRC-32 checksum string
3374        {
3375            Glib::ustring s = "---";
3376            if (sample) {
3377                char buf[64] = {};
3378                snprintf(buf, sizeof(buf), "%x", sample->GetWaveDataCRC32Checksum());
3379                s = buf;
3380            }
3381            eChecksum.text.set_text(s);
3382        }
3383        eLoopsCount.set_value(sample->Loops);
3384        eLoopStart.set_value(sample->LoopStart);
3385        eLoopLength.set_value(sample->LoopSize);
3386        eLoopType.set_value(sample->LoopType);
3387        eLoopPlayCount.set_value(sample->LoopPlayCount);
3388        // tab 2
3389        eName2.set_value(sample->pInfo->Name);
3390        eCreationDate.set_value(sample->pInfo->CreationDate);
3391        eComments.set_value(sample->pInfo->Comments);
3392        eProduct.set_value(sample->pInfo->Product);
3393        eCopyright.set_value(sample->pInfo->Copyright);
3394        eArtists.set_value(sample->pInfo->Artists);
3395        eGenre.set_value(sample->pInfo->Genre);
3396        eKeywords.set_value(sample->pInfo->Keywords);
3397        eEngineer.set_value(sample->pInfo->Engineer);
3398        eTechnician.set_value(sample->pInfo->Technician);
3399        eSoftware.set_value(sample->pInfo->Software);
3400        eMedium.set_value(sample->pInfo->Medium);
3401        eSource.set_value(sample->pInfo->Source);
3402        eSourceForm.set_value(sample->pInfo->SourceForm);
3403        eCommissioned.set_value(sample->pInfo->Commissioned);
3404        eSubject.set_value(sample->pInfo->Subject);
3405    
3406        update_model--;
3407    }
3408    
3409    void SampleProps::set_Name(const gig::String& name)
3410    {
3411        m->pInfo->Name = name;
3412    }
3413    
3414    void SampleProps::update_name()
3415    {
3416        update_model++;
3417        eName.set_value(m->pInfo->Name);
3418      update_model--;      update_model--;
3419  }  }
3420    
# Line 3042  void MainWindow::load_gig(gig::File* gig Line 3510  void MainWindow::load_gig(gig::File* gig
3510      file_has_name = filename;      file_has_name = filename;
3511      file_is_changed = false;      file_is_changed = false;
3512    
3513      propDialog.set_file(gig);      fileProps.set_file(gig);
3514    
3515      instrument_name_connection.block();      instrument_name_connection.block();
3516      int index = 0;      int index = 0;
# Line 3182  void MainWindow::instr_name_changed_by_i Line 3650  void MainWindow::instr_name_changed_by_i
3650      }      }
3651  }  }
3652    
3653    bool MainWindow::sample_props_set_sample()
3654    {
3655        sampleProps.signal_name_changed().clear();
3656    
3657        std::vector<Gtk::TreeModel::Path> rows = m_TreeViewSamples.get_selection()->get_selected_rows();
3658        if (rows.empty()) {
3659            sampleProps.hide();
3660            return false;
3661        }
3662        //NOTE: was const_iterator before, which did not compile with GTKMM4 development branch, probably going to be fixed before final GTKMM4 release though.
3663        Gtk::TreeModel::iterator it = m_refSamplesTreeModel->get_iter(rows[0]);
3664        if (it) {
3665            Gtk::TreeModel::Row row = *it;
3666            gig::Sample* sample = row[m_SamplesModel.m_col_sample];
3667    
3668            sampleProps.set_sample(sample);
3669    
3670            // make sure sample tree is updated when user changes the
3671            // sample name in sample properties window
3672            sampleProps.signal_name_changed().connect(
3673                sigc::bind(
3674                    sigc::mem_fun(*this,
3675                        &MainWindow::sample_name_changed_by_sample_props
3676                    ), it
3677                )
3678            );
3679        } else {
3680            sampleProps.hide();
3681        }
3682        //NOTE: explicit boolean cast required for GTKMM4 development branch here
3683        return it ? true : false;
3684    }
3685    
3686    void MainWindow::show_sample_props()
3687    {
3688        if (sample_props_set_sample()) {
3689            sampleProps.show();
3690            sampleProps.deiconify();
3691        }
3692    }
3693    
3694    void MainWindow::sample_name_changed_by_sample_props(Gtk::TreeModel::iterator& it)
3695    {
3696        Gtk::TreeModel::Row row = *it;
3697        Glib::ustring name = row[m_SamplesModel.m_col_name];
3698    
3699        gig::Sample* sample = row[m_SamplesModel.m_col_sample];
3700        Glib::ustring gigname(gig_to_utf8(sample->pInfo->Name));
3701        if (gigname != name) {
3702            Gtk::TreeModel::Path path(*it);
3703            row[m_SamplesModel.m_col_name] = gigname;
3704        }
3705    }
3706    
3707  void MainWindow::show_midi_rules()  void MainWindow::show_midi_rules()
3708  {  {
3709      if (gig::Instrument* instrument = get_instrument())      if (gig::Instrument* instrument = get_instrument())
# Line 3310  void MainWindow::on_auto_restore_win_dim Line 3832  void MainWindow::on_auto_restore_win_dim
3832  #endif  #endif
3833  }  }
3834    
3835    void MainWindow::on_instr_double_click_opens_props() {
3836    #if USE_GLIB_ACTION
3837        bool active = false;
3838        m_actionInstrDoubleClickOpensProps->get_state(active);
3839        // for some reason toggle state does not change automatically
3840        active = !active;
3841        m_actionInstrDoubleClickOpensProps->change_state(active);
3842        Settings::singleton()->instrumentDoubleClickOpensProps = active;
3843    #else
3844        Gtk::CheckMenuItem* item =
3845            dynamic_cast<Gtk::CheckMenuItem*>(uiManager->get_widget("/MenuBar/MenuView/OpenInstrPropsByDoubleClick"));
3846        if (!item) {
3847            std::cerr << "/MenuBar/MenuView/OpenInstrPropsByDoubleClick == NULL\n";
3848            return;
3849        }
3850        Settings::singleton()->instrumentDoubleClickOpensProps = item->get_active();
3851    #endif
3852    }
3853    
3854  void MainWindow::on_save_with_temporary_file() {  void MainWindow::on_save_with_temporary_file() {
3855  #if USE_GLIB_ACTION  #if USE_GLIB_ACTION
3856      bool active = false;      bool active = false;
# Line 3384  bool MainWindow::on_button_release(Gdk:: Line 3925  bool MainWindow::on_button_release(Gdk::
3925  void MainWindow::on_button_release(GdkEventButton* button) {  void MainWindow::on_button_release(GdkEventButton* button) {
3926  #endif  #endif
3927      if (button->type == GDK_2BUTTON_PRESS) {      if (button->type == GDK_2BUTTON_PRESS) {
3928          show_instr_props();          if (Settings::singleton()->instrumentDoubleClickOpensProps)
3929                show_instr_props();
3930      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {      } else if (button->type == GDK_BUTTON_PRESS && button->button == 3) {
3931          // gig v2 files have no midi rules          // gig v2 files have no midi rules
3932          const bool bEnabled = !(file->pVersion && file->pVersion->major == 2);          const bool bEnabled = !(file->pVersion && file->pVersion->major == 2);
# Line 3424  void MainWindow::on_instrument_selection Line 3966  void MainWindow::on_instrument_selection
3966  }  }
3967  #endif  #endif
3968    
3969    void MainWindow::on_action_move_instr() {
3970        gig::Instrument* instr = get_instrument();
3971        if (!instr) return;
3972    
3973        int currentIndex = getIndexOf(instr);
3974    
3975        Gtk::Dialog dialog(_("Move Instrument"), true /*modal*/);
3976    #if (GTKMM_MAJOR_VERSION == 2 && GTKMM_MINOR_VERSION < 90) || GTKMM_MAJOR_VERSION < 2
3977        Gtk::Adjustment adjustment(
3978            currentIndex,
3979            0 /*min*/, file->CountInstruments() - 1 /*max*/
3980        );
3981        Gtk::SpinButton spinBox(adjustment);
3982    #else
3983        Gtk::SpinButton spinBox(
3984            Gtk::Adjustment::create(
3985                currentIndex,
3986                0 /*min*/, file->CountInstruments() - 1 /*max*/
3987            )
3988        );
3989    #endif
3990    #if USE_GTKMM_BOX
3991        dialog.get_content_area()->pack_start(spinBox);
3992    #else
3993        dialog.get_vbox()->pack_start(spinBox);
3994    #endif
3995    #if HAS_GTKMM_STOCK
3996        Gtk::Button* okButton = dialog.add_button(Gtk::Stock::OK, 0);
3997        dialog.add_button(Gtk::Stock::CANCEL, 1);
3998    #else
3999        Gtk::Button* okButton = dialog.add_button(_("_OK"), 0);
4000        dialog.add_button(_("_Cancel"), 1);
4001    #endif
4002        okButton->set_sensitive(false);
4003        // show the dialog at a reasonable screen position
4004        dialog.set_position(Gtk::WIN_POS_MOUSE);
4005        // only enable the 'OK' button if entered new index is not instrument's
4006        // current index already
4007        spinBox.signal_value_changed().connect([&]{
4008            okButton->set_sensitive( spinBox.get_value_as_int() != currentIndex );
4009        });
4010        // usability acceleration: if user hits enter key on the text entry field
4011        // then auto trigger the 'OK' button
4012        spinBox.signal_activate().connect([&]{
4013            if (okButton->get_sensitive())
4014                okButton->clicked();
4015        });
4016    #if HAS_GTKMM_SHOW_ALL_CHILDREN
4017        dialog.show_all_children();
4018    #endif
4019        if (!dialog.run()) { // 'OK' selected ...
4020            int newIndex = spinBox.get_value_as_int();
4021            printf("MOVE TO %d\n", newIndex);
4022            gig::Instrument* dst = file->GetInstrument(newIndex);
4023            instr->MoveTo(dst);
4024            __refreshEntireGUI();
4025            select_instrument(instr);
4026        }
4027    }
4028    
4029  void MainWindow::select_instrument(gig::Instrument* instrument) {  void MainWindow::select_instrument(gig::Instrument* instrument) {
4030      if (!instrument) return;      if (!instrument) return;
4031    
# Line 3888  void MainWindow::on_action_remove_instru Line 4490  void MainWindow::on_action_remove_instru
4490  }  }
4491    
4492  void MainWindow::on_action_sample_properties() {  void MainWindow::on_action_sample_properties() {
4493      //TODO: show a dialog where the selected sample's properties can be edited      show_sample_props();
     Gtk::MessageDialog msg(  
         *this, _("Sorry, yet to be implemented!"), false, Gtk::MESSAGE_INFO  
     );  
     msg.run();  
4494  }  }
4495    
4496  void MainWindow::on_action_add_script_group() {  void MainWindow::on_action_add_script_group() {
# Line 4691  void MainWindow::sample_name_changed(con Line 5289  void MainWindow::sample_name_changed(con
5289              file_changed();              file_changed();
5290          }          }
5291      }      }
5292        // change name in the sample properties window
5293        if (sampleProps.get_sample() == sample && sample) {
5294            sampleProps.set_sample(sample);
5295        }
5296  }  }
5297    
5298  void MainWindow::script_name_changed(const Gtk::TreeModel::Path& path,  void MainWindow::script_name_changed(const Gtk::TreeModel::Path& path,
Legend:
Removed from v.3619  
changed lines
  Added in v.3737
  ViewVC Help
Powered by ViewVC