mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-10-31 13:10:19 -04:00 
			
		
		
		
	Add more on Copyright protections.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8156 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									3cde83ceb5
								
							
						
					
					
						commit
						26b567b4f0
					
				| @ -12,4 +12,18 @@ GNU General Public License for more details. | |||||||
| You should have received a copy of the GNU General Public License | You should have received a copy of the GNU General Public License | ||||||
| along with this documentation. If not, see {gnu_gpl}. | 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.* | ||||||
|  | |||||||
| @ -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
 | // This allows the window to shrink by removing certain things
 | ||||||
| // and reducing space used by controls
 | // and reducing space used by controls
 | ||||||
| void MainWindow::hideMenus(bool checked) | void MainWindow::hideMenus(bool checked) | ||||||
|  | |||||||
| @ -150,6 +150,7 @@ private slots: | |||||||
|   void on_actionKeyboard_shortcuts_triggered(); |   void on_actionKeyboard_shortcuts_triggered(); | ||||||
|   void on_actionSpecial_mouse_commands_triggered(); |   void on_actionSpecial_mouse_commands_triggered(); | ||||||
|   void on_actionSolve_FreqCal_triggered(); |   void on_actionSolve_FreqCal_triggered(); | ||||||
|  |   void on_actionCopyright_Notice_triggered(); | ||||||
|   void on_DecodeButton_clicked (bool); |   void on_DecodeButton_clicked (bool); | ||||||
|   void decode(); |   void decode(); | ||||||
|   void decodeBusy(bool b); |   void decodeBusy(bool b); | ||||||
|  | |||||||
| @ -2363,6 +2363,8 @@ QPushButton[state="ok"] { | |||||||
|     <addaction name="actionShort_list_of_add_on_prefixes_and_suffixes"/> |     <addaction name="actionShort_list_of_add_on_prefixes_and_suffixes"/> | ||||||
|     <addaction name="separator"/> |     <addaction name="separator"/> | ||||||
|     <addaction name="actionAbout"/> |     <addaction name="actionAbout"/> | ||||||
|  |     <addaction name="separator"/> | ||||||
|  |     <addaction name="actionCopyright_Notice"/> | ||||||
|    </widget> |    </widget> | ||||||
|    <widget class="QMenu" name="menuMode"> |    <widget class="QMenu" name="menuMode"> | ||||||
|     <property name="title"> |     <property name="title"> | ||||||
| @ -2952,6 +2954,14 @@ QPushButton[state="ok"] { | |||||||
|     <string>Solve for calibration parameters</string> |     <string>Solve for calibration parameters</string> | ||||||
|    </property> |    </property> | ||||||
|   </action> |   </action> | ||||||
|  |   <action name="actionCopyright_Notice"> | ||||||
|  |    <property name="text"> | ||||||
|  |     <string>Copyright notice</string> | ||||||
|  |    </property> | ||||||
|  |    <property name="shortcut"> | ||||||
|  |     <string>Shift+F1</string> | ||||||
|  |    </property> | ||||||
|  |   </action> | ||||||
|  </widget> |  </widget> | ||||||
|  <layoutdefault spacing="6" margin="11"/> |  <layoutdefault spacing="6" margin="11"/> | ||||||
|  <customwidgets> |  <customwidgets> | ||||||
|  | |||||||
| @ -1,5 +1,6 @@ | |||||||
| <table cellspacing=1> | <table cellspacing=1> | ||||||
|   <tr><td><b>F1       </b></td><td>Online User's Guide</td></tr> |   <tr><td><b>F1       </b></td><td>Online User's Guide</td></tr> | ||||||
|  |   <tr><td><b>Shift+F1  </b></td><td>Copyright Notice</td></tr> | ||||||
|   <tr><td><b>Ctrl+F1  </b></td><td>About WSJT-X</td></tr> |   <tr><td><b>Ctrl+F1  </b></td><td>About WSJT-X</td></tr> | ||||||
|   <tr><td><b>F2       </b></td><td>Open settings window</td></tr> |   <tr><td><b>F2       </b></td><td>Open settings window</td></tr> | ||||||
|   <tr><td><b>F3       </b></td><td>Display keyboard shortcuts</td></tr> |   <tr><td><b>F3       </b></td><td>Display keyboard shortcuts</td></tr> | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user