From 9f1c6164873ef39d22a44902b4c8d7f01ee00825 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Sat, 10 Dec 2022 14:12:57 -0500
Subject: [PATCH] Move Settings to the File menu.
---
q65w/devsetup.cpp | 8 --------
q65w/devsetup.h | 6 ------
q65w/devsetup.ui | 4 ++--
q65w/mainwindow.cpp | 2 +-
q65w/mainwindow.h | 2 +-
q65w/mainwindow.ui | 26 ++++++++++----------------
6 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/q65w/devsetup.cpp b/q65w/devsetup.cpp
index dacb82055..f331efa4c 100644
--- a/q65w/devsetup.cpp
+++ b/q65w/devsetup.cpp
@@ -48,11 +48,3 @@ void DevSetup::accept()
m_dB=ui.sb_dB->value();
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);
-}
diff --git a/q65w/devsetup.h b/q65w/devsetup.h
index c3fe4b264..888da3a15 100644
--- a/q65w/devsetup.h
+++ b/q65w/devsetup.h
@@ -25,12 +25,9 @@ public:
qint32 m_fCal;
qint32 m_udpPort;
qint32 m_astroFont;
- qint32 m_mult570;
- qint32 m_mult570Tx;
qint32 m_dB;
double m_fAdd;
- double m_cal570;
double m_TxOffset;
bool m_network;
@@ -48,9 +45,6 @@ public:
public slots:
void accept();
-private slots:
- void on_soundCardRadioButton_toggled(bool checked);
-
private:
int r,g,b,r0,g0,b0,r1,g1,b1,r2,g2,b2,r3,g3,b3;
Ui::DialogSndCard ui;
diff --git a/q65w/devsetup.ui b/q65w/devsetup.ui
index 6d6f798ec..e3be1344e 100644
--- a/q65w/devsetup.ui
+++ b/q65w/devsetup.ui
@@ -234,7 +234,7 @@
<item>
<widget class="QLineEdit" name="saveDirEntry">
<property name="text">
- <string>C:\Users\joe\wsjt\map65\save</string>
+ <string/>
</property>
</widget>
</item>
@@ -258,7 +258,7 @@
<item>
<widget class="QLineEdit" name="azelDirEntry">
<property name="text">
- <string>C:\Users\joe\wsjt\map65</string>
+ <string/>
</property>
</widget>
</item>
diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp
index 8db83c76f..d260e1456 100644
--- a/q65w/mainwindow.cpp
+++ b/q65w/mainwindow.cpp
@@ -505,7 +505,7 @@ void MainWindow::showSoundInError(const QString& errorMsg)
void MainWindow::showStatusMessage(const QString& statusMsg)
{statusBar()->showMessage(statusMsg);}
-void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
+void MainWindow::on_actionSettings_triggered()
{
DevSetup dlg(this);
dlg.m_myCall=m_myCall;
diff --git a/q65w/mainwindow.h b/q65w/mainwindow.h
index c8617455f..0fc8657b6 100644
--- a/q65w/mainwindow.h
+++ b/q65w/mainwindow.h
@@ -51,7 +51,6 @@ private:
virtual void closeEvent (QCloseEvent *) override;
private slots:
- void on_actionDeviceSetup_triggered();
void on_monitorButton_clicked();
void on_actionExit_triggered();
void on_actionAbout_triggered();
@@ -80,6 +79,7 @@ private slots:
void on_dxGridEntry_textChanged(const QString &arg1);
void bumpDF(int n);
void on_actionErase_map65_rx_log_triggered();
+ void on_actionSettings_triggered();
void on_NBcheckBox_toggled(bool checked);
void on_NBslider_valueChanged(int value);
void on_actionAFMHot_triggered();
diff --git a/q65w/mainwindow.ui b/q65w/mainwindow.ui
index aecd58bc4..a2097e75a 100644
--- a/q65w/mainwindow.ui
+++ b/q65w/mainwindow.ui
@@ -627,18 +627,13 @@ p, li { white-space: pre-wrap; }
<addaction name="actionOpen_next_in_directory"/>
<addaction name="actionDecode_remaining_files_in_directory"/>
<addaction name="separator"/>
- <addaction name="separator"/>
<addaction name="actionDelete_all_tf2_files_in_SaveDir"/>
<addaction name="actionErase_map65_rx_log"/>
<addaction name="separator"/>
+ <addaction name="actionSettings"/>
+ <addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
- <widget class="QMenu" name="menuSetup">
- <property name="title">
- <string>Setup</string>
- </property>
- <addaction name="actionDeviceSetup"/>
- </widget>
<widget class="QMenu" name="menuView">
<property name="title">
<string>View</string>
@@ -691,7 +686,6 @@ p, li { white-space: pre-wrap; }
<addaction name="actionQ65E"/>
</widget>
<addaction name="menuFile"/>
- <addaction name="menuSetup"/>
<addaction name="menuView"/>
<addaction name="menuMode"/>
<addaction name="menuDecode"/>
@@ -712,14 +706,6 @@ p, li { white-space: pre-wrap; }
<string>Exit</string>
</property>
</action>
- <action name="actionDeviceSetup">
- <property name="text">
- <string>Options</string>
- </property>
- <property name="shortcut">
- <string>F2</string>
- </property>
- </action>
<action name="actionAbout">
<property name="text">
<string> About Q65W</string>
@@ -1138,6 +1124,14 @@ p, li { white-space: pre-wrap; }
<string>Release Notes</string>
</property>
</action>
+ <action name="actionSettings">
+ <property name="text">
+ <string>Settings ...</string>
+ </property>
+ <property name="shortcut">
+ <string>F2</string>
+ </property>
+ </action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>