[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src commands/Gain.cpp commands/MoveCli...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src commands/Gain.cpp commands/MoveCli... |
|
Date: |
Mon, 16 Apr 2007 09:08:31 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/16 09:08:31
Modified files:
src/commands : Gain.cpp MoveClip.cpp
src/core : ContextPointer.cpp ContextPointer.h Curve.cpp
FadeCurve.cpp InputEngine.cpp Project.cpp
Project.h ProjectManager.cpp ViewPort.cpp
src/traverso/dialogs/settings: Pages.cpp Pages.h
src/traverso : Interface.cpp Traverso.cpp
src/traverso/songcanvas: AudioClipView.cpp CurveView.cpp
TimeLineView.cpp ViewItem.h
src/traverso/ui: KeyboardConfigPage.ui ThemeConfigPage.ui
Log message:
* Before saving, move old project file to backup file
* Don't quit during a recording
* Use a QTimer to distribute jog (mouse move) events evenly, and added
it as
a configuration option (JogUpdateInterval)
* updated the Settings dialog, showing the JogUpdateInterval in frames
per second.
* ViewItems now have the float cursor by default set
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Gain.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ContextPointer.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ContextPointer.h?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Curve.cpp?cvsroot=traverso&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/InputEngine.cpp?cvsroot=traverso&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.h?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ViewPort.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.h?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Traverso.cpp?cvsroot=traverso&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ViewItem.h?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/KeyboardConfigPage.ui?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ThemeConfigPage.ui?cvsroot=traverso&r1=1.2&r2=1.3
Patches:
Index: commands/Gain.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Gain.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- commands/Gain.cpp 12 Apr 2007 18:50:21 -0000 1.15
+++ commands/Gain.cpp 16 Apr 2007 09:08:30 -0000 1.16
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: Gain.cpp,v 1.15 2007/04/12 18:50:21 r_sijrier Exp $
+$Id: Gain.cpp,v 1.16 2007/04/16 09:08:30 r_sijrier Exp $
*/
#include "Gain.h"
@@ -171,6 +171,7 @@
int Gain::jog()
{
PENTER;
+
float of = 0;
float dbFactor = coefficient_to_dB(newGain);
Index: commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- commands/MoveClip.cpp 13 Apr 2007 12:07:00 -0000 1.33
+++ commands/MoveClip.cpp 16 Apr 2007 09:08:30 -0000 1.34
@@ -107,8 +107,6 @@
{
QList<QObject* > items = cpointer().get_context_items();
- printf("audioclip_added() : Clip has id %lld\n", clip->get_id());
-
foreach(QObject* obj, items) {
AudioClipView* acv = qobject_cast<AudioClipView*>(obj);
@@ -126,11 +124,8 @@
disconnect(d->view->get_clip()->get_track(),
SIGNAL(audioClipAdded(AudioClip*)),
this, SLOT(audioclip_added(AudioClip*)));
- printf("Found a match!!!!\n");
return;
}
-
- printf("MoveClip:: Added new AudioClip, but no AudioClipView available
???\n");
}
Index: core/ContextPointer.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ContextPointer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- core/ContextPointer.cpp 22 Mar 2007 13:35:42 -0000 1.12
+++ core/ContextPointer.cpp 16 Apr 2007 09:08:31 -0000 1.13
@@ -17,11 +17,15 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: ContextPointer.cpp,v 1.12 2007/03/22 13:35:42 r_sijrier Exp $
+$Id: ContextPointer.cpp,v 1.13 2007/04/16 09:08:31 r_sijrier Exp $
*/
#include "ContextPointer.h"
#include "ContextItem.h"
+#include "Config.h"
+#include "InputEngine.h"
+#include "Utils.h"
+
// Always put me below _all_ includes, this is needed
// in case we run with memory leak detection enabled!
@@ -63,7 +67,10 @@
{
m_x = 0;
m_y = 0;
+ m_jogEvent = false;
currentViewPort = 0;
+
+ connect(&m_jogTimer, SIGNAL(timeout()), this, SLOT(update_jog()));
}
/**
@@ -135,20 +142,27 @@
/**
* Called _only_ by InputEngine, not to be used anywhere else.
*/
-void ContextPointer::grab_mouse( )
+void ContextPointer::jog_start()
{
- if (currentViewPort)
+ if (currentViewPort) {
currentViewPort->viewport()->grabMouse();
-
+ }
+ m_jogEvent = true;
+ int interval = config().get_property("CCE", "JogUpdateInterval",
28).toInt();
+ m_jogTimer.start(interval);
}
/**
* Called _only_ by InputEngine, not to be used anywhere else.
*/
-void ContextPointer::release_mouse( )
+void ContextPointer::jog_finished()
{
- if (currentViewPort)
+ if (currentViewPort) {
currentViewPort->viewport()->releaseMouse();
+
currentViewPort->setCursor(QCursor(find_pixmap(":/cursorFloat")));
+
+ }
+ m_jogTimer.stop();
}
/**
@@ -186,4 +200,13 @@
m_contextMenuItems = list;
}
+void ContextPointer::update_jog()
+{
+ if (m_jogEvent) {
+ ie().jog();
+ m_jogEvent = false;
+ }
+}
+
//eof
+
Index: core/ContextPointer.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ContextPointer.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- core/ContextPointer.h 12 Apr 2007 12:32:07 -0000 1.13
+++ core/ContextPointer.h 16 Apr 2007 09:08:31 -0000 1.14
@@ -17,21 +17,23 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: ContextPointer.h,v 1.13 2007/04/12 12:32:07 r_sijrier Exp $
+ $Id: ContextPointer.h,v 1.14 2007/04/16 09:08:31 r_sijrier Exp $
*/
#ifndef CONTEXTPOINTER_H
#define CONTEXTPOINTER_H
#include <QObject>
+#include <QTimer>
-#include "InputEngine.h"
#include "ViewPort.h"
class ContextItem;
class ContextPointer : public QObject
{
+ Q_OBJECT
+
public:
/**
* Returns the current ViewPort's mouse x coordinate
@@ -96,7 +98,7 @@
{
m_x = x;
m_y = y;
- ie().jog();
+ m_jogEvent = true;
}
/**
@@ -143,8 +145,8 @@
return -1;
}
- void grab_mouse();
- void release_mouse();
+ void jog_start();
+ void jog_finished();
void reset_cursor();
ViewPort* get_viewport();
@@ -173,12 +175,20 @@
int m_x;
int m_y;
+ bool m_jogEvent;
+
+ QTimer m_jogTimer;
+
int m_onFirstInputEventX;
int m_onFirstInputEventY;
ViewPort* currentViewPort;
QList<QObject* > contextItemsList;
QList<QObject* > m_contextMenuItems;
+
+
+private slots:
+ void update_jog();
};
#endif
Index: core/Curve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Curve.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- core/Curve.cpp 11 Apr 2007 23:35:30 -0000 1.36
+++ core/Curve.cpp 16 Apr 2007 09:08:31 -0000 1.37
@@ -484,16 +484,16 @@
void Curve::set_range(double when)
{
if (m_nodes.isEmpty()) {
- printf("Curve::guidata_set_range: no nodes!!");
+ printf("Curve::set_range: no nodes!!");
return;
}
if (m_nodes.last()->when == when) {
- printf("Curve::guidata_set_range: new range == current
range!\n");
+// printf("Curve::set_range: new range == current range!\n");
return;
}
if (when < 0.0 ) {
- printf("Curve::guidata_set_range: error, when < 0.0 ! (%f)\n",
when);
+ printf("Curve::set_range: error, when < 0.0 ! (%f)\n", when);
return;
}
Index: core/FadeCurve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- core/FadeCurve.cpp 2 Apr 2007 21:05:43 -0000 1.16
+++ core/FadeCurve.cpp 16 Apr 2007 09:08:31 -0000 1.17
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: FadeCurve.cpp,v 1.16 2007/04/02 21:05:43 r_sijrier Exp $
+$Id: FadeCurve.cpp,v 1.17 2007/04/16 09:08:31 r_sijrier Exp $
*/
#include "FadeCurve.h"
@@ -298,7 +298,6 @@
void FadeCurve::set_range(double when)
{
- printf("FadeCurve::set_range(%f)\n", when);
Curve::set_range(when);
emit rangeChanged();
}
Index: core/InputEngine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/InputEngine.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- core/InputEngine.cpp 13 Apr 2007 11:15:00 -0000 1.49
+++ core/InputEngine.cpp 16 Apr 2007 09:08:31 -0000 1.50
@@ -489,9 +489,9 @@
void InputEngine::set_jogging(bool jog)
{
if (jog) {
- cpointer().grab_mouse();
+ cpointer().jog_start();
} else {
- cpointer().release_mouse();
+ cpointer().jog_finished();
}
isJogging = jog;
Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- core/Project.cpp 4 Apr 2007 00:30:38 -0000 1.27
+++ core/Project.cpp 16 Apr 2007 09:08:31 -0000 1.28
@@ -22,6 +22,7 @@
#include <QFile>
#include <QDir>
#include <QTextStream>
+#include <QMessageBox>
#include <sys/stat.h>
#include <sys/types.h>
@@ -31,6 +32,7 @@
#include "Song.h"
#include "ProjectManager.h"
#include "Information.h"
+#include "InputEngine.h"
#include "ResourcesManager.h"
#include "Export.h"
#include "AudioDevice.h"
@@ -210,6 +212,11 @@
PENTER;
QDomDocument doc("Project");
QString fileName = rootDir + "/project.traverso";
+
+ QFile::remove(fileName + "~");
+ QFile backup(fileName);
+ backup.rename(fileName + "~");
+
QFile data( fileName );
if (data.open( QIODevice::WriteOnly ) ) {
@@ -253,12 +260,14 @@
// Get the AudioSources Node, and append
if (! istemplate) {
+// printf("getting resources state\n");
projectNode.appendChild(m_asmanager->get_state(doc));
}
// Get all the Songs
QDomNode songsNode = doc.createElement("Songs");
+// printf("getting all Songs states\n");
foreach(Song* song, m_songs) {
songsNode.appendChild(song->get_state(doc, istemplate));
}
@@ -562,5 +571,19 @@
m_importDir = dir;
}
+bool Project::is_save_to_close()
+{
+ foreach(Song* song, m_songs) {
+ if (song->is_recording() && song->is_transporting()) {
+ QMessageBox::information( 0,
+ tr("Traverso - Information"),
+ tr("You're still recording, please stop
recording first to be able to quit the application!"),
+ QMessageBox::Ok);
+ return false;
+ }
+ }
+ return true;
+}
+
//eof
Index: core/Project.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- core/Project.h 4 Apr 2007 00:05:51 -0000 1.16
+++ core/Project.h 16 Apr 2007 09:08:31 -0000 1.17
@@ -73,6 +73,7 @@
Command* remove_song(Song* song, bool historable=true);
bool has_changed();
+ bool is_save_to_close();
int save();
int load(QString projectfile = "");
Index: core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- core/ProjectManager.cpp 4 Apr 2007 00:46:38 -0000 1.28
+++ core/ProjectManager.cpp 16 Apr 2007 09:08:31 -0000 1.29
@@ -87,10 +87,27 @@
{
PENTER;
+ if ( ! m_exitInProgress) {
emit projectLoaded(project);
+ }
if (currentProject) {
+ if (m_exitInProgress) {
+ QString oncloseaction =
config().get_property("Project", "onclose", "save").toString();
+ if (oncloseaction == "save") {
+ currentProject->save();
+ } else if (oncloseaction == "ask") {
+ if (QMessageBox::question(0, tr("Save
Project"),
+ tr("Do you want to save the Project before
quiting?"),
+ QMessageBox::Yes |
QMessageBox::No,
+ QMessageBox::Yes) ==
QMessageBox::Yes)
+ {
+ currentProject->save();
+ }
+ }
+ } else {
currentProject->save();
+ }
delete currentProject;
}
@@ -298,11 +315,15 @@
Command* ProjectManager::exit()
{
PENTER;
- m_exitInProgress = true;
if (currentProject) {
+ if (currentProject->is_save_to_close()) {
+ m_exitInProgress = true;
set_current_project(0);
} else {
+ return 0;
+ }
+ } else {
QApplication::exit();
}
Index: core/ViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ViewPort.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- core/ViewPort.cpp 12 Apr 2007 17:06:57 -0000 1.16
+++ core/ViewPort.cpp 16 Apr 2007 09:08:31 -0000 1.17
@@ -30,6 +30,7 @@
#include <QEvent>
#include <QStyleOptionGraphicsItem>
#include <Utils.h>
+#include "InputEngine.h"
#include "ViewPort.h"
#include "ContextPointer.h"
Index: traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- traverso/dialogs/settings/Pages.cpp 4 Apr 2007 12:08:57 -0000 1.9
+++ traverso/dialogs/settings/Pages.cpp 16 Apr 2007 09:08:31 -0000 1.10
@@ -524,6 +524,8 @@
config().set_property("Themer", "coloradjust",
m_themepage->colorAdjustBox->value());
config().set_property("Themer", "style",
m_themepage->styleCombo->currentText());
config().set_property("Themer", "usestylepallet",
m_themepage->useStylePalletCheckBox->isChecked());
+ config().set_property("Themer", "paintaudiorectified",
m_themepage->rectifiedCheckBox->isChecked());
+ config().set_property("Themer", "paintstereoaudioasmono",
m_themepage->mergedCheckBox->isChecked());
config().set_property("Interface", "OpenGL",
m_themepage->useOpenGLCheckBox->isChecked());
}
@@ -553,6 +555,8 @@
int coloradjust = config().get_property("Themer", "coloradjust",
100).toInt();
bool usestylepallete = config().get_property("Themer",
"usestylepallet", "").toBool();
bool useOpenGL = config().get_property("Interface", "OpenGL",
false).toBool();
+ bool paintRectified = config().get_property("Themer",
"paintaudiorectified", false).toBool();
+ bool paintStereoAsMono = config().get_property("Themer",
"paintstereoaudioasmono", false).toBool();
int index = m_themepage->styleCombo->findText(style);
m_themepage->styleCombo->setCurrentIndex(index);
@@ -562,6 +566,8 @@
m_themepage->useStylePalletCheckBox->setChecked(usestylepallete);
m_themepage->themePathLineEdit->setText(themepath);
m_themepage->useOpenGLCheckBox->setChecked(useOpenGL);
+ m_themepage->rectifiedCheckBox->setChecked(paintRectified);
+ m_themepage->mergedCheckBox->setChecked(paintStereoAsMono);
}
void AppearancePage::reset_default_config()
@@ -575,6 +581,8 @@
config().set_property("Themer", "style", systemstyle);
config().set_property("Themer", "usestylepallet", false);
config().set_property("Interface", "OpenGL", false);
+ config().set_property("Themer", "paintaudiorectified", false);
+ config().set_property("Themer", "paintstereoaudioasmono", false);
load_config();
}
@@ -584,6 +592,8 @@
: QWidget(parent)
{
setupUi(this);
+ // Until we find out how to make properly use of it, set disabled.
+ openGlGroupBox->hide();
themeSelecterCombo->setInsertPolicy(QComboBox::InsertAlphabetically);
}
@@ -594,6 +604,8 @@
connect(useStylePalletCheckBox, SIGNAL(toggled(bool)), this,
SLOT(use_selected_styles_pallet_checkbox_toggled(bool)));
connect(colorAdjustBox, SIGNAL(valueChanged(int)), this,
SLOT(color_adjustbox_changed(int)));
connect(pathSelectButton, SIGNAL(clicked()), this,
SLOT(dirselect_button_clicked()));
+ connect(rectifiedCheckBox, SIGNAL(toggled(bool)), this,
SLOT(theme_option_changed()));
+ connect(mergedCheckBox, SIGNAL(toggled(bool)), this,
SLOT(theme_option_changed()));
}
void ThemeConfigPage::style_index_changed(const QString& text)
@@ -661,6 +673,12 @@
}
+void ThemeConfigPage::theme_option_changed()
+{
+ config().set_property("Themer", "paintaudiorectified",
rectifiedCheckBox->isChecked());
+ config().set_property("Themer", "paintstereoaudioasmono",
mergedCheckBox->isChecked());
+ themer()->load();
+}
/****************************************/
@@ -681,9 +699,11 @@
{
int doubleFactTimeout = config().get_property("CCE",
"doublefactTimeout", 200).toInt();
int holdTimeout = config().get_property("CCE", "holdTimeout",
200).toInt();
+ int jogUpdateInterval = config().get_property("CCE",
"JogUpdateInterval", 28).toInt();
m_configpage->doubleFactTimeoutSpinBox->setValue(doubleFactTimeout);
m_configpage->holdTimeoutSpinBox->setValue(holdTimeout);
+ m_configpage->jogUpdateIntervalSpinBox->setValue(1000 /
jogUpdateInterval);
QString defaultkeymap = config().get_property("CCE", "keymap",
"default").toString();
int index = m_configpage->keymapComboBox->findText(defaultkeymap);
@@ -700,6 +720,7 @@
config().set_property("CCE", "doublefactTimeout",
m_configpage->doubleFactTimeoutSpinBox->value());
config().set_property("CCE", "holdTimeout",
m_configpage->holdTimeoutSpinBox->value());
config().set_property("CCE", "keymap", newkeymap);
+ config().set_property("CCE", "JogUpdateInterval", 1000 /
m_configpage->jogUpdateIntervalSpinBox->value());
ie().set_double_fact_interval(m_configpage->doubleFactTimeoutSpinBox->value());
ie().set_hold_sensitiveness(m_configpage->holdTimeoutSpinBox->value());
@@ -713,7 +734,7 @@
config().set_property("CCE", "doublefactTimeout", 180);
config().set_property("CCE", "holdTimeout", 150);
config().set_property("CCE", "keymap", "default");
-
+ config().set_property("CCE", "JogUpdateInterval", 28);
load_config();
}
Index: traverso/dialogs/settings/Pages.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- traverso/dialogs/settings/Pages.h 4 Apr 2007 12:08:57 -0000 1.4
+++ traverso/dialogs/settings/Pages.h 16 Apr 2007 09:08:31 -0000 1.5
@@ -129,6 +129,7 @@
void theme_index_changed(const QString& theme);
void use_selected_styles_pallet_checkbox_toggled(bool);
void color_adjustbox_changed(int);
+ void theme_option_changed();
};
Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- traverso/Interface.cpp 14 Apr 2007 19:14:51 -0000 1.63
+++ traverso/Interface.cpp 16 Apr 2007 09:08:31 -0000 1.64
@@ -754,10 +754,15 @@
void Interface::closeEvent(QCloseEvent * event)
{
- if (m_settingsdialog && m_settingsdialog->isVisible())
+ if (m_settingsdialog && m_settingsdialog->isVisible()) {
m_settingsdialog->close();
+ }
+ if (pm().get_project() && pm().get_project()->is_save_to_close()) {
event->accept();
+ } else {
+ event->ignore();
+ }
}
Command* Interface::show_project_manager_dialog()
Index: traverso/Traverso.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Traverso.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- traverso/Traverso.cpp 2 Apr 2007 09:52:31 -0000 1.32
+++ traverso/Traverso.cpp 16 Apr 2007 09:08:31 -0000 1.33
@@ -122,7 +122,7 @@
PENTER;
// Just in case the mouse was grabbed...
- cpointer().release_mouse();
+ cpointer().jog_finished();
QApplication::sendPostedEvents();
switch(signal) {
Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- traverso/songcanvas/AudioClipView.cpp 12 Apr 2007 12:48:17 -0000
1.40
+++ traverso/songcanvas/AudioClipView.cpp 16 Apr 2007 09:08:31 -0000
1.41
@@ -131,7 +131,7 @@
bool mousehover = (option->state & QStyle::State_MouseOver);
if (m_clip->recording_state() == AudioClip::RECORDING) {
- m_backgroundColor =
themer()->get_color("AudioClip:background:recording");
+ m_backgroundColor = m_backgroundColorMouseHover =
themer()->get_color("AudioClip:background:recording");
} else {
if (m_clip->is_muted()) {
m_backgroundColor =
themer()->get_color("AudioClip:background:muted");
@@ -648,8 +648,8 @@
m_infoAreaHeight = themer()->get_property("AudioClip:infoareaheight",
16).toInt();
m_usePolygonPeakDrawing =
themer()->get_property("AudioClip:polygonpeakdrawing", 0).toInt();
m_mimimumheightforinfoarea =
themer()->get_property("AudioClip:mimimumheightforinfoarea", 45).toInt();
- m_classicView = ! themer()->get_property("AudioClip:paintrectified",
0).toInt();
- m_mergedView = themer()->get_property("AudioClip:paintmerged",
0).toInt();
+ m_classicView = ! config().get_property("Themer",
"paintaudiorectified", false).toBool();
+ m_mergedView = config().get_property("Themer",
"paintstereoaudioasmono", false).toBool();
m_fillwave = themer()->get_property("AudioClip:fillwave", 1).toInt();
recreate_clipname_pixmap();
calculate_bounding_rect();
Index: traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- traverso/songcanvas/CurveView.cpp 12 Apr 2007 12:32:07 -0000 1.27
+++ traverso/songcanvas/CurveView.cpp 16 Apr 2007 09:08:31 -0000 1.28
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: CurveView.cpp,v 1.27 2007/04/12 12:32:07 r_sijrier Exp $
+$Id: CurveView.cpp,v 1.28 2007/04/16 09:08:31 r_sijrier Exp $
*/
#include "CurveView.h"
@@ -30,6 +30,7 @@
#include <CurveNode.h>
#include <ContextPointer.h>
#include <Song.h>
+#include <InputEngine.h>
#include <AddRemove.h>
Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- traverso/songcanvas/TimeLineView.cpp 11 Apr 2007 15:56:35 -0000
1.20
+++ traverso/songcanvas/TimeLineView.cpp 16 Apr 2007 09:08:31 -0000
1.21
@@ -39,6 +39,7 @@
#include <defines.h>
#include <AddRemove.h>
#include <CommandGroup.h>
+#include <InputEngine.h>
#include <QDebug>
@@ -209,7 +210,7 @@
void TimeLineView::paint(QPainter* painter, const QStyleOptionGraphicsItem*
option, QWidget* widget)
{
- PENTER;
+ PENTER3;
Q_UNUSED(widget);
// When the scrollarea moves by a small value, the text
Index: traverso/songcanvas/ViewItem.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ViewItem.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- traverso/songcanvas/ViewItem.h 11 Apr 2007 15:56:35 -0000 1.14
+++ traverso/songcanvas/ViewItem.h 16 Apr 2007 09:08:31 -0000 1.15
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: ViewItem.h,v 1.14 2007/04/11 15:56:35 r_sijrier Exp $
+$Id: ViewItem.h,v 1.15 2007/04/16 09:08:31 r_sijrier Exp $
*/
#ifndef VIEW_ITEM_H
@@ -29,6 +29,7 @@
#include <QGraphicsItem>
#include <QGraphicsSceneMouseEvent>
#include <QStyleOptionGraphicsItem>
+#include <Utils.h>
class SongView;
@@ -55,6 +56,7 @@
{
set_context_item(parentContext);
m_parentViewItem = parentViewItem;
+ setCursor(QCursor(find_pixmap(":/cursorFloat")));
}
~ViewItem() {};
Index: traverso/ui/KeyboardConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/KeyboardConfigPage.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- traverso/ui/KeyboardConfigPage.ui 5 Apr 2007 13:55:10 -0000 1.3
+++ traverso/ui/KeyboardConfigPage.ui 16 Apr 2007 09:08:31 -0000 1.4
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>341</width>
- <height>285</height>
+ <height>324</height>
</rect>
</property>
<property name="windowTitle" >
@@ -45,7 +45,7 @@
<number>9</number>
</property>
<property name="spacing" >
- <number>9</number>
+ <number>6</number>
</property>
<item>
<layout class="QHBoxLayout" >
@@ -150,6 +150,60 @@
</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_4" >
+ <property name="toolTip" >
+ <string><html><head><meta name="qrichtext" content="1"
/><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt;
font-weight:400; font-style:normal; text-decoration:none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">The number of times per
second at which the Graphical</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Items are repainted
during a jog action, like moving an</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">AudioClip, or changing
the Gain.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">The default frames per
second of 35 is a perfect compromise </p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">between smooth
painting, and low cpu usage.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">However, if you find
the painting to be not smooth enough,</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">change this value to a
higher one, but keep in mind that it</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">will consume
considerably more cpu!</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">If for example moving
an AudioClip still takes to much cpu,</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">you should consider to
lower this value.</p></body></html></string>
+ </property>
+ <property name="text" >
+ <string>Jog update interval (fps)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="jogUpdateIntervalSpinBox" >
+ <property name="maximumSize" >
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="maximum" >
+ <number>50</number>
+ </property>
+ <property name="minimum" >
+ <number>20</number>
+ </property>
+ <property name="value" >
+ <number>25</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
@@ -210,19 +264,6 @@
</layout>
</widget>
</item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>16</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<resources/>
Index: traverso/ui/ThemeConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ThemeConfigPage.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/ui/ThemeConfigPage.ui 3 Apr 2007 21:25:25 -0000 1.2
+++ traverso/ui/ThemeConfigPage.ui 16 Apr 2007 09:08:31 -0000 1.3
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>346</width>
- <height>410</height>
+ <height>428</height>
</rect>
</property>
<property name="windowTitle" >
@@ -170,7 +170,7 @@
<number>9</number>
</property>
<property name="spacing" >
- <number>9</number>
+ <number>6</number>
</property>
<item>
<layout class="QHBoxLayout" >
@@ -199,6 +199,20 @@
</item>
</layout>
</item>
+ <item>
+ <widget class="QCheckBox" name="rectifiedCheckBox" >
+ <property name="text" >
+ <string>Paint audio rectified</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="mergedCheckBox" >
+ <property name="text" >
+ <string>Paint stereo audio as mono audio</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -262,7 +276,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_3" >
+ <widget class="QGroupBox" name="openGlGroupBox" >
<property name="title" >
<string>Open GL Options</string>
</property>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src commands/Gain.cpp commands/MoveCli...,
Remon Sijrier <=