[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso Interface.cpp Interface.h...
|
From: |
Ben Levitt |
|
Subject: |
[Traverso-commit] traverso/src/traverso Interface.cpp Interface.h... |
|
Date: |
Thu, 07 Jun 2007 04:05:14 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/06/07 04:05:14
Modified files:
src/traverso : Interface.cpp Interface.h traverso.pro
Added files:
src/traverso/ui: QuickStart.ui
Log message:
Reword the About Box text, Add a Getting Started item to the Help Menu
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/QuickStart.ui?cvsroot=traverso&rev=1.1
Patches:
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- Interface.cpp 5 Jun 2007 14:02:16 -0000 1.90
+++ Interface.cpp 7 Jun 2007 04:05:13 -0000 1.91
@@ -42,6 +42,8 @@
#include "songcanvas/SongWidget.h"
+#include "ui_QuickStart.h"
+
#include "widgets/InfoWidgets.h"
#include "widgets/ResourcesWidget.h"
@@ -166,6 +168,7 @@
m_busSelector = 0;
m_newSongDialog = 0;
m_newTrackDialog = 0;
+ m_quickStart = 0;
create_menus();
@@ -270,18 +273,32 @@
Command* Interface::about_traverso()
{
PENTER;
- QString text(tr("Traverso %1, making use of Qt %2\n\n"
- "Traverso, a Multitrack audio recording and editing
program.\n\n"
- "Traverso uses a very powerfull interface concept,
which makes recording\n"
- "and editing audio much quicker and a pleasure to do!\n"
- "See for more info the Help file\n\n"
- "Traverso is brought to you by the author, R. Sijrier,
and all the people from Free Software world\n"
- "who made important technologies on which Traverso is
based (Gcc, Qt, Xorg, Linux, and so on)").arg(VERSION).arg(QT_VERSION_STR));
+ QString text(tr("Traverso %1 (built with Qt %2)\n\n"
+ "A multitrack audio recording and editing program.\n\n"
+ "Look in the Help menu for more info.\n\n"
+ "Traverso is brought to you by R. Sijrier and others,\n"
+ "including all the people from the Free Software
world\n"
+ "who contributed the important technologies on which\n"
+ "Traverso is based (Gcc, Qt, Xorg, Linux, and so on)"
).arg(VERSION).arg(QT_VERSION_STR));
QMessageBox::about ( this, tr("About Traverso"), text);
return (Command*) 0;
}
+Command* Interface::quick_start()
+{
+ PENTER;
+
+ if (m_quickStart == 0) {
+ m_quickStart = new QDialog();
+ Ui_QuickStartDialog *qsd = new Ui_QuickStartDialog();
+ qsd->setupUi(m_quickStart);
+ }
+ m_quickStart->show();
+
+ return (Command*) 0;
+}
+
Command* Interface::full_screen()
{
if (isFullScreen())
@@ -417,6 +434,9 @@
menu = menuBar()->addMenu("&Help");
+ action = menu->addAction(tr("&Getting Started"));
+ connect(action, SIGNAL(triggered(bool)), this, SLOT(quick_start()));
+
action = menu->addAction(tr("&User Manual"));
action->setIcon(style()->standardIcon(QStyle::SP_DialogHelpButton));
connect(action, SIGNAL(triggered(bool)), this,
SLOT(open_help_browser()));
Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- Interface.h 5 Jun 2007 14:02:16 -0000 1.37
+++ Interface.h 7 Jun 2007 04:05:14 -0000 1.38
@@ -62,6 +62,7 @@
class NewSongDialog;
class NewTrackDialog;
class NewProjectDialog;
+class Ui_QuickStartDialog;
struct MenuData;
class Interface : public QMainWindow
@@ -118,6 +119,7 @@
NewSongDialog* m_newSongDialog;
NewTrackDialog* m_newTrackDialog;
NewProjectDialog* m_newProjectDialog;
+ QDialog *m_quickStart;
BusMonitor* busMonitor;
@@ -152,6 +154,7 @@
Command* full_screen();
Command* about_traverso();
+ Command* quick_start();
Command* export_keymap();
Command* show_export_widget();
Command* show_context_menu();
Index: traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- traverso.pro 5 Jun 2007 14:02:16 -0000 1.53
+++ traverso.pro 7 Jun 2007 04:05:14 -0000 1.54
@@ -102,6 +102,7 @@
ui/NewSongDialog.ui \
ui/NewTrackDialog.ui \
ui/ResourcesWidget.ui \
+ ui/QuickStart.ui \
ui/InsertSilenceDialog.ui
INCLUDEPATH += ../core \
../commands \
Index: ui/QuickStart.ui
===================================================================
RCS file: ui/QuickStart.ui
diff -N ui/QuickStart.ui
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ui/QuickStart.ui 7 Jun 2007 04:05:14 -0000 1.1
@@ -0,0 +1,96 @@
+<ui version="4.0" >
+ <class>QuickStartDialog</class>
+ <widget class="QDialog" name="QuickStartDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>515</width>
+ <height>370</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Traverso: Getting Started</string>
+ </property>
+ <property name="windowIcon" >
+ <iconset>../../../resources/images/traverso.png</iconset>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QTextBrowser" name="textBrowser" >
+ <property name="horizontalScrollBarPolicy" >
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="html" >
+ <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; font-family:'MS Shell
Dlg 2'; font-size:8pt;"><span style=" font-size:18pt;
font-weight:600;">Traverso: Getting Started</span></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;
font-family:'MS Shell Dlg 2'; font-size:8pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;">When you import an audio file into Traverso, it shows
up as an Audio Clip in one of the horizontal Tracks in the current Sheet. You
can edit many aspects of these Clips by placing the mouse pointer over a Clip
and pressing or holding different keys on your keyboard. You can also change
settings of a Track, the Sheet as a whole, and other objects in the
Sheet.</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;
font-family:'MS Shell Dlg 2'; font-size:8pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;">To see a list of what commands are available for any
given object in the Sheet, move the mouse over that object, and Right-Click (or
press Q). The keyboard shortcuts for each command are shown in the menu. The
notation used is shown below.</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;
font-family:'MS Shell Dlg 2'; font-size:8pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">&lt; K
&gt; </span> means press and release the K key. (Like a click.)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"><span style=" font-weight:600;">&lt;&lt; K
&gt;&gt;</span> means press the K key two times fast. (Like a double
click.)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">[ K ]</span>
means drag the mouse while holding down the K key.</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">&lt; KL
&gt; </span> means press the K and L keys at the same time.</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">[ KL ]
</span> means drag the mouse while holding down the K and L keys at the same
time.</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;
font-family:'MS Shell Dlg 2'; font-size:8pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;">Here are some basic commands:</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">&lt; SPACE
&gt;</span> is Play/Stop.</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">&lt; SHIFT
&gt;</span> sets the Playhead. (Blue vertical line where playing
starts.)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">&lt; W
&gt;</span> sets the Work Cursor. (Red vertical line.)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">&lt; V
&gt; </span> moves the Playhead back to the Work Cursor.</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">[ Z
]</span> zooms in and out.</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;
font-family:'MS Shell Dlg 2'; font-size:8pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;">And some Audio Clip Commands:</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">[ E ] </span>
drags a Clip's left or right edge.</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">[ F ]</span>
adjusts the length of a Clip's Fade In / Fade Out.</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;"> <span style=" font-weight:600;">&lt; X
&gt;</span> splits the Clip at the cursor's position.</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;
font-family:'MS Shell Dlg 2'; font-size:8pt;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell
Dlg 2'; font-size:8pt;">For more information, right-click on everything, or
check out the Traverso manual.</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;
font-family:'MS Shell Dlg 2'; font-size:8pt;"></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;
font-family:'MS Shell Dlg 2'; font-size:8pt;"></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;
font-family:'MS Shell Dlg 2';
font-size:8pt;"></p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+ <set>QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>clicked(QAbstractButton*)</signal>
+ <receiver>QuickStartDialog</receiver>
+ <slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>262</x>
+ <y>324</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>314</x>
+ <y>-10</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/traverso Interface.cpp Interface.h...,
Ben Levitt <=