/[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 2541 by schoenebeck, Wed Apr 23 16:49:05 2014 UTC revision 2550 by schoenebeck, Wed May 14 01:31:30 2014 UTC
# Line 43  Line 43 
43    
44  #include "mainwindow.h"  #include "mainwindow.h"
45  #include "Settings.h"  #include "Settings.h"
46    #include "CombineInstrumentsDialog.h"
47  #include "../../gfx/status_attached.xpm"  #include "../../gfx/status_attached.xpm"
48  #include "../../gfx/status_detached.xpm"  #include "../../gfx/status_detached.xpm"
49    
# Line 194  MainWindow::MainWindow() : Line 195  MainWindow::MainWindow() :
195      );      );
196    
197    
198        actionGroup->add(Gtk::Action::create("MenuTools", _("_Tools")));
199    
200        actionGroup->add(
201            Gtk::Action::create("CombineInstruments", _("_Combine Instruments...")),
202            sigc::mem_fun(*this, &MainWindow::on_action_combine_instruments)
203        );
204    
205    
206      // sample right-click popup actions      // sample right-click popup actions
207      actionGroup->add(      actionGroup->add(
208          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),          Gtk::Action::create("SampleProperties", Gtk::Stock::PROPERTIES),
# Line 245  MainWindow::MainWindow() : Line 254  MainWindow::MainWindow() :
254          "    <menu action='MenuView'>"          "    <menu action='MenuView'>"
255          "      <menuitem action='Statusbar'/>"          "      <menuitem action='Statusbar'/>"
256          "    </menu>"          "    </menu>"
257            "    <menu action='MenuTools'>"
258            "      <menuitem action='CombineInstruments'/>"
259            "    </menu>"
260          "    <menu action='MenuSettings'>"          "    <menu action='MenuSettings'>"
261          "      <menuitem action='WarnUserOnExtensions'/>"          "      <menuitem action='WarnUserOnExtensions'/>"
262          "    </menu>"          "    </menu>"
# Line 422  MainWindow::MainWindow() : Line 434  MainWindow::MainWindow() :
434    
435      // start with a new gig file by default      // start with a new gig file by default
436      on_action_file_new();      on_action_file_new();
437    
438        // select 'Instruments' tab by default
439        // (gtk allows this only if the tab childs are visible, thats why it's here)
440        m_TreeViewNotebook.set_current_page(1);
441  }  }
442    
443  MainWindow::~MainWindow()  MainWindow::~MainWindow()
# Line 1998  void MainWindow::on_sample_label_drop_dr Line 2014  void MainWindow::on_sample_label_drop_dr
2014          bool channels_changed = false;          bool channels_changed = false;
2015          if (sample->Channels == 1 && stereo_dimension) {          if (sample->Channels == 1 && stereo_dimension) {
2016              // remove the samplechannel dimension              // remove the samplechannel dimension
2017    /* commented out, because it makes it impossible building up an instrument from scratch using two separate L/R samples
2018              region->DeleteDimension(stereo_dimension);              region->DeleteDimension(stereo_dimension);
2019              channels_changed = true;              channels_changed = true;
2020              region_changed();              region_changed();
2021    */
2022          }          }
2023          dimreg_edit.set_sample(          dimreg_edit.set_sample(
2024              sample,              sample,
# Line 2100  void MainWindow::instrument_name_changed Line 2118  void MainWindow::instrument_name_changed
2118      }      }
2119  }  }
2120    
2121    void MainWindow::on_action_combine_instruments() {
2122        CombineInstrumentsDialog* d = new CombineInstrumentsDialog(*this, file);
2123        d->show_all();
2124        d->resize(500, 400);
2125        d->run();
2126        if (d->fileWasChanged()) {
2127            // update GUI with new instrument just created
2128            add_instrument(d->newCombinedInstrument());
2129        }
2130        delete d;
2131    }
2132    
2133  void MainWindow::set_file_is_shared(bool b) {  void MainWindow::set_file_is_shared(bool b) {
2134      this->file_is_shared = b;      this->file_is_shared = b;
2135    
Legend:
Removed from v.2541  
changed lines
  Added in v.2550
  ViewVC Help
Powered by ViewVC