[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, 05 Apr 2007 13:15:07 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/05 13:15:07
Modified files:
src/traverso/dialogs/project: NewSongDialog.cpp
ProjectManagerDialog.cpp
src/traverso : Interface.cpp Interface.h traverso.pro
src/traverso/songcanvas: SongView.cpp SongView.h
src/traverso/ui: BusSelectorDialog.ui
Added files:
src/traverso/dialogs/project: NewTrackDialog.cpp
NewTrackDialog.h
src/traverso/ui: NewTrackDialog.ui
Log message:
* Added NewTrackDialog
* Few minor improvements
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewSongDialog.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewTrackDialog.cpp?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/NewTrackDialog.h?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/BusSelectorDialog.ui?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/NewTrackDialog.ui?cvsroot=traverso&rev=1.1
Patches:
Index: dialogs/project/NewSongDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/NewSongDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- dialogs/project/NewSongDialog.cpp 4 Apr 2007 00:30:12 -0000 1.3
+++ dialogs/project/NewSongDialog.cpp 5 Apr 2007 13:15:06 -0000 1.4
@@ -23,6 +23,7 @@
#include "NewSongDialog.h"
#include <libtraversocore.h>
+#include <CommandGroup.h>
NewSongDialog::NewSongDialog(QWidget * parent)
: QDialog(parent)
@@ -65,6 +66,8 @@
node = templatesong->get_state(doc, usetemplate);
}
+ CommandGroup* group = new CommandGroup(m_project, "");
+
for (int i=0; i<count; ++i) {
Song* song;
if (usetemplate) {
@@ -74,9 +77,12 @@
song = new Song(m_project, trackcount);
}
song->set_title(title);
- Command::process_command(m_project->add_song(song));
+ group->add_command(m_project->add_song(song));
}
+ group->setText(tr("Added %n Song(s)", "", count));
+ Command::process_command(group);
+
hide();
}
Index: dialogs/project/ProjectManagerDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/ProjectManagerDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dialogs/project/ProjectManagerDialog.cpp 4 Apr 2007 00:05:51 -0000
1.9
+++ dialogs/project/ProjectManagerDialog.cpp 5 Apr 2007 13:15:06 -0000
1.10
@@ -74,6 +74,8 @@
this, SLOT(undo_text_changed(const QString&)));
setWindowTitle("Manage Project - " + m_project->get_title());
descriptionTextEdit->setText(m_project->get_description());
+ 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();
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- Interface.cpp 4 Apr 2007 02:24:38 -0000 1.56
+++ Interface.cpp 5 Apr 2007 13:15:06 -0000 1.57
@@ -50,6 +50,7 @@
#include "dialogs/project/OpenProjectDialog.h"
#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"
@@ -379,9 +380,9 @@
menu = menuBar()->addMenu(tr("&Song"));
action = menu->addAction(tr("New &Track(s)"));
- connect(action, SIGNAL(triggered()), this, SLOT(add_new_track()));
+ connect(action, SIGNAL(triggered()), this,
SLOT(show_newtrack_dialog()));
action = menu->addAction(tr("New &Song(s)"));
- connect(action, SIGNAL(triggered()), this, SLOT(add_new_song()));
+ connect(action, SIGNAL(triggered()), this, SLOT(show_newsong_dialog()));
menu = menuBar()->addMenu(tr("&View"));
@@ -811,13 +812,15 @@
return 0;
}
-void Interface::add_new_song()
+Command* Interface::show_newtrack_dialog()
{
- Interface::instance()->show_newsong_dialog();
-}
+ if (! m_newTrackDialog) {
+ m_newTrackDialog = new NewTrackDialog(this);
+ }
-void Interface::add_new_track()
-{
+ m_newTrackDialog->show();
+
+ return 0;
}
// eof
Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- Interface.h 4 Apr 2007 00:05:51 -0000 1.28
+++ Interface.h 5 Apr 2007 13:15:06 -0000 1.29
@@ -152,14 +152,13 @@
Command* show_cdtext_dialog();
Command* show_marker_dialog();
Command* show_newsong_dialog();
+ Command* show_newtrack_dialog();
Command* show_newproject_dialog();
private slots:
void delete_songwidget(Song*);
void undo();
void redo();
- void add_new_song();
- void add_new_track();
};
Index: traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- traverso.pro 5 Apr 2007 09:14:56 -0000 1.40
+++ traverso.pro 5 Apr 2007 13:15:06 -0000 1.41
@@ -54,7 +54,8 @@
dialogs/BusSelectorDialog.h \
dialogs/project/NewSongDialog.h \
dialogs/project/NewProjectDialog.h \
- dialogs/project/OpenProjectDialog.h
+ dialogs/project/OpenProjectDialog.h \
+ dialogs/project/NewTrackDialog.h
SOURCES += \
Traverso.cpp \
AudioSourcesTreeWidget.cpp \
@@ -84,7 +85,8 @@
dialogs/BusSelectorDialog.cpp \
dialogs/project/NewSongDialog.cpp \
dialogs/project/NewProjectDialog.cpp \
- dialogs/project/OpenProjectDialog.cpp
+ dialogs/project/OpenProjectDialog.cpp \
+ dialogs/project/NewTrackDialog.cpp
FORMS += ui/ExportWidget.ui \
ui/AudioSourcesManagerWidget.ui \
ui/PluginSelectorDialog.ui \
@@ -105,6 +107,7 @@
ui/OpenProjectDialog.ui \
ui/NewProjectDialog.ui \
ui/NewSongDialog.ui \
+ ui/NewTrackDialog.ui
INCLUDEPATH += ../core \
Index: songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- songcanvas/SongView.cpp 4 Apr 2007 02:24:38 -0000 1.36
+++ songcanvas/SongView.cpp 5 Apr 2007 13:15:07 -0000 1.37
@@ -17,7 +17,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: SongView.cpp,v 1.36 2007/04/04 02:24:38 benjie Exp $
*/
Index: songcanvas/SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- songcanvas/SongView.h 4 Apr 2007 02:24:38 -0000 1.17
+++ songcanvas/SongView.h 5 Apr 2007 13:15:07 -0000 1.18
@@ -17,7 +17,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: SongView.h,v 1.17 2007/04/04 02:24:38 benjie Exp $
*/
#ifndef SONG_VIEW_H
@@ -59,6 +58,7 @@
Q_CLASSINFO("set_editing_mode", tr("Mode: Edit"))
Q_CLASSINFO("set_curve_mode", tr("Mode: Curve"))
Q_CLASSINFO("add_marker", tr("Add Marker"))
+ Q_CLASSINFO("playhead_to_workcursor", tr("Playcursor: To workcursor"))
public :
Index: ui/BusSelectorDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/BusSelectorDialog.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ui/BusSelectorDialog.ui 29 Mar 2007 11:17:23 -0000 1.1
+++ ui/BusSelectorDialog.ui 5 Apr 2007 13:15:07 -0000 1.2
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>185</width>
- <height>200</height>
+ <height>202</height>
</rect>
</property>
<property name="windowTitle" >
@@ -14,13 +14,47 @@
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
<number>6</number>
</property>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
<property name="spacing" >
<number>6</number>
</property>
<item>
- <widget class="QComboBox" name="trackComboBox" />
+ <widget class="QLabel" name="label_3" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Track</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="trackComboBox" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>5</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<layout class="QHBoxLayout" >
Index: dialogs/project/NewTrackDialog.cpp
===================================================================
RCS file: dialogs/project/NewTrackDialog.cpp
diff -N dialogs/project/NewTrackDialog.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ dialogs/project/NewTrackDialog.cpp 5 Apr 2007 13:15:06 -0000 1.1
@@ -0,0 +1,80 @@
+/*
+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 "NewTrackDialog.h"
+
+#include <libtraversocore.h>
+#include <CommandGroup.h>
+
+NewTrackDialog::NewTrackDialog(QWidget * parent)
+ : QDialog(parent)
+{
+ setupUi(this);
+
+ set_project(pm().get_project());
+
+ connect(&pm(), SIGNAL(projectLoaded(Project*)), this,
SLOT(set_project(Project*)));
+}
+
+void NewTrackDialog::accept()
+{
+ if (! m_project) {
+ info().information(tr("I can't create a new Track if there is
no Project loaded!!"));
+ return;
+ }
+
+ Song* song = m_project->get_current_song();
+ if ( ! song ) {
+ return ;
+ }
+
+ int count = countSpinBox->value();
+ QString title = titleLineEdit->text();
+
+ if (title.isEmpty()) {
+ title = "Untitled";
+ }
+
+ CommandGroup* group = new CommandGroup(song, "");
+
+ for (int i=0; i<count; ++i) {
+ Track* track = new Track(song, "Unnamed",
Track::INITIAL_HEIGHT);
+ track->set_name(title);
+ group->add_command(song->add_track(track));
+ }
+
+ group->setText(tr("Added %n Track(s)", "", count));
+ Command::process_command(group);
+
+ hide();
+}
+
+void NewTrackDialog::set_project(Project * project)
+{
+ m_project = project;
+}
+
+void NewTrackDialog::reject()
+{
+ hide();
+}
+
Index: dialogs/project/NewTrackDialog.h
===================================================================
RCS file: dialogs/project/NewTrackDialog.h
diff -N dialogs/project/NewTrackDialog.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ dialogs/project/NewTrackDialog.h 5 Apr 2007 13:15:06 -0000 1.1
@@ -0,0 +1,51 @@
+/*
+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_TRACK_DIALOG_H
+#define NEW_TRACK_DIALOG_H
+
+#include "ui_NewTrackDialog.h"
+
+#include <QDialog>
+
+class Project;
+
+class NewTrackDialog : public QDialog, protected Ui::NewTrackDialog
+{
+ Q_OBJECT
+
+public:
+ NewTrackDialog(QWidget* parent = 0);
+ ~NewTrackDialog() {};
+
+
+private:
+ Project* m_project;
+
+
+private slots:
+ void accept();
+ void reject();
+ void set_project(Project* project);
+
+};
+
+#endif
Index: ui/NewTrackDialog.ui
===================================================================
RCS file: ui/NewTrackDialog.ui
diff -N ui/NewTrackDialog.ui
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ui/NewTrackDialog.ui 5 Apr 2007 13:15:07 -0000 1.1
@@ -0,0 +1,116 @@
+<ui version="4.0" >
+ <class>NewTrackDialog</class>
+ <widget class="QDialog" name="NewTrackDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>239</width>
+ <height>111</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>New Track(s)</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Track name</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="titleLineEdit" />
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Track count</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="countSpinBox" >
+ <property name="minimum" >
+ <number>1</number>
+ </property>
+ <property name="value" >
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>NewTrackDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>NewTrackDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/traverso dialogs/project/NewSongDi...,
Remon Sijrier <=