[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso dialogs/project/NewSongDi...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src/traverso dialogs/project/NewSongDi... |
|
Date: |
Thu, 24 May 2007 11:53:25 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/05/24 11:53:25
Modified files:
src/traverso/dialogs/project: NewSongDialog.cpp
OpenProjectDialog.cpp
ProjectManagerDialog.cpp
src/traverso : Interface.cpp
src/traverso/songcanvas: SongWidget.cpp
src/traverso/ui: BehaviorConfigPage.ui ExportWidget.ui
NewProjectDialog.ui NewSongDialog.ui
ProjectManagerDialog.ui
src/traverso/widgets: InfoWidgets.cpp
Log message:
* Renamed occurrences of Song in the GUI to Sheet
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewSongDialog.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongWidget.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/BehaviorConfigPage.ui?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ExportWidget.ui?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/NewProjectDialog.ui?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/NewSongDialog.ui?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ProjectManagerDialog.ui?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.30&r2=1.31
Patches:
Index: dialogs/project/NewSongDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewSongDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- dialogs/project/NewSongDialog.cpp 5 Apr 2007 13:15:06 -0000 1.4
+++ dialogs/project/NewSongDialog.cpp 24 May 2007 11:53:24 -0000 1.5
@@ -43,7 +43,7 @@
void NewSongDialog::accept()
{
if (! m_project) {
- info().information(tr("I can't create a new Song if there is no
Project loaded!!"));
+ info().information(tr("I can't create a new Sheet if there is
no Project loaded!!"));
return;
}
@@ -62,7 +62,7 @@
usetemplate = true;
Song* templatesong =
m_project->get_song(templateComboBox->itemData(index).toLongLong());
Q_ASSERT(templatesong);
- QDomDocument doc("Song");
+ QDomDocument doc("Sheet");
node = templatesong->get_state(doc, usetemplate);
}
@@ -80,7 +80,7 @@
group->add_command(m_project->add_song(song));
}
- group->setText(tr("Added %n Song(s)", "", count));
+ group->setText(tr("Added %n Sheet(s)", "", count));
Command::process_command(group);
hide();
@@ -111,7 +111,7 @@
templateComboBox->clear();
foreach(Song* song, m_project->get_songs()) {
- QString text = "Song " +
QString::number(m_project->get_song_index(song->get_id())) +
+ QString text = "Sheet " +
QString::number(m_project->get_song_index(song->get_id())) +
" " + song->get_title();
templateComboBox->addItem(text, song->get_id());
Index: dialogs/project/OpenProjectDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- dialogs/project/OpenProjectDialog.cpp 21 May 2007 08:49:46 -0000
1.5
+++ dialogs/project/OpenProjectDialog.cpp 24 May 2007 11:53:24 -0000
1.6
@@ -48,7 +48,7 @@
projectListView->setColumnCount(2);
update_projects_list();
QStringList stringList;
- stringList << "Project Name" << "Songs";
+ stringList << "Project Name" << "Sheets";
projectListView->setHeaderLabels(stringList);
projectListView->header()->resizeSection(0, 160);
Index: dialogs/project/ProjectManagerDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- dialogs/project/ProjectManagerDialog.cpp 10 May 2007 21:08:29 -0000
1.15
+++ dialogs/project/ProjectManagerDialog.cpp 24 May 2007 11:53:24 -0000
1.16
@@ -46,7 +46,7 @@
treeSongWidget->header()->resizeSection(1, 55);
treeSongWidget->header()->resizeSection(2, 70);
QStringList stringList;
- stringList << "Song Name" << "Tracks" << "Length";
+ stringList << "Sheet Name" << "Tracks" << "Length";
treeSongWidget->setHeaderLabels(stringList);
set_project(pm().get_project());
@@ -113,7 +113,7 @@
foreach(Song* song, m_project->get_songs()) {
QString songNr =
QString::number(m_project->get_song_index(song->get_id()));
- QString songName = "Song " + songNr + " - " + song->get_title();
+ QString songName = "Sheet " + songNr + " - " +
song->get_title();
QString numberOfTracks = QString::number(song->get_numtracks());
QString songLength = frame_to_ms_2(song->get_last_frame(),
song->get_rate());
QString songStatus = song->is_changed()?"UnSaved":"Saved";
@@ -168,7 +168,7 @@
QString newtitle = selectedSongName->text();
if (newtitle.isEmpty()) {
- info().information(tr("No new Song name was supplied!"));
+ info().information(tr("No new Sheet name was supplied!"));
return;
}
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- Interface.cpp 15 May 2007 20:06:31 -0000 1.82
+++ Interface.cpp 24 May 2007 11:53:25 -0000 1.83
@@ -365,12 +365,12 @@
connect(action, SIGNAL(triggered( bool )), &pm(), SLOT(exit()));
- menu = menuBar()->addMenu(tr("&Song"));
+ menu = menuBar()->addMenu(tr("&Sheet"));
m_songMenuAction = menu->menuAction();
action = menu->addAction(tr("New &Track(s)..."));
connect(action, SIGNAL(triggered()), this,
SLOT(show_newtrack_dialog()));
- action = menu->addAction(tr("New &Song(s)..."));
+ action = menu->addAction(tr("New &Sheet(s)..."));
connect(action, SIGNAL(triggered()), this, SLOT(show_newsong_dialog()));
menu->addSeparator();
@@ -400,7 +400,7 @@
menu->addSeparator();
menu->addAction(m_infoBar->toggleViewAction());
- m_infoBar->toggleViewAction()->setText(tr("Song Toolbar"));
+ m_infoBar->toggleViewAction()->setText(tr("Sheet Toolbar"));
menu->addAction(m_sysinfo->toggleViewAction());
m_sysinfo->toggleViewAction()->setText(tr("System Information"));
Index: songcanvas/SongWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongWidget.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- songcanvas/SongWidget.cpp 17 May 2007 12:45:20 -0000 1.18
+++ songcanvas/SongWidget.cpp 24 May 2007 11:53:25 -0000 1.19
@@ -154,7 +154,7 @@
painter->setPen(themer()->get_color("TrackPanel:text"));
painter->setFont(themer()->get_font("TrackPanel:fontscale:led"));
- painter->drawText(10, 11, "Song: " + m_song->get_title());
+ painter->drawText(10, 11, "Sheet: " + m_song->get_title());
QColor color =
QColor(Qt::darkGray);//themer()->get_color("Track:cliptopoffset");
painter->setPen(color);
Index: ui/BehaviorConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/BehaviorConfigPage.ui,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ui/BehaviorConfigPage.ui 17 May 2007 15:54:30 -0000 1.6
+++ ui/BehaviorConfigPage.ui 24 May 2007 11:53:25 -0000 1.7
@@ -145,7 +145,7 @@
<item>
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
- <string>New Song Settings</string>
+ <string>New Sheet Settings</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
Index: ui/ExportWidget.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ExportWidget.ui,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ui/ExportWidget.ui 23 May 2007 17:51:45 -0000 1.14
+++ ui/ExportWidget.ui 24 May 2007 11:53:25 -0000 1.15
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>410</width>
- <height>387</height>
+ <height>423</height>
</rect>
</property>
<property name="minimumSize" >
@@ -92,7 +92,7 @@
<item>
<widget class="QLabel" name="label_6" >
<property name="text" >
- <string>Song(s) to render</string>
+ <string>Sheet(s) to render</string>
</property>
</widget>
</item>
@@ -471,7 +471,7 @@
<item>
<widget class="QLabel" name="label_7" >
<property name="text" >
- <string>Song(s) to render</string>
+ <string>Sheet(s) to render</string>
</property>
</widget>
</item>
Index: ui/NewProjectDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/NewProjectDialog.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ui/NewProjectDialog.ui 23 Apr 2007 11:56:52 -0000 1.2
+++ ui/NewProjectDialog.ui 24 May 2007 11:53:25 -0000 1.3
@@ -161,7 +161,7 @@
</sizepolicy>
</property>
<property name="text" >
- <string>Song count</string>
+ <string>Sheet count</string>
</property>
</widget>
</item>
@@ -210,7 +210,7 @@
</sizepolicy>
</property>
<property name="text" >
- <string>Tracks per Song</string>
+ <string>Tracks per Sheet</string>
</property>
</widget>
</item>
Index: ui/NewSongDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/NewSongDialog.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui/NewSongDialog.ui 3 Apr 2007 14:17:50 -0000 1.1
+++ ui/NewSongDialog.ui 24 May 2007 11:53:25 -0000 1.2
@@ -41,14 +41,14 @@
<item>
<widget class="QLabel" name="label" >
<property name="text" >
- <string>New Song name</string>
+ <string>New Sheet name</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
- <string>Song count</string>
+ <string>Sheet count</string>
</property>
</widget>
</item>
Index: ui/ProjectManagerDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ProjectManagerDialog.ui,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ui/ProjectManagerDialog.ui 10 May 2007 22:26:32 -0000 1.12
+++ ui/ProjectManagerDialog.ui 24 May 2007 11:53:25 -0000 1.13
@@ -28,7 +28,7 @@
<item>
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tab_4" >
<attribute name="title" >
@@ -162,7 +162,7 @@
<item>
<widget class="QPushButton" name="songsExportButton" >
<property name="text" >
- <string>Song(s)</string>
+ <string>Sheet(s)</string>
</property>
</widget>
</item>
@@ -209,7 +209,7 @@
</widget>
<widget class="QWidget" name="tab" >
<attribute name="title" >
- <string>Songs</string>
+ <string>Sheets</string>
</attribute>
<layout class="QHBoxLayout" >
<property name="margin" >
@@ -236,7 +236,7 @@
</property>
<column>
<property name="text" >
- <string>Song Name</string>
+ <string>Sheet Name</string>
</property>
</column>
<column>
@@ -262,7 +262,7 @@
<item>
<widget class="QGroupBox" name="groupBox_4" >
<property name="title" >
- <string>Selected Song</string>
+ <string>Selected Sheet</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
@@ -330,7 +330,7 @@
<item>
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
- <string>New Song</string>
+ <string>New Sheet</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
@@ -350,7 +350,7 @@
<item>
<widget class="QPushButton" name="createSongButton" >
<property name="text" >
- <string>Create new Song</string>
+ <string>Create new Sheet</string>
</property>
</widget>
</item>
Index: widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- widgets/InfoWidgets.cpp 17 May 2007 19:59:29 -0000 1.30
+++ widgets/InfoWidgets.cpp 24 May 2007 11:53:25 -0000 1.31
@@ -521,7 +521,7 @@
{
m_songselectbox = new QComboBox(this);
m_songselectbox->setMinimumWidth(140);
- m_songselectbox->setToolTip(tr("Select Song to be displayed"));
+ m_songselectbox->setToolTip(tr("Select Sheet to be displayed"));
connect(m_songselectbox, SIGNAL(activated(int)), this,
SLOT(song_selector_index_changed(int)));
m_playhead = new PlayHeadInfo(this);
@@ -717,7 +717,7 @@
{
m_songselectbox->clear();
foreach(Song* song, m_project->get_songs()) {
- m_songselectbox->addItem("Song " +
+ m_songselectbox->addItem("Sheet " +
QString::number(m_project->get_song_index(song->get_id())) +
": " + song->get_title(),
song->get_id());
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/traverso dialogs/project/NewSongDi...,
Remon Sijrier <=