[Traverso-commit] traverso/src/traverso CMakeLists.txt Interface....

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/05/24 17:24:06

Modified files:
        src/traverso   : CMakeLists.txt Interface.cpp Interface.h 
        src/traverso/dialogs/settings: SettingsDialog.cpp 
                                       SettingsDialog.h 
        src/traverso/widgets: InfoWidgets.cpp InfoWidgets.h 

Log message:
        * open the SettingsDialog when clicking on the driver info button 
(bottom left mainwindow) instead of a slimmed down version of the 
settingsdialog Sound System page.
        * cleanup includes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.142&r2=1.143
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/SettingsDialog.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.25&r2=1.26

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CMakeLists.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- CMakeLists.txt      22 May 2008 14:54:23 -0000      1.14
+++ CMakeLists.txt      24 May 2008 17:24:05 -0000      1.15
@@ -29,7 +29,6 @@
 PluginSelectorDialog.cpp
 Interface.cpp
 VUMeter.cpp
-QuickDriverConfigWidget.cpp
 dialogs/settings/Pages.cpp
 dialogs/settings/SettingsDialog.cpp
 dialogs/project/ProjectManagerDialog.cpp
@@ -58,7 +57,6 @@
 ui/AudioSourcesManagerWidget.ui
 ui/ExportFormatOptionsWidget.ui
 ui/SpectralMeterConfigWidget.ui
-ui/QuickDriverConfigWidget.ui
 ui/DriverConfigPage.ui
 ui/AlsaDevicesPage.ui
 ui/PaDriverPage.ui
@@ -76,7 +74,6 @@
 ui/NewSheetDialog.ui
 ui/NewTrackDialog.ui
 ui/ResourcesWidget.ui
-ui/QuickStart.ui
 ui/InsertSilenceDialog.ui
 ui/RestoreProjectBackupDialog.ui
 ui/ProjectConverterDialog.ui
@@ -88,7 +85,6 @@
 BusMonitor.h
 Interface.h
 PluginSelectorDialog.h
-QuickDriverConfigWidget.h
 Traverso.h
 VUMeter.h
 dialogs/BusSelectorDialog.h

Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- Interface.cpp       23 May 2008 08:48:27 -0000      1.142
+++ Interface.cpp       24 May 2008 17:24:05 -0000      1.143
@@ -1187,6 +1187,12 @@
        m_settingsdialog->show();
 }
 
+void Interface::show_settings_dialog_sound_system_page()
+{
+       show_settings_dialog();
+       m_settingsdialog->show_page("Sound System");
+}
+
 
 void Interface::closeEvent(QCloseEvent * event)
 {
@@ -1571,4 +1577,3 @@
        sheet_selector_update_sheets();
 }
 
-

Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- Interface.h 23 May 2008 08:48:27 -0000      1.58
+++ Interface.h 24 May 2008 17:24:05 -0000      1.59
@@ -47,8 +47,6 @@
 class QToolButton;
 class ResourcesWidget;
 class ResourcesInfoWidget;
-class DriverInfoWidget;
-class HDDSpaceInfoWidget;
 class SheetWidget;
 class CorrelationMeterWidget;
 class SpectralMeterWidget;
@@ -156,10 +154,6 @@
        QMenu*                  m_helpMenu;
        QList<QAction*>         m_currentSheetActions;
        
-       ResourcesInfoWidget*    resourcesInfo;
-       DriverInfoWidget*       driverInfo;
-       HDDSpaceInfoWidget*     hddInfo;
-       
        void create_menus();
        void save_config_and_emit_message(const QString& message);
        
@@ -172,6 +166,7 @@
        void set_project(Project* project);
        void show_sheet(Sheet* sheet);
        void show_settings_dialog();
+       void show_settings_dialog_sound_system_page();
        void open_help_browser();
        void process_context_menu_action(QAction* action);
        void set_fade_in_shape(QAction* action);

Index: dialogs/settings/SettingsDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- dialogs/settings/SettingsDialog.cpp 24 May 2008 15:51:09 -0000      1.12
+++ dialogs/settings/SettingsDialog.cpp 24 May 2008 17:24:06 -0000      1.13
@@ -88,6 +88,14 @@
        resize(500, 400);
 }
 
+void SettingsDialog::show_page(const QString & page)
+{
+       if (page == "Sound System") {
+               contentsWidget->setCurrentRow(2);
+       }
+}
+
+
 void SettingsDialog::createIcons()
 {
        QListWidgetItem* behaviorButton = new QListWidgetItem(contentsWidget);

Index: dialogs/settings/SettingsDialog.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/settings/SettingsDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- dialogs/settings/SettingsDialog.h   22 Nov 2007 19:11:16 -0000      1.2
+++ dialogs/settings/SettingsDialog.h   24 May 2008 17:24:06 -0000      1.3
@@ -35,6 +35,8 @@
 public:
        SettingsDialog(QWidget* parent=0);
        
+       void show_page(const QString& page);
+       
 public slots:
        void changePage(QListWidgetItem *current, QListWidgetItem *previous);
        

Index: widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- widgets/InfoWidgets.cpp     13 May 2008 23:24:34 -0000      1.62
+++ widgets/InfoWidgets.cpp     24 May 2008 17:24:06 -0000      1.63
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2005-2007 Remon Sijrier 
+Copyright (C) 2005-2008 Remon Sijrier 
 
 This file is part of Traverso
 
@@ -21,19 +21,25 @@
 
 #include "InfoWidgets.h"
 
-#include "libtraversocore.h"
-#include "Themer.h"
+#include "AudioDevice.h"
+#include "Config.h"
 #include "DiskIO.h"
-#include <AudioDevice.h>
-#include <Utils.h>
-#include "QuickDriverConfigWidget.h"
+#include "Interface.h"
 #include "MessageWidget.h" 
-#include <Interface.h>
+#include "Project.h"
+#include "ProjectManager.h"
+#include "Sheet.h"
+#include "Themer.h"
+#include "Track.h"
+#include "Utils.h"
 
-#include <QPixmap>
+#include <QPainter>
 #include <QByteArray>
-#include <QDesktopWidget>
 #include <QPalette>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QAction>
+
 
 #if defined (Q_WS_WIN)
 #include <Windows.h>
@@ -151,8 +157,6 @@
        m_driver->setFlat(true);
        m_driver->setFocusPolicy(Qt::NoFocus);
        
-       driverConfigWidget = 0;
-       
        QHBoxLayout* lay = new QHBoxLayout(this);
        lay->addWidget(m_driver);
        lay->setMargin(0);
@@ -162,7 +166,7 @@
        
        connect(&audiodevice(), SIGNAL(driverParamsChanged()), this, 
SLOT(update_driver_info()));
        connect(&audiodevice(), SIGNAL(bufferUnderRun()), this, 
SLOT(update_xrun_info()));
-       connect(m_driver, SIGNAL(clicked( bool )), this, 
SLOT(show_driver_config_widget()));
+       connect(m_driver, SIGNAL(clicked( bool )), this, 
SLOT(show_driver_config_dialog()));
        
        update_driver_info();
 }
@@ -216,26 +220,9 @@
 }
 
 
-void DriverInfo::show_driver_config_widget( )
+void DriverInfo::show_driver_config_dialog( )
 {
-       if (! driverConfigWidget) {
-               driverConfigWidget = new QuickDriverConfigWidget(m_driver);
-       }
-       
-       
-       QRect rect = QApplication::desktop()->screenGeometry();
-       QPoint pos = QCursor::pos();
-       
-       if ( (pos.y() + driverConfigWidget->height() + 30) > rect.height()) {
-               pos.setY(pos.y() - driverConfigWidget->height());
-       }
-       
-       if ( (pos.x() + driverConfigWidget->width() + 20) > rect.width()) {
-               pos.setX(pos.x() - driverConfigWidget->width());
-       }
-       
-       driverConfigWidget->move(pos);
-       driverConfigWidget->show();
+       Interface::instance()->show_settings_dialog_sound_system_page();
 }
 
 

Index: widgets/InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- widgets/InfoWidgets.h       13 May 2008 23:24:34 -0000      1.25
+++ widgets/InfoWidgets.h       24 May 2008 17:24:06 -0000      1.26
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2005-2007 Remon Sijrier 
+    Copyright (C) 2005-2008 Remon Sijrier 
  
     This file is part of Traverso
  
@@ -22,23 +22,17 @@
 #ifndef RESOURCES_INFO_WIDGET_H
 #define RESOURCES_INFO_WIDGET_H
 
-#include <QPushButton>
-#include <QComboBox>
-#include <QAction>
 #include <QToolBar>
-#include <QToolButton>
 #include <QTimer>
-#include <QLabel>
 #include <QFrame>
-#include <QProgressBar>
-#include <QMenu>
 
 class Project;
 class Sheet;
-class QuickDriverConfigWidget;
 class MessageWidget;
 class SystemValueBar;
 
+class QPushButton;
+
 
 class InfoWidget : public QFrame
 {
@@ -105,14 +99,13 @@
         QTimer         updateTimer;
        QPushButton*    m_driver;
         int            xrunCount;
-       QuickDriverConfigWidget* driverConfigWidget;
        
        void draw_information();
 
 private slots:
         void update_driver_info();
         void update_xrun_info();
-       void show_driver_config_widget();
+       void show_driver_config_dialog();
 };