From eccd80758a08b422409d52c7b3a113862829e059 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Fri, 5 Sep 2014 17:10:01 +0000 Subject: [PATCH] Define WSJT-X manual URL in a single place. Since the manual URL is used in both the installer and the WSJT-X code the definition of the URL (CMake variable PROJECT_MANUAL) is defined in the CMakeList.txt file and propagated to the source via the wsjtx_config.h header. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4252 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 2 +- mainwindow.cpp | 4 +--- wsjtx_config.h.in | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc97ec924..a450b561a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set (PROJECT_VENDOR "Joe Taylor, K1JT") set (PROJECT_CONTACT "Joe Taylor ") set (PROJECT_COPYRIGHT "Copyright (C) 2001-2014 by Joe Taylor, K1JT") set (PROJECT_HOMEPAGE "http://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html") -set (PROJECT_MANUAL "http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main-toc2.html") +set (PROJECT_MANUAL "http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main.html") set (PROJECT_SUMMARY_DESCRIPTION "WSJT-X - JT9 and JT65 Modes for LF, MF and HF Amateur Radio.") set (PROJECT_DESCRIPTION "${PROJECT_SUMMARY_DESCRIPTION} WSJT-X implements JT9, a new mode designed especially for the LF, MF, diff --git a/mainwindow.cpp b/mainwindow.cpp index 1e095dddf..105f69a0b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -994,9 +994,7 @@ void MainWindow::msgBox(QString t) //msgBox void MainWindow::on_actionOnline_Users_Guide_triggered() //Display manual { - QDesktopServices::openUrl(QUrl( - "http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main.html", - QUrl::TolerantMode)); + QDesktopServices::openUrl (QUrl (PROJECT_MANUAL, QUrl::TolerantMode)); } void MainWindow::on_actionWide_Waterfall_triggered() //Display Waterfalls diff --git a/wsjtx_config.h.in b/wsjtx_config.h.in index f905727e9..d16cf7821 100644 --- a/wsjtx_config.h.in +++ b/wsjtx_config.h.in @@ -15,6 +15,7 @@ #cmakedefine WSJT_LIB_DESTINATION "@WSJT_LIB_DESTINATION@" #cmakedefine WSJT_SHARE_DESTINATION "@WSJT_SHARE_DESTINATION@" #cmakedefine WSJT_DOC_DESTINATION "@WSJT_DOC_DESTINATION@" +#cmakedefine PROJECT_MANUAL "@PROJECT_MANUAL@" #cmakedefine01 WSJT_SHARED_RUNTIME #cmakedefine01 WSJT_QDEBUG_TO_FILE