w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 05:38:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move bundled cty.dat from resources FS to installation data dir

Browse Source 
This file is only used at start up so there is little point to keeping
it in program memory.
This commit is contained in:
Bill Somerville 2020-08-14 14:47:07 +01:00
parent 7eb229ecde
commit f7377e686f
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -748,7 +748,6 @@ set (all_C_and_CXXSRCS
) )
set (TOP_LEVEL_RESOURCES set (TOP_LEVEL_RESOURCES
cty.dat
icons/Darwin/wsjtx.iconset/icon_128x128.png icons/Darwin/wsjtx.iconset/icon_128x128.png
contrib/gpl-v3-logo.svg contrib/gpl-v3-logo.svg
artwork/splash.png artwork/splash.png
@ -1574,6 +1573,7 @@ install (FILES
) )
install (FILES install (FILES
cty.dat
contrib/Ephemeris/JPLEPH contrib/Ephemeris/JPLEPH
DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
#COMPONENT runtime #COMPONENT runtime

4
logbook/AD1CCty.cpp
View File

@ -319,12 +319,12 @@ AD1CCty::AD1CCty (Configuration const * configuration)
{ {
Q_ASSERT (configuration); Q_ASSERT (configuration);
// TODO: G4WJS - consider doing the following asynchronously to // TODO: G4WJS - consider doing the following asynchronously to
// speed up startup. Not urgent as it takes less than 1s on a Core // speed up startup. Not urgent as it takes less than 0.5s on a Core
// i7 reading BIG CTY.DAT. // i7 reading BIG CTY.DAT.
QDir dataPath {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}; QDir dataPath {QStandardPaths::writableLocation (QStandardPaths::DataLocation)};
m_->path_ = dataPath.exists (file_name) m_->path_ = dataPath.exists (file_name)
? dataPath.absoluteFilePath (file_name) // user override ? dataPath.absoluteFilePath (file_name) // user override
: QString {":/"} + file_name; // or original in the resources FS : configuration->data_dir ().absoluteFilePath (file_name); // or original
QFile file {m_->path_}; QFile file {m_->path_};
if (file.open (QFile::ReadOnly)) if (file.open (QFile::ReadOnly))
{ {