[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso/dialogs BusSelectorDialog...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src/traverso/dialogs BusSelectorDialog... |
|
Date: |
Mon, 21 Jan 2008 16:25:17 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/01/21 16:25:17
Modified files:
src/traverso/dialogs: BusSelectorDialog.cpp CDWritingDialog.cpp
CDWritingDialog.h ExportDialog.cpp
ExportDialog.h InsertSilenceDialog.cpp
MarkerDialog.cpp MarkerDialog.h
src/traverso/dialogs/project: NewProjectDialog.cpp
NewTrackDialog.cpp
OpenProjectDialog.cpp
ProjectManagerDialog.cpp
ProjectManagerDialog.h
src/traverso/dialogs/settings: Pages.cpp SettingsDialog.cpp
Added files:
src/traverso/dialogs/project: NewSheetDialog.cpp
NewSheetDialog.h
Removed files:
src/traverso/dialogs/project: NewSongDialog.cpp NewSongDialog.h
Log message:
* Song->Sheet renaming
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/BusSelectorDialog.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/CDWritingDialog.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/CDWritingDialog.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/ExportDialog.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/ExportDialog.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/InsertSilenceDialog.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.h?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewTrackDialog.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp?cvsroot=traverso&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/ProjectManagerDialog.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewSheetDialog.cpp?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewSheetDialog.h?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewSongDialog.cpp?cvsroot=traverso&r1=1.7&r2=0
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewSongDialog.h?cvsroot=traverso&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp?cvsroot=traverso&r1=1.10&r2=1.11
Patches:
Index: BusSelectorDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/BusSelectorDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- BusSelectorDialog.cpp 2 Jan 2008 19:23:59 -0000 1.9
+++ BusSelectorDialog.cpp 21 Jan 2008 16:25:16 -0000 1.10
@@ -23,7 +23,7 @@
#include <AudioDevice.h>
#include <ProjectManager.h>
-#include <Song.h>
+#include <Sheet.h>
#include <Track.h>
#include <Project.h>
#include <QPushButton>
@@ -82,8 +82,8 @@
}
qint64 id = trackComboBox->itemData(index).toLongLong();
- Song* song = pm().get_project()->get_current_song();
- m_currentTrack = song->get_track(id);
+ Sheet* sheet = pm().get_project()->get_current_sheet();
+ m_currentTrack = sheet->get_track(id);
QList<QListWidgetItem *> list =
busesListWidget->findItems(m_currentTrack->get_bus_in(), Qt::MatchExactly);
@@ -174,9 +174,9 @@
{
trackComboBox->clear();
- Song* song = pm().get_project()->get_current_song();
+ Sheet* sheet = pm().get_project()->get_current_sheet();
- foreach(Track* track, song->get_tracks()) {
+ foreach(Track* track, sheet->get_tracks()) {
QString fulltitle = QString::number(track->get_sort_index() +
1) + " " + track->get_name();
trackComboBox->addItem(fulltitle, track->get_id());
}
Index: CDWritingDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/CDWritingDialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CDWritingDialog.cpp 22 Nov 2007 15:07:02 -0000 1.5
+++ CDWritingDialog.cpp 21 Jan 2008 16:25:16 -0000 1.6
@@ -280,11 +280,11 @@
}
// FIXME: We should instead check export wav file timestamps/revision
numbers as a dirty test
- if (! cdAllSongsButton->isChecked() && m_lastSheetExported !=
m_project->get_current_song_id()) {
+ if (! cdAllSheetsButton->isChecked() && m_lastSheetExported !=
m_project->get_current_sheet_id()) {
m_exportSpec->renderfinished = false;
}
- if (m_wasClosed && m_exportSpec->renderfinished &&
(m_exportSpec->allSongs == cdAllSongsButton->isChecked()) ) {
+ if (m_wasClosed && m_exportSpec->renderfinished &&
(m_exportSpec->allSheets == cdAllSheetsButton->isChecked()) ) {
if (QMessageBox::question(this, tr("Rerender CD content"),
tr("There is already a CD render
available.\nShould I re-render the CD content?"),
@@ -298,7 +298,7 @@
m_wasClosed = false;
if ( ! (m_exportSpec->renderfinished &&
- (m_exportSpec->allSongs == cdAllSongsButton->isChecked()) &&
+ (m_exportSpec->allSheets == cdAllSheetsButton->isChecked()) &&
(m_exportSpec->normalize == cdNormalizeCheckBox->isChecked()))
) {
m_exportSpec->data_width = 16;
@@ -309,10 +309,10 @@
m_exportSpec->writeToc = true;
m_exportSpec->dither_type = GDitherTri;
m_exportSpec->src_quality = SRC_SINC_MEDIUM_QUALITY; //
SRC_SINC_BEST_QUALITY SRC_SINC_FASTEST SRC_ZERO_ORDER_HOLD SRC_LINEAR
- if (cdAllSongsButton->isChecked()) {
- m_exportSpec->allSongs = true;
+ if (cdAllSheetsButton->isChecked()) {
+ m_exportSpec->allSheets = true;
} else {
- m_exportSpec->allSongs = false;
+ m_exportSpec->allSheets = false;
}
m_exportSpec->normalize = cdNormalizeCheckBox->isChecked();
m_exportSpec->isRecording = false;
@@ -334,7 +334,7 @@
disable_ui_interaction();
m_project->export_project(m_exportSpec);
- m_lastSheetExported = m_project->get_current_song_id();
+ m_lastSheetExported = m_project->get_current_sheet_id();
} else {
if (cdDiskExportOnlyCheckBox->isChecked()) {
return;
Index: CDWritingDialog.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/CDWritingDialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CDWritingDialog.h 15 Oct 2007 18:36:28 -0000 1.3
+++ CDWritingDialog.h 21 Jan 2008 16:25:16 -0000 1.4
@@ -29,7 +29,7 @@
#include <QProcess>
class Project;
-class Song;
+class Sheet;
struct ExportSpecification;
class QProcess;
Index: ExportDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/ExportDialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ExportDialog.cpp 5 Nov 2007 15:53:03 -0000 1.8
+++ ExportDialog.cpp 21 Jan 2008 16:25:16 -0000 1.9
@@ -335,10 +335,10 @@
return;
}
- connect(m_project, SIGNAL(songExportProgressChanged(int)), this,
SLOT(update_song_progress(int)));
+ connect(m_project, SIGNAL(sheetExportProgressChanged(int)), this,
SLOT(update_sheet_progress(int)));
connect(m_project, SIGNAL(overallExportProgressChanged(int)), this,
SLOT(update_overall_progress(int)));
connect(m_project, SIGNAL(exportFinished()), this,
SLOT(render_finished()));
- connect(m_project, SIGNAL(exportStartedForSong(Song*)), this, SLOT
(set_exporting_song(Song*)));
+ connect(m_project, SIGNAL(exportStartedForSheet(Sheet*)), this, SLOT
(set_exporting_sheet(Sheet*)));
// clear extraformats, it might be different now from previous runs!
m_exportSpec->extraFormat.clear();
@@ -389,10 +389,10 @@
m_exportSpec->dither_type = GDitherTri;
- if (allSongsButton->isChecked()) {
- m_exportSpec->allSongs = true;
+ if (allSheetsButton->isChecked()) {
+ m_exportSpec->allSheets = true;
} else {
- m_exportSpec->allSongs = false;
+ m_exportSpec->allSheets = false;
}
m_exportSpec->exportdir = exportDirName->text();
@@ -442,7 +442,7 @@
}
-void ExportDialog::update_song_progress( int progress )
+void ExportDialog::update_sheet_progress( int progress )
{
}
@@ -453,10 +453,10 @@
void ExportDialog::render_finished( )
{
- disconnect(m_project, SIGNAL(songExportProgressChanged(int)), this,
SLOT(update_song_progress(int)));
+ disconnect(m_project, SIGNAL(sheetExportProgressChanged(int)), this,
SLOT(update_sheet_progress(int)));
disconnect(m_project, SIGNAL(overallExportProgressChanged(int)), this,
SLOT(update_overall_progress(int)));
disconnect(m_project, SIGNAL(exportFinished()), this,
SLOT(render_finished()));
- disconnect(m_project, SIGNAL(exportStartedForSong(Song*)), this, SLOT
(set_exporting_song(Song*)));
+ disconnect(m_project, SIGNAL(exportStartedForSheet(Sheet*)), this, SLOT
(set_exporting_sheet(Sheet*)));
startButton->show();
closeButton->show();
@@ -464,13 +464,13 @@
progressBar->setValue(0);
}
-void ExportDialog::set_exporting_song( Song * song )
+void ExportDialog::set_exporting_sheet( Sheet * sheet )
{
QString name = tr("Progress of Sheet ") +
- QString::number(m_project->get_song_index(song->get_id())) + ":
" +
- song->get_title();
+ QString::number(m_project->get_sheet_index(sheet->get_id())) +
": " +
+ sheet->get_title();
- currentProcessingSongName->setText(name);
+ currentProcessingSheetName->setText(name);
}
void ExportDialog::set_project(Project * project)
Index: ExportDialog.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/ExportDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ExportDialog.h 16 Oct 2007 12:45:16 -0000 1.2
+++ ExportDialog.h 21 Jan 2008 16:25:16 -0000 1.3
@@ -27,7 +27,7 @@
#include <QDialog>
class Project;
-class Song;
+class Sheet;
struct ExportSpecification;
class ExportDialog : public QDialog, protected Ui::ExportDialog
@@ -55,10 +55,10 @@
private slots:
void set_project(Project* project);
- void update_song_progress(int progress);
+ void update_sheet_progress(int progress);
void update_overall_progress(int progress);
void render_finished();
- void set_exporting_song(Song* song);
+ void set_exporting_sheet(Sheet* sheet);
void on_fileSelectButton_clicked();
void on_startButton_clicked();
Index: InsertSilenceDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/InsertSilenceDialog.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- InsertSilenceDialog.cpp 7 Jan 2008 19:36:05 -0000 1.10
+++ InsertSilenceDialog.cpp 21 Jan 2008 16:25:16 -0000 1.11
@@ -22,7 +22,7 @@
#include "InsertSilenceDialog.h"
#include "ProjectManager.h"
#include "Project.h"
-#include "Song.h"
+#include "Sheet.h"
#include "Import.h"
#include "Track.h"
#include "AudioClip.h"
@@ -52,10 +52,10 @@
void InsertSilenceDialog::accept()
{
- Song* song = pm().get_project()->get_current_song();
- QList<Track*> tracks = song->get_tracks();
+ Sheet* sheet = pm().get_project()->get_current_sheet();
+ QList<Track*> tracks = sheet->get_tracks();
- // Make sure track is still in the song
+ // Make sure track is still in the sheet
if (m_track){
Track* foundTrack = 0;
@@ -67,7 +67,7 @@
m_track = foundTrack;
}
- if (song->get_numtracks() > 0) {
+ if (sheet->get_numtracks() > 0) {
if (!m_track){
Track* shortestTrack = (Track*)tracks.first();
Index: MarkerDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- MarkerDialog.cpp 6 Dec 2007 19:18:58 -0000 1.23
+++ MarkerDialog.cpp 21 Jan 2008 16:25:16 -0000 1.24
@@ -28,7 +28,7 @@
#include <QString>
#include <ProjectManager.h>
#include <Project.h>
-#include <Song.h>
+#include <Sheet.h>
#include <TimeLine.h>
#include <Marker.h>
#include <Utils.h>
@@ -45,7 +45,7 @@
{
setupUi(this);
- checkBoxAllSongs->hide();
+ checkBoxAllSheets->hide();
set_project(pm().get_project());
@@ -61,11 +61,11 @@
pushButtonClose->setAutoDefault(false);
- // connect signals which require an update of the song list
+ // connect signals which require an update of the sheet list
connect(&pm(), SIGNAL(projectLoaded(Project*)), this,
SLOT(set_project(Project*)));
// connect signals which require an update of the treeWidget's items
- connect(comboBoxDisplaySong, SIGNAL(currentIndexChanged(int)), this,
SLOT(update_marker_treeview()));
+ connect(comboBoxDisplaySheet, SIGNAL(currentIndexChanged(int)), this,
SLOT(update_marker_treeview()));
// connect other stuff related to the treeWidget
connect(lineEditTitle, SIGNAL(textEdited(const QString &)), this,
SLOT(description_changed(const QString &)));
@@ -81,7 +81,7 @@
connect(lineEditPerformer, SIGNAL(returnPressed()), this,
SLOT(performer_enter()));
connect(lineEditArranger, SIGNAL(returnPressed()), this,
SLOT(arranger_enter()));
connect(lineEditMessage, SIGNAL(returnPressed()), this,
SLOT(message_enter()));
- connect(lineEditSongwriter, SIGNAL(returnPressed()), this,
SLOT(songwriter_enter()));
+ connect(lineEditSheetwriter, SIGNAL(returnPressed()), this,
SLOT(sheetwriter_enter()));
connect(lineEditIsrc, SIGNAL(returnPressed()), this,
SLOT(isrc_enter()));
connect(toolButtonTitleAll, SIGNAL(clicked()), this, SLOT(title_all()));
@@ -89,7 +89,7 @@
connect(toolButtonPerformerAll, SIGNAL(clicked()), this,
SLOT(performer_all()));
connect(toolButtonArrangerAll, SIGNAL(clicked()), this,
SLOT(arranger_all()));
connect(toolButtonMessageAll, SIGNAL(clicked()), this,
SLOT(message_all()));
- connect(toolButtonSongwriterAll, SIGNAL(clicked()), this,
SLOT(songwriter_all()));
+ connect(toolButtonSheetwriterAll, SIGNAL(clicked()), this,
SLOT(sheetwriter_all()));
connect(toolButtonCopyAll, SIGNAL(clicked()), this, SLOT(copy_all()));
connect(toolButtonPEmphAll, SIGNAL(clicked()), this, SLOT(pemph_all()));
@@ -99,7 +99,7 @@
void MarkerDialog::set_project(Project * project)
{
m_project = project;
- comboBoxDisplaySong->clear();
+ comboBoxDisplaySheet->clear();
if (! m_project) {
return;
@@ -107,16 +107,16 @@
setWindowTitle("Marker Editor - Project " + m_project->get_title());
- connect(m_project, SIGNAL(songAdded(Song*)), this,
SLOT(update_songs()));
- connect(m_project, SIGNAL(songRemoved(Song*)), this,
SLOT(update_songs()));
+ connect(m_project, SIGNAL(sheetAdded(Sheet*)), this,
SLOT(update_sheets()));
+ connect(m_project, SIGNAL(sheetRemoved(Sheet*)), this,
SLOT(update_sheets()));
- // fill the combo box with the names of the songs
- m_songlist = m_project->get_songs();
- for (int i = 0; i < m_songlist.size(); ++i) {
- comboBoxDisplaySong->addItem("Sheet " + QString::number(i+1) +
": " + m_songlist.at(i)->get_title());
- connect(m_songlist.at(i)->get_timeline(),
SIGNAL(markerAdded(Marker*)), this, SLOT(update_marker_treeview()));
- connect(m_songlist.at(i)->get_timeline(),
SIGNAL(markerRemoved(Marker*)), this, SLOT(update_marker_treeview()));
- connect(m_songlist.at(i)->get_timeline(),
SIGNAL(markerPositionChanged(Marker*)), this, SLOT(update_marker_treeview()));
+ // fill the combo box with the names of the sheets
+ m_sheetlist = m_project->get_sheets();
+ for (int i = 0; i < m_sheetlist.size(); ++i) {
+ comboBoxDisplaySheet->addItem("Sheet " + QString::number(i+1) +
": " + m_sheetlist.at(i)->get_title());
+ connect(m_sheetlist.at(i)->get_timeline(),
SIGNAL(markerAdded(Marker*)), this, SLOT(update_marker_treeview()));
+ connect(m_sheetlist.at(i)->get_timeline(),
SIGNAL(markerRemoved(Marker*)), this, SLOT(update_marker_treeview()));
+ connect(m_sheetlist.at(i)->get_timeline(),
SIGNAL(markerPositionChanged(Marker*)), this, SLOT(update_marker_treeview()));
}
// Fill dialog with marker stuff....
@@ -124,18 +124,18 @@
}
-void MarkerDialog::song_to_be_showed(Song * song)
+void MarkerDialog::sheet_to_be_showed(Sheet * sheet)
{
int index = -1;
- for (int i=0; i<m_songlist.size(); ++i) {
- if (song == m_songlist.at(i)) {
+ for (int i=0; i<m_sheetlist.size(); ++i) {
+ if (sheet == m_sheetlist.at(i)) {
index = i;
break;
}
}
- if (index != -1 && index < m_songlist.size()) {
- comboBoxDisplaySong->setCurrentIndex(index);
+ if (index != -1 && index < m_sheetlist.size()) {
+ comboBoxDisplaySheet->setCurrentIndex(index);
}
}
@@ -148,33 +148,33 @@
m_marker = (Marker*)0;
markersTreeWidget->clear();
- if (!m_songlist.size() || !m_project) {
+ if (!m_sheetlist.size() || !m_project) {
return;
}
- if (comboBoxDisplaySong->currentIndex() >= m_songlist.size()) {
+ if (comboBoxDisplaySheet->currentIndex() >= m_sheetlist.size()) {
return;
}
- int index = comboBoxDisplaySong->currentIndex();
+ int index = comboBoxDisplaySheet->currentIndex();
if (index < 0) {
index = 0;
}
- if (index >= m_songlist.size()) {
- index = m_songlist.size() - 1;
+ if (index >= m_sheetlist.size()) {
+ index = m_sheetlist.size() - 1;
}
- Song* song = m_songlist.at(index);
+ Sheet* sheet = m_sheetlist.at(index);
- TimeLine* tl = song->get_timeline();
+ TimeLine* tl = sheet->get_timeline();
foreach(Marker* marker, tl->get_markers()) {
QString name = marker->get_description();
QString pos = timeref_to_cd_including_hours(marker->get_when());
QTreeWidgetItem* item = new QTreeWidgetItem(markersTreeWidget);
- item->setText(0, QString("%1 %2").arg(index, 2, 10,
QLatin1Char('0')).arg(song->get_title()));
+ item->setText(0, QString("%1 %2").arg(index, 2, 10,
QLatin1Char('0')).arg(sheet->get_title()));
item->setText(1, pos.simplified());
item->setText(2, name);
item->setData(0, Qt::UserRole, marker->get_id());
@@ -206,7 +206,7 @@
marker->set_description(lineEditTitle->text());
marker->set_performer(lineEditPerformer->text());
marker->set_composer(lineEditComposer->text());
- marker->set_songwriter(lineEditSongwriter->text());
+ marker->set_sheetwriter(lineEditSheetwriter->text());
marker->set_arranger(lineEditArranger->text());
marker->set_message(lineEditMessage->text());
marker->set_isrc(lineEditIsrc->text());
@@ -218,7 +218,7 @@
lineEditTitle->setText(m_marker->get_description());
lineEditPerformer->setText(m_marker->get_performer());
lineEditComposer->setText(m_marker->get_composer());
- lineEditSongwriter->setText(m_marker->get_songwriter());
+ lineEditSheetwriter->setText(m_marker->get_sheetwriter());
lineEditArranger->setText(m_marker->get_arranger());
lineEditMessage->setText(m_marker->get_message());
lineEditIsrc->setText(m_marker->get_isrc());
@@ -268,13 +268,13 @@
markersTreeWidget->sortItems(1, Qt::AscendingOrder);
}
-// find the marker based on it's id. Since each song has it's own timeline,
-// we need to iterate over all songs
+// find the marker based on it's id. Since each sheet has it's own timeline,
+// we need to iterate over all sheets
Marker * MarkerDialog::get_marker(qint64 id)
{
- foreach(Song* song, m_project->get_songs()) {
+ foreach(Sheet* sheet, m_project->get_sheets()) {
- TimeLine* tl = song->get_timeline();
+ TimeLine* tl = sheet->get_timeline();
foreach(Marker* marker, tl->get_markers()) {
if (marker->get_id() == id) {
@@ -311,9 +311,9 @@
next_item(lineEditArranger);
}
-void MarkerDialog::songwriter_enter()
+void MarkerDialog::sheetwriter_enter()
{
- next_item(lineEditSongwriter);
+ next_item(lineEditSheetwriter);
}
void MarkerDialog::message_enter()
@@ -417,11 +417,11 @@
}
}
-void MarkerDialog::songwriter_all()
+void MarkerDialog::sheetwriter_all()
{
- QString str = lineEditSongwriter->text();
- if (QMessageBox::question(this, tr("Set all Songwriters"),
- tr("Do you really want to set all
songwriters to\n\"")
+ QString str = lineEditSheetwriter->text();
+ if (QMessageBox::question(this, tr("Set all Sheetwriters"),
+ tr("Do you really want to set all
sheetwriters to\n\"")
+str+"\"?", QMessageBox::Yes |
QMessageBox::No,
QMessageBox::Yes) == QMessageBox::No)
{
@@ -431,7 +431,7 @@
for (int i = 0; i < markersTreeWidget->topLevelItemCount(); ++i) {
QTreeWidgetItem *it = markersTreeWidget->topLevelItem(i);
Marker *m = get_marker(it->data(0, Qt::UserRole).toLongLong());
- m->set_songwriter(str);
+ m->set_sheetwriter(str);
}
}
@@ -499,7 +499,7 @@
}
}
-void MarkerDialog::update_songs()
+void MarkerDialog::update_sheets()
{
// this one does all we need
set_project(m_project);
@@ -516,8 +516,8 @@
return;
}
- Song *song = m_songlist.at(comboBoxDisplaySong->currentIndex());
- TimeLine* tl = song->get_timeline();
+ Sheet *sheet = m_sheetlist.at(comboBoxDisplaySheet->currentIndex());
+ TimeLine* tl = sheet->get_timeline();
AddRemove *ar = (AddRemove*) tl->remove_marker(m_marker);
Command::process_command(ar);
@@ -551,14 +551,14 @@
out << " <hr>\n";
out << " <table>\n <tr><th>Position
(mm:ss:frames)</th><th>Title</th>\n";
- if (comboBoxDisplaySong->currentIndex() >= m_songlist.size()) {
+ if (comboBoxDisplaySheet->currentIndex() >= m_sheetlist.size()) {
return;
}
- int i = comboBoxDisplaySong->currentIndex();
- Song *song = m_songlist.at(i);
+ int i = comboBoxDisplaySheet->currentIndex();
+ Sheet *sheet = m_sheetlist.at(i);
- TimeLine* tl = song->get_timeline();
+ TimeLine* tl = sheet->get_timeline();
foreach(Marker* marker, tl->get_markers()) {
QString name = marker->get_description();
QString pos = timeref_to_cd(marker->get_when());
Index: MarkerDialog.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MarkerDialog.h 30 Nov 2007 19:35:44 -0000 1.5
+++ MarkerDialog.h 21 Jan 2008 16:25:16 -0000 1.6
@@ -27,7 +27,7 @@
class Project;
class Marker;
-class Song;
+class Sheet;
class MarkerDialog : public QDialog, protected Ui::MarkerDialog
{
@@ -37,13 +37,13 @@
MarkerDialog(QWidget* parent = 0);
~MarkerDialog() {};
- void song_to_be_showed(Song* song);
+ void sheet_to_be_showed(Sheet* sheet);
private:
Project* m_project;
Marker* m_marker;
- QList<Song*> m_songlist;
+ QList<Sheet*> m_sheetlist;
Marker* get_marker(qint64);
void next_item(QLineEdit *);
@@ -54,7 +54,7 @@
void item_changed(QTreeWidgetItem *, QTreeWidgetItem *);
void description_changed(const QString &);
void position_changed(const QString &);
- void update_songs();
+ void update_sheets();
void remove_marker();
void export_toc();
@@ -63,7 +63,7 @@
void performer_enter();
void composer_enter();
void arranger_enter();
- void songwriter_enter();
+ void sheetwriter_enter();
void message_enter();
void isrc_enter();
@@ -71,7 +71,7 @@
void performer_all();
void composer_all();
void arranger_all();
- void songwriter_all();
+ void sheetwriter_all();
void message_all();
void copy_all();
void pemph_all();
Index: project/NewProjectDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewProjectDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- project/NewProjectDialog.cpp 25 May 2007 04:13:12 -0000 1.3
+++ project/NewProjectDialog.cpp 21 Jan 2008 16:25:16 -0000 1.4
@@ -46,7 +46,7 @@
: QDialog(parent)
{
setupUi(this);
- trackCountSpinBox->setValue(config().get_property("Song",
"trackCreationCount", 4).toInt());
+ trackCountSpinBox->setValue(config().get_property("Sheet",
"trackCreationCount", 4).toInt());
use_template_checkbox_state_changed(Qt::Unchecked);
update_template_combobox();
@@ -88,7 +88,7 @@
}
}
- int numSongs = songCountSpinBox->value();
+ int numSheets = sheetCountSpinBox->value();
int numTracks = trackCountSpinBox->value();
int index = templateComboBox->currentIndex();
@@ -104,7 +104,7 @@
templateComboBox->itemText(index) + ".tpt",
title);
} else {
- project = pm().create_new_project(numSongs, numTracks, title);
+ project = pm().create_new_project(numSheets, numTracks, title);
}
if (! project) {
Index: project/NewTrackDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewTrackDialog.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- project/NewTrackDialog.cpp 25 May 2007 04:13:12 -0000 1.2
+++ project/NewTrackDialog.cpp 21 Jan 2008 16:25:17 -0000 1.3
@@ -45,8 +45,8 @@
return;
}
- Song* song = m_project->get_current_song();
- if ( ! song ) {
+ Sheet* sheet = m_project->get_current_sheet();
+ if ( ! sheet ) {
return ;
}
@@ -57,12 +57,12 @@
title = "Untitled";
}
- CommandGroup* group = new CommandGroup(song, "");
+ CommandGroup* group = new CommandGroup(sheet, "");
for (int i=0; i<count; ++i) {
- Track* track = new Track(song, "Unnamed",
Track::INITIAL_HEIGHT);
+ Track* track = new Track(sheet, "Unnamed",
Track::INITIAL_HEIGHT);
track->set_name(title);
- group->add_command(song->add_track(track));
+ group->add_command(sheet->add_track(track));
}
group->setText(tr("Added %n Track(s)", "", count));
Index: project/OpenProjectDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- project/OpenProjectDialog.cpp 5 Nov 2007 15:54:32 -0000 1.14
+++ project/OpenProjectDialog.cpp 21 Jan 2008 16:25:17 -0000 1.15
@@ -103,17 +103,17 @@
qint64 id = e.attribute( "id", "" ).toLongLong();
- QDomNode songsNode = docElem.firstChildElement("Sheets");
- QDomNode songNode = songsNode.firstChild();
- int songCounter = 0;
+ QDomNode sheetsNode = docElem.firstChildElement("Sheets");
+ QDomNode sheetNode = sheetsNode.firstChild();
+ int sheetCounter = 0;
- // count to get Songs number....
- while(!songNode.isNull()) {
- songCounter++;
- songNode = songNode.nextSibling();
+ // count to get Sheets number....
+ while(!sheetNode.isNull()) {
+ sheetCounter++;
+ sheetNode = sheetNode.nextSibling();
}
- QString sNumSongs = QString::number(songCounter);
+ QString sNumSheets = QString::number(sheetCounter);
/*********** TO HERE THIS CODE IS DUPLICATE FROM THAT IN
PROJECT.CC :-(
Don't know if this is avoidable at all *********/
@@ -147,7 +147,7 @@
}
item->setText(0, title);
- item->setText(1, sNumSongs);
+ item->setText(1, sNumSheets);
}
}
Index: project/ProjectManagerDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- project/ProjectManagerDialog.cpp 5 Nov 2007 15:54:32 -0000 1.22
+++ project/ProjectManagerDialog.cpp 21 Jan 2008 16:25:17 -0000 1.23
@@ -29,7 +29,7 @@
#include <QFile>
#include <QDir>
#include <QMessageBox>
-#include <dialogs/project/NewSongDialog.h>
+#include <dialogs/project/NewSheetDialog.h>
#include <Interface.h>
// Always put me below _all_ includes, this is needed
@@ -41,13 +41,13 @@
{
setupUi(this);
- treeSongWidget->setColumnCount(3);
- treeSongWidget->header()->resizeSection(0, 160);
- treeSongWidget->header()->resizeSection(1, 55);
- treeSongWidget->header()->resizeSection(2, 70);
+ treeSheetWidget->setColumnCount(3);
+ treeSheetWidget->header()->resizeSection(0, 160);
+ treeSheetWidget->header()->resizeSection(1, 55);
+ treeSheetWidget->header()->resizeSection(2, 70);
QStringList stringList;
stringList << "Sheet Name" << "Tracks" << "Length";
- treeSongWidget->setHeaderLabels(stringList);
+ treeSheetWidget->setHeaderLabels(stringList);
set_project(pm().get_project());
@@ -56,7 +56,7 @@
buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
- connect(treeSongWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
this, SLOT(songitem_clicked(QTreeWidgetItem*,int)));
+ connect(treeSheetWidget, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
this, SLOT(sheetitem_clicked(QTreeWidgetItem*,int)));
connect(&pm(), SIGNAL(projectLoaded(Project*)), this,
SLOT(set_project(Project*)));
}
@@ -68,8 +68,8 @@
m_project = project;
if (m_project) {
- connect(m_project, SIGNAL(songAdded(Song*)), this,
SLOT(update_song_list()));
- connect(m_project, SIGNAL(songRemoved(Song*)), this,
SLOT(update_song_list()));
+ connect(m_project, SIGNAL(sheetAdded(Sheet*)), this,
SLOT(update_sheet_list()));
+ connect(m_project, SIGNAL(sheetRemoved(Sheet*)), this,
SLOT(update_sheet_list()));
connect(m_project->get_history_stack(), SIGNAL(redoTextChanged
( const QString &)),
this, SLOT(redo_text_changed(const QString&)));
connect(m_project->get_history_stack(), SIGNAL(undoTextChanged
( const QString &)),
@@ -81,107 +81,107 @@
lineEditUPC->setText(m_project->get_upc_ean());
lineEditPerformer->setText(m_project->get_performer());
lineEditArranger->setText(m_project->get_arranger());
- lineEditSongwriter->setText(m_project->get_songwriter());
+ lineEditSheetwriter->setText(m_project->get_sheetwriter());
lineEditMessage->setText(m_project->get_message());
comboBoxGenre->setCurrentIndex(m_project->get_genre());
redoButton->setText(m_project->get_history_stack()->redoText());
undoButton->setText(m_project->get_history_stack()->undoText());
} else {
setWindowTitle("Manage Project - No Project loaded!");
- treeSongWidget->clear();
+ treeSheetWidget->clear();
descriptionTextEdit->clear();
lineEditTitle->clear();
lineEditId->clear();
lineEditUPC->clear();
lineEditPerformer->clear();
lineEditArranger->clear();
- lineEditSongwriter->clear();
+ lineEditSheetwriter->clear();
lineEditMessage->clear();
comboBoxGenre->setCurrentIndex(0);
}
- update_song_list();
+ update_sheet_list();
}
-void ProjectManagerDialog::update_song_list( )
+void ProjectManagerDialog::update_sheet_list( )
{
if ( ! m_project) {
printf("ProjectManagerDialog:: no project ?\n");
return;
}
- treeSongWidget->clear();
- foreach(Song* song, m_project->get_songs()) {
+ treeSheetWidget->clear();
+ foreach(Sheet* sheet, m_project->get_sheets()) {
- QString songNr =
QString::number(m_project->get_song_index(song->get_id()));
- QString songName = "Sheet " + songNr + " - " +
song->get_title();
- QString numberOfTracks = QString::number(song->get_numtracks());
- QString songLength = timeref_to_ms_2(song->get_last_location());
- QString songStatus = song->is_changed()?"UnSaved":"Saved";
- QString songSpaceAllocated = "Unknown";
+ QString sheetNr =
QString::number(m_project->get_sheet_index(sheet->get_id()));
+ QString sheetName = "Sheet " + sheetNr + " - " +
sheet->get_title();
+ QString numberOfTracks =
QString::number(sheet->get_numtracks());
+ QString sheetLength =
timeref_to_ms_2(sheet->get_last_location());
+ QString sheetStatus = sheet->is_changed()?"UnSaved":"Saved";
+ QString sheetSpaceAllocated = "Unknown";
- QTreeWidgetItem* item = new QTreeWidgetItem(treeSongWidget);
+ QTreeWidgetItem* item = new QTreeWidgetItem(treeSheetWidget);
item->setTextAlignment(1, Qt::AlignHCenter);
item->setTextAlignment(2, Qt::AlignHCenter);
- item->setText(0, songName);
+ item->setText(0, sheetName);
item->setText(1, numberOfTracks);
- item->setText(2, songLength);
+ item->setText(2, sheetLength);
- item->setData(0, Qt::UserRole, song->get_id());
+ item->setData(0, Qt::UserRole, sheet->get_id());
}
}
-void ProjectManagerDialog::songitem_clicked( QTreeWidgetItem* item, int)
+void ProjectManagerDialog::sheetitem_clicked( QTreeWidgetItem* item, int)
{
if (!item) {
return;
}
- Song* song;
+ Sheet* sheet;
qint64 id = item->data(0, Qt::UserRole).toLongLong();
- song = m_project->get_song(id);
+ sheet = m_project->get_sheet(id);
- Q_ASSERT(song);
+ Q_ASSERT(sheet);
- selectedSongName->setText(song->get_title());
+ selectedSheetName->setText(sheet->get_title());
- m_project->set_current_song(song->get_id());
+ m_project->set_current_sheet(sheet->get_id());
}
-void ProjectManagerDialog::on_renameSongButton_clicked( )
+void ProjectManagerDialog::on_renameSheetButton_clicked( )
{
if( ! m_project) {
return;
}
- QTreeWidgetItem* item = treeSongWidget->currentItem();
+ QTreeWidgetItem* item = treeSheetWidget->currentItem();
if ( ! item) {
return;
}
qint64 id = item->data(0, Qt::UserRole).toLongLong();
- Song* song = m_project->get_song(id);
+ Sheet* sheet = m_project->get_sheet(id);
- Q_ASSERT(song);
+ Q_ASSERT(sheet);
- QString newtitle = selectedSongName->text();
+ QString newtitle = selectedSheetName->text();
if (newtitle.isEmpty()) {
info().information(tr("No new Sheet name was supplied!"));
return;
}
- song->set_title(newtitle);
+ sheet->set_title(newtitle);
- update_song_list();
+ update_sheet_list();
}
-void ProjectManagerDialog::on_deleteSongButton_clicked( )
+void ProjectManagerDialog::on_deleteSheetButton_clicked( )
{
- QTreeWidgetItem* item = treeSongWidget->currentItem();
+ QTreeWidgetItem* item = treeSheetWidget->currentItem();
if ( ! item ) {
return;
@@ -189,12 +189,12 @@
qint64 id = item->data(0, Qt::UserRole).toLongLong();
-
Command::process_command(m_project->remove_song(m_project->get_song(id)));
+
Command::process_command(m_project->remove_sheet(m_project->get_sheet(id)));
}
-void ProjectManagerDialog::on_createSongButton_clicked( )
+void ProjectManagerDialog::on_createSheetButton_clicked( )
{
- Interface::instance()->show_newsong_dialog();
+ Interface::instance()->show_newsheet_dialog();
}
void ProjectManagerDialog::redo_text_changed(const QString & text)
@@ -225,7 +225,7 @@
m_project->get_history_stack()->redo();
}
-void ProjectManagerDialog::on_songsExportButton_clicked()
+void ProjectManagerDialog::on_sheetsExportButton_clicked()
{
Interface::instance()->show_export_widget();
}
@@ -306,7 +306,7 @@
m_project->set_upc_ean(lineEditUPC->text());
m_project->set_performer(lineEditPerformer->text());
m_project->set_arranger(lineEditArranger->text());
- m_project->set_songwriter(lineEditSongwriter->text());
+ m_project->set_sheetwriter(lineEditSheetwriter->text());
m_project->set_message(lineEditMessage->text());
m_project->set_genre(comboBoxGenre->currentIndex());
@@ -326,7 +326,7 @@
lineEditUPC->setText(m_project->get_upc_ean());
lineEditPerformer->setText(m_project->get_performer());
lineEditArranger->setText(m_project->get_arranger());
- lineEditSongwriter->setText(m_project->get_songwriter());
+ lineEditSheetwriter->setText(m_project->get_sheetwriter());
lineEditMessage->setText(m_project->get_message());
comboBoxGenre->setCurrentIndex(m_project->get_genre());
@@ -353,7 +353,7 @@
#define tc_title textcodes[0x00]
#define tc_performer textcodes[0x01]
-#define tc_songwriter textcodes[0x02]
+#define tc_sheetwriter textcodes[0x02]
#define tc_composer textcodes[0x03]
#define tc_arranger textcodes[0x04]
#define tc_message textcodes[0x05]
Index: project/ProjectManagerDialog.h
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/ProjectManagerDialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- project/ProjectManagerDialog.h 3 Apr 2007 19:05:38 -0000 1.3
+++ project/ProjectManagerDialog.h 21 Jan 2008 16:25:17 -0000 1.4
@@ -26,7 +26,7 @@
#include <QDialog>
class Project;
-class Song;
+class Sheet;
class ProjectManagerDialog : public QDialog, protected Ui::ProjectManagerDialog
{
@@ -40,19 +40,19 @@
Project* m_project;
private slots:
- void update_song_list();
+ void update_sheet_list();
void set_project(Project* project);
- void songitem_clicked( QTreeWidgetItem* item, int);
- void on_renameSongButton_clicked();
- void on_deleteSongButton_clicked();
- void on_createSongButton_clicked();
+ void sheetitem_clicked( QTreeWidgetItem* item, int);
+ void on_renameSheetButton_clicked();
+ void on_deleteSheetButton_clicked();
+ void on_createSheetButton_clicked();
void redo_text_changed(const QString& text);
void undo_text_changed(const QString& text);
void on_undoButton_clicked();
void on_redoButton_clicked();
- void on_songsExportButton_clicked();
+ void on_sheetsExportButton_clicked();
void on_exportTemplateButton_clicked();
void accept();
Index: settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- settings/Pages.cpp 15 Jan 2008 19:51:49 -0000 1.34
+++ settings/Pages.cpp 21 Jan 2008 16:25:17 -0000 1.35
@@ -460,7 +460,7 @@
{
config().set_property("Project", "DefaultDirectory",
m_configpage->projectDirLineEdit->text());
config().set_property("Project", "loadLastUsed",
m_configpage->loadLastProjectCheckBox->isChecked());
- config().set_property("Song", "trackCreationCount",
m_configpage->numberOfTrackSpinBox->value());
+ config().set_property("Sheet", "trackCreationCount",
m_configpage->numberOfTrackSpinBox->value());
config().set_property("PlayHead", "Follow",
m_configpage->keepCursorVisibleCheckBox->isChecked());
config().set_property("PlayHead", "Scrollmode",
m_configpage->scrollModeComboBox->currentIndex());
config().set_property("AudioClip", "SyncDuringDrag",
m_configpage->resyncAudioCheckBox->isChecked());
@@ -481,7 +481,7 @@
QString dir = config().get_property("Project", "DefaultDirectory",
getenv("HOME")).toString();
bool loadLastUsedProject = config().get_property("Project",
"loadLastUsed", 1).toBool();
QString oncloseaction = config().get_property("Project", "onclose",
"save").toString();
- int defaultNumTracks = config().get_property("Song",
"trackCreationCount", 6).toInt();
+ int defaultNumTracks = config().get_property("Sheet",
"trackCreationCount", 6).toInt();
int scrollMode = config().get_property("PlayHead", "Scrollmode",
2).toInt();
bool resyncAudio = config().get_property("AudioClip", "SyncDuringDrag",
false).toBool();
bool lockClips = config().get_property("AudioClip", "LockByDefault",
false).toBool();
@@ -518,7 +518,7 @@
config().set_property("Project", "DefaultDirectory", getenv("HOME"));
config().set_property("Project", "loadLastUsed", true);
config().set_property("Project", "onclose", "save");
- config().set_property("Song", "trackCreationCount", 6);
+ config().set_property("Sheet", "trackCreationCount", 6);
config().set_property("PlayHead", "Follow", 0);
config().set_property("PlayHead", "Scrollmode", 2);
config().set_property("AudioClip", "SyncDuringDrag", false);
Index: settings/SettingsDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- settings/SettingsDialog.cpp 22 Nov 2007 19:11:16 -0000 1.10
+++ settings/SettingsDialog.cpp 21 Jan 2008 16:25:17 -0000 1.11
@@ -91,7 +91,7 @@
void SettingsDialog::createIcons()
{
QListWidgetItem* behaviorButton = new QListWidgetItem(contentsWidget);
- behaviorButton->setIcon(QIcon(":/songmanagement"));
+ behaviorButton->setIcon(QIcon(":/sheetmanagement"));
behaviorButton->setTextAlignment(Qt::AlignHCenter);
behaviorButton->setText(tr("Behavior"));
behaviorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
Index: project/NewSheetDialog.cpp
===================================================================
RCS file: project/NewSheetDialog.cpp
diff -N project/NewSheetDialog.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ project/NewSheetDialog.cpp 21 Jan 2008 16:25:16 -0000 1.1
@@ -0,0 +1,144 @@
+/*
+Copyright (C) 2007 Remon Sijrier
+
+This file is part of Traverso
+
+Traverso is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+*/
+
+
+#include "NewSheetDialog.h"
+
+#include <libtraversocore.h>
+#include <CommandGroup.h>
+#include <QPushButton>
+
+NewSheetDialog::NewSheetDialog(QWidget * parent)
+ : QDialog(parent)
+{
+ setupUi(this);
+
+ trackCountSpinBox->setValue(config().get_property("Sheet",
"trackCreationCount", 4).toInt());
+
+ set_project(pm().get_project());
+
+ use_template_checkbox_state_changed(Qt::Unchecked);
+
+ buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+
+ connect(&pm(), SIGNAL(projectLoaded(Project*)), this,
SLOT(set_project(Project*)));
+ connect(useTemplateCheckBox, SIGNAL(stateChanged (int)), this,
SLOT(use_template_checkbox_state_changed(int)));
+}
+
+void NewSheetDialog::accept()
+{
+ if (! m_project) {
+ info().information(tr("I can't create a new Sheet if there is
no Project loaded!!"));
+ return;
+ }
+
+ int count = countSpinBox->value();
+ int trackcount = trackCountSpinBox->value();
+ QString title = titleLineEdit->text();
+
+ if (title.isEmpty()) {
+ title = "Untitled";
+ }
+
+ int index = templateComboBox->currentIndex();
+ bool usetemplate = false;
+ QDomNode node;
+ if (useTemplateCheckBox->isChecked() && index >= 0) {
+ usetemplate = true;
+ Sheet* templatesheet =
m_project->get_sheet(templateComboBox->itemData(index).toLongLong());
+ Q_ASSERT(templatesheet);
+ QDomDocument doc("Sheet");
+ node = templatesheet->get_state(doc, usetemplate);
+ }
+
+ CommandGroup* group = new CommandGroup(m_project, "");
+
+ Sheet* firstNewSheet = 0;
+
+ for (int i=0; i<count; ++i) {
+ Sheet* sheet;
+ if (usetemplate) {
+ sheet = new Sheet(m_project);
+ sheet->set_state(node);
+ } else {
+ sheet = new Sheet(m_project, trackcount);
+ }
+ sheet->set_title(title);
+ group->add_command(m_project->add_sheet(sheet));
+ if (i == 0) {
+ firstNewSheet = sheet;
+ }
+ }
+
+ group->setText(tr("Added %n Sheet(s)", "", count));
+ Command::process_command(group);
+
+ if (firstNewSheet) {
+ m_project->set_current_sheet(firstNewSheet->get_id());
+ }
+
+ hide();
+}
+
+void NewSheetDialog::set_project(Project * project)
+{
+ m_project = project;
+
+ if (! m_project) {
+ templateComboBox->clear();
+ return;
+ }
+
+ connect(m_project, SIGNAL(sheetAdded(Sheet*)), this,
SLOT(update_template_combo()));
+ connect(m_project, SIGNAL(sheetRemoved(Sheet*)), this,
SLOT(update_template_combo()));
+
+ update_template_combo();
+}
+
+void NewSheetDialog::reject()
+{
+ hide();
+}
+
+void NewSheetDialog::update_template_combo()
+{
+ templateComboBox->clear();
+
+ foreach(Sheet* sheet, m_project->get_sheets()) {
+ QString text = "Sheet " +
QString::number(m_project->get_sheet_index(sheet->get_id())) +
+ " " + sheet->get_title();
+
+ templateComboBox->addItem(text, sheet->get_id());
+ connect(sheet, SIGNAL(propertyChanged()), this,
SLOT(update_template_combo()));
+ }
+}
+
+void NewSheetDialog::use_template_checkbox_state_changed(int state)
+{
+ if (state == Qt::Checked) {
+ templateComboBox->setEnabled(true);
+ trackCountSpinBox->setEnabled(false);
+ } else {
+ templateComboBox->setEnabled(false);
+ trackCountSpinBox->setEnabled(true);
+ }
+}
+
Index: project/NewSheetDialog.h
===================================================================
RCS file: project/NewSheetDialog.h
diff -N project/NewSheetDialog.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ project/NewSheetDialog.h 21 Jan 2008 16:25:17 -0000 1.1
@@ -0,0 +1,53 @@
+/*
+Copyright (C) 2007 Remon Sijrier
+
+This file is part of Traverso
+
+Traverso is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+*/
+
+#ifndef NEW_SONG_DIALOG_H
+#define NEW_SONG_DIALOG_H
+
+#include "ui_NewSheetDialog.h"
+
+#include <QDialog>
+
+class Project;
+
+class NewSheetDialog : public QDialog, protected Ui::NewSheetDialog
+{
+ Q_OBJECT
+
+public:
+ NewSheetDialog(QWidget* parent = 0);
+ ~NewSheetDialog() {};
+
+
+private:
+ Project* m_project;
+
+
+private slots:
+ void accept();
+ void reject();
+ void set_project(Project* project);
+ void update_template_combo();
+ void use_template_checkbox_state_changed(int state);
+
+};
+
+#endif
Index: project/NewSongDialog.cpp
===================================================================
RCS file: project/NewSongDialog.cpp
diff -N project/NewSongDialog.cpp
--- project/NewSongDialog.cpp 13 Aug 2007 00:26:34 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,144 +0,0 @@
-/*
-Copyright (C) 2007 Remon Sijrier
-
-This file is part of Traverso
-
-Traverso is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-*/
-
-
-#include "NewSongDialog.h"
-
-#include <libtraversocore.h>
-#include <CommandGroup.h>
-#include <QPushButton>
-
-NewSongDialog::NewSongDialog(QWidget * parent)
- : QDialog(parent)
-{
- setupUi(this);
-
- trackCountSpinBox->setValue(config().get_property("Song",
"trackCreationCount", 4).toInt());
-
- set_project(pm().get_project());
-
- use_template_checkbox_state_changed(Qt::Unchecked);
-
- buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-
- connect(&pm(), SIGNAL(projectLoaded(Project*)), this,
SLOT(set_project(Project*)));
- connect(useTemplateCheckBox, SIGNAL(stateChanged (int)), this,
SLOT(use_template_checkbox_state_changed(int)));
-}
-
-void NewSongDialog::accept()
-{
- if (! m_project) {
- info().information(tr("I can't create a new Sheet if there is
no Project loaded!!"));
- return;
- }
-
- int count = countSpinBox->value();
- int trackcount = trackCountSpinBox->value();
- QString title = titleLineEdit->text();
-
- if (title.isEmpty()) {
- title = "Untitled";
- }
-
- int index = templateComboBox->currentIndex();
- bool usetemplate = false;
- QDomNode node;
- if (useTemplateCheckBox->isChecked() && index >= 0) {
- usetemplate = true;
- Song* templatesong =
m_project->get_song(templateComboBox->itemData(index).toLongLong());
- Q_ASSERT(templatesong);
- QDomDocument doc("Sheet");
- node = templatesong->get_state(doc, usetemplate);
- }
-
- CommandGroup* group = new CommandGroup(m_project, "");
-
- Song* firstNewSong = 0;
-
- for (int i=0; i<count; ++i) {
- Song* song;
- if (usetemplate) {
- song = new Song(m_project);
- song->set_state(node);
- } else {
- song = new Song(m_project, trackcount);
- }
- song->set_title(title);
- group->add_command(m_project->add_song(song));
- if (i == 0) {
- firstNewSong = song;
- }
- }
-
- group->setText(tr("Added %n Sheet(s)", "", count));
- Command::process_command(group);
-
- if (firstNewSong) {
- m_project->set_current_song(firstNewSong->get_id());
- }
-
- hide();
-}
-
-void NewSongDialog::set_project(Project * project)
-{
- m_project = project;
-
- if (! m_project) {
- templateComboBox->clear();
- return;
- }
-
- connect(m_project, SIGNAL(songAdded(Song*)), this,
SLOT(update_template_combo()));
- connect(m_project, SIGNAL(songRemoved(Song*)), this,
SLOT(update_template_combo()));
-
- update_template_combo();
-}
-
-void NewSongDialog::reject()
-{
- hide();
-}
-
-void NewSongDialog::update_template_combo()
-{
- templateComboBox->clear();
-
- foreach(Song* song, m_project->get_songs()) {
- QString text = "Sheet " +
QString::number(m_project->get_song_index(song->get_id())) +
- " " + song->get_title();
-
- templateComboBox->addItem(text, song->get_id());
- connect(song, SIGNAL(propertyChanged()), this,
SLOT(update_template_combo()));
- }
-}
-
-void NewSongDialog::use_template_checkbox_state_changed(int state)
-{
- if (state == Qt::Checked) {
- templateComboBox->setEnabled(true);
- trackCountSpinBox->setEnabled(false);
- } else {
- templateComboBox->setEnabled(false);
- trackCountSpinBox->setEnabled(true);
- }
-}
-
Index: project/NewSongDialog.h
===================================================================
RCS file: project/NewSongDialog.h
diff -N project/NewSongDialog.h
--- project/NewSongDialog.h 3 Apr 2007 19:05:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-/*
-Copyright (C) 2007 Remon Sijrier
-
-This file is part of Traverso
-
-Traverso is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-*/
-
-#ifndef NEW_SONG_DIALOG_H
-#define NEW_SONG_DIALOG_H
-
-#include "ui_NewSongDialog.h"
-
-#include <QDialog>
-
-class Project;
-
-class NewSongDialog : public QDialog, protected Ui::NewSongDialog
-{
- Q_OBJECT
-
-public:
- NewSongDialog(QWidget* parent = 0);
- ~NewSongDialog() {};
-
-
-private:
- Project* m_project;
-
-
-private slots:
- void accept();
- void reject();
- void set_project(Project* project);
- void update_template_combo();
- void use_template_checkbox_state_changed(int state);
-
-};
-
-#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/traverso/dialogs BusSelectorDialog...,
Remon Sijrier <=