[Traverso-commit] traverso/src/traverso dialogs/settings/Pages.h ...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/22 19:11:17

Modified files:
        src/traverso/dialogs/settings: Pages.h SettingsDialog.cpp 
                                       SettingsDialog.h 
        src/traverso   : Interface.cpp Interface.h 

Log message:
        * added submenu in settings menu for easy selection of recording 
encoding format

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.h?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/SettingsDialog.h?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.45&r2=1.46

Patches:
Index: dialogs/settings/Pages.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dialogs/settings/Pages.h    11 Oct 2007 13:01:55 -0000      1.7
+++ dialogs/settings/Pages.h    22 Nov 2007 19:11:16 -0000      1.8
@@ -156,6 +156,7 @@
 public:
        ConfigPage(QWidget* parent);
        virtual void save_config() = 0;
+       virtual void load_config() = 0;
        virtual void reset_default_config() = 0;
 protected:
        QVBoxLayout* mainLayout;

Index: dialogs/settings/SettingsDialog.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- dialogs/settings/SettingsDialog.cpp 5 Nov 2007 19:19:25 -0000       1.9
+++ dialogs/settings/SettingsDialog.cpp 22 Nov 2007 19:11:16 -0000      1.10
@@ -34,6 +34,8 @@
 SettingsDialog::SettingsDialog(QWidget* parent)
        : QDialog(parent)
 {
+       m_saving = false;
+       
        contentsWidget = new QListWidget;
        contentsWidget->setViewMode(QListView::IconMode);
        contentsWidget->setIconSize(QSize(32, 32));
@@ -81,6 +83,8 @@
        
        setWindowTitle(tr("Configure - Traverso"));
        
+       connect(&config(), SIGNAL(configChanged()), this, 
SLOT(external_change_to_settings()));
+       
        resize(500, 400);
 }
 
@@ -146,7 +150,9 @@
        for (int i=0; i<pagesWidget->count(); ++i) {
                
qobject_cast<ConfigPage*>(pagesWidget->widget(i))->save_config();
        }
+       m_saving = true;
        config().save();
+       m_saving = false;
 }
 
 void SettingsDialog::restore_defaults_button_clicked()
@@ -159,3 +165,12 @@
        }
 }
 
+void SettingsDialog::external_change_to_settings()
+{
+       if (!m_saving) {
+               for (int i=0; i<pagesWidget->count(); ++i) {
+                       
qobject_cast<ConfigPage*>(pagesWidget->widget(i))->load_config();
+               }
+       }
+}
+

Index: dialogs/settings/SettingsDialog.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/traverso/dialogs/settings/SettingsDialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dialogs/settings/SettingsDialog.h   27 Feb 2007 19:51:30 -0000      1.1
+++ dialogs/settings/SettingsDialog.h   22 Nov 2007 19:11:16 -0000      1.2
@@ -44,10 +44,13 @@
        QListWidget *contentsWidget;
        QStackedWidget *pagesWidget;
        
+       bool m_saving;
+       
 
 private slots:
        void save_config();
        void restore_defaults_button_clicked();
+       void external_change_to_settings();
 };
 
 #endif

Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- Interface.cpp       22 Nov 2007 15:07:02 -0000      1.109
+++ Interface.cpp       22 Nov 2007 19:11:16 -0000      1.110
@@ -499,6 +499,17 @@
        
        
        menu = menuBar()->addMenu(tr("Se&ttings"));
+       
+       QMenu* submenu = menu->addMenu(tr("&Recording File Format"));
+       action = submenu->addAction("WAVE");
+       connect(action, SIGNAL(triggered( bool )), this, 
SLOT(change_recording_format_to_wav()));
+       action = submenu->addAction("WavPack");
+       connect(action, SIGNAL(triggered( bool )), this, 
SLOT(change_recording_format_to_wavpack()));
+       action = submenu->addAction("WAVE-64");
+       connect(action, SIGNAL(triggered( bool )), this, 
SLOT(change_recording_format_to_wav64()));
+       
+       menu->addSeparator();
+       
        menu->addAction(m_infoBar->get_snap_action());
        menu->addAction(m_infoBar->get_follow_action());
        
@@ -1126,3 +1137,24 @@
        dialog.exec();
 }
 
+void Interface::change_recording_format_to_wav()
+{
+       config().set_property("Recording", "FileFormat", "wav");
+       info().information(tr("Changed encoding for recording to 
%1").arg("WAVE"));
+       config().save();
+}
+
+void Interface::change_recording_format_to_wav64()
+{
+       config().set_property("Recording", "FileFormat", "w64");
+       info().information(tr("Changed encoding for recording to 
%1").arg("WAVE-64"));
+       config().save();
+}
+
+void Interface::change_recording_format_to_wavpack()
+{
+       config().set_property("Recording", "FileFormat", "wavpack");
+       info().information(tr("Changed encoding for recording to 
%1").arg("WavPack"));
+       config().save();
+}
+

Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- Interface.h 15 Oct 2007 11:28:29 -0000      1.45
+++ Interface.h 22 Nov 2007 19:11:17 -0000      1.46
@@ -157,6 +157,9 @@
        void update_opengl();
        void import_audio();
        void show_restore_project_backup_dialog();
+       void change_recording_format_to_wav();
+       void change_recording_format_to_wav64();
+       void change_recording_format_to_wavpack();
 
        Command* full_screen();
        Command* about_traverso();