/[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 1075 by schoenebeck, Tue Mar 6 01:17:03 2007 UTC revision 1080 by schoenebeck, Tue Mar 6 23:16:18 2007 UTC
# Line 523  MainWindow::MainWindow() : Line 523  MainWindow::MainWindow() :
523      m_TreeView.signal_button_press_event().connect_notify(      m_TreeView.signal_button_press_event().connect_notify(
524          sigc::mem_fun(*this, &MainWindow::on_button_release));          sigc::mem_fun(*this, &MainWindow::on_button_release));
525    
526      // Add the TreeView, inside a ScrolledWindow, with the button underneath:      // Add the TreeView tab, inside a ScrolledWindow, with the button underneath:
527      m_ScrolledWindow.add(m_TreeView);      m_ScrolledWindow.add(m_TreeViewNotebook);
528      m_ScrolledWindow.set_size_request(400, 600);      m_ScrolledWindow.set_size_request(400, 600);
529      m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);      m_ScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
530    
# Line 783  MainWindow::MainWindow() : Line 783  MainWindow::MainWindow() :
783      m_HPaned.add2(m_Notebook);      m_HPaned.add2(m_Notebook);
784    
785    
786        m_TreeViewNotebook.append_page(m_TreeViewSamples, "Samples");
787        m_TreeViewNotebook.append_page(m_TreeView, "Instruments");
788    
789    
790      actionGroup = Gtk::ActionGroup::create();      actionGroup = Gtk::ActionGroup::create();
791    
792      actionGroup->add(Gtk::Action::create("MenuFile", _("_File")));      actionGroup->add(Gtk::Action::create("MenuFile", _("_File")));
# Line 886  MainWindow::MainWindow() : Line 890  MainWindow::MainWindow() :
890      m_TreeView.append_column("Instrument", m_Columns.m_col_name);      m_TreeView.append_column("Instrument", m_Columns.m_col_name);
891      m_TreeView.set_headers_visible(false);      m_TreeView.set_headers_visible(false);
892    
893        // create samples treeview (including its data model)
894        m_refSamplesTreeModel = Gtk::TreeStore::create(m_SamplesModel);
895        m_TreeViewSamples.set_model(m_refSamplesTreeModel);
896        m_TreeViewSamples.append_column("Samples", m_SamplesModel.m_col_name);
897        m_TreeViewSamples.set_headers_visible(false);
898    
899      file = 0;      file = 0;
900    
901      show_all_children();      show_all_children();
# Line 1255  void MainWindow::on_action_file_open() Line 1265  void MainWindow::on_action_file_open()
1265          instrument_menu->get_submenu()->items().clear();          instrument_menu->get_submenu()->items().clear();
1266    
1267          m_refTreeModel->clear();          m_refTreeModel->clear();
1268            m_refSamplesTreeModel->clear();
1269          if (file) delete file;          if (file) delete file;
1270    
1271          // getInfo(dialog.get_filename().c_str(), *this);          // getInfo(dialog.get_filename().c_str(), *this);
# Line 1510  void MainWindow::load_gig(gig::File* gig Line 1521  void MainWindow::load_gig(gig::File* gig
1521      }      }
1522      instrument_menu->show();      instrument_menu->show();
1523      instrument_menu->get_submenu()->show_all_children();      instrument_menu->get_submenu()->show_all_children();
1524    
1525        for (gig::Group* group = gig->GetFirstGroup(); group; group = gig->GetNextGroup()) {
1526            Gtk::TreeModel::iterator iterGroup = m_refSamplesTreeModel->append();
1527            Gtk::TreeModel::Row rowGroup = *iterGroup;
1528            rowGroup[m_SamplesModel.m_col_name]   = group->Name.c_str();
1529            rowGroup[m_SamplesModel.m_col_sample] = group;
1530            for (gig::Sample* sample = group->GetFirstSample(); sample; sample = group->GetNextSample()) {
1531                Gtk::TreeModel::iterator iterSample = m_refSamplesTreeModel->append(rowGroup.children());
1532                Gtk::TreeModel::Row rowSample = *iterSample;
1533                rowSample[m_SamplesModel.m_col_name]   = sample->pInfo->Name.c_str();
1534                rowSample[m_SamplesModel.m_col_sample] = sample;
1535            }
1536        }
1537  }  }
1538    
1539  void MainWindow::on_button_release(GdkEventButton* button)  void MainWindow::on_button_release(GdkEventButton* button)
Legend:
Removed from v.1075  
changed lines
  Added in v.1080
  ViewVC Help
Powered by ViewVC