[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso src/traverso/Interface.cpp src/travers...
|
From: |
Nicola Doebelin |
|
Subject: |
[Traverso-commit] traverso src/traverso/Interface.cpp src/travers... |
|
Date: |
Wed, 14 May 2008 17:22:36 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 08/05/14 17:22:33
Modified files:
src/traverso : Interface.cpp Interface.h traverso.qrc
src/traverso/widgets: TransportConsoleWidget.cpp
Added files:
resources/images/icons: system-switch-user.png
system-switch-user.svgz
traverso-snap.png traverso-snap.svgz
view-media-equalizer.png
view-media-equalizer.svgz
Log message:
* added standard tool bars and new icons
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/icons/system-switch-user.png?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/icons/system-switch-user.svgz?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/icons/traverso-snap.png?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/icons/traverso-snap.svgz?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/icons/view-media-equalizer.png?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/icons/view-media-equalizer.svgz?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.137&r2=1.138
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.qrc?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/TransportConsoleWidget.cpp?cvsroot=traverso&r1=1.1&r2=1.2
Patches:
Index: src/traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- src/traverso/Interface.cpp 13 May 2008 23:24:32 -0000 1.137
+++ src/traverso/Interface.cpp 14 May 2008 17:22:26 -0000 1.138
@@ -171,6 +171,11 @@
m_sysinfo = new SysInfoToolBar(this);
addToolBar(Qt::BottomToolBarArea, m_sysinfo);
+ m_projectToolBar = new QToolBar(this);
+ addToolBar(m_projectToolBar);
+
+ m_editToolBar = new QToolBar(this);
+ addToolBar(m_editToolBar);
// Some default values.
currentSheetWidget = 0;
@@ -475,63 +480,54 @@
action = m_projectMenu->addAction(tr("&New..."));
action->setIcon(find_pixmap(":/new"));
action->setShortcuts(QKeySequence::New);
+ m_projectToolBar->addAction(action);
connect(action, SIGNAL(triggered(bool)), this,
SLOT(show_newproject_dialog()));
action = m_projectMenu->addAction(tr("&Open..."));
-//
action->setIcon(style()->standardIcon(QStyle::SP_FileDialogContentsView));
action->setIcon(QIcon(":/open"));
action->setShortcuts(QKeySequence::Open);
+ m_projectToolBar->addAction(action);
connect(action, SIGNAL(triggered(bool)), this,
SLOT(show_open_project_dialog()));
action = m_projectMenu->addAction(tr("&Save"));
m_projectSaveAction = action;
action->setShortcuts(QKeySequence::Save);
-// action->setIcon(style()->standardIcon(QStyle::SP_DialogSaveButton));
action->setIcon(QIcon(":/save"));
+ m_projectToolBar->addAction(action);
connect(action, SIGNAL(triggered(bool)), &pm(), SLOT(save_project()));
m_projectMenu->addSeparator();
- action = m_projectMenu->addAction(tr("Import &Audio..."));
- action->setIcon(QIcon(":/import-audio"));
- connect(action, SIGNAL(triggered()), this, SLOT(import_audio()));
- action = m_projectMenu->addAction(tr("Insert Si&lence..."));
- action->setIcon(QIcon(":/import-silence"));
- connect(action, SIGNAL(triggered()), this,
SLOT(show_insertsilence_dialog()));
-
- m_projectMenu->addSeparator();
-
- action = m_projectMenu->addAction(tr("&Manage Project..."));
+ m_projectSheetManagerAction = m_projectMenu->addAction(tr("&Manage
Project..."));
QList<QKeySequence> list;
list.append(QKeySequence("F4"));
- action->setShortcuts(list);
- action->setIcon(QIcon(find_pixmap(":/sheetmanager-16")));
- m_projectSheetManagerAction = action;
+ m_projectSheetManagerAction->setShortcuts(list);
+ m_projectSheetManagerAction->setIcon(QIcon(":/projectmanager"));
+ m_projectToolBar->addAction(m_projectSheetManagerAction);
connect(action, SIGNAL(triggered(bool)), this,
SLOT(show_project_manager_dialog()));
- action = m_projectMenu->addAction(tr("&Export..."));
+ m_projectExportAction = m_projectMenu->addAction(tr("&Export..."));
list.clear();
list.append(QKeySequence("F9"));
- action->setShortcuts(list);
-// action->setIcon(style()->standardIcon(QStyle::SP_DialogApplyButton));
- action->setIcon(QIcon(":/export"));
- m_projectExportAction = action;
+ m_projectExportAction->setShortcuts(list);
+ m_projectExportAction->setIcon(QIcon(":/export"));
+ m_projectToolBar->addAction(m_projectExportAction);
connect(action, SIGNAL(triggered(bool)), this,
SLOT(show_export_widget()));
action = m_projectMenu->addAction(tr("&CD Writing..."));
list.clear();
list.append(QKeySequence("F8"));
action->setShortcuts(list);
-// action->setIcon(style()->standardIcon(QStyle::SP_DialogApplyButton));
action->setIcon(QIcon(":/write-cd"));
+ m_projectToolBar->addAction(action);
connect(action, SIGNAL(triggered(bool)), this,
SLOT(show_cd_writing_dialog()));
action = m_projectMenu->addAction(tr("&Restore Backup..."));
list.clear();
list.append(QKeySequence("F10"));
action->setShortcuts(list);
-// action->setIcon(style()->standardIcon(QStyle::SP_FileDialogBack));
action->setIcon(QIcon(":/restore"));
+ m_projectToolBar->addAction(action);
connect(action, SIGNAL(triggered(bool)), this,
SLOT(show_restore_project_backup_dialog()));
m_projectMenu->addSeparator();
@@ -547,29 +543,51 @@
action = m_editMenu->addAction(tr("Undo"));
action->setIcon(QIcon(":/undo"));
+ m_editToolBar->addAction(action);
connect(action, SIGNAL(triggered( bool )), &pm(), SLOT(undo()));
+
action = m_editMenu->addAction(tr("Redo"));
action->setIcon(QIcon(":/redo"));
+ m_editToolBar->addAction(action);
connect(action, SIGNAL(triggered( bool )), &pm(), SLOT(redo()));
+ m_editMenu->addSeparator();
+ m_editToolBar->addSeparator();
+
+ action = m_editMenu->addAction(tr("Import &Audio..."));
+ action->setIcon(QIcon(":/import-audio"));
+ m_editToolBar->addAction(action);
+ connect(action, SIGNAL(triggered()), this, SLOT(import_audio()));
+
+ action = m_editMenu->addAction(tr("Insert Si&lence..."));
+ action->setIcon(QIcon(":/import-silence"));
+ m_editToolBar->addAction(action);
+ connect(action, SIGNAL(triggered()), this,
SLOT(show_insertsilence_dialog()));
+
+ m_editMenu->addSeparator();
+ m_editToolBar->addSeparator();
m_snapAction = m_editMenu->addAction(tr("&Snap"));
+ m_snapAction->setIcon(QIcon(":/snap"));
m_snapAction->setCheckable(true);
m_snapAction->setToolTip(tr("Snap items to edges of other items while
dragging."));
+ m_editToolBar->addAction(m_snapAction);
connect(m_snapAction, SIGNAL(triggered(bool)), this,
SLOT(snap_state_changed(bool)));
m_followAction = m_editMenu->addAction(tr("S&croll Playback"));
+ m_followAction->setIcon(QIcon(":/follow"));
m_followAction->setCheckable(true);
m_followAction->setToolTip(tr("Keep play cursor in view while playing
or recording."));
+ m_editToolBar->addAction(m_followAction);
connect(m_followAction, SIGNAL(triggered(bool)), this,
SLOT(follow_state_changed(bool)));
m_effectAction = m_editMenu->addAction(tr("&Show Effects"));
+ m_effectAction->setIcon(QIcon(":/effects"));
m_effectAction->setCheckable(true);
m_effectAction->setToolTip(tr("Show effect plugins and automation
curves on tracks"));
+ m_editToolBar->addAction(m_effectAction);
connect(m_effectAction, SIGNAL(triggered(bool)), this,
SLOT(effect_state_changed(bool)));
-
-
m_viewMenu = menuBar()->addMenu(tr("&View"));
m_viewMenu->addAction(historyDW->toggleViewAction());
@@ -590,6 +608,15 @@
m_viewMenu->addAction(m_sysinfo->toggleViewAction());
m_sysinfo->toggleViewAction()->setText(tr("System Information"));
+ // if unifiedTitleAndToolBarOnMac == true we don't want the main
toolbars
+ // to be hidden. thus only add the menu entries on systems != OS X
+ #if !defined (Q_WS_MAC)
+ m_viewMenu->addAction(m_projectToolBar->toggleViewAction());
+ m_projectToolBar->toggleViewAction()->setText(tr("Project tool
bar"));
+
+ m_viewMenu->addAction(m_editToolBar->toggleViewAction());
+ m_editToolBar->toggleViewAction()->setText(tr("Edit tool bar"));
+ #endif
m_sheetMenu = menuBar()->addMenu(tr("&Sheet"));
m_sheetMenuAction = m_sheetMenu->menuAction();
Index: src/traverso/Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/traverso/Interface.h 13 May 2008 23:24:33 -0000 1.56
+++ src/traverso/Interface.h 14 May 2008 17:22:28 -0000 1.57
@@ -137,6 +137,8 @@
BusMonitor* busMonitor;
QToolBar* mainToolBar;
+ QToolBar* m_projectToolBar;
+ QToolBar* m_editToolBar;
QToolButton* openGlButton;
QAction* m_projectSaveAction;
QAction* m_projectSheetManagerAction;
Index: src/traverso/traverso.qrc
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.qrc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/traverso/traverso.qrc 13 May 2008 23:24:33 -0000 1.28
+++ src/traverso/traverso.qrc 14 May 2008 17:22:29 -0000 1.29
@@ -52,9 +52,9 @@
<file
alias="redled-16">../../resources/images/icons/16x16/redled.png</file>
<file
alias="refresh-16">../../resources/images/icons/16x16/reload.png</file>
<file
alias="redledinactive-16">../../resources/images/icons/16x16/redledinactive.png</file>
- <file
alias="sheetmanager-16">../../resources/images/icons/16x16/contents.png</file>
+ <file
alias="projectmanager">../../resources/images/icons/project-open.png</file>
<file
alias="new">../../resources/images/icons/document-new.png</file>
- <file
alias="open">../../resources/images/icons/project-open.png</file>
+ <file
alias="open">../../resources/images/icons/document-open.png</file>
<file
alias="save">../../resources/images/icons/document-save.png</file>
<file
alias="export">../../resources/images/icons/document-export.png</file>
<file
alias="import">../../resources/images/icons/document-import.png</file>
@@ -63,6 +63,9 @@
<file
alias="new-sheet">../../resources/images/icons/tab-new-background.png</file>
<file
alias="import-audio">../../resources/images/icons/document-open.png</file>
<file
alias="import-silence">../../resources/images/icons/document-import.png</file>
+ <file
alias="snap">../../resources/images/icons/traverso-snap.png</file>
+ <file
alias="effects">../../resources/images/icons/view-media-equalizer.png</file>
+ <file
alias="follow">../../resources/images/icons/system-switch-user.png</file>
<file
alias="traverso_nl">../../resources/translations/traverso_nl.qm</file>
<file
alias="traverso_de">../../resources/translations/traverso_de.qm</file>
<file
alias="traverso_fr">../../resources/translations/traverso_fr.qm</file>
Index: src/traverso/widgets/TransportConsoleWidget.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/widgets/TransportConsoleWidget.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/traverso/widgets/TransportConsoleWidget.cpp 13 May 2008 23:24:35
-0000 1.1
+++ src/traverso/widgets/TransportConsoleWidget.cpp 14 May 2008 17:22:32
-0000 1.2
@@ -40,6 +40,8 @@
TransportConsoleWidget::TransportConsoleWidget(QWidget* parent)
: QWidget(parent)
{
+ setEnabled(false);
+
m_layout = new QGridLayout(this);
m_label = new QLabel(this);
m_label->setAlignment(Qt::AlignCenter);
@@ -125,9 +127,12 @@
if (!m_sheet)
{
m_updateTimer.stop();
+ setEnabled(false);
return;
}
+ setEnabled(true);
+
connect(m_sheet, SIGNAL(recordingStateChanged()), this,
SLOT(update_recording_state()));
connect(m_sheet, SIGNAL(transferStarted()), this,
SLOT(transfer_started()));
connect(m_sheet, SIGNAL(transferStopped()), this,
SLOT(transfer_stopped()));
@@ -138,22 +143,12 @@
void TransportConsoleWidget::to_start()
{
- if (!m_sheet)
- {
- return;
- }
-
m_sheet->set_transport_pos((TimeRef)0.0);
m_sheet->set_work_at((TimeRef)0.0);
}
void TransportConsoleWidget::to_left()
{
- if (!m_sheet)
- {
- return;
- }
-
SnapList* slist = m_sheet->get_snap_list();
TimeRef p = m_sheet->get_transport_location();
TimeRef newpos = slist->prev_snap_pos(p);
@@ -162,31 +157,16 @@
void TransportConsoleWidget::rec_toggled()
{
- if (!m_sheet)
- {
- return;
- }
-
m_sheet->set_recordable();
}
void TransportConsoleWidget::play_toggled()
{
- if (!m_sheet)
- {
- return;
- }
-
m_sheet->start_transport();
}
void TransportConsoleWidget::to_end()
{
- if (!m_sheet)
- {
- return;
- }
-
// stop the transport, no need to play any further than the end of the
sheet
if (m_sheet->is_transport_rolling())
{
@@ -197,11 +177,6 @@
void TransportConsoleWidget::to_right()
{
- if (!m_sheet)
- {
- return;
- }
-
SnapList* slist = m_sheet->get_snap_list();
TimeRef p = m_sheet->get_transport_location();
TimeRef newpos = slist->next_snap_pos(p);
Index: resources/images/icons/system-switch-user.png
===================================================================
RCS file: resources/images/icons/system-switch-user.png
diff -N resources/images/icons/system-switch-user.png
Binary files /dev/null and /tmp/cvsHXqEKN differ
Index: resources/images/icons/system-switch-user.svgz
===================================================================
RCS file: resources/images/icons/system-switch-user.svgz
diff -N resources/images/icons/system-switch-user.svgz
Binary files /dev/null and /tmp/cvsIQynfU differ
Index: resources/images/icons/traverso-snap.png
===================================================================
RCS file: resources/images/icons/traverso-snap.png
diff -N resources/images/icons/traverso-snap.png
Binary files /dev/null and /tmp/cvsz9uulY differ
Index: resources/images/icons/traverso-snap.svgz
===================================================================
RCS file: resources/images/icons/traverso-snap.svgz
diff -N resources/images/icons/traverso-snap.svgz
Binary files /dev/null and /tmp/cvstIvOu1 differ
Index: resources/images/icons/view-media-equalizer.png
===================================================================
RCS file: resources/images/icons/view-media-equalizer.png
diff -N resources/images/icons/view-media-equalizer.png
Binary files /dev/null and /tmp/cvsOjAA31 differ
Index: resources/images/icons/view-media-equalizer.svgz
===================================================================
RCS file: resources/images/icons/view-media-equalizer.svgz
diff -N resources/images/icons/view-media-equalizer.svgz
Binary files /dev/null and /tmp/cvsXq03hf differ