mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-08-03 14:42:25 -04:00
Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop
This commit is contained in:
commit
ee6cd7aa0e
@ -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
|
||||||
|
@ -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,15 +23,8 @@
|
|||||||
<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>
|
|
||||||
<x>10</x>
|
|
||||||
<y>34</y>
|
|
||||||
<width>421</width>
|
|
||||||
<height>275</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
@ -78,7 +71,7 @@
|
|||||||
<widget class="QLineEdit" name="myCallEntry">
|
<widget class="QLineEdit" name="myCallEntry">
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>60</width>
|
<width>16777215</width>
|
||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -91,7 +84,7 @@
|
|||||||
<widget class="QLineEdit" name="myGridEntry">
|
<widget class="QLineEdit" name="myGridEntry">
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>60</width>
|
<width>16777215</width>
|
||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -125,7 +118,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0">
|
<property name="sizeHint" stdset="0">
|
||||||
<size>
|
<size>
|
||||||
<width>40</width>
|
<width>10</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -265,7 +258,8 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</item>
|
||||||
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="tab_2">
|
<widget class="QWidget" name="tab_2">
|
||||||
<property name="enabled">
|
<property name="enabled">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user