w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-29 07:28:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Joe Taylor 2023-03-10 09:12:37 -05:00
commit ee6cd7aa0e
2 changed files with 240 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1431,8 +1431,8 @@ endif (${OPENMP_FOUND} OR APPLE)
if (WIN32) if (WIN32)
find_package (Portaudio REQUIRED) find_package (Portaudio REQUIRED)
add_subdirectory (map65) add_subdirectory (map65)
add_subdirectory (qmap)
endif () endif ()
add_subdirectory (qmap)
# build the main application # build the main application
generate_version_info (wsjtx_VERSION_RESOURCES generate_version_info (wsjtx_VERSION_RESOURCES

484
qmap/devsetup.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>463</width> <width>511</width>
<height>390</height> <height>360</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -23,249 +23,243 @@
<attribute name="title"> <attribute name="title">
<string>Station</string> <string>Station</string>
</attribute> </attribute>
<widget class="QWidget" name="layoutWidget"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="geometry"> <item>
<rect> <layout class="QVBoxLayout" name="verticalLayout_6">
<x>10</x> <item>
<y>34</y> <layout class="QHBoxLayout" name="horizontalLayout_2">
<width>421</width> <item>
<height>275</height> <layout class="QVBoxLayout" name="verticalLayout">
</rect> <item>
</property> <widget class="QLabel" name="label">
<layout class="QVBoxLayout" name="verticalLayout_6"> <property name="minimumSize">
<item> <size>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <width>0</width>
<item> <height>20</height>
<layout class="QVBoxLayout" name="verticalLayout"> </size>
<item> </property>
<widget class="QLabel" name="label"> <property name="text">
<property name="minimumSize"> <string>My Call:</string>
<size> </property>
<width>0</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <widget class="QLabel" name="label_2">
<property name="text"> <property name="minimumSize">
<string>My Call:</string> <size>
</property> <width>0</width>
</widget> <height>20</height>
</item> </size>
<item> </property>
<widget class="QLabel" name="label_2"> <property name="text">
<property name="minimumSize"> <string>My Grid:</string>
<size> </property>
<width>0</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>My Grid:</string> <string>Astro Font Size:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="QLabel" name="label_7"> </item>
<property name="text"> <item>
<string>Astro Font Size:</string> <layout class="QVBoxLayout" name="verticalLayout_3">
</property> <item>
</widget> <widget class="QLineEdit" name="myCallEntry">
</item> <property name="maximumSize">
</layout> <size>
</item> <width>16777215</width>
<item> <height>16777215</height>
<layout class="QVBoxLayout" name="verticalLayout_3"> </size>
<item> </property>
<widget class="QLineEdit" name="myCallEntry"> <property name="text">
<property name="maximumSize"> <string>K1JT</string>
<size> </property>
<width>60</width> </widget>
<height>16777215</height> </item>
</size> <item>
</property> <widget class="QLineEdit" name="myGridEntry">
<property name="text"> <property name="maximumSize">
<string>K1JT</string> <size>
</property> <width>16777215</width>
</widget> <height>16777215</height>
</item> </size>
<item> </property>
<widget class="QLineEdit" name="myGridEntry"> <property name="text">
<property name="maximumSize"> <string>FN20qi</string>
<size> </property>
<width>60</width> </widget>
<height>16777215</height> </item>
</size> <item>
</property> <widget class="QSpinBox" name="astroFont">
<property name="text"> <property name="minimum">
<string>FN20qi</string> <number>12</number>
</property> </property>
</widget> <property name="maximum">
</item> <number>32</number>
<item> </property>
<widget class="QSpinBox" name="astroFont"> <property name="value">
<property name="minimum"> <number>20</number>
<number>12</number> </property>
</property> </widget>
<property name="maximum"> </item>
<number>32</number> </layout>
</property> </item>
<property name="value"> <item>
<number>20</number> <spacer name="horizontalSpacer_2">
</property> <property name="orientation">
</widget> <enum>Qt::Horizontal</enum>
</item> </property>
</layout> <property name="sizeType">
</item> <enum>QSizePolicy::Fixed</enum>
<item> </property>
<spacer name="horizontalSpacer_2"> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Horizontal</enum> <width>10</width>
</property> <height>20</height>
<property name="sizeType"> </size>
<enum>QSizePolicy::Fixed</enum> </property>
</property> </spacer>
<property name="sizeHint" stdset="0"> </item>
<size> <item>
<width>40</width> <layout class="QVBoxLayout" name="verticalLayout_4">
<height>20</height> <item>
</size> <widget class="QLabel" name="label_9">
</property> <property name="minimumSize">
</spacer> <size>
</item> <width>0</width>
<item> <height>20</height>
<layout class="QVBoxLayout" name="verticalLayout_4"> </size>
<item> </property>
<widget class="QLabel" name="label_9"> <property name="text">
<property name="minimumSize"> <string>Fcal (Hz):</string>
<size> </property>
<width>0</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <widget class="QLabel" name="label_11">
<property name="text"> <property name="minimumSize">
<string>Fcal (Hz):</string> <size>
</property> <width>0</width>
</widget> <height>20</height>
</item> </size>
<item> </property>
<widget class="QLabel" name="label_11"> <property name="text">
<property name="minimumSize"> <string>Fadd (MHz)</string>
<size> </property>
<width>0</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <spacer name="verticalSpacer">
<property name="text"> <property name="orientation">
<string>Fadd (MHz)</string> <enum>Qt::Vertical</enum>
</property> </property>
</widget> <property name="sizeType">
</item> <enum>QSizePolicy::Fixed</enum>
<item> </property>
<spacer name="verticalSpacer"> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Vertical</enum> <width>20</width>
</property> <height>20</height>
<property name="sizeType"> </size>
<enum>QSizePolicy::Fixed</enum> </property>
</property> </spacer>
<property name="sizeHint" stdset="0"> </item>
<size> </layout>
<width>20</width> </item>
<height>20</height> <item>
</size> <layout class="QVBoxLayout" name="verticalLayout_5">
</property> <item>
</spacer> <widget class="QSpinBox" name="fCalSpinBox">
</item> <property name="minimum">
</layout> <number>-20000</number>
</item> </property>
<item> <property name="maximum">
<layout class="QVBoxLayout" name="verticalLayout_5"> <number>20000</number>
<item> </property>
<widget class="QSpinBox" name="fCalSpinBox"> </widget>
<property name="minimum"> </item>
<number>-20000</number> <item>
</property> <widget class="QLineEdit" name="faddEntry">
<property name="maximum"> <property name="text">
<number>20000</number> <string>0.0</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="faddEntry"> <spacer name="verticalSpacer_3">
<property name="text"> <property name="orientation">
<string>0.0</string> <enum>Qt::Vertical</enum>
</property> </property>
</widget> <property name="sizeType">
</item> <enum>QSizePolicy::Fixed</enum>
<item> </property>
<spacer name="verticalSpacer_3"> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Vertical</enum> <width>20</width>
</property> <height>20</height>
<property name="sizeType"> </size>
<enum>QSizePolicy::Fixed</enum> </property>
</property> </spacer>
<property name="sizeHint" stdset="0"> </item>
<size> </layout>
<width>20</width> </item>
<height>20</height> </layout>
</size> </item>
</property> <item>
</spacer> <layout class="QHBoxLayout" name="horizontalLayout_3">
</item> <item>
</layout> <widget class="QLabel" name="label_10">
</item> <property name="minimumSize">
</layout> <size>
</item> <width>80</width>
<item> <height>20</height>
<layout class="QHBoxLayout" name="horizontalLayout_3"> </size>
<item> </property>
<widget class="QLabel" name="label_10"> <property name="text">
<property name="minimumSize"> <string>Save Directory:</string>
<size> </property>
<width>80</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <widget class="QLineEdit" name="saveDirEntry">
<property name="text"> <property name="text">
<string>Save Directory:</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="QLineEdit" name="saveDirEntry"> </item>
<property name="text"> <item>
<string/> <layout class="QHBoxLayout" name="horizontalLayout_4">
</property> <item>
</widget> <widget class="QLabel" name="label_6">
</item> <property name="minimumSize">
</layout> <size>
</item> <width>80</width>
<item> <height>20</height>
<layout class="QHBoxLayout" name="horizontalLayout_4"> </size>
<item> </property>
<widget class="QLabel" name="label_6"> <property name="text">
<property name="minimumSize"> <string>AzEl Directory:</string>
<size> </property>
<width>80</width> </widget>
<height>20</height> </item>
</size> <item>
</property> <widget class="QLineEdit" name="azelDirEntry">
<property name="text"> <property name="text">
<string>AzEl Directory:</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="QLineEdit" name="azelDirEntry"> </item>
<property name="text"> </layout>
<string/> </item>
</property> </layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
<property name="enabled"> <property name="enabled">