mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge

half-duplex
Phil Taylor 2021-12-31 00:03:05 +00:00
rodzic 7d95f2d863
commit 2a0b79449d
3 zmienionych plików z 204 dodań i 98 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
wfview - Backup.vcxproj.user 100644
Wyświetl plik

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<<<<<<< HEAD
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
=======
>>>>>>> settings
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
<<<<<<< HEAD
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH)</LocalDebuggerEnvironment>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<QtLastBackgroundBuild>2021-11-18T12:40:24.8966742Z</QtLastBackgroundBuild>
=======
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<QtLastBackgroundBuild>2021-11-22T18:24:33.3752914Z</QtLastBackgroundBuild>
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<QtLastBackgroundBuild>2021-11-22T18:24:41.6960953Z</QtLastBackgroundBuild>
>>>>>>> settings
</PropertyGroup>
</Project>

264
wfview.vcxproj.filters
Wyświetl plik

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Form Files">
@ -122,158 +122,238 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<QtMoc Include="aboutbox.h">
<CustomBuild Include="aboutbox.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="resampler\arch.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="audiohandler.h">
<CustomBuild Include="audiohandler.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="audiotaper.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="calibrationwindow.h">
<CustomBuild Include="calibrationwindow.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="commhandler.h">
</CustomBuild>
<CustomBuild Include="commhandler.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="freqmemory.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="logcategories.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="meter.h">
<CustomBuild Include="meter.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="packettypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="pttyhandler.h">
<CustomBuild Include="pttyhandler.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="qledlabel.h">
</CustomBuild>
<CustomBuild Include="qledlabel.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="repeaterattributes.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="repeatersetup.h">
<CustomBuild Include="repeatersetup.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="resampler\resample_sse.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="rigcommander.h">
<CustomBuild Include="rigcommander.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="rigctld.h">
</CustomBuild>
<CustomBuild Include="rigctld.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="rigidentities.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ring\ring.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="satellitesetup.h">
<CustomBuild Include="satellitesetup.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="resampler\speex_resampler.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="transceiveradjustments.h">
<CustomBuild Include="transceiveradjustments.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="udphandler.h">
</CustomBuild>
<CustomBuild Include="udphandler.h">
<Filter>Header Files</Filter>
</QtMoc>
<QtMoc Include="udpserver.h">
</CustomBuild>
<CustomBuild Include="udpserver.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
<ClInclude Include="ulaw.h">
<Filter>Header Files</Filter>
</ClInclude>
<QtMoc Include="wfmain.h">
<CustomBuild Include="wfmain.h">
<Filter>Header Files</Filter>
</QtMoc>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClCompile Include="debug\moc_aboutbox.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_aboutbox.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_audiohandler.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_audiohandler.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_calibrationwindow.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_calibrationwindow.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_commhandler.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_commhandler.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_meter.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_meter.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<CustomBuild Include="debug\moc_predefs.h.cbt">
<Filter>Generated Files</Filter>
</CustomBuild>
<CustomBuild Include="release\moc_predefs.h.cbt">
<Filter>Generated Files</Filter>
</CustomBuild>
<ClCompile Include="debug\moc_pttyhandler.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_pttyhandler.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_qledlabel.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_qledlabel.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_repeatersetup.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_repeatersetup.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_rigcommander.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_rigcommander.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_rigctld.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_rigctld.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_satellitesetup.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_satellitesetup.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_transceiveradjustments.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_transceiveradjustments.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_udphandler.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_udphandler.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_udpserver.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_udpserver.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\moc_wfmain.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\moc_wfmain.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\qrc_resources.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\qrc_resources.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="debug\qrc_style.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClCompile Include="release\qrc_style.cpp">
<Filter>Generated Files</Filter>
</ClCompile>
<ClInclude Include="ui_aboutbox.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="ui_calibrationwindow.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="ui_repeatersetup.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="ui_satellitesetup.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="ui_transceiveradjustments.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="ui_udpserversetup.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="ui_wfmain.h">
<Filter>Generated Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<QtUic Include="aboutbox.ui">
<CustomBuild Include="aboutbox.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="calibrationwindow.ui">
</CustomBuild>
<CustomBuild Include="calibrationwindow.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="repeatersetup.ui">
</CustomBuild>
<CustomBuild Include="repeatersetup.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="satellitesetup.ui">
</CustomBuild>
<CustomBuild Include="satellitesetup.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="transceiveradjustments.ui">
</CustomBuild>
<CustomBuild Include="transceiveradjustments.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="udpserversetup.ui">
</CustomBuild>
<CustomBuild Include="udpserversetup.ui">
<Filter>Form Files</Filter>
</QtUic>
<QtUic Include="wfmain.ui">
</CustomBuild>
<CustomBuild Include="wfmain.ui">
<Filter>Form Files</Filter>
</QtUic>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<None Include="qdarkstyle\rc\Hmovetoolbar.png">
@ -363,9 +443,9 @@
<None Include="qdarkstyle\rc\radio_unchecked_focus.png">
<Filter>Resource Files</Filter>
</None>
<QtRcc Include="resources\resources.qrc">
<CustomBuild Include="resources\resources.qrc">
<Filter>Resource Files</Filter>
</QtRcc>
</CustomBuild>
<None Include="qdarkstyle\rc\right_arrow.png">
<Filter>Resource Files</Filter>
</None>
@ -375,9 +455,9 @@
<None Include="qdarkstyle\rc\sizegrip.png">
<Filter>Resource Files</Filter>
</None>
<QtRcc Include="qdarkstyle\style.qrc">
<CustomBuild Include="qdarkstyle\style.qrc">
<Filter>Resource Files</Filter>
</QtRcc>
</CustomBuild>
<None Include="qdarkstyle\style.qss">
<Filter>Resource Files</Filter>
</None>

9
wfview_resource.rc
Wyświetl plik

@ -1,6 +1,6 @@
#include <windows.h>
IDI_ICON1 ICON "C:\\Users\\Phil\\source\\repos\\wfview\\resources\\wfview.ico"
IDI_ICON1 ICON DISCARDABLE "C:\\Users\\Phil\\source\\repos\\wfview\\resources\\wfview.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,0,0,0
@ -11,9 +11,9 @@ VS_VERSION_INFO VERSIONINFO
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE VFT2_UNKNOWN
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
@ -26,9 +26,6 @@ VS_VERSION_INFO VERSIONINFO
VALUE "OriginalFilename", "wfview.exe\0"
VALUE "ProductName", "wfview\0"
VALUE "ProductVersion", "0.0.0.0\0"
VALUE "InternalName", "\0"
VALUE "Comments", "\0"
VALUE "LegalTrademarks", "\0"
END
END
BLOCK "VarFileInfo"