diff --git a/doc/common/license.adoc b/doc/common/license.adoc index e96507f82..17cd48e55 100755 --- a/doc/common/license.adoc +++ b/doc/common/license.adoc @@ -12,4 +12,18 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this documentation. If not, see {gnu_gpl}. -Copyright (C) 2001-2017 Joseph H Taylor, Jr., K1JT. +Except where otherwise noted, all algorithms, protocol designs, source +code, and supporting files contained in the _{prog}_ package are the +intellectual property of the program's authors. The authors assert +*Copyright ownership* of this material, whether or not notice of such +copyright appears in each individual file. Others who make fair use +of our work under terms of the GNU General Public License must display +the following copyright notice prominently: + +*The algorithms, source code, look-and-feel of _{prog}_ and related +programs, and protocol specifications for the modes FSK441, FT8, JT4, +JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144, are Copyright (C) +2001-2017 by one or more of the following authors: Joseph Taylor, +K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, +IV3NWV; Greg Beam, KI7MT; Micael Black, W9MDB; Edson Pereira, PY2SDR; +and other members of the WSJT Development Group.* diff --git a/mainwindow.cpp b/mainwindow.cpp index a97705b55..875c49b4e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2140,6 +2140,21 @@ void MainWindow::on_actionSolve_FreqCal_triggered() } } +void MainWindow::on_actionCopyright_Notice_triggered() +{ + auto const& message = tr("If you make fair use of any part of WSJT-X under terms of the GNU " + "General Public License, you must display the following copyright " + "notice prominently in your derivative work:\n\n" + "The algorithms, source code, look-and-feel of WSJT-X and related " + "programs, and protocol specifications for the modes FSK441, FT8, JT4, " + "JT6M, JT9, JT65, JTMS, QRA64, ISCAT, MSK144 are Copyright (C) " + "2001-2017 by one or more of the following authors: Joseph Taylor, " + "K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, " + "IV3NWV; Greg Beam, KI7MT; Micael Black, W9MDB; Edson Pereira, PY2SDR; " + "and other members of the WSJT Development Group."); + MessageBox::warning_message(this, message); +} + // This allows the window to shrink by removing certain things // and reducing space used by controls void MainWindow::hideMenus(bool checked) diff --git a/mainwindow.h b/mainwindow.h index dec030a28..5d39184fd 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -150,6 +150,7 @@ private slots: void on_actionKeyboard_shortcuts_triggered(); void on_actionSpecial_mouse_commands_triggered(); void on_actionSolve_FreqCal_triggered(); + void on_actionCopyright_Notice_triggered(); void on_DecodeButton_clicked (bool); void decode(); void decodeBusy(bool b); diff --git a/mainwindow.ui b/mainwindow.ui index ca1099286..3d9c53bad 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2363,6 +2363,8 @@ QPushButton[state="ok"] { + + @@ -2952,6 +2954,14 @@ QPushButton[state="ok"] { Solve for calibration parameters + + + Copyright notice + + + Shift+F1 + + diff --git a/shortcuts.txt b/shortcuts.txt index 6b505203d..2acb7bf1a 100644 --- a/shortcuts.txt +++ b/shortcuts.txt @@ -1,5 +1,6 @@ +
F1 Online User's Guide
Shift+F1 Copyright Notice
Ctrl+F1 About WSJT-X
F2 Open settings window
F3 Display keyboard shortcuts