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

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

View File

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

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>463</width>
<height>390</height>
<width>511</width>
<height>360</height>
</rect>
</property>
<property name="windowTitle">
@ -23,15 +23,8 @@
<attribute name="title">
<string>Station</string>
</attribute>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>34</y>
<width>421</width>
<height>275</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
@ -78,7 +71,7 @@
<widget class="QLineEdit" name="myCallEntry">
<property name="maximumSize">
<size>
<width>60</width>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
@ -91,7 +84,7 @@
<widget class="QLineEdit" name="myGridEntry">
<property name="maximumSize">
<size>
<width>60</width>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
@ -125,7 +118,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>10</width>
<height>20</height>
</size>
</property>
@ -265,7 +258,8 @@
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<property name="enabled">