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

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

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

revision 1087 by schoenebeck, Fri Mar 9 19:45:45 2007 UTC revision 1088 by persson, Sat Mar 10 08:16:38 2007 UTC
# Line 520  MainWindow::MainWindow() : Line 520  MainWindow::MainWindow() :
520      eSampleLoops("SampleLoops", &access_SampleLoops, 0, 1)      eSampleLoops("SampleLoops", &access_SampleLoops, 0, 1)
521  {  {
522  //    set_border_width(5);  //    set_border_width(5);
523      set_default_size(400, 200);  //    set_default_size(400, 200);
524    
525    
526      add(m_VBox);      add(m_VBox);
# Line 534  MainWindow::MainWindow() : Line 534  MainWindow::MainWindow() :
534          sigc::mem_fun(*this, &MainWindow::on_button_release));          sigc::mem_fun(*this, &MainWindow::on_button_release));
535    
536      // Add the TreeView tab, inside a ScrolledWindow, with the button underneath:      // Add the TreeView tab, inside a ScrolledWindow, with the button underneath:
537      m_ScrolledWindow.add(m_TreeViewNotebook);      m_ScrolledWindow.add(m_TreeView);
538      m_ScrolledWindow.set_size_request(400, 600);  //    m_ScrolledWindow.set_size_request(200, 600);
539      m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);      m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
540    
541        m_ScrolledWindowSamples.add(m_TreeViewSamples);
542        m_ScrolledWindowSamples.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
543    
544    
545      for (int i = 0 ; i < 5 ; i++) {      for (int i = 0 ; i < 5 ; i++) {
546          table[i] = new Gtk::Table(3, 1);          table[i] = new Gtk::Table(3, 1);
547          table[i]->set_col_spacings(5);          table[i]->set_col_spacings(5);
# Line 787  MainWindow::MainWindow() : Line 791  MainWindow::MainWindow() :
791      m_Notebook.append_page(*table[2], "EG3");      m_Notebook.append_page(*table[2], "EG3");
792      m_Notebook.append_page(*table[3], "Velocity");      m_Notebook.append_page(*table[3], "Velocity");
793      m_Notebook.append_page(*table[4], "Misc");      m_Notebook.append_page(*table[4], "Misc");
794      m_Notebook.set_size_request(400, 500);  //    m_Notebook.set_size_request(400, 500);
795    
796      m_HPaned.add1(m_ScrolledWindow);      m_TreeViewNotebook.set_size_request(300);
797        m_HPaned.add1(m_TreeViewNotebook);
798      m_HPaned.add2(m_Notebook);      m_HPaned.add2(m_Notebook);
799    
800    
801      m_TreeViewNotebook.append_page(m_TreeViewSamples, "Samples");      m_TreeViewNotebook.append_page(m_ScrolledWindowSamples, "Samples");
802      m_TreeViewNotebook.append_page(m_TreeView, "Instruments");      m_TreeViewNotebook.append_page(m_ScrolledWindow, "Instruments");
803    
804    
805      actionGroup = Gtk::ActionGroup::create();      actionGroup = Gtk::ActionGroup::create();
# Line 1639  void MainWindow::load_gig(gig::File* gig Line 1644  void MainWindow::load_gig(gig::File* gig
1644      instrument_menu->get_submenu()->show_all_children();      instrument_menu->get_submenu()->show_all_children();
1645    
1646      for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {      for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {
1647          Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();          if (group->Name != "") {
1648          Gtk::TreeModel::Row rowGroup = *iterGroup;              Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
1649          rowGroup[m_SamplesModel.m_col_name]   = group->Name.c_str();              Gtk::TreeModel::Row rowGroup = *iterGroup;
1650          rowGroup[m_SamplesModel.m_col_group]  = group;              rowGroup[m_SamplesModel.m_col_name]   = group->Name.c_str();
1651          rowGroup[m_SamplesModel.m_col_sample] = NULL;              rowGroup[m_SamplesModel.m_col_group]  = group;
1652          for (gig::Sample* sample = group->GetFirstSample(); sample; sample = group->GetNextSample()) {              rowGroup[m_SamplesModel.m_col_sample] = NULL;
1653              Gtk::TreeModel::iterator iterSample = m_refSamplesTreeModel->append(rowGroup.children());              for (gig::Sample* sample = group->GetFirstSample(); sample; sample = group->GetNextSample()) {
1654              Gtk::TreeModel::Row rowSample = *iterSample;                  Gtk::TreeModel::iterator iterSample = m_refSamplesTreeModel->append(rowGroup.children());
1655              rowSample[m_SamplesModel.m_col_name]   = sample->pInfo->Name.c_str();                  Gtk::TreeModel::Row rowSample = *iterSample;
1656              rowSample[m_SamplesModel.m_col_sample] = sample;                  rowSample[m_SamplesModel.m_col_name]   = sample->pInfo->Name.c_str();
1657              rowSample[m_SamplesModel.m_col_group]  = NULL;                  rowSample[m_SamplesModel.m_col_sample] = sample;
1658                    rowSample[m_SamplesModel.m_col_group]  = NULL;
1659                }
1660          }          }
1661      }      }
1662  }  }
Legend:
Removed from v.1087  
changed lines
  Added in v.1088
  ViewVC Help
Powered by ViewVC