VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-17 13:51:47 -05:00
Code Issues Projects Releases Wiki Activity

Tidy.

Browse Source
This commit is contained in:
John Greb 2014-11-22 23:24:21 +00:00
parent 836796fff4
commit 0ada023270
3 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include-gpl/mainwindow.h
View File

@ -120,7 +120,6 @@ private slots:
void on_dcOffset_toggled(bool checked); void on_dcOffset_toggled(bool checked);
void on_iqImbalance_toggled(bool checked); void on_iqImbalance_toggled(bool checked);
void on_action_View_Fullscreen_toggled(bool checked); void on_action_View_Fullscreen_toggled(bool checked);
void on_actionOsmoSDR_Firmware_Upgrade_triggered();
void on_presetSave_clicked(); void on_presetSave_clicked();
void on_presetLoad_clicked(); void on_presetLoad_clicked();
void on_presetDelete_clicked(); void on_presetDelete_clicked();

21
sdrbase/mainwindow.cpp
View File

@ -339,8 +339,6 @@ void MainWindow::updateStatus()
m_engineRunning->setColor(Qt::gray); m_engineRunning->setColor(Qt::gray);
m_engineError->setColor(Qt::gray); m_engineError->setColor(Qt::gray);
statusBar()->clearMessage(); statusBar()->clearMessage();
//if(m_startOsmoSDRUpdateAfterStop)
// on_actionOsmoSDR_Firmware_Upgrade_triggered();
break; break;
case DSPEngine::StRunning: case DSPEngine::StRunning:
@ -355,8 +353,6 @@ void MainWindow::updateStatus()
m_engineRunning->setColor(Qt::gray); m_engineRunning->setColor(Qt::gray);
m_engineError->setColor(Qt::red); m_engineError->setColor(Qt::red);
statusBar()->showMessage(tr("Error: %1").arg(m_dspEngine->errorMessage())); statusBar()->showMessage(tr("Error: %1").arg(m_dspEngine->errorMessage()));
//if(m_startOsmoSDRUpdateAfterStop)
// on_actionOsmoSDR_Firmware_Upgrade_triggered();
break; break;
} }
m_lastEngineState = state; m_lastEngineState = state;
@ -399,23 +395,6 @@ void MainWindow::on_action_View_Fullscreen_toggled(bool checked)
else showNormal(); else showNormal();
} }
void MainWindow::on_actionOsmoSDR_Firmware_Upgrade_triggered()
{
#if 0
DSPEngine::State engineState = m_dspEngine->state();
if((engineState != DSPEngine::StIdle) && (engineState != DSPEngine::StError)) {
m_startOsmoSDRUpdateAfterStop = true;
m_dspEngine->stopAcquistion();
return;
}
m_startOsmoSDRUpdateAfterStop = false;
/* TODO: osmosdr upgrade
OsmoSDRUpgrade osmoSDRUpgrade;
osmoSDRUpgrade.exec();
*/
#endif
}
void MainWindow::on_presetSave_clicked() void MainWindow::on_presetSave_clicked()
{ {
QStringList groups; QStringList groups;

29
sdrbase/mainwindow.ui
View File

@ -73,9 +73,6 @@
<property name="title"> <property name="title">
<string>&amp;Help</string> <string>&amp;Help</string>
</property> </property>
<!--addaction name="action_Open_Website"/>
<addaction name="action_Check_for_Update"/>
<addaction name="separator"/-->
<addaction name="action_Loaded_Plugins"/> <addaction name="action_Loaded_Plugins"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="action_About"/> <addaction name="action_About"/>
@ -94,7 +91,6 @@
<addaction name="menu_View"/> <addaction name="menu_View"/>
<addaction name="menu_Acquisition"/> <addaction name="menu_Acquisition"/>
<addaction name="menu_Channels"/> <addaction name="menu_Channels"/>
<!--addaction name="menu_Options"/-->
<addaction name="menu_Window"/> <addaction name="menu_Window"/>
<addaction name="menu_Help"/> <addaction name="menu_Help"/>
</widget> </widget>
@ -365,11 +361,6 @@
<string>F11</string> <string>F11</string>
</property> </property>
</action> </action>
<!--action name="actionOsmoSDR_Firmware_Upgrade">
<property name="text">
<string>OsmoSDR &amp;Firmware Upgrade...</string>
</property>
</action-->
<action name="action_Oscilloscope"> <action name="action_Oscilloscope">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
@ -386,31 +377,11 @@
<string>&amp;About SDRangelove...</string> <string>&amp;About SDRangelove...</string>
</property> </property>
</action> </action>
<action name="action_Open_Website">
<property name="text">
<string>&amp;Open Website</string>
</property>
</action>
<action name="action_Check_for_Update">
<property name="text">
<string>Check for &amp;Update...</string>
</property>
</action>
<action name="action_Preferences"> <action name="action_Preferences">
<property name="text"> <property name="text">
<string>&amp;Preferences...</string> <string>&amp;Preferences...</string>
</property> </property>
</action> </action>
<!--action name="action_Demod_NFM">
<property name="text">
<string>N&amp;FM</string>
</property>
</action>
<action name="action_Demod_SSB">
<property name="text">
<string>&amp;SSB</string>
</property>
</action-->
<action name="action_Loaded_Plugins"> <action name="action_Loaded_Plugins">
<property name="text"> <property name="text">
<string>Loaded &amp;Plugins...</string> <string>Loaded &amp;Plugins...</string>