[Traverso-commit] traverso/src core/Marker.cpp core/Marker.h core...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/01/01 11:30:26

Modified files:
        src/core       : Marker.cpp Marker.h Project.cpp Project.h 
                         Sheet.cpp 
        src/traverso/dialogs: MarkerDialog.cpp MarkerDialog.h 
        src/traverso/ui: MarkerDialog.ui ProjectManagerDialog.ui 

Log message:
        * Songwriter shouldn't have been renamed to Sheet!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Marker.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Marker.h?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.h?cvsroot=traverso&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Sheet.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.h?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/MarkerDialog.ui?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ProjectManagerDialog.ui?cvsroot=traverso&r1=1.16&r2=1.17

Patches:
Index: core/Marker.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Marker.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- core/Marker.cpp     7 Nov 2008 10:43:08 -0000       1.23
+++ core/Marker.cpp     1 Jan 2009 11:30:04 -0000       1.24
@@ -68,7 +68,7 @@
        domNode.setAttribute("id",  m_id);
        domNode.setAttribute("performer", m_performer);
        domNode.setAttribute("composer", m_composer);
-       domNode.setAttribute("sheetwriter", m_sheetwriter);
+       domNode.setAttribute("songwriter", m_songwriter);
        domNode.setAttribute("arranger", m_arranger);
        domNode.setAttribute("message", m_message);
        domNode.setAttribute("isrc", m_isrc);
@@ -97,7 +97,7 @@
        m_id = e.attribute("id", "0").toLongLong();
        m_performer = e.attribute("performer", "");
        m_composer = e.attribute("composer", "");
-       m_sheetwriter = e.attribute("sheetwriter", "");
+       m_songwriter = e.attribute("songwriter", "");
        m_arranger = e.attribute("arranger", "");
        m_message = e.attribute("message", "");
        m_isrc = e.attribute("isrc", "");
@@ -134,9 +134,9 @@
        m_composer = s;
 }
 
-void Marker::set_sheetwriter(const QString &s)
+void Marker::set_songwriter(const QString &s)
 {
-       m_sheetwriter = s;
+       m_songwriter = s;
 }
 
 void Marker::set_arranger(const QString &s)

Index: core/Marker.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Marker.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- core/Marker.h       5 Nov 2008 00:42:22 -0000       1.19
+++ core/Marker.h       1 Jan 2009 11:30:04 -0000       1.20
@@ -50,7 +50,7 @@
        void set_description(const QString &);
        void set_performer(const QString &);
        void set_composer(const QString &);
-       void set_sheetwriter(const QString &);
+       void set_songwriter(const QString &);
        void set_arranger(const QString &);
        void set_message(const QString &);
        void set_isrc(const QString &);
@@ -63,7 +63,7 @@
        QString get_description() const {return m_description;}
        QString get_performer() const {return m_performer;}
        QString get_composer() const {return m_composer;}
-       QString get_sheetwriter() const {return m_sheetwriter;}
+       QString get_songwriter() const {return m_songwriter;}
        QString get_arranger() const {return m_arranger;}
        QString get_message() const {return m_message;}
        QString get_isrc() const {return m_isrc;}
@@ -83,7 +83,7 @@
        QString m_description,
                m_performer,
                m_composer,
-               m_sheetwriter,
+               m_songwriter,
                m_arranger,
                m_message,
                m_isrc;

Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- core/Project.cpp    21 Jan 2008 16:22:14 -0000      1.66
+++ core/Project.cpp    1 Jan 2009 11:30:06 -0000       1.67
@@ -206,7 +206,7 @@
        m_genre = e.attribute( "genre", "" ).toInt();
        m_performer = e.attribute( "performer", "" );
        m_arranger = e.attribute( "arranger", "" );
-       m_sheetwriter = e.attribute( "sheetwriter", "" );
+       m_songwriter = e.attribute( "songwriter", "" );
        m_message = e.attribute( "message", "" );
        m_rate = e.attribute( "rate", "" ).toInt();
        m_bitDepth = e.attribute( "bitdepth", "" ).toInt();
@@ -295,7 +295,7 @@
        properties.setAttribute("genre", QString::number(m_genre));
        properties.setAttribute("performer", m_performer);
        properties.setAttribute("arranger", m_arranger);
-       properties.setAttribute("sheetwriter", m_sheetwriter);
+       properties.setAttribute("songwriter", m_songwriter);
        properties.setAttribute("message", m_message);
        properties.setAttribute("currentsheetid", m_currentSheetId);
        properties.setAttribute("rate", m_rate);
@@ -395,9 +395,9 @@
        m_arranger = pArranger;
 }
 
-void Project::set_sheetwriter(const QString& pSheetwriter)
+void Project::set_songwriter(const QString& sw)
 {
-       m_sheetwriter = pSheetwriter;
+       m_songwriter = sw;
 }
 
 void Project::set_message(const QString& pMessage)
@@ -662,7 +662,7 @@
        output += "    UPC_EAN \"" + get_upc_ean() + "\"\n\n";
 
        output += "    ARRANGER \"" + get_arranger() + "\"\n";
-       output += "    SONGWRITER \"" + get_sheetwriter() + "\"\n";
+       output += "    SONGWRITER \"" + get_songwriter() + "\"\n";
        output += "    MESSAGE \"" + get_message() + "\"\n";
        output += "    GENRE \"" + QString::number(get_genre()) + "\"\n  
}\n}\n\n";
 
@@ -792,9 +792,9 @@
        return m_arranger;
 }
 
-QString Project::get_sheetwriter() const
+QString Project::get_songwriter() const
 {
-       return m_sheetwriter;
+       return m_songwriter;
 }
 
 QString Project::get_message() const

Index: core/Project.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- core/Project.h      21 Jan 2008 16:22:14 -0000      1.30
+++ core/Project.h      1 Jan 2009 11:30:09 -0000       1.31
@@ -54,7 +54,7 @@
        QString get_discid() const;
        QString get_performer() const;
        QString get_arranger() const;
-       QString get_sheetwriter() const;
+       QString get_songwriter() const;
        QString get_message() const;
        QString get_upc_ean() const;
        int get_genre();
@@ -76,7 +76,7 @@
        void set_discid(const QString& pId);
        void set_performer(const QString& pPerformer);
        void set_arranger(const QString& pArranger);
-       void set_sheetwriter(const QString& pSheetwriter);
+       void set_songwriter(const QString& sw);
        void set_message(const QString& pMessage);
        void set_upc_ean(const QString& pUPC);
        void set_genre(int pGenre);
@@ -126,7 +126,7 @@
        QString         m_upcEan;
        QString         m_performer;
        QString         m_arranger;
-       QString         m_sheetwriter;
+       QString         m_songwriter;
        QString         m_message;
        QString         m_errorString;
 

Index: core/Sheet.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Sheet.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- core/Sheet.cpp      29 Dec 2008 20:56:00 -0000      1.16
+++ core/Sheet.cpp      1 Jan 2009 11:30:12 -0000       1.17
@@ -928,7 +928,7 @@
                output += "      PERFORMER \"" + startmarker->get_performer() + 
"\"\n";
                output += "      ISRC \"" + startmarker->get_isrc() + "\"\n";
                output += "      ARRANGER \"" + startmarker->get_arranger() + 
"\"\n";
-               output += "      SONGWRITER \"" + 
startmarker->get_sheetwriter() + "\"\n";
+               output += "      SONGWRITER \"" + startmarker->get_songwriter() 
+ "\"\n";
                output += "      MESSAGE \"" + startmarker->get_message() + 
"\"\n    }\n  }\n";
 
                //Â add some stuff only required for the first track (e.g. 
pre-gap)

Index: traverso/dialogs/MarkerDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- traverso/dialogs/MarkerDialog.cpp   4 Nov 2008 21:30:18 -0000       1.27
+++ traverso/dialogs/MarkerDialog.cpp   1 Jan 2009 11:30:16 -0000       1.28
@@ -72,7 +72,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(lineEditSheetwriter, SIGNAL(returnPressed()), this, 
SLOT(sheetwriter_enter()));
+       connect(lineEditSongwriter, SIGNAL(returnPressed()), this, 
SLOT(sheetwriter_enter()));
        connect(lineEditIsrc, SIGNAL(returnPressed()), this, 
SLOT(isrc_enter()));
 
        connect(toolButtonTitleAll, SIGNAL(clicked()), this, SLOT(title_all()));
@@ -80,7 +80,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(toolButtonSheetwriterAll, SIGNAL(clicked()), this, 
SLOT(sheetwriter_all()));
+       connect(toolButtonSongWriterAll, SIGNAL(clicked()), this, 
SLOT(songwriter_all()));
        connect(toolButtonCopyAll, SIGNAL(clicked()), this, SLOT(copy_all()));
        connect(toolButtonPEmphAll, SIGNAL(clicked()), this, SLOT(pemph_all()));
 
@@ -137,7 +137,7 @@
                marker->set_description(lineEditTitle->text());
                marker->set_performer(lineEditPerformer->text());
                marker->set_composer(lineEditComposer->text());
-               marker->set_sheetwriter(lineEditSheetwriter->text());
+               marker->set_songwriter(lineEditSongwriter->text());
                marker->set_arranger(lineEditArranger->text());
                marker->set_message(lineEditMessage->text());
                marker->set_isrc(lineEditIsrc->text());
@@ -149,7 +149,7 @@
        lineEditTitle->setText(m_marker->get_description());
        lineEditPerformer->setText(m_marker->get_performer());
        lineEditComposer->setText(m_marker->get_composer());
-       lineEditSheetwriter->setText(m_marker->get_sheetwriter());
+       lineEditSongwriter->setText(m_marker->get_songwriter());
        lineEditArranger->setText(m_marker->get_arranger());
        lineEditMessage->setText(m_marker->get_message());
        lineEditIsrc->setText(m_marker->get_isrc());
@@ -250,7 +250,7 @@
 
 void MarkerDialog::sheetwriter_enter()
 {
-       next_item(lineEditSheetwriter);
+       next_item(lineEditSongwriter);
 }
 
 void MarkerDialog::message_enter()
@@ -354,11 +354,11 @@
        }
 }
 
-void MarkerDialog::sheetwriter_all()
+void MarkerDialog::songwriter_all()
 {
-       QString str = lineEditSheetwriter->text();
-       if (QMessageBox::question(this, tr("Set all Sheetwriters"), 
-                                       tr("Do you really want to set all 
sheetwriters to\n\"")
+       QString str = lineEditSongwriter->text();
+       if (QMessageBox::question(this, tr("Set all Songwriters"), 
+                                       tr("Do you really want to set all 
songwriters to\n\"")
                                        +str+"\"?", QMessageBox::Yes | 
QMessageBox::No, 
                                        QMessageBox::Yes) == QMessageBox::No)
        {
@@ -368,7 +368,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_sheetwriter(str);
+               m->set_songwriter(str);
        }
 }
 

Index: traverso/dialogs/MarkerDialog.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- traverso/dialogs/MarkerDialog.h     4 Nov 2008 14:00:46 -0000       1.7
+++ traverso/dialogs/MarkerDialog.h     1 Jan 2009 11:30:18 -0000       1.8
@@ -68,7 +68,7 @@
        void performer_all();
        void composer_all();
        void arranger_all();
-       void sheetwriter_all();
+       void songwriter_all();
        void message_all();
        void copy_all();
        void pemph_all();

Index: traverso/ui/MarkerDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/MarkerDialog.ui,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/ui/MarkerDialog.ui 4 Nov 2008 14:00:46 -0000       1.8
+++ traverso/ui/MarkerDialog.ui 1 Jan 2009 11:30:23 -0000       1.9
@@ -223,15 +223,15 @@
        <item row="0" column="0" >
         <widget class="QLabel" name="label_4" >
          <property name="text" >
-          <string>Sheetwriter</string>
+          <string>Songwriter</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1" >
-        <widget class="QLineEdit" name="lineEditSheetwriter" />
+        <widget class="QLineEdit" name="lineEditSongwriter" />
        </item>
        <item row="0" column="2" >
-        <widget class="QToolButton" name="toolButtonSheetwriterAll" >
+        <widget class="QToolButton" name="toolButtonSongWriterAll" >
          <property name="toolTip" >
           <string>Apply to all</string>
          </property>
@@ -366,8 +366,8 @@
   <tabstop>toolButtonPerformerAll</tabstop>
   <tabstop>lineEditComposer</tabstop>
   <tabstop>toolButtonComposerAll</tabstop>
-  <tabstop>lineEditSheetwriter</tabstop>
-  <tabstop>toolButtonSheetwriterAll</tabstop>
+  <tabstop>lineEditSongwriter</tabstop>
+  <tabstop>toolButtonSongwriterAll</tabstop>
   <tabstop>lineEditArranger</tabstop>
   <tabstop>toolButtonArrangerAll</tabstop>
   <tabstop>lineEditMessage</tabstop>

Index: traverso/ui/ProjectManagerDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ProjectManagerDialog.ui,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- traverso/ui/ProjectManagerDialog.ui 21 Jan 2008 16:22:18 -0000      1.16
+++ traverso/ui/ProjectManagerDialog.ui 1 Jan 2009 11:30:25 -0000       1.17
@@ -625,12 +625,12 @@
        <item row="5" column="0" >
         <widget class="QLabel" name="label_9" >
          <property name="text" >
-          <string>Sheetwriter</string>
+          <string>Songwriter</string>
          </property>
         </widget>
        </item>
        <item row="5" column="1" colspan="2" >
-        <widget class="QLineEdit" name="lineEditSheetwriter" />
+        <widget class="QLineEdit" name="lineEditSongwriter" />
        </item>
        <item row="6" column="0" >
         <widget class="QLabel" name="label_10" >