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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/23 21:47:14

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

Log message:
        * added icons to the encoding format submenu

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.46&r2=1.47

Patches:
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- Interface.cpp       22 Nov 2007 19:11:16 -0000      1.110
+++ Interface.cpp       23 Nov 2007 21:47:14 -0000      1.111
@@ -199,7 +199,7 @@
 
        cpointer().add_contextitem(this);
 
-       connect(&config(), SIGNAL(configChanged()), this, 
SLOT(update_opengl()));
+       connect(&config(), SIGNAL(configChanged()), this, 
SLOT(config_changed()));
 }
 
 Interface::~Interface()
@@ -501,12 +501,15 @@
        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()));
+       m_wavAction = submenu->addAction("WAVE");
+       connect(m_wavAction, SIGNAL(triggered( bool )), this, 
SLOT(change_recording_format_to_wav()));
+       m_wavpackAction = submenu->addAction("WavPack");
+       connect(m_wavpackAction, SIGNAL(triggered( bool )), this, 
SLOT(change_recording_format_to_wavpack()));
+       m_wav64Action = submenu->addAction("WAVE-64");
+       connect(m_wav64Action, SIGNAL(triggered( bool )), this, 
SLOT(change_recording_format_to_wav64()));
+       
+       // fake a config changed 'signal-slot' action, to set the encoding menu 
icons
+       config_changed();
        
        menu->addSeparator();
        
@@ -931,13 +934,25 @@
        return menu;
 }
 
-void Interface::update_opengl()
+void Interface::config_changed()
 {
        bool toggled = config().get_property("Interface", "OpenGL", 
false).toBool();
 
        foreach(SongWidget* widget, m_songWidgets) {
                widget->set_use_opengl(toggled);
        }
+       
+       QString encoding = config().get_property("Recording", "FileFormat", 
"").toString();
+       m_wavAction->setIcon(QIcon());
+       m_wav64Action->setIcon(QIcon());
+       m_wavpackAction->setIcon(QIcon());
+       if (encoding == "wav") {
+               
m_wavAction->setIcon(style()->standardIcon(QStyle::SP_DialogApplyButton));
+       } else if (encoding == "wavpack") {
+               
m_wavpackAction->setIcon(style()->standardIcon(QStyle::SP_DialogApplyButton));
+       } else if (encoding == "w64") {
+               
m_wav64Action->setIcon(style()->standardIcon(QStyle::SP_DialogApplyButton));
+       }
 }
 
 void Interface::import_audio()

Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- Interface.h 22 Nov 2007 19:11:17 -0000      1.46
+++ Interface.h 23 Nov 2007 21:47:14 -0000      1.47
@@ -134,6 +134,9 @@
        QAction*                m_projectSongManagerAction;
        QAction*                m_projectExportAction;
        QAction*                m_songMenuAction;
+       QAction*                m_wavAction;
+       QAction*                m_wav64Action;
+       QAction*                m_wavpackAction;
        
        ResourcesInfoWidget*    resourcesInfo;
        DriverInfoWidget*       driverInfo;
@@ -154,7 +157,7 @@
        void process_context_menu_action(QAction* action);
        void set_fade_in_shape(QAction* action);
        void set_fade_out_shape(QAction* action);
-       void update_opengl();
+       void config_changed();
        void import_audio();
        void show_restore_project_backup_dialog();
        void change_recording_format_to_wav();