[Traverso-commit] traverso/src/traverso Interface.cpp Interface.h

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    08/05/23 08:48:28

Modified files:
        src/traverso   : Interface.cpp Interface.h 

Log message:
        * Transport console was converted into a toolbar

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.57&r2=1.58

Patches:
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- Interface.cpp       18 May 2008 20:55:33 -0000      1.141
+++ Interface.cpp       23 May 2008 08:48:27 -0000      1.142
@@ -161,12 +161,9 @@
        busMonitorDW->setWidget(busMonitor);
        addDockWidget(Qt::RightDockWidgetArea, busMonitorDW);
        
-       transportDW = new QDockWidget(tr("Transport Console"), this);
-       transportDW->setObjectName("TransportConsoleDockWidget");
-       transportConsole = new TransportConsoleWidget(transportDW);
-       transportDW->setWidget(transportConsole);
-       addDockWidget(Qt::RightDockWidgetArea, transportDW);
-       transportDW->hide();
+       transportConsole = new TransportConsoleWidget(this);
+       transportConsole->setObjectName("Transport Console");
+       addToolBar(Qt::BottomToolBarArea, transportConsole);
        
        m_sysinfo = new SysInfoToolBar(this);
        m_sysinfo->setObjectName("System Info Toolbar");
@@ -606,7 +603,6 @@
        m_viewMenu->addAction(historyDW->toggleViewAction());
        m_viewMenu->addAction(busMonitorDW->toggleViewAction());
        m_viewMenu->addAction(AudioSourcesDW->toggleViewAction());
-       m_viewMenu->addAction(transportDW->toggleViewAction());
 
        action = m_viewMenu->addAction(tr("Marker Editor..."));
        connect(action, SIGNAL(triggered(bool)), this, 
SLOT(show_marker_dialog()));
@@ -621,6 +617,9 @@
        m_viewMenu->addAction(m_sysinfo->toggleViewAction());
        m_sysinfo->toggleViewAction()->setText(tr("System Information"));
 
+       m_viewMenu->addAction(transportConsole->toggleViewAction());
+       transportConsole->toggleViewAction()->setText(tr("Transport Console"));
+
        // 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)
@@ -643,7 +642,6 @@
 
        m_sheetMenu->addSeparator();
 
-       
        m_settingsMenu = menuBar()->addMenu(tr("Se&ttings"));
        
        m_encodingMenu = m_settingsMenu->addMenu(tr("&Recording File Format"));

Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- Interface.h 14 May 2008 17:22:28 -0000      1.57
+++ Interface.h 23 May 2008 08:48:27 -0000      1.58
@@ -124,7 +124,6 @@
        OpenProjectDialog*      m_openProjectDialog;
        InsertSilenceDialog*    m_insertSilenceDialog;
        MarkerDialog*           m_markerDialog;
-//     InfoToolBar*            m_infoBar;
        SysInfoToolBar*         m_sysinfo;
        BusSelectorDialog*      m_busSelector;
        NewSheetDialog*         m_newSheetDialog;