[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src core/Project.cpp core/Project.h co...
|
From: |
Nicola Doebelin |
|
Subject: |
[Traverso-commit] traverso/src core/Project.cpp core/Project.h co... |
|
Date: |
Thu, 10 May 2007 20:58:46 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 07/05/10 20:58:46
Modified files:
src/core : Project.cpp Project.h Song.cpp Song.h
src/traverso/dialogs/project: ProjectManagerDialog.cpp
src/traverso : Interface.cpp Interface.h traverso.pro
src/traverso/ui: ProjectManagerDialog.ui
Log message:
CD text input completed (2nd attempt)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.h?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ProjectManagerDialog.ui?cvsroot=traverso&r1=1.9&r2=1.10
Patches:
Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- core/Project.cpp 10 May 2007 20:02:36 -0000 1.40
+++ core/Project.cpp 10 May 2007 20:58:46 -0000 1.41
@@ -197,6 +197,13 @@
title = e.attribute( "title", "" );
engineer = e.attribute( "engineer", "" );
m_description = e.attribute( "description", "No description set");
+ m_discid = e.attribute( "discId", "" );
+ m_upcEan = e.attribute( "upc_ean", "" );
+ m_genre = e.attribute( "genre", "" ).toInt();
+ m_performer = e.attribute( "performer", "" );
+ m_arranger = e.attribute( "arranger", "" );
+ m_songwriter = e.attribute( "songwriter", "" );
+ m_message = e.attribute( "message", "" );
m_rate = e.attribute( "rate", "" ).toInt();
m_bitDepth = e.attribute( "bitdepth", "" ).toInt();
m_id = e.attribute("id", "0").toLongLong();
@@ -277,6 +284,13 @@
properties.setAttribute("title", title);
properties.setAttribute("engineer", engineer);
properties.setAttribute("description", m_description);
+ properties.setAttribute("discId", m_discid );
+ properties.setAttribute("upc_ean", m_upcEan);
+ properties.setAttribute("genre", QString::number(m_genre));
+ properties.setAttribute("performer", m_performer);
+ properties.setAttribute("arranger", m_arranger);
+ properties.setAttribute("songwriter", m_songwriter);
+ properties.setAttribute("message", m_message);
properties.setAttribute("currentSongId", m_currentSongId);
properties.setAttribute("rate", m_rate);
properties.setAttribute("bitdepth", m_bitDepth);
@@ -327,6 +341,41 @@
m_description = des;
}
+void Project::set_discid(const QString& pId)
+{
+ m_discid = pId;
+}
+
+void Project::set_performer(const QString& pPerformer)
+{
+ m_performer = pPerformer;
+}
+
+void Project::set_arranger(const QString& pArranger)
+{
+ m_arranger = pArranger;
+}
+
+void Project::set_songwriter(const QString& pSongwriter)
+{
+ m_songwriter = pSongwriter;
+}
+
+void Project::set_message(const QString& pMessage)
+{
+ m_message = pMessage;
+}
+
+void Project::set_upc_ean(const QString& pUpc)
+{
+ m_upcEan = pUpc;
+}
+
+void Project::set_genre(int pGenre)
+{
+ m_genre = pGenre;
+}
+
bool Project::has_changed()
{
foreach(Song* song, m_songs) {
@@ -463,6 +512,7 @@
}
QString cdrdaoImg = get_cdrdao_header(spec);
+ bool pregap = true;
foreach(Song* song, songsToRender) {
PMESG("Starting export for song %lld", song->get_id());
@@ -501,7 +551,8 @@
continue;
}
- cdrdaoImg += song->get_cdrdao_tracklist(spec);
+ cdrdaoImg += song->get_cdrdao_tracklist(spec, pregap);
+ pregap = false; //Â only add the pregap at the first song
while(song->render(spec) > 0) {}
@@ -563,14 +614,14 @@
output += " LANGUAGE 0 {\n";
output += " TITLE \"" + get_title() + "\"\n";
- output += " PERFORMER \"\"\n";
- output += " DISC_ID \"\"\n";
- output += " UPC_EAN \"\"\n\n";
-
- output += " ARRANGER \"\"\n";
- output += " SONGWRITER \"\"\n";
- output += " MESSAGE \"\"\n";
- output += " GENRE \"\"\n }\n}\n\n";
+ output += " PERFORMER \"" + get_performer() + "\"\n";
+ output += " DISC_ID \"" + get_discid() + "\"\n";
+ output += " UPC_EAN \"" + get_upc_ean() + "\"\n\n";
+
+ output += " ARRANGER \"" + get_arranger() + "\"\n";
+ output += " SONGWRITER \"" + get_songwriter() + "\"\n";
+ output += " MESSAGE \"" + get_message() + "\"\n";
+ output += " GENRE \"" + QString::number(get_genre()) + "\"\n
}\n}\n\n";
return output;
}
@@ -645,6 +696,41 @@
return m_description;
}
+QString Project::get_discid() const
+{
+ return m_discid;
+}
+
+QString Project::get_performer() const
+{
+ return m_performer;
+}
+
+QString Project::get_arranger() const
+{
+ return m_arranger;
+}
+
+QString Project::get_songwriter() const
+{
+ return m_songwriter;
+}
+
+QString Project::get_message() const
+{
+ return m_message;
+}
+
+QString Project::get_upc_ean() const
+{
+ return m_upcEan;
+}
+
+int Project::get_genre()
+{
+ return m_genre;
+}
+
QString Project::get_root_dir( ) const
{
return rootDir;
Index: core/Project.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- core/Project.h 9 May 2007 20:11:47 -0000 1.19
+++ core/Project.h 10 May 2007 20:58:46 -0000 1.20
@@ -50,6 +50,13 @@
QString get_title() const;
QString get_engineer() const;
QString get_description() const;
+ QString get_discid() const;
+ QString get_performer() const;
+ QString get_arranger() const;
+ QString get_songwriter() const;
+ QString get_message() const;
+ QString get_upc_ean() const;
+ int get_genre();
QString get_root_dir() const;
QString get_audiosources_dir() const;
QString get_import_dir() const;
@@ -64,6 +71,13 @@
void set_title(const QString& pTitle);
void set_engineer(const QString& pEngineer);
void set_description(const QString& des);
+ void set_discid(const QString& pId);
+ void set_performer(const QString& pPerformer);
+ void set_arranger(const QString& pArranger);
+ void set_songwriter(const QString& pSongwriter);
+ void set_message(const QString& pMessage);
+ void set_upc_ean(const QString& pUPC);
+ void set_genre(int pGenre);
void set_song_export_progress(int pogress);
void set_current_song(qint64 id);
void set_import_dir(const QString& dir);
@@ -97,6 +111,13 @@
QString engineer;
QString m_description;
QString m_importDir;
+ QString m_discid;
+ int m_genre;
+ QString m_upcEan;
+ QString m_performer;
+ QString m_arranger;
+ QString m_songwriter;
+ QString m_message;
int m_rate;
int m_bitDepth;
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- core/Song.cpp 10 May 2007 20:02:36 -0000 1.92
+++ core/Song.cpp 10 May 2007 20:58:46 -0000 1.93
@@ -860,7 +860,7 @@
return 1;
}
-QString Song::get_cdrdao_tracklist(ExportSpecification* spec)
+QString Song::get_cdrdao_tracklist(ExportSpecification* spec, bool pregap)
{
QString output;
@@ -933,6 +933,11 @@
output += " SONGWRITER \"" + m_start->get_songwriter() +
"\"\n";
output += " MESSAGE \"" + m_start->get_message() + "\"\n
}\n }\n";
+ //Â add a standard pregap if requested, but only if it is the
first track
+ if (pregap && (i == 0)) {
+ output += " PREGAP 00:02:00\n";
+ }
+
if (i == 0) {
start = cd_to_frame(frame_to_cd(m_start->get_when(),
m_project->get_rate()), m_project->get_rate());
// I thought some cd players required a 2-second PREGAP
on the first track?
Index: core/Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- core/Song.h 9 May 2007 20:11:47 -0000 1.50
+++ core/Song.h 10 May 2007 20:58:46 -0000 1.51
@@ -132,7 +132,7 @@
void disconnect_from_audiodevice();
void connect_to_audiodevice();
void schedule_for_deletion();
- QString get_cdrdao_tracklist(ExportSpecification* spec);
+ QString get_cdrdao_tracklist(ExportSpecification* spec, bool pregap =
false);
audio_sample_t* mixdown;
audio_sample_t* gainbuffer;
Index: traverso/dialogs/project/ProjectManagerDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- traverso/dialogs/project/ProjectManagerDialog.cpp 8 May 2007 22:13:40
-0000 1.13
+++ traverso/dialogs/project/ProjectManagerDialog.cpp 10 May 2007 20:58:46
-0000 1.14
@@ -75,6 +75,13 @@
setWindowTitle("Manage Project - " + m_project->get_title());
descriptionTextEdit->setText(m_project->get_description());
lineEditTitle->setText(m_project->get_title());
+ lineEditId->setText(m_project->get_discid());
+ 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());
+ 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 {
@@ -82,6 +89,13 @@
treeSongWidget->clear();
descriptionTextEdit->clear();
lineEditTitle->clear();
+ lineEditId->clear();
+ lineEditUPC->clear();
+ lineEditPerformer->clear();
+ lineEditArranger->clear();
+ lineEditSongwriter->clear();
+ lineEditMessage->clear();
+ comboBoxGenre->setCurrentIndex(0);
}
update_song_list();
@@ -273,6 +287,13 @@
m_project->set_description(descriptionTextEdit->toPlainText());
m_project->set_title(lineEditTitle->text());
+ m_project->set_discid(lineEditId->text());
+ 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_message(lineEditMessage->text());
+ m_project->set_genre(comboBoxGenre->currentText().toInt());
hide();
}
@@ -286,8 +307,111 @@
descriptionTextEdit->setText(m_project->get_description());
lineEditTitle->setText(m_project->get_title());
+ lineEditId->setText(m_project->get_discid());
+ 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());
+ lineEditMessage->setText(m_project->get_message());
+ comboBoxGenre->setCurrentIndex(m_project->get_genre());
+
hide();
}
+
+/*
----------------------------------------------------------------------------------------------
*/
+/* Here is some stuff about CD-Text. It is difficult to find in the web, so
let's archive it here */
+/*
----------------------------------------------------------------------------------------------
*/
+
+/* @(#)cdtext.h 1.1 02/02/23 Copyright 1999-2002 J. Schilling */
+/*
+ * Generic CD-Text support definitions
+ *
+ * Copyright (c) 1999-2002 J. Schilling
+ */
+/*
+ * This program 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, or (at your option)
+ * any later version.
+
+...
+
+#define tc_title textcodes[0x00]
+#define tc_performer textcodes[0x01]
+#define tc_songwriter textcodes[0x02]
+#define tc_composer textcodes[0x03]
+#define tc_arranger textcodes[0x04]
+#define tc_message textcodes[0x05]
+#define tc_diskid textcodes[0x06]
+#define tc_genre textcodes[0x07]
+#define tc_toc textcodes[0x08]
+#define tc_toc2 textcodes[0x09]
+
+#define tc_closed_info textcodes[0x0d]
+#define tc_isrc textcodes[0x0e]
+
+/*
+ * binaere Felder sind
+ * Disc ID (Wirklich ???)
+ * Genre ID
+ * TOC
+ * Second TOC
+ * Size information
+ */
+
+/*
+ * Genre codes from Enhanced CD Specification page 21
+ */
+
+// #define GENRE_UNUSED 0 /* not used
*/
+// #define GENRE_UNDEFINED 1 /* not defined
*/
+// #define GENRE_ADULT_CONTEMP 2 /* Adult Contemporary
*/
+// #define GENRE_ALT_ROCK 3 /* Alternative Rock
*/
+// #define GENRE_CHILDRENS 4 /* Childrens Music
*/
+// #define GENRE_CLASSIC 5 /* Classical
*/
+// #define GENRE_CHRIST_CONTEMP 6 /* Contemporary Christian
*/
+// #define GENRE_COUNTRY 7 /* Country
*/
+// #define GENRE_DANCE 8 /* Dance
*/
+// #define GENRE_EASY_LISTENING 9 /* Easy Listening
*/
+// #define GENRE_EROTIC 10 /* Erotic
*/
+// #define GENRE_FOLK 11 /* Folk
*/
+// #define GENRE_GOSPEL 12 /* Gospel
*/
+// #define GENRE_HIPHOP 13 /* Hip Hop
*/
+// #define GENRE_JAZZ 14 /* Jazz
*/
+// #define GENRE_LATIN 15 /* Latin
*/
+// #define GENRE_MUSICAL 16 /* Musical
*/
+// #define GENRE_NEWAGE 17 /* New Age
*/
+// #define GENRE_OPERA 18 /* Opera
*/
+// #define GENRE_OPERETTA 19 /* Operetta
*/
+// #define GENRE_POP 20 /* Pop Music
*/
+// #define GENRE_RAP 21 /* RAP
*/
+// #define GENRE_REGGAE 22 /* Reggae
*/
+// #define GENRE_ROCK 23 /* Rock Music
*/
+// #define GENRE_RYTHMANDBLUES 24 /* Rhythm & Blues
*/
+// #define GENRE_SOUNDEFFECTS 25 /* Sound Effects
*/
+// #define GENRE_SPOKEN_WORD 26 /* Spoken Word
*/
+// #define GENRE_WORLD_MUSIC 28 /* World Music
*/
+// #define GENRE_RESERVED 29 /* Reserved is 29..32767
*/
+// #define GENRE_RIAA 32768 /* Registration by RIAA
32768..65535 */
+
+/*
+ * Character codings used in CD-Text data.
+ * Korean and Mandarin Chinese to be defined in sept 1996
+ */
+// #define CC_8859_1 0x00 /* ISO 8859-1 */
+// #define CC_ASCII 0x01 /* ISO 646, ASCII (7 bit) */
+// #define CC_RESERVED_02 0x02 /* Reserved codes 0x02..0x7f */
+// #define CC_KANJI 0x80 /* Music Shift-JIS Kanji */
+// #define CC_KOREAN 0x81 /* Korean */
+// #define CC_CHINESE 0x82 /* Mandarin Chinese */
+// #define CC_RESERVED_83 0x83 /* Reserved codes 0x83..0xFF */
+
+
+/*
+ * Language codes (currently guessed)
+ */
+// #define LANG_ENGLISH 9
+
//eof
Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- traverso/Interface.cpp 8 May 2007 16:44:31 -0000 1.78
+++ traverso/Interface.cpp 10 May 2007 20:58:46 -0000 1.79
@@ -51,7 +51,6 @@
#include "dialogs/project/NewProjectDialog.h"
#include "dialogs/project/NewSongDialog.h"
#include "dialogs/project/NewTrackDialog.h"
-#include "dialogs/CDTextDialog.h"
#include "dialogs/MarkerDialog.h"
#include "dialogs/BusSelectorDialog.h"
#include "dialogs/InsertSilenceDialog.h"
@@ -171,7 +170,6 @@
m_projectManagerDialog = 0;
m_openProjectDialog = 0;
m_newProjectDialog = 0;
- m_cdTextDialog = 0;
m_insertSilenceDialog = 0;
m_markerDialog = 0;
m_busSelector = 0;
@@ -399,9 +397,6 @@
action = menu->addAction(tr("Marker Editor"));
connect(action, SIGNAL(triggered(bool)), this,
SLOT(show_marker_dialog()));
- action = menu->addAction(tr("CD Text Editor"));
- connect(action, SIGNAL(triggered(bool)), this,
SLOT(show_cdtext_dialog()));
-
menu->addSeparator();
menu->addAction(correlationMeterDW->toggleViewAction());
@@ -915,19 +910,6 @@
return 0;
}
-
-Command * Interface::show_cdtext_dialog()
-{
- if (! m_cdTextDialog ) {
- m_cdTextDialog = new CDTextDialog(this);
- }
-
- m_cdTextDialog->show();
-
- return 0;
-}
-
-
Command * Interface::show_insertsilence_dialog()
{
if (! m_insertSilenceDialog) {
Index: traverso/Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- traverso/Interface.h 8 May 2007 16:44:31 -0000 1.35
+++ traverso/Interface.h 10 May 2007 20:58:46 -0000 1.36
@@ -57,7 +57,6 @@
class OpenProjectDialog;
class InfoToolBar;
class SysInfoToolBar;
-class CDTextDialog;
class InsertSilenceDialog;
class MarkerDialog;
class BusSelectorDialog;
@@ -112,7 +111,6 @@
SettingsDialog* m_settingsdialog;
ProjectManagerDialog* m_projectManagerDialog;
OpenProjectDialog* m_openProjectDialog;
- CDTextDialog* m_cdTextDialog;
InsertSilenceDialog* m_insertSilenceDialog;
MarkerDialog* m_markerDialog;
InfoToolBar* m_infoBar;
@@ -161,7 +159,6 @@
Command* show_context_menu();
Command* show_open_project_dialog();
Command* show_project_manager_dialog();
- Command* show_cdtext_dialog();
Command* show_insertsilence_dialog();
Command* show_marker_dialog();
Command* show_newsong_dialog();
Index: traverso/traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- traverso/traverso.pro 3 May 2007 19:43:32 -0000 1.49
+++ traverso/traverso.pro 10 May 2007 20:58:46 -0000 1.50
@@ -46,7 +46,6 @@
songcanvas/MarkerView.h \
widgets/InfoWidgets.h \
widgets/MessageWidget.h \
- dialogs/CDTextDialog.h \
dialogs/InsertSilenceDialog.h \
dialogs/MarkerDialog.h \
dialogs/BusSelectorDialog.h \
@@ -78,7 +77,6 @@
songcanvas/MarkerView.cpp \
widgets/InfoWidgets.cpp \
widgets/MessageWidget.cpp \
- dialogs/CDTextDialog.cpp \
dialogs/InsertSilenceDialog.cpp \
dialogs/MarkerDialog.cpp \
dialogs/BusSelectorDialog.cpp \
@@ -104,7 +102,6 @@
ui/SongManagerDialog.ui \
ui/ProjectManagerDialog.ui \
ui/MarkerDialog.ui \
- ui/CDTextDialog.ui \
ui/BusSelectorDialog.ui \
ui/OpenProjectDialog.ui \
ui/NewProjectDialog.ui \
Index: traverso/ui/ProjectManagerDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ProjectManagerDialog.ui,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- traverso/ui/ProjectManagerDialog.ui 9 Apr 2007 14:00:58 -0000 1.9
+++ traverso/ui/ProjectManagerDialog.ui 10 May 2007 20:58:46 -0000 1.10
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>581</width>
- <height>281</height>
+ <height>301</height>
</rect>
</property>
<property name="maximumSize" >
@@ -19,47 +19,38 @@
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
- <number>0</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tab_4" >
<attribute name="title" >
<string>Project</string>
</attribute>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item rowspan="2" row="0" column="0" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>Informational</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
+ <item>
+ <layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
+ <property name="leftMargin" >
<number>0</number>
</property>
- <property name="spacing" >
- <number>6</number>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
</property>
<item>
<widget class="QLabel" name="label_3" >
@@ -81,12 +72,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QLabel" name="label" >
<property name="minimumSize" >
@@ -114,12 +114,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QLabel" name="label_2" >
<property name="minimumSize" >
@@ -141,22 +150,6 @@
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Maximum</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="0" column="1" >
<widget class="QGroupBox" name="groupBox" >
<property name="minimumSize" >
@@ -169,10 +162,19 @@
<string>Export</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
+ <property name="spacing" >
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
<number>9</number>
</property>
<item>
@@ -205,6 +207,22 @@
</property>
</spacer>
</item>
+ <item row="2" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Maximum</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>385</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tab" >
@@ -212,18 +230,25 @@
<string>Songs</string>
</attribute>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
<item>
<widget class="QTreeWidget" name="treeSongWidget" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>10</horstretch>
<verstretch>5</verstretch>
</sizepolicy>
@@ -234,28 +259,51 @@
<height>120</height>
</size>
</property>
+ <column>
+ <property name="text" >
+ <string>1</string>
+ </property>
+ </column>
</widget>
</item>
<item>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QGroupBox" name="groupBox_4" >
<property name="title" >
<string>Selected Song</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
<item>
<widget class="QLineEdit" name="selectedSongName" >
<property name="minimumSize" >
@@ -268,12 +316,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QPushButton" name="deleteSongButton" >
<property name="text" >
@@ -318,20 +375,38 @@
<string>New Song</string>
</property>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QPushButton" name="createSongButton" >
<property name="text" >
@@ -361,24 +436,297 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="cdtext" >
+ <attribute name="title" >
+ <string>CDÂ Text</string>
+ </attribute>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_7" >
+ <property name="minimumSize" >
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>Performer</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="2" >
+ <widget class="QLineEdit" name="lineEditPerformer" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_4" >
+ <property name="minimumSize" >
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>Disc ID:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2" >
+ <widget class="QLineEdit" name="lineEditId" />
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="label_6" >
+ <property name="minimumSize" >
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>UPC EAN:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2" >
+ <widget class="QLineEdit" name="lineEditUPC" />
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="label_5" >
+ <property name="minimumSize" >
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>Genre:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QComboBox" name="comboBoxGenre" >
+ <item>
+ <property name="text" >
+ <string>Unused</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Undefined</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Adult Contemporary</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Alternative Rock</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Childrens</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Classical</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Contemporary Christian</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Country</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Dance</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Easy Listening</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Erotic</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Folk</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Gospel</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Hip Hop</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Jazz</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Latin</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Musical</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>New Age</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Opera</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Operette</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Pop Music</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Rap</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Reggae</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Rock Music</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Rhythm and Blues</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Sound Effects</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Spoken Word</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>World Music</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="3" column="2" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="label_8" >
+ <property name="text" >
+ <string>Arranger</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="2" >
+ <widget class="QLineEdit" name="lineEditArranger" />
+ </item>
+ <item row="5" column="0" >
+ <widget class="QLabel" name="label_9" >
+ <property name="text" >
+ <string>Songwriter</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1" colspan="2" >
+ <widget class="QLineEdit" name="lineEditSongwriter" />
+ </item>
+ <item row="6" column="0" >
+ <widget class="QLabel" name="label_10" >
+ <property name="text" >
+ <string>Message</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1" colspan="2" >
+ <widget class="QLineEdit" name="lineEditMessage" />
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
<number>0</number>
</property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QPushButton" name="undoButton" >
<property name="maximumSize" >
@@ -436,22 +784,6 @@
<resources/>
<connections>
<connection>
- <sender>selectedSongName</sender>
- <signal>returnPressed()</signal>
- <receiver>renameSongButton</receiver>
- <slot>animateClick()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>548</x>
- <y>96</y>
- </hint>
- <hint type="destinationlabel" >
- <x>547</x>
- <y>130</y>
- </hint>
- </hints>
- </connection>
- <connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>ProjectManagerDialog</receiver>