w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-12 18:52:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move Settings to the File menu.

Browse Source
This commit is contained in:
Joe Taylor 2022-12-10 14:12:57 -05:00
parent d26f8c1a30
commit 9f1c616487
6 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
q65w/devsetup.cpp
View File

@ -48,11 +48,3 @@ void DevSetup::accept()
m_dB=ui.sb_dB->value(); m_dB=ui.sb_dB->value();
QDialog::accept(); QDialog::accept();
} }
void DevSetup::on_soundCardRadioButton_toggled(bool checked)
{
ui.label_Port->setEnabled(!checked);
ui.sbPort->setEnabled(!checked);
ui.cbIQswap->setEnabled(checked);
ui.sb_dB->setEnabled(checked);
}

6
q65w/devsetup.h
View File

@ -25,12 +25,9 @@ public:
qint32 m_fCal; qint32 m_fCal;
qint32 m_udpPort; qint32 m_udpPort;
qint32 m_astroFont; qint32 m_astroFont;
qint32 m_mult570;
qint32 m_mult570Tx;
qint32 m_dB; qint32 m_dB;
double m_fAdd; double m_fAdd;
double m_cal570;
double m_TxOffset; double m_TxOffset;
bool m_network; bool m_network;
@ -48,9 +45,6 @@ public:
public slots: public slots:
void accept(); void accept();
private slots:
void on_soundCardRadioButton_toggled(bool checked);
private: private:
int r,g,b,r0,g0,b0,r1,g1,b1,r2,g2,b2,r3,g3,b3; int r,g,b,r0,g0,b0,r1,g1,b1,r2,g2,b2,r3,g3,b3;
Ui::DialogSndCard ui; Ui::DialogSndCard ui;

4
q65w/devsetup.ui
View File

@ -234,7 +234,7 @@
<item> <item>
<widget class="QLineEdit" name="saveDirEntry"> <widget class="QLineEdit" name="saveDirEntry">
<property name="text"> <property name="text">
<string>C:\Users\joe\wsjt\map65\save</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
@ -258,7 +258,7 @@
<item> <item>
<widget class="QLineEdit" name="azelDirEntry"> <widget class="QLineEdit" name="azelDirEntry">
<property name="text"> <property name="text">
<string>C:\Users\joe\wsjt\map65</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>

2
q65w/mainwindow.cpp
View File

@ -505,7 +505,7 @@ void MainWindow::showSoundInError(const QString& errorMsg)
void MainWindow::showStatusMessage(const QString& statusMsg) void MainWindow::showStatusMessage(const QString& statusMsg)
{statusBar()->showMessage(statusMsg);} {statusBar()->showMessage(statusMsg);}
void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog void MainWindow::on_actionSettings_triggered()
{ {
DevSetup dlg(this); DevSetup dlg(this);
dlg.m_myCall=m_myCall; dlg.m_myCall=m_myCall;

2
q65w/mainwindow.h
View File

@ -51,7 +51,6 @@ private:
virtual void closeEvent (QCloseEvent *) override; virtual void closeEvent (QCloseEvent *) override;
private slots: private slots:
void on_actionDeviceSetup_triggered();
void on_monitorButton_clicked(); void on_monitorButton_clicked();
void on_actionExit_triggered(); void on_actionExit_triggered();
void on_actionAbout_triggered(); void on_actionAbout_triggered();
@ -80,6 +79,7 @@ private slots:
void on_dxGridEntry_textChanged(const QString &arg1); void on_dxGridEntry_textChanged(const QString &arg1);
void bumpDF(int n); void bumpDF(int n);
void on_actionErase_map65_rx_log_triggered(); void on_actionErase_map65_rx_log_triggered();
void on_actionSettings_triggered();
void on_NBcheckBox_toggled(bool checked); void on_NBcheckBox_toggled(bool checked);
void on_NBslider_valueChanged(int value); void on_NBslider_valueChanged(int value);
void on_actionAFMHot_triggered(); void on_actionAFMHot_triggered();

26
q65w/mainwindow.ui
View File

@ -627,18 +627,13 @@ p, li { white-space: pre-wrap; }
<addaction name="actionOpen_next_in_directory"/> <addaction name="actionOpen_next_in_directory"/>
<addaction name="actionDecode_remaining_files_in_directory"/> <addaction name="actionDecode_remaining_files_in_directory"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="separator"/>
<addaction name="actionDelete_all_tf2_files_in_SaveDir"/> <addaction name="actionDelete_all_tf2_files_in_SaveDir"/>
<addaction name="actionErase_map65_rx_log"/> <addaction name="actionErase_map65_rx_log"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionSettings"/>
<addaction name="separator"/>
<addaction name="actionExit"/> <addaction name="actionExit"/>
</widget> </widget>
<widget class="QMenu" name="menuSetup">
<property name="title">
<string>Setup</string>
</property>
<addaction name="actionDeviceSetup"/>
</widget>
<widget class="QMenu" name="menuView"> <widget class="QMenu" name="menuView">
<property name="title"> <property name="title">
<string>View</string> <string>View</string>
@ -691,7 +686,6 @@ p, li { white-space: pre-wrap; }
<addaction name="actionQ65E"/> <addaction name="actionQ65E"/>
</widget> </widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
<addaction name="menuSetup"/>
<addaction name="menuView"/> <addaction name="menuView"/>
<addaction name="menuMode"/> <addaction name="menuMode"/>
<addaction name="menuDecode"/> <addaction name="menuDecode"/>
@ -712,14 +706,6 @@ p, li { white-space: pre-wrap; }
<string>Exit</string> <string>Exit</string>
</property> </property>
</action> </action>
<action name="actionDeviceSetup">
<property name="text">
<string>Options</string>
</property>
<property name="shortcut">
<string>F2</string>
</property>
</action>
<action name="actionAbout"> <action name="actionAbout">
<property name="text"> <property name="text">
<string> About Q65W</string> <string> About Q65W</string>
@ -1138,6 +1124,14 @@ p, li { white-space: pre-wrap; }
<string>Release Notes</string> <string>Release Notes</string>
</property> </property>
</action> </action>
<action name="actionSettings">
<property name="text">
<string>Settings ...</string>
</property>
<property name="shortcut">
<string>F2</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>