gpredict-svn Mailing List for Gpredict (Page 21)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
You can subscribe to this list here.
2008 |
Jan
(24) |
Feb
|
Mar
(6) |
Apr
(14) |
May
(9) |
Jun
|
Jul
|
Aug
(25) |
Sep
(60) |
Oct
(26) |
Nov
|
Dec
(20) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
|
Feb
(2) |
Mar
(22) |
Apr
(61) |
May
(57) |
Jun
|
Jul
(3) |
Aug
(83) |
Sep
(35) |
Oct
(50) |
Nov
(28) |
Dec
(34) |
2010 |
Jan
(29) |
Feb
(15) |
Mar
(2) |
Apr
|
May
(6) |
Jun
(2) |
Jul
(24) |
Aug
(2) |
Sep
(9) |
Oct
(43) |
Nov
(22) |
Dec
(6) |
2011 |
Jan
(24) |
Feb
(22) |
Mar
(31) |
Apr
(13) |
May
(10) |
Jun
(10) |
Jul
(43) |
Aug
(12) |
Sep
(18) |
Oct
(33) |
Nov
(18) |
Dec
(4) |
From: <cs...@us...> - 2009-10-01 18:20:12
|
Revision: 466 http://gpredict.svn.sourceforge.net/gpredict/?rev=466&view=rev Author: csete Date: 2009-10-01 18:19:58 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Updated NOAA 18 and 19. Modified Paths: -------------- trunk/data/trsp/28654.trsp Added Paths: ----------- trunk/data/trsp/33591.trsp Modified: trunk/data/trsp/28654.trsp =================================================================== --- trunk/data/trsp/28654.trsp 2009-10-01 15:43:33 UTC (rev 465) +++ trunk/data/trsp/28654.trsp 2009-10-01 18:19:58 UTC (rev 466) @@ -1,6 +1,6 @@ [APT] -DOWN_LOW=137100000 +DOWN_LOW=137912500 [HRPT] -DOWN_LOW=1698000000 +DOWN_LOW=1707000000 Added: trunk/data/trsp/33591.trsp =================================================================== --- trunk/data/trsp/33591.trsp (rev 0) +++ trunk/data/trsp/33591.trsp 2009-10-01 18:19:58 UTC (rev 466) @@ -0,0 +1,6 @@ +[APT] +DOWN_LOW=137100000 + +[HRPT] +DOWN_LOW=1698000000 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-10-01 15:43:53
|
Revision: 465 http://gpredict.svn.sourceforge.net/gpredict/?rev=465&view=rev Author: csete Date: 2009-10-01 15:43:33 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Updated translation files. Modified Paths: -------------- trunk/po/en_GB.po trunk/po/en_US.po trunk/po/fr.po trunk/po/gpredict.pot Modified: trunk/po/en_GB.po =================================================================== --- trunk/po/en_GB.po 2009-10-01 15:39:29 UTC (rev 464) +++ trunk/po/en_GB.po 2009-10-01 15:43:33 UTC (rev 465) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gpredict\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-07 01:26+0200\n" +"POT-Creation-Date: 2009-10-01 17:41+0200\n" "PO-Revision-Date: 2009-08-05 00:53+0100\n" "Last-Translator: Michael Stephenson <mic...@go...>\n" "Language-Team: British English\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/about.c:58 +#: ../src/about.c:62 msgid "" "Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n" "Contact: oz9aec at googlemail.com\n" @@ -68,14 +68,15 @@ #. window title #. icon file name #. create window title and file name for window icon -#: ../src/about.c:90 ../src/main.c:168 ../src/sat-log.c:58 -#: ../src/sat-log-browser.c:462 +#: ../src/about.c:94 ../src/main.c:166 ../src/sat-log-browser.c:462 +#: ../src/sat-log.c:58 msgid "GPREDICT" msgstr "GPREDICT" -#: ../src/about.c:93 +#: ../src/about.c:97 +#, fuzzy msgid "" -"Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n" +"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n" "\n" "Gpredict is available free of charge from:" msgstr "" @@ -83,89 +84,167 @@ "\n" "Gpredict is available free of charge from:" -#: ../src/about.c:110 +#: ../src/about.c:114 msgid "translator-credits" msgstr "Michael Stephenson" -#: ../src/first-time.c:189 ../src/first-time.c:465 ../src/first-time.c:710 +#: ../src/first-time.c:190 ../src/first-time.c:836 #, c-format msgid "%s: Could not open %s." msgstr "%s: Could not open %s." -#: ../src/first-time.c:213 +#: ../src/first-time.c:214 #, c-format msgid "%s: Found at least one .qth file." msgstr "%s: Found at least one .qth file." -#: ../src/first-time.c:255 +#: ../src/first-time.c:256 #, c-format msgid "%s: Failed to copy sample.qth" msgstr "%s: Failed to copy sample.qth" -#: ../src/first-time.c:262 +#: ../src/first-time.c:263 #, c-format msgid "%s: Copied sample.qth to %s/" msgstr "%s: Copied sample.qth to %s/" -#: ../src/first-time.c:303 ../src/first-time.c:408 ../src/first-time.c:532 -#: ../src/first-time.c:583 ../src/first-time.c:659 +#: ../src/first-time.c:304 ../src/first-time.c:409 ../src/first-time.c:658 +#: ../src/first-time.c:709 ../src/first-time.c:785 #, c-format msgid "%s: Check successful." msgstr "%s: Check successful." -#: ../src/first-time.c:309 ../src/first-time.c:413 ../src/first-time.c:537 -#: ../src/first-time.c:589 ../src/first-time.c:664 +#: ../src/first-time.c:310 ../src/first-time.c:414 ../src/first-time.c:663 +#: ../src/first-time.c:715 ../src/first-time.c:790 #, c-format msgid "%s: Check failed. Creating %s" msgstr "%s: Check failed. Creating %s" -#: ../src/first-time.c:320 ../src/first-time.c:422 ../src/first-time.c:546 -#: ../src/first-time.c:600 ../src/first-time.c:673 +#: ../src/first-time.c:321 ../src/first-time.c:423 ../src/first-time.c:672 +#: ../src/first-time.c:726 ../src/first-time.c:799 #, c-format msgid "%s: Failed to create %s" msgstr "%s: Failed to create %s" -#: ../src/first-time.c:325 ../src/first-time.c:427 ../src/first-time.c:551 -#: ../src/first-time.c:605 ../src/first-time.c:678 +#: ../src/first-time.c:326 ../src/first-time.c:428 ../src/first-time.c:677 +#: ../src/first-time.c:731 ../src/first-time.c:804 #, c-format msgid "%s: Created %s." msgstr "%s: Created %s." -#: ../src/first-time.c:369 +#: ../src/first-time.c:370 #, c-format msgid "%s: Failed to copy Amateur.mod" msgstr "%s: Failed to copy Amateur.mod" -#: ../src/first-time.c:376 +#: ../src/first-time.c:377 #, c-format msgid "%s: Copied amateur.mod to %s/" msgstr "%s: Copied amateur.mod to %s/" -#: ../src/first-time.c:486 ../src/first-time.c:742 +#: ../src/first-time.c:480 ../src/gtk-sat-data.c:73 +#, fuzzy, c-format +msgid "%s: Failed to load data from %s (%s)" +msgstr "%s: Failed to load %s (%s)" + +#: ../src/first-time.c:489 +#, fuzzy, c-format +msgid "%s: Found %d satellites in %s" +msgstr "%s: Found #%d in %s" + +#: ../src/first-time.c:497 #, c-format +msgid "%s: %s.sat already exists. Skipped." +msgstr "" + +#: ../src/first-time.c:529 ../src/tle-update.c:389 +#, fuzzy, c-format +msgid "%s: Could not create satellite file (%s)." +msgstr "%s: Could not create config file (%s)." + +#: ../src/first-time.c:546 ../src/tle-update.c:951 +#, fuzzy, c-format +msgid "%s: Error writing satellite data (%s)." +msgstr "%s: Error writing config data (%s)." + +#: ../src/first-time.c:553 ../src/tle-update.c:958 +#, fuzzy, c-format +msgid "%s: Wrote only %d out of %d chars for satellite data." +msgstr "%s: Wrote only %d out of %d chars." + +#: ../src/first-time.c:558 +#, fuzzy, c-format +msgid "%s: Satellite data written for %s." +msgstr "%s: Satellite #%d removed from list." + +#: ../src/first-time.c:577 +#, fuzzy, c-format +msgid "%s: Written %d new satellite to user config" +msgstr "%s: Added %d new satellites to local database" + +#: ../src/first-time.c:594 +#, fuzzy, c-format +msgid "%s: Could not open %s (%s)." +msgstr "%s: Could not open %s." + +#: ../src/first-time.c:619 ../src/first-time.c:868 +#, c-format msgid "%s: Failed to copy %s" msgstr "%s: Failed to copy %s" -#: ../src/first-time.c:491 +#: ../src/first-time.c:624 #, c-format msgid "%s: Successfully copied %s" msgstr "%s: Successfully copied %s" -#: ../src/first-time.c:501 -#, fuzzy, c-format -msgid "%s: Copied %d files to %s" -msgstr "%s: Copied sample.qth to %s/" - -#: ../src/first-time.c:735 +#: ../src/first-time.c:861 #, c-format msgid "%s: %s does not appear to be in user conf dir; adding." msgstr "%s: %s does not appear to be in user conf dir; adding." -#: ../src/first-time.c:751 +#: ../src/first-time.c:877 #, c-format msgid "%s: %s already in user conf dir." msgstr "%s: %s already in user conf dir." +#: ../src/gpredict-help.c:66 +#, c-format +msgid "%s: Help browser is not set up yet." +msgstr "%s: Help browser is not set up yet." + +#: ../src/gpredict-help.c:73 +#, c-format +msgid "%s: Configure help browser cancelled." +msgstr "%s: Configure help browser cancelled." + +#: ../src/gpredict-help.c:89 +#, c-format +msgid "%s: Launching help browser %s." +msgstr "%s: Launching help browser %s." + +#: ../src/gpredict-help.c:114 +msgid "Configure Help Browser" +msgstr "Configure Help Browser" + +#: ../src/gpredict-help.c:124 +msgid "Please select a HTML browser to be used to view the help." +msgstr "Please select a HTML browser to be used to view the help." + +#: ../src/gpredict-help.c:191 +#, c-format +msgid "%s: Failed to load %s (%s)" +msgstr "%s: Failed to load %s (%s)" + +#: ../src/gpredict-help.c:202 +#, c-format +msgid "%s: Error reading %s (%s)" +msgstr "%s: Error reading %s (%s)" + +#. create and show dialogue with textbuffer +#: ../src/gpredict-help.c:234 +msgid "Gpredict Info" +msgstr "Gpredict Info" + #: ../src/gpredict-utils.c:293 ../src/gpredict-utils.c:332 #: ../src/gpredict-utils.c:379 ../src/gpredict-utils.c:421 #, c-format @@ -191,8 +270,8 @@ msgid "Local Time" msgstr "Local Time" -#: ../src/gtk-azel-plot.c:383 ../src/pass-to-txt.c:158 -#: ../src/gtk-sky-glance.c:339 +#: ../src/gtk-azel-plot.c:383 ../src/gtk-sky-glance.c:350 +#: ../src/pass-to-txt.c:158 msgid "UTC" msgstr "UTC" @@ -208,19 +287,19 @@ msgid "El" msgstr "El" -#: ../src/gtk-polar-plot.c:616 ../src/gtk-polar-view.c:332 +#: ../src/gtk-polar-plot.c:616 ../src/gtk-polar-view.c:340 msgid "N" msgstr "N" -#: ../src/gtk-polar-plot.c:627 ../src/gtk-polar-view.c:343 +#: ../src/gtk-polar-plot.c:627 ../src/gtk-polar-view.c:351 msgid "S" msgstr "S" -#: ../src/gtk-polar-plot.c:638 ../src/gtk-polar-view.c:354 +#: ../src/gtk-polar-plot.c:638 ../src/gtk-polar-view.c:362 msgid "E" msgstr "E" -#: ../src/gtk-polar-plot.c:649 ../src/gtk-polar-view.c:365 +#: ../src/gtk-polar-plot.c:649 ../src/gtk-polar-view.c:373 msgid "W" msgstr "W" @@ -229,79 +308,16 @@ msgid "%s:%d: Incorrect polar plot orientation." msgstr "%s:%d: Incorrect polar plot orientation." -#. next pass and predict passes -#: ../src/gtk-polar-view-popup.c:107 ../src/gtk-sat-list-popup.c:97 -#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:837 -msgid "Show next pass" -msgstr "Show next pass" - -#: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108 -#: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:851 -msgid "Future passes" -msgstr "Future passes" - -#. show track -#: ../src/gtk-polar-view-popup.c:134 -msgid "Sky track" -msgstr "Sky track" - -#: ../src/gtk-polar-view-popup.c:197 ../src/gtk-polar-view-popup.c:304 -#: ../src/gtk-sat-map-popup.c:195 ../src/gtk-sat-map-popup.c:248 -#: ../src/gtk-sat-map-popup.c:425 +#: ../src/gtk-polar-view.c:741 #, c-format -msgid "%s:%d: Failed to get satellite object." -msgstr "%s:%d: Failed to get satellite object." - -#: ../src/gtk-polar-view-popup.c:404 ../src/gtk-polar-view-popup.c:474 -#: ../src/gtk-sat-list-popup.c:176 ../src/gtk-sat-list-popup.c:246 -#: ../src/gtk-sat-map-popup.c:306 ../src/gtk-sat-map-popup.c:376 -#: ../src/gtk-single-sat.c:1054 ../src/gtk-single-sat.c:1125 -#, c-format msgid "" -"Satellite %s has no passes\n" -"within the next %d days" -msgstr "" -"Satellite %s has no passes\n" -"within the next %d days" - -#: ../src/gtk-polar-view-popup.c:420 ../src/gtk-sat-list-popup.c:192 -#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1070 -#, c-format -msgid "" -"Satellite %s has no passes for\n" -"the current ground station!\n" -"\n" -"This can be because the satellite\n" -"is geostationary, decayed or simply\n" -"never comes above the horizon" -msgstr "" -"Satellite %s has no passes for\n" -"the current ground station!\n" -"\n" -"This can be because the satellite\n" -"is geostationary, decayed or simply\n" -"never comes above the horizon" - -#: ../src/gtk-polar-view-popup.c:493 ../src/gtk-sat-list-popup.c:265 -#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1144 -#, c-format -msgid "" -"Satellite %s has no passes for\n" -"the current ground station!" -msgstr "" -"Satellite %s has no passes for\n" -"the current ground station!" - -#: ../src/gtk-polar-view.c:733 -#, c-format -msgid "" "Next: %s\n" "in %s%d:%s%d%s%d" msgstr "" "Next: %s\n" "in %s%d:%s%d%s%d" -#: ../src/gtk-polar-view.c:736 +#: ../src/gtk-polar-view.c:744 #, c-format msgid "" "Next: %s\n" @@ -310,20 +326,20 @@ "Next: %s\n" "in %s%d%s%d" -#: ../src/gtk-polar-view.c:751 ../src/gtk-sat-map.c:694 +#: ../src/gtk-polar-view.c:759 ../src/gtk-sat-map.c:694 #, c-format msgid "%s: Can not find NEXT satellite." msgstr "%s: Can not find NEXT satellite." -#: ../src/gtk-polar-view.c:754 ../src/gtk-sat-map.c:697 +#: ../src/gtk-polar-view.c:762 ../src/gtk-sat-map.c:697 msgid "Next: ERR" msgstr "Next: ERR" -#: ../src/gtk-polar-view.c:760 ../src/gtk-sat-map.c:703 +#: ../src/gtk-polar-view.c:768 ../src/gtk-sat-map.c:703 msgid "Next: N/A" msgstr "Next: N/A" -#: ../src/gtk-polar-view.c:916 +#: ../src/gtk-polar-view.c:924 #, c-format msgid "" "%s\n" @@ -332,7 +348,7 @@ "%s\n" "LOS in %s%d:%s%d%s%d" -#: ../src/gtk-polar-view.c:920 +#: ../src/gtk-polar-view.c:928 #, c-format msgid "" "%s\n" @@ -341,7 +357,7 @@ "%s\n" "LOS in %s%d%s%d" -#: ../src/gtk-polar-view.c:928 +#: ../src/gtk-polar-view.c:936 #, c-format msgid "" "%s\n" @@ -350,16 +366,79 @@ "%s\n" "Always in range" -#: ../src/gtk-polar-view.c:1237 +#: ../src/gtk-polar-view.c:1137 ../src/gtk-polar-view-popup.c:197 +#: ../src/gtk-polar-view-popup.c:304 ../src/gtk-sat-map-popup.c:195 +#: ../src/gtk-sat-map-popup.c:248 ../src/gtk-sat-map-popup.c:425 #, c-format +msgid "%s:%d: Failed to get satellite object." +msgstr "%s:%d: Failed to get satellite object." + +#: ../src/gtk-polar-view.c:1394 +#, c-format msgid "%s:%d: Could not find satellite (%d) in hash table" msgstr "%s:%d: Could not find satellite (%d) in hash table" -#: ../src/gtk-polar-view.c:1285 ../src/gtk-sat-map.c:903 +#: ../src/gtk-polar-view.c:1442 ../src/gtk-sat-map.c:903 #, c-format msgid "%s:%d: Can not find clicked object (%d) in hash table" msgstr "%s:%d: Can not find clicked object (%d) in hash table" +#. next pass and predict passes +#: ../src/gtk-polar-view-popup.c:107 ../src/gtk-sat-list-popup.c:97 +#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:837 +msgid "Show next pass" +msgstr "Show next pass" + +#: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108 +#: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:851 +msgid "Future passes" +msgstr "Future passes" + +#. show track +#: ../src/gtk-polar-view-popup.c:134 +msgid "Sky track" +msgstr "Sky track" + +#: ../src/gtk-polar-view-popup.c:404 ../src/gtk-polar-view-popup.c:474 +#: ../src/gtk-sat-list-popup.c:176 ../src/gtk-sat-list-popup.c:246 +#: ../src/gtk-sat-map-popup.c:306 ../src/gtk-sat-map-popup.c:376 +#: ../src/gtk-single-sat.c:1054 ../src/gtk-single-sat.c:1125 +#, c-format +msgid "" +"Satellite %s has no passes\n" +"within the next %d days" +msgstr "" +"Satellite %s has no passes\n" +"within the next %d days" + +#: ../src/gtk-polar-view-popup.c:420 ../src/gtk-sat-list-popup.c:192 +#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1070 +#, c-format +msgid "" +"Satellite %s has no passes for\n" +"the current ground station!\n" +"\n" +"This can be because the satellite\n" +"is geostationary, decayed or simply\n" +"never comes above the horizon" +msgstr "" +"Satellite %s has no passes for\n" +"the current ground station!\n" +"\n" +"This can be because the satellite\n" +"is geostationary, decayed or simply\n" +"never comes above the horizon" + +#: ../src/gtk-polar-view-popup.c:493 ../src/gtk-sat-list-popup.c:265 +#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1144 +#, c-format +msgid "" +"Satellite %s has no passes for\n" +"the current ground station!" +msgstr "" +"Satellite %s has no passes for\n" +"the current ground station!" + #: ../src/gtk-rig-ctrl.c:386 msgid "<b> Downlink </b>" msgstr "<b> Downlink </b>" @@ -518,8 +597,8 @@ "This device will be used for uplink" #. load config -#: ../src/gtk-rig-ctrl.c:703 ../src/sat-pref-rig-editor.c:237 -#: ../src/sat-pref-rig.c:747 ../src/sat-pref-rig.c:756 +#: ../src/gtk-rig-ctrl.c:703 ../src/sat-pref-rig.c:747 +#: ../src/sat-pref-rig.c:756 ../src/sat-pref-rig-editor.c:237 msgid "None" msgstr "None" @@ -741,7 +820,7 @@ msgstr "%s:%d: Error reading radio configuration %s" #: ../src/gtk-rot-ctrl.c:328 ../src/gtk-sat-list.c:85 -#: ../src/sat-pass-dialogs.c:125 ../src/gtk-single-sat.c:56 +#: ../src/gtk-single-sat.c:56 ../src/sat-pass-dialogs.c:125 msgid "Azimuth" msgstr "Azimuth" @@ -750,7 +829,7 @@ msgstr "Read:" #: ../src/gtk-rot-ctrl.c:367 ../src/gtk-sat-list.c:86 -#: ../src/sat-pass-dialogs.c:126 ../src/gtk-single-sat.c:57 +#: ../src/gtk-single-sat.c:57 ../src/sat-pass-dialogs.c:126 msgid "Elevation" msgstr "Elevation" @@ -822,7 +901,7 @@ #: ../src/gtk-rot-ctrl.c:864 ../src/gtk-rot-ctrl.c:865 #: ../src/gtk-sat-module-popup.c:896 ../src/gtk-sat-module-popup.c:969 -#: ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:718 +#: ../src/qth-data.c:94 ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:718 msgid "ERROR" msgstr "ERROR" @@ -836,11 +915,6 @@ msgid "%s:%s: Read %d bytes from rotctld" msgstr "%s:%s: Read %d bytes from rotctld" -#: ../src/gtk-sat-data.c:73 -#, fuzzy, c-format -msgid "%s: Failed to load data from %s (%s)" -msgstr "%s: Failed to load %s (%s)" - #: ../src/gtk-sat-data.c:85 #, fuzzy, c-format msgid "%s: Error reading NAME from %s (%s)" @@ -860,7 +934,8 @@ msgid "Satellite" msgstr "Satellite" -#: ../src/gtk-sat-list.c:54 ../src/gtk-sat-tree.c:222 +#: ../src/gtk-sat-list.c:54 ../src/gtk-sat-selector.c:238 +#: ../src/gtk-sat-tree.c:222 ../src/mod-cfg.c:622 msgid "Catnum" msgstr "Catnum" @@ -887,8 +962,8 @@ #. Next Event #: ../src/gtk-sat-list.c:62 ../src/gtk-sat-list.c:92 -#: ../src/sat-pref-map-view.c:241 ../src/sat-pref-polar-view.c:272 -#: ../src/gtk-single-sat.c:63 +#: ../src/gtk-single-sat.c:63 ../src/sat-pref-map-view.c:241 +#: ../src/sat-pref-polar-view.c:276 msgid "Next Event" msgstr "Next Event" @@ -976,18 +1051,18 @@ msgid "Right Ascension" msgstr "Right Ascension" -#: ../src/gtk-sat-list.c:89 ../src/sat-pass-dialogs.c:128 -#: ../src/gtk-single-sat.c:60 +#: ../src/gtk-sat-list.c:89 ../src/gtk-single-sat.c:60 +#: ../src/sat-pass-dialogs.c:128 msgid "Declination" msgstr "Declination" -#: ../src/gtk-sat-list.c:90 ../src/sat-pass-dialogs.c:129 -#: ../src/gtk-single-sat.c:61 +#: ../src/gtk-sat-list.c:90 ../src/gtk-single-sat.c:61 +#: ../src/sat-pass-dialogs.c:129 msgid "Slant Range" msgstr "Slant Range" -#: ../src/gtk-sat-list.c:91 ../src/sat-pass-dialogs.c:130 -#: ../src/gtk-single-sat.c:62 +#: ../src/gtk-sat-list.c:91 ../src/gtk-single-sat.c:62 +#: ../src/sat-pass-dialogs.c:130 msgid "Range Rate" msgstr "Range Rate" @@ -1003,25 +1078,24 @@ msgid "Sub-Satellite Point" msgstr "Sub-Satellite Point" -#: ../src/gtk-sat-list.c:98 ../src/sat-pass-dialogs.c:134 -#: ../src/gtk-single-sat.c:69 +#: ../src/gtk-sat-list.c:98 ../src/gtk-single-sat.c:69 +#: ../src/sat-pass-dialogs.c:134 msgid "Footprint" msgstr "Footprint" #. altitude -#: ../src/gtk-sat-list.c:99 ../src/sat-pass-dialogs.c:135 -#: ../src/sat-pref-qth-editor.c:318 ../src/gtk-single-sat.c:70 -#: ../src/qth-editor.c:334 +#: ../src/gtk-sat-list.c:99 ../src/gtk-single-sat.c:70 ../src/qth-editor.c:334 +#: ../src/sat-pass-dialogs.c:135 ../src/sat-pref-qth-editor.c:318 msgid "Altitude" msgstr "Altitude" -#: ../src/gtk-sat-list.c:100 ../src/sat-pass-dialogs.c:136 -#: ../src/gtk-single-sat.c:71 +#: ../src/gtk-sat-list.c:100 ../src/gtk-single-sat.c:71 +#: ../src/sat-pass-dialogs.c:136 msgid "Velocity" msgstr "Velocity" -#: ../src/gtk-sat-list.c:101 ../src/sat-pass-dialogs.c:137 -#: ../src/gtk-single-sat.c:100 +#: ../src/gtk-sat-list.c:101 ../src/gtk-single-sat.c:100 +#: ../src/sat-pass-dialogs.c:137 msgid "Doppler Shift @ 100MHz" msgstr "Doppler Shift @ 100MHz" @@ -1029,18 +1103,18 @@ msgid "Signal Loss @ 100MHz" msgstr "Signal Loss @ 100MHz" -#: ../src/gtk-sat-list.c:103 ../src/sat-pass-dialogs.c:139 -#: ../src/gtk-single-sat.c:102 +#: ../src/gtk-sat-list.c:103 ../src/gtk-single-sat.c:102 +#: ../src/sat-pass-dialogs.c:139 msgid "Signal Delay" msgstr "Signal Delay" -#: ../src/gtk-sat-list.c:104 ../src/sat-pass-dialogs.c:140 -#: ../src/gtk-single-sat.c:103 +#: ../src/gtk-sat-list.c:104 ../src/gtk-single-sat.c:103 +#: ../src/sat-pass-dialogs.c:140 msgid "Mean Anomaly" msgstr "Mean Anomaly" -#: ../src/gtk-sat-list.c:105 ../src/sat-pass-dialogs.c:141 -#: ../src/gtk-single-sat.c:76 ../src/gtk-single-sat.c:104 +#: ../src/gtk-sat-list.c:105 ../src/gtk-single-sat.c:76 +#: ../src/gtk-single-sat.c:104 ../src/sat-pass-dialogs.c:141 msgid "Orbit Phase" msgstr "Orbit Phase" @@ -1048,8 +1122,8 @@ msgid "Orbit Number" msgstr "Orbit Number" -#: ../src/gtk-sat-list.c:107 ../src/sat-pass-dialogs.c:142 -#: ../src/gtk-single-sat.c:78 +#: ../src/gtk-sat-list.c:107 ../src/gtk-single-sat.c:78 +#: ../src/sat-pass-dialogs.c:142 msgid "Visibility" msgstr "Visibility" @@ -1101,6 +1175,41 @@ msgid "Row" msgstr "Row" +#: ../src/gtk-sat-map.c:671 +#, c-format +msgid "<span background=\"#%s\"> Next: %s in %s%d:%s%d%s%d </span>" +msgstr "<span background=\"#%s\"> Next: %s in %s%d:%s%d%s%d </span>" + +#: ../src/gtk-sat-map.c:677 +#, c-format +msgid "<span background=\"#%s\"> Next: %s in %s%d%s%d </span>" +msgstr "<span background=\"#%s\"> Next: %s in %s%d%s%d </span>" + +#: ../src/gtk-sat-map.c:1048 +#, c-format +msgid "%s:%d: Loading map file %s" +msgstr "%s:%d: Loading map file %s" + +#: ../src/gtk-sat-map.c:1054 +#, c-format +msgid "%s:%d: Map file found" +msgstr "%s:%d: Map file found" + +#: ../src/gtk-sat-map.c:1059 +#, c-format +msgid "%s:%d: Could not find map file %s" +msgstr "%s:%d: Could not find map file %s" + +#: ../src/gtk-sat-map.c:1067 +#, c-format +msgid "%s:%d: Using default map: %s" +msgstr "%s:%d: Using default map: %s" + +#: ../src/gtk-sat-map.c:1076 +#, c-format +msgid "%s:%d: Error loading map file (%s)" +msgstr "%s:%d: Error loading map file (%s)" + #: ../src/gtk-sat-map-ground-track.c:82 #, c-format msgid "%s: Creating ground track for %s" @@ -1156,41 +1265,6 @@ msgid "Set Target" msgstr "Set Target" -#: ../src/gtk-sat-map.c:671 -#, c-format -msgid "<span background=\"#%s\"> Next: %s in %s%d:%s%d%s%d </span>" -msgstr "<span background=\"#%s\"> Next: %s in %s%d:%s%d%s%d </span>" - -#: ../src/gtk-sat-map.c:677 -#, c-format -msgid "<span background=\"#%s\"> Next: %s in %s%d%s%d </span>" -msgstr "<span background=\"#%s\"> Next: %s in %s%d%s%d </span>" - -#: ../src/gtk-sat-map.c:1048 -#, c-format -msgid "%s:%d: Loading map file %s" -msgstr "%s:%d: Loading map file %s" - -#: ../src/gtk-sat-map.c:1054 -#, c-format -msgid "%s:%d: Map file found" -msgstr "%s:%d: Map file found" - -#: ../src/gtk-sat-map.c:1059 -#, c-format -msgid "%s:%d: Could not find map file %s" -msgstr "%s:%d: Could not find map file %s" - -#: ../src/gtk-sat-map.c:1067 -#, c-format -msgid "%s:%d: Using default map: %s" -msgstr "%s:%d: Using default map: %s" - -#: ../src/gtk-sat-map.c:1076 -#, c-format -msgid "%s:%d: Error loading map file (%s)" -msgstr "%s:%d: Error loading map file (%s)" - #: ../src/gtk-sat-module.c:256 #, c-format msgid "%s: Module %s is not valid." @@ -1243,7 +1317,7 @@ msgid "Error" msgstr "Error" -#: ../src/gtk-sat-module.c:670 ../src/mod-cfg.c:578 +#: ../src/gtk-sat-module.c:670 ../src/mod-cfg.c:673 #, c-format msgid "%s: Failed to get list of satellites (%s)" msgstr "%s: Failed to get list of satellites (%s)" @@ -1369,7 +1443,7 @@ msgstr "Sky at a glance" #. time manager -#: ../src/gtk-sat-module-popup.c:157 ../src/gtk-sat-module-tmg.c:261 +#: ../src/gtk-sat-module-popup.c:157 ../src/gtk-sat-module-tmg.c:289 msgid "Time Controller" msgstr "Time Controller" @@ -1427,7 +1501,7 @@ msgid "Name of new module:" msgstr "Name of new module:" -#: ../src/gtk-sat-module-popup.c:319 ../src/mod-cfg.c:515 +#: ../src/gtk-sat-module-popup.c:319 ../src/mod-cfg.c:501 msgid "" "Enter a short name for this module.\n" "Allowed characters: 0..9, a..z, A..Z, - and _" @@ -1435,7 +1509,7 @@ "Enter a short name for this module.\n" "Allowed characters: 0..9, a..z, A..Z, - and _" -#: ../src/gtk-sat-module-popup.c:321 ../src/mod-cfg.c:517 +#: ../src/gtk-sat-module-popup.c:321 ../src/mod-cfg.c:503 msgid "" "The name will be used to identify the module and it is also used a file name " "for saving the data.Max length is 25 characters." @@ -1536,115 +1610,181 @@ msgid "%s:%d: %s deleted permanently." msgstr "%s:%d: %s deleted permanently." -#: ../src/gtk-sat-module-tmg.c:70 +#: ../src/gtk-sat-module-tmg.c:75 #, c-format msgid "%s: Time Controller for %s is already active" msgstr "%s: Time Controller for %s is already active" -#: ../src/gtk-sat-module-tmg.c:94 +#: ../src/gtk-sat-module-tmg.c:99 msgid "Play forward" msgstr "Play forward" -#: ../src/gtk-sat-module-tmg.c:104 +#: ../src/gtk-sat-module-tmg.c:109 msgid "Stop" msgstr "Stop" -#: ../src/gtk-sat-module-tmg.c:115 +#: ../src/gtk-sat-module-tmg.c:120 msgid "Play backwards" msgstr "Play backwards" #. reset time #. reset button -#: ../src/gtk-sat-module-tmg.c:120 ../src/sat-pref-conditions.c:427 -#: ../src/sat-pref-single-sat.c:222 ../src/sat-pref-debug.c:141 -#: ../src/sat-pref-formats.c:118 ../src/sat-pref-layout.c:576 -#: ../src/sat-pref-list-view.c:253 ../src/sat-pref-map-view.c:644 -#: ../src/sat-pref-multi-pass.c:190 ../src/sat-pref-polar-view.c:577 -#: ../src/sat-pref-refresh.c:419 ../src/sat-pref-single-pass.c:184 +#: ../src/gtk-sat-module-tmg.c:125 ../src/sat-pref-conditions.c:427 +#: ../src/sat-pref-debug.c:141 ../src/sat-pref-formats.c:118 +#: ../src/sat-pref-layout.c:576 ../src/sat-pref-list-view.c:253 +#: ../src/sat-pref-map-view.c:644 ../src/sat-pref-multi-pass.c:190 +#: ../src/sat-pref-polar-view.c:627 ../src/sat-pref-refresh.c:419 +#: ../src/sat-pref-single-pass.c:184 ../src/sat-pref-single-sat.c:222 #: ../src/sat-pref-sky-at-glance.c:491 ../src/sat-pref-tle.c:348 msgid "Reset" msgstr "Reset" -#: ../src/gtk-sat-module-tmg.c:122 +#: ../src/gtk-sat-module-tmg.c:127 msgid "Reset to current date and time" msgstr "Reset to current date and time" -#: ../src/gtk-sat-module-tmg.c:129 ../src/gtk-sat-module-tmg.c:576 +#: ../src/gtk-sat-module-tmg.c:134 ../src/gtk-sat-module-tmg.c:778 msgid "<b>Real-Time</b>" msgstr "<b>Real-Time</b>" +#. Time controllers. +#. Note that the controllers for hours, minutes, and seconds have ranges; +#. however, they can wrap around their limits in order to ensure a smooth +#. and continuous control of the time +#. #. hour -#: ../src/gtk-sat-module-tmg.c:149 +#: ../src/gtk-sat-module-tmg.c:160 msgid " Hour:" msgstr " Hour:" -#: ../src/gtk-sat-module-tmg.c:161 +#: ../src/gtk-sat-module-tmg.c:173 msgid "Use this control to set the hour" msgstr "Use this control to set the hour" #. minutes -#: ../src/gtk-sat-module-tmg.c:169 +#: ../src/gtk-sat-module-tmg.c:182 msgid " Min:" msgstr " Min:" -#: ../src/gtk-sat-module-tmg.c:181 +#: ../src/gtk-sat-module-tmg.c:195 msgid "Use this control to set the minutes" msgstr "Use this control to set the minutes" #. seconds -#: ../src/gtk-sat-module-tmg.c:189 +#: ../src/gtk-sat-module-tmg.c:204 msgid " Sec:" msgstr " Sec:" -#: ../src/gtk-sat-module-tmg.c:201 +#: ../src/gtk-sat-module-tmg.c:217 msgid "Use this control to set the seconds" msgstr "Use this control to set the seconds" #. milliseconds -#: ../src/gtk-sat-module-tmg.c:209 +#: ../src/gtk-sat-module-tmg.c:226 msgid " Msec:" msgstr " Msec:" -#: ../src/gtk-sat-module-tmg.c:221 +#: ../src/gtk-sat-module-tmg.c:239 msgid "Use this control to set the milliseconds" msgstr "Use this control to set the milliseconds" #. time throttle -#: ../src/gtk-sat-module-tmg.c:229 +#: ../src/gtk-sat-module-tmg.c:248 msgid "Throttle:" msgstr "Throttle:" -#: ../src/gtk-sat-module-tmg.c:241 +#: ../src/gtk-sat-module-tmg.c:260 msgid "Time throttle / compression factor" msgstr "Time throttle / compression factor" -#: ../src/gtk-sat-module-tmg.c:282 +#: ../src/gtk-sat-module-tmg.c:310 #, c-format msgid "%s: Time Controller for %s launched" msgstr "%s: Time Controller for %s launched" -#: ../src/gtk-sat-module-tmg.c:313 +#: ../src/gtk-sat-module-tmg.c:339 #, c-format msgid "%s: Time Controller for %s closed. Time reset." msgstr "%s: Time Controller for %s closed. Time reset." -#: ../src/gtk-sat-module-tmg.c:483 +#: ../src/gtk-sat-module-tmg.c:508 ../src/gtk-sat-module-tmg.c:809 +#: ../src/gtk-sat-module-tmg.c:864 #, c-format msgid "%s: %d/%d/%d %d:%d:%d.%d" msgstr "%s: %d/%d/%d %d:%d:%d.%d" -#: ../src/gtk-sat-module-tmg.c:567 +#: ../src/gtk-sat-module-tmg.c:769 msgid "<b>Simulated Real-Time</b>" msgstr "<b>Simulated Real-Time</b>" -#: ../src/gtk-sat-module-tmg.c:571 +#: ../src/gtk-sat-module-tmg.c:773 msgid "<b>Manual Control</b>" msgstr "<b>Manual Control</b>" -#: ../src/gtk-sat-tree.c:232 +#: ../src/gtk-sat-selector.c:197 +msgid "Select a satellite group or category to narrow your search." +msgstr "" + +#: ../src/gtk-sat-selector.c:229 +#, fuzzy +msgid "Available Satellites" +msgstr "<b>Select Satellites:</b>" + +#: ../src/gtk-sat-selector.c:247 ../src/gtk-sat-tree.c:232 +#: ../src/mod-cfg.c:630 msgid "Epoch" msgstr "Epoch" +#. Search +#: ../src/gtk-sat-selector.c:275 +msgid "Search" +msgstr "" + +#: ../src/gtk-sat-selector.c:279 +msgid "" +"Start typing in this field to search for a satellite in the selected group." +msgstr "" + +#. Group selector +#: ../src/gtk-sat-selector.c:289 +msgid "Group" +msgstr "" + +#: ../src/gtk-sat-selector.c:353 +#, fuzzy +msgid "All satellites" +msgstr "Select satellite" + +#: ../src/gtk-sat-selector.c:360 +#, fuzzy, c-format +msgid "%s:%s: Failed to open satdata directory %s." +msgstr "%s:%d Failed to get data for %d." + +#: ../src/gtk-sat-selector.c:401 +#, fuzzy, c-format +msgid "%s:%s: Read %d satellites into MAIN group." +msgstr "%s:%d: Read %d sats from %s " + +#: ../src/gtk-sat-selector.c:448 +#, fuzzy, c-format +msgid "%s:%s: Failed to open %s: %s" +msgstr "%s:%s: Failed to open %s" + +#: ../src/gtk-sat-selector.c:485 ../src/mod-cfg.c:746 +#, fuzzy, c-format +msgid "%s:%s: Error reading satellite %d." +msgstr "%s: Error reading %s: %s" + +#: ../src/gtk-sat-selector.c:504 +#, fuzzy, c-format +msgid "%s:%s: Read %d satellites from %s" +msgstr "%s:%d: Read %d sats from %s " + +#: ../src/gtk-sat-selector.c:509 +#, fuzzy, c-format +msgid "%s:%s: Failed to read %s" +msgstr "%s:%d: Failed to read %s" + #: ../src/gtk-sat-tree.c:245 msgid "Selected" msgstr "Selected" @@ -1716,9 +1856,176 @@ msgid "%s: There are no satellites selected => NULL." msgstr "%s: There are no satellites selected => NULL." +#: ../src/gtk-single-sat.c:59 +msgid "Right Asc." +msgstr "Right Asc." + +#: ../src/gtk-single-sat.c:66 +msgid "SSP Lat." +msgstr "SSP Lat." + +#: ../src/gtk-single-sat.c:67 +msgid "SSP Lon." +msgstr "SSP Lon." + +#: ../src/gtk-single-sat.c:68 +msgid "SSP Loc." +msgstr "SSP Loc." + +#: ../src/gtk-single-sat.c:72 +msgid "Doppler@100M" +msgstr "Doppler@100M" + +#: ../src/gtk-single-sat.c:73 +msgid "Sig. Loss" +msgstr "Sig. Loss" + +#: ../src/gtk-single-sat.c:74 +msgid "Sig. Delay" +msgstr "Sig. Delay" + +#: ../src/gtk-single-sat.c:75 +msgid "Mean Anom." +msgstr "Mean Anom." + +#: ../src/gtk-single-sat.c:77 +msgid "Orbit Num." +msgstr "Orbit Num." + +#: ../src/gtk-single-sat.c:84 +msgid "Azimuth of the satellite" +msgstr "Azimuth of the satellite" + +#: ../src/gtk-single-sat.c:85 +msgid "Elevation of the satellite" +msgstr "Elevation of the satellite" + +#: ../src/gtk-single-sat.c:86 +msgid "Direction of the satellite" +msgstr "Direction of the satellite" + +#: ../src/gtk-single-sat.c:87 +msgid "Right Ascension of the satellite" +msgstr "Right Ascension of the satellite" + +#: ../src/gtk-single-sat.c:88 +msgid "Declination of the satellite" +msgstr "Declination of the satellite" + +#: ../src/gtk-single-sat.c:89 +msgid "The range between satellite and observer" +msgstr "The range between satellite and observer" + +#: ../src/gtk-single-sat.c:90 +msgid "The rate at which the Slant Range changes" +msgstr "The rate at which the Slant Range changes" + +#: ../src/gtk-single-sat.c:91 +msgid "The time of next AOS or LOS" +msgstr "The time of next AOS or LOS" + +#: ../src/gtk-single-sat.c:92 +msgid "The time of next AOS" +msgstr "The time of next AOS" + +#: ../src/gtk-single-sat.c:93 +msgid "The time of next LOS" +msgstr "The time of next LOS" + +#: ../src/gtk-single-sat.c:94 +msgid "Latitude of the sub-satellite point" +msgstr "Latitude of the sub-satellite point" + +#: ../src/gtk-single-sat.c:95 +msgid "Longitude of the sub-satellite point" +msgstr "Longitude of the sub-satellite point" + +#: ../src/gtk-single-sat.c:96 +msgid "Sub-Satellite Point as Maidenhead grid square" +msgstr "Sub-Satellite Point as Maidenhead grid square" + +#: ../src/gtk-single-sat.c:97 +msgid "Size of the satellite footprint" +msgstr "Size of the satellite footprint" + +#: ../src/gtk-single-sat.c:98 +msgid "Altitude of the satellite" +msgstr "Altitude of the satellite" + +#: ../src/gtk-single-sat.c:99 +msgid "Tangential velocity of the satellite" +msgstr "Tangential velocity of the satellite" + +#: ../src/gtk-single-sat.c:101 +msgid "Signal loss @ 100MHz" +msgstr "Signal loss @ 100MHz" + +#: ../src/gtk-single-sat.c:106 +msgid "Visibility of the satellite" +msgstr "Visibility of the satellite" + +#: ../src/gtk-single-sat.c:251 +msgid "Satellite options / shortcuts" +msgstr "Satellite options / shortcuts" + +#: ../src/gtk-single-sat.c:344 +#, c-format +msgid "%s: Invalid GtkSingleSat!" +msgstr "%s: Invalid GtkSingleSat!" + +#: ../src/gtk-single-sat.c:404 +#, c-format +msgid "%s:%d: Can not update invisible field (I:%d F:%d)" +msgstr "%s:%d: Can not update invisible field (I:%d F:%d)" + +#: ../src/gtk-single-sat.c:415 +#, c-format +msgid "%s:%d: Can not update non-existing sat" +msgstr "%s:%d: Can not update non-existing sat" + +#: ../src/gtk-single-sat.c:520 ../src/gtk-single-sat.c:551 +#: ../src/gtk-single-sat.c:579 +msgid "N/A" +msgstr "N/A" + +#: ../src/gtk-single-sat.c:701 +#, c-format +msgid "%s:%d: Invalid field number (%d)" +msgstr "%s:%d: Invalid field number (%d)" + +#. select sat +#: ../src/gtk-single-sat.c:908 +msgid "Select satellite" +msgstr "Select satellite" + +#. no satellites +#: ../src/gtk-sky-glance.c:238 +#, fuzzy +msgid "This module has no satellites!" +msgstr "%s:%s: GtkSatModule has no target satellite." + +#: ../src/gtk-sky-glance.c:343 +msgid "TIME" +msgstr "TIME" + +#: ../src/gtk-sky-glance.c:840 +#, c-format +msgid "%s:%d: Colour index out of valid range (%d)" +msgstr "%s:%d: Colour index out of valid range (%d)" + +#: ../src/gtk-sky-glance.c:898 +#, c-format +msgid "%s:%d: %s has %d passes within %.4f days\n" +msgstr "%s:%d: %s has %d passes within %.4f days\n" + +#: ../src/gtk-sky-glance.c:925 +#, c-format +msgid "%s:%d: Could not allocate memory for pass object" +msgstr "%s:%d: Could not allocate memory for pass object" + #. location -#: ../src/loc-tree.c:133 ../src/sat-pref-qth.c:189 -#: ../src/sat-pref-qth-editor.c:220 ../src/qth-editor.c:236 +#: ../src/loc-tree.c:133 ../src/qth-editor.c:236 ../src/sat-pref-qth.c:189 +#: ../src/sat-pref-qth-editor.c:220 msgid "Location" msgstr "Location" @@ -1775,11 +2082,11 @@ msgid "%s: No selection found!" msgstr "%s: No selection found!" -#: ../src/main.c:61 +#: ../src/main.c:60 msgid "just to have a pot" msgstr "just to have a pot" -#: ../src/main.c:113 +#: ../src/main.c:112 #, fuzzy, c-format msgid "" "%s: User config check failed (code %d). This is fatal.\n" @@ -1790,22 +2097,22 @@ "A possible solution would be to remove the .gpredict2 data dir\n" "in your home directory" -#: ../src/main.c:418 +#: ../src/main.c:413 #, c-format msgid "%s: Time threshold has been passed." msgstr "%s: Time threshold has been passed." -#: ../src/main.c:426 +#: ../src/main.c:421 #, c-format msgid "%s: Starting new update thread." msgstr "%s: Starting new update thread." -#: ../src/main.c:436 +#: ../src/main.c:431 #, c-format msgid "%s: Failed to create TLE update thread (%s)" msgstr "%s: Failed to create TLE update thread (%s)" -#: ../src/main.c:446 +#: ../src/main.c:441 msgid "" "Your TLE files are getting out of date.\n" "You can update them by selecting\n" @@ -1817,11 +2124,25 @@ "<b>Edit -> Update TLE</b>\n" "in the menubar." -#: ../src/main.c:477 +#: ../src/main.c:472 #, c-format msgid "%s: Could not find TLE monitoring task (ID = %d)" msgstr "%s: Could not find TLE monitoring task (ID = %d)" +#. create a new file chooser dialogue in "open file" mode +#: ../src/map-selector.c:76 +msgid "Select Map" +msgstr "Select Map" + +#: ../src/map-selector.c:92 +msgid "Image files" +msgstr "Image files" + +#: ../src/map-selector.c:187 ../src/map-selector.c:245 +#, c-format +msgid "%s:%d: Could not stat %s" +msgstr "%s:%d: Could not stat %s" + #: ../src/menubar.c:88 msgid "_File" msgstr "_File" @@ -2101,12 +2422,12 @@ msgid "%s:%s: No selection is list of modules." msgstr "%s:%s: No selection is list of modules." -#: ../src/mod-cfg.c:148 +#: ../src/mod-cfg.c:134 #, c-format msgid "%s: Already have module %s. Ask user to confirm..." msgstr "%s: Already have module %s. Ask user to confirm..." -#: ../src/mod-cfg.c:157 +#: ../src/mod-cfg.c:143 #, c-format msgid "" "There is already a module called %s.\n" @@ -2115,81 +2436,114 @@ "There is already a module called %s.\n" "Do you want to overwrite this module?" -#: ../src/mod-cfg.c:183 +#: ../src/mod-cfg.c:169 #, c-format msgid "%s: Error while saving module data (%d)." msgstr "%s: Error while saving module data (%d)." -#: ../src/mod-cfg.c:194 ../src/mod-cfg.c:283 +#: ../src/mod-cfg.c:178 ../src/mod-cfg.c:264 #, c-format msgid "%s: User tried to create module with no sats." msgstr "%s: User tried to create module with no sats." -#: ../src/mod-cfg.c:206 ../src/mod-cfg.c:294 +#: ../src/mod-cfg.c:190 ../src/mod-cfg.c:275 msgid "Please select at least one satellite from the list." msgstr "Please select at least one satellite from the list." -#: ../src/mod-cfg.c:345 +#: ../src/mod-cfg.c:325 #, c-format msgid "%s: Attempt to save data to empty file name." msgstr "%s: Attempt to save data to empty file name." -#: ../src/mod-cfg.c:352 +#: ../src/mod-cfg.c:332 #, c-format msgid "%s: Attempt to save NULL data." msgstr "%s: Attempt to save NULL data." -#: ../src/mod-cfg.c:363 ../src/sat-cfg.c:307 +#: ../src/mod-cfg.c:343 ../src/sat-cfg.c:324 #, c-format msgid "%s: Could not create config data (%s)." msgstr "%s: Could not create config data (%s)." -#: ../src/mod-cfg.c:380 ../src/sat-cfg.c:324 +#: ../src/mod-cfg.c:360 ../src/sat-cfg.c:341 #, c-format msgid "%s: Could not create config file (%s)." msgstr "%s: Could not create config file (%s)." -#: ../src/mod-cfg.c:399 ../src/sat-cfg.c:343 +#: ../src/mod-cfg.c:379 ../src/sat-cfg.c:360 #, c-format msgid "%s: Error writing config data (%s)." msgstr "%s: Error writing config data (%s)." -#: ../src/mod-cfg.c:408 ../src/sat-cfg.c:352 +#: ../src/mod-cfg.c:388 ../src/qth-data.c:341 ../src/sat-cfg.c:369 #, c-format msgid "%s: Wrote only %d out of %d chars." msgstr "%s: Wrote only %d out of %d chars." -#: ../src/mod-cfg.c:415 +#: ../src/mod-cfg.c:395 #, c-format msgid "%s: Configuration saved for module %s." msgstr "%s: Configuration saved for module %s." -#: ../src/mod-cfg.c:465 +#: ../src/mod-cfg.c:451 msgid "Create New Module" msgstr "Create New Module" -#: ../src/mod-cfg.c:478 +#: ../src/mod-cfg.c:464 msgid "Edit Module" msgstr "Edit Module" -#: ../src/mod-cfg.c:539 +#: ../src/mod-cfg.c:520 +#, fuzzy +msgid "Select a ground station for this module." +msgstr "Add a new ground station to the list" + +#: ../src/mod-cfg.c:526 msgid "Module Name" msgstr "Module Name" -#: ../src/mod-cfg.c:543 +#: ../src/mod-cfg.c:530 msgid "Ground Station" msgstr "Ground Station" #. add button -#: ../src/mod-cfg.c:549 -msgid "Add new ground station" +#: ../src/mod-cfg.c:536 +#, fuzzy +msgid "Add a new ground station" msgstr "Add new ground station" -#: ../src/mod-cfg.c:558 -msgid "<b>Select Satellites:</b>" -msgstr "<b>Select Satellites:</b>" +#: ../src/mod-cfg.c:546 +#, fuzzy +msgid "<b>Satellites</b>" +msgstr "<b>Satellite name:</b>" -#: ../src/mod-cfg.c:698 +#: ../src/mod-cfg.c:564 +#, fuzzy +msgid "Add satellite to list of selected satellites." +msgstr "Click to select colour for selected satellites" + +#: ../src/mod-cfg.c:567 +#, fuzzy +msgid "Remove satellite from the list of selected satellites." +msgstr "Click to select colour for selected satellites" + +#: ../src/mod-cfg.c:575 +msgid "" +"<b>Hint: </b> Double click on any satellite\n" +"to move it to the other box." +msgstr "" + +#: ../src/mod-cfg.c:614 +#, fuzzy +msgid "Selected Satellites" +msgstr "Select satellite" + +#: ../src/mod-cfg.c:731 ../src/mod-cfg.c:985 +#, fuzzy, c-format +msgid "%s:%s: Could not fetch entry %d in satellite list" +msgstr "%s:%d: Could not find satellite (%d) in hash table" + +#: ../src/mod-cfg.c:851 #, c-format msgid "%s: Module has no QTH; use default." msgstr "%s: Module has no QTH; use default." @@ -2201,25 +2555,40 @@ #. is buff == "** DEFAULT **" clear the configuration key #. otherwise store the filename #. -#: ../src/mod-cfg.c:701 ../src/mod-cfg.c:742 ../src/mod-cfg.c:790 +#: ../src/mod-cfg.c:854 ../src/mod-cfg.c:895 ../src/mod-cfg.c:944 msgid "** DEFAULT **" msgstr "** DEFAULT **" -#: ../src/mod-cfg.c:733 +#: ../src/mod-cfg.c:886 #, c-format msgid "%s:%d: Failed to open user cfg dir %s (%s)" msgstr "%s:%d: Failed to open user cfg dir %s (%s)" -#: ../src/mod-cfg.c:831 +#: ../src/mod-cfg.c:999 #, c-format msgid "%s: Applied changes to %s." msgstr "%s: Applied changes to %s." #. window icon file name -#: ../src/mod-cfg.c:853 +#: ../src/mod-cfg.c:1020 msgid "Module Properties" msgstr "Module Properties" +#: ../src/mod-cfg-get-param.c:71 +#, c-format +msgid "%s: Failed to read boolean (%s)" +msgstr "%s: Failed to read boolean (%s)" + +#: ../src/mod-cfg-get-param.c:107 +#, c-format +msgid "%s: Failed to read integer (%s)" +msgstr "%s: Failed to read integer (%s)" + +#: ../src/mod-cfg-get-param.c:143 +#, c-format +msgid "%s: Failed to read string (%s)" +msgstr "%s: Failed to read string (%s)" + #: ../src/mod-mgr.c:147 #, c-format msgid "%s: Failed to restore %s" @@ -2463,6 +2832,251 @@ "Observer: %s, %s\n" "LAT:%.2f LON:%.2f\n" +#: ../src/qth-data.c:66 +#, fuzzy, c-format +msgid "%s: Could not load data from %s (%s)" +msgstr "%s: Could not load config data from %s (%s)." + +#: ../src/qth-data.c:74 +#, fuzzy, c-format +msgid "%s: QTH data: %s" +msgstr "%s:%d: Read QTH data from %s." + +#: ../src/qth-data.c:91 +#, fuzzy, c-format +msgid "%s: Error reading QTH name (%s)." +msgstr "%s: Error reading %s (%s)" + +#: ../src/qth-data.c:105 +#, fuzzy, c-format +msgid "%s: QTH has no location (%s)." +msgstr "%s: No location selected" + +#: ../src/qth-data.c:119 +#, c-format +msgid "%s: QTH has no description." +msgstr "" + +#: ../src/qth-data.c:133 +#, c-format +msgid "%s: QTH has no weather station." +msgstr "" + +#: ../src/qth-data.c:147 +#, fuzzy, c-format +msgid "%s: Error reading QTH latitude (%s)." +msgstr "%s: Error reading %s (%s)" + +#: ../src/qth-data.c:169 +#, fuzzy, c-format +msgid "%s: Error reading QTH longitude (%s)." +msgstr "%s: Error reading config file (%s)" + +#: ../src/qth-data.c:191 +#, fuzzy, c-format +msgid "%s: Error reading QTH altitude (%s)." +msgstr "%s: Error reading %s (%s)" + +#: ../src/qth-data.c:206 +#, c-format +msgid "%s: QTH data: %s, %.4f, %.4f, %d" +msgstr "" + +#: ../src/qth-data.c:300 +#, fuzzy, c-format +msgid "%s: Could not create QTH data (%s)." +msgstr "%s: Could not create config data (%s)." + +#: ../src/qth-data.c:313 +#, fuzzy, c-format +msgid "" +"%s: Could not create QTH file %s\n" +"%s." +msgstr "%s: Could not create file %s (%s)" + +#: ../src/qth-data.c:332 +#, fuzzy, c-format +msgid "%s: Error writing QTH data (%s)." +msgstr "%s: Error writing config data (%s)." + +#: ../src/qth-data.c:348 +#, fuzzy, c-format +msgid "%s: QTH data saved." +msgstr "%s:%d: Read QTH data from %s." + +#. crate dialog and add contents +#: ../src/qth-editor.c:110 ../src/sat-pref-qth-editor.c:112 +msgid "Edit ground station data" +msgstr "Edit ground station data" + +#: ../src/qth-editor.c:153 +#, c-format +msgid "" +"An error occurred while trying to save\n" +"ground station data to %s.qth!\n" +"Please try again using a different name." +msgstr "" +"An error occurred while trying to save\n" +"ground station data to %s.qth!\n" +"Please try again using a different name." + +#. QTH name +#. Config name +#: ../src/qth-editor.c:200 ../src/sat-pref-qth.c:182 +#: ../src/sat-pref-qth-editor.c:184 ../src/sat-pref-rig-editor.c:157 +#: ../src/sat-pref-rot-editor.c:154 +msgid "Name" +msgstr "Name" + +#: ../src/qth-editor.c:208 ../src/sat-pref-qth-editor.c:192 +msgid "" +"Enter a short name for this ground station, e.g. callsign.\n" +"Allowed characters: 0..9, a..z, A..Z, - and _" +msgstr "" +"Enter a short name for this ground station, e.g. callsign.\n" +"Allowed characters: 0..9, a..z, A..Z, - and _" + +#: ../src/qth-editor.c:210 ../src/sat-pref-qth-editor.c:194 +msgid "" +"The name will be used to identify the ground station when it is presented to " +"the user. Maximum allowed length is 25 characters." +msgstr "" +"The name will be used to identify the ground station when it is presented to " +"the user. Maximum allowed length is 25 characters." + +#. QTH description +#: ../src/qth-editor.c:221 ../src/sat-pref-qth-editor.c:205 +msgid "Description" +msgstr "Description" + +#: ../src/qth-editor.c:229 ../src/sat-pref-qth-editor.c:213 +msgid "Enter an optional description for this ground station." +msgstr "Enter an optional description for this ground station." + +#: ../src/qth-editor.c:230 +msgid "" +"The description for the ground station can be used as additional " +"information. It may be included when generating reports. The maximum length " +"for the description is 256 characters." +msgstr "" +"The description for the ground station can be used as additional " +"information. It may be included when generating reports. The maximum length " +"for the description is 256 characters." + +#: ../src/qth-editor.c:244 ../src/sat-pref-qth-editor.c:228 +msgid "Optional location of the ground station, fx. Copenhagen, Denmark." +msgstr "Optional location of the ground station, fx. Copenhagen, Denmark." + +#: ../src/qth-editor.c:248 ../src/qth-editor.c:369 +#: ../src/sat-pref-qth-editor.c:232 ../src/sat-pref-qth-editor.c:353 +msgid "Select" +msgstr "Select" + +#: ../src/qth-editor.c:249 ../src/sat-pref-qth-editor.c:233 +msgid "Select a predefined location from a list." +msgstr "Select a predefined location from a list." + +#. latitude +#: ../src/qth-editor.c:257 ../src/sat-pref-qth-editor.c:241 +msgid "Latitude (°)" +msgstr "Latitude (°)" + +#: ../src/qth-editor.c:267 ../src/sat-pref-qth-editor.c:251 +msgid "Select the latitude of the ground station in decimal degrees." +msgstr "Select the latitude of the ground station in decimal degrees." + +#: ../src/qth-editor.c:272 ../src/sat-pref-qth-editor.c:256 +msgid "North" +msgstr "North" + +#: ../src/qth-editor.c:273 ../src/sat-pref-qth-editor.c:257 +msgid "South" +msgstr "South" + +#. longitude +#: ../src/qth-editor.c:279 ../src/sat-pref-qth-editor.c:263 +msgid "Longitude (°)" +msgstr "Longitude (°)" + +#: ../src/qth-editor.c:288 ../src/sat-pref-qth-editor.c:272 +msgid "Select the longitude of the ground station in decimal degrees." +msgstr "Select the longitude of the ground station in decimal degrees." + +#: ../src/qth-editor.c:293 ../src/sat-pref-qth-editor.c:277 +msgid "East" +msgstr "East" + +#: ../src/qth-editor.c:294 ../src/sat-pref-qth-editor.c:278 +msgid "West" +msgstr "West" + +#. QRA locator +#: ../src/qth-editor.c:318 ../src/sat-pref-qth-editor.c:302 +msgid "Locator" +msgstr "Locator" + +#: ../src/qth-editor.c:326 ../src/sat-pref-qth-editor.c:310 +msgid "Maidenhead locator grid." +msgstr "Maidenhead locator grid." + +#: ../src/qth-editor.c:342 ../src/sat-pref-qth-editor.c:326 +msgid "" +"Select the altitude of the ground station in meters or feet depending on " +"your settings" +msgstr "" +"Select the altitude of the ground station in meters or feet depending on " +"your settings" + +#: ../src/qth-editor.c:348 ../src/sat-pref-qth-editor.c:332 +msgid "ft asl" +msgstr "ft asl" + +#: ../src/qth-editor.c:351 ../src/sat-pref-qth-editor.c:335 +msgid "m asl" +msgstr "m asl" + +#. weather station +#: ../src/qth-editor.c:357 ../src/sat-pref-qth-editor.c:341 +msgid "Weather St" +msgstr "Weather St" + +#: ../src/qth-editor.c:365 ../src/sat-pref-qth-editor.c:349 +msgid "Four letter code for weather station" +msgstr "Four letter code for weather station" + +#: ../src/qth-editor.c:370 ../src/sat-pref-qth-editor.c:354 +msgid "Select a predefined weather station from a list." +msgstr "Select a predefined weather station from a list." + +#: ../src/qth-editor.c:424 +#, c-format +msgid "" +"%s:%d: Loaded %s for editing:\n" +"LAT:%.2f LON:%.2f ALT:%d" +msgstr "" +"%s:%d: Loaded %s for editing:\n" +"LAT:%.2f LON:%.2f ALT:%d" + +#: ../src/qth-editor.c:724 ../src/sat-pref-qth-editor.c:744 +#, c-format +msgid "%s:%s: %.2f %.2f => %s" +msgstr "%s:%s: %.2f %.2f => %s" + +#: ../src/qth-editor.c:739 ../src/sat-pref-qth-editor.c:759 +#, c-format +msgid "%s:%d: Error converting lon/lat to locator" +msgstr "%s:%d: Error converting lon/lat to locator" + +#: ../src/qth-editor.c:767 ../src/sat-pref-qth-editor.c:787 +#, c-format +msgid "%s:%s: %s => %.2f %.2f" +msgstr "%s:%s: %s => %.2f %.2f" + +#: ../src/qth-editor.c:809 ../src/sat-pref-qth-editor.c:829 +#, c-format +msgid "%s:%d: Invalid locator: %s" +msgstr "%s:%d: Invalid locator: %s" + #: ../src/radio-conf.c:68 ../src/radio-conf.c:224 ../src/rotor-conf.c:65 #, c-format msgid "%s: NULL configuration name!" @@ -2520,47 +3134,47 @@ msgid "%s: MaxEl not defined for %s. Assuming 90°." msgstr "%s: MaxEl not defined for %s. Assuming 90°." -#: ../src/sat-cfg.c:264 +#: ../src/sat-cfg.c:271 #, c-format msgid "%s: Error reading config file (%s)" msgstr "%s: Error reading config file (%s)" -#: ../src/sat-cfg.c:268 +#: ../src/sat-cfg.c:275 #, c-format msgid "%s: Using built-in defaults" msgstr "%s: Using built-in defaults" -#: ../src/sat-cfg.c:277 +#: ../src/sat-cfg.c:284 #, c-format msgid "%s: Everything OK." msgstr "%s: Everything OK." -#: ../src/sat-cfg.c:359 +#: ../src/sat-cfg.c:376 #, c-format msgid "%s: Configuration saved." msgstr "%s: Configuration saved." -#: ../src/sat-cfg.c:402 ../src/sat-cfg.c:465 ../src/sat-cfg.c:491 -#: ../src/sat-cfg.c:524 ../src/sat-cfg.c:589 ../src/sat-cfg.c:625 -#: ../src/sat-cfg.c:653 ../src/sat-cfg.c:709 ../src/sat-cfg.c:735 +#: ../src/sat-cfg.c:419 ../src/sat-cfg.c:482 ../src/sat-cfg.c:508 +#: ../src/sat-cfg.c:541 ../src/sat-cfg.c:606 ../src/sat-cfg.c:642 +#: ../src/sat-cfg.c:670 ../src/sat-cfg.c:726 ../src/sat-cfg.c:752 #, c-format msgid "%s: Module not initialised\n" msgstr "%s: Module not initialised\n" -#: ../src/sat-cfg.c:425 ../src/sat-cfg.c:443 ../src/sat-cfg.c:478 -#: ../src/sat-cfg.c:504 +#: ../src/sat-cfg.c:442 ../src/sat-cfg.c:460 ../src/sat-cfg.c:495 +#: ../src/sat-cfg.c:521 #, c-format msgid "%s: Unknown BOOL param index (%d)\n" msgstr "%s: Unknown BOOL param index (%d)\n" -#: ../src/sat-cfg.c:547 ../src/sat-cfg.c:570 ../src/sat-cfg.c:611 -#: ../src/sat-cfg.c:638 +#: ../src/sat-cfg.c:564 ../src/sat-cfg.c:587 ../src/sat-cfg.c:628 +#: ../src/sat-cfg.c:655 #, c-format msgid "%s: Unknown STR param index (%d)\n" msgstr "%s: Unknown STR param index (%d)\n" -#: ../src/sat-cfg.c:676 ../src/sat-cfg.c:694 ../src/sat-cfg.c:722 -#: ../src/sat-cfg.c:748 +#: ../src/sat-cfg.c:693 ../src/sat-cfg.c:711 ../src/sat-cfg.c:739 +#: ../src/sat-cfg.c:765 #, c-format msgid "%s: Unknown INT param index (%d)\n" msgstr "%s: Unknown INT param index (%d)\n" @@ -2725,46 +3339,6 @@ msgid "Mode: %s" msgstr "Mode: %s" -#. * WARNING: Used directly in sat-log-browser -#: ../src/sat-log.c:58 ../src/sat-log-browser.c:70 -msgid "NONE" -msgstr "NONE" - -#: ../src/sat-log.c:58 -msgid "HAMLIB" -msgstr "HAMLIB" - -#. print an error message -#: ../src/sat-log.c:102 -#, c-format -msgid "ERROR: Could not create %s\n" -msgstr "ERROR: Could not create %s\n" - -#: ../src/sat-log.c:126 -#, c-format -msgid "" -"\n" -"\n" -"ERROR: Failed to create %s\n" -"%s\n" -"\n" -msgstr "" -"\n" -"\n" -"ERROR: Failed to create %s\n" -"%s\n" -"\n" - -#: ../src/sat-log.c:139 -#, c-format -msgid "%s: Session started" -msgstr "%s: Session started" - -#: ../src/sat-log.c:151 -#, c-format -msgid "%s: Session ended" -msgstr "%s: Session ended" - #: ../src/sat-log-browser.c:57 ../src/sat-pass-dialogs.c:100 #: ../src/sat-pass-dialogs.c:124 msgid "Time" @@ -2782,6 +3356,11 @@ msgid "Message" msgstr "Message" +#. * WARNING: Used directly in sat-log-browser +#: ../src/sat-log-browser.c:70 ../src/sat-log.c:58 +msgid "NONE" +msgstr "NONE" + #: ../src/sat-log-browser.c:71 msgid "BUG" msgstr "BUG" @@ -2864,6 +3443,41 @@ msgid " Summary " msgstr " Summary " +#: ../src/sat-log.c:58 +msgid "HAMLIB" +msgstr "HAMLIB" + +#. print an error message +#: ../src/sat-log.c:102 +#, c-format +msgid "ERROR: Could not create %s\n" +msgstr "ERROR: Could not create %s\n" + +#: ../src/sat-log.c:126 +#, c-format +msgid "" +"\n" +"\n" +"ERROR: Failed to create %s\n" +"%s\n" +"\n" +msgstr "" +"\n" +"\n" +"ERROR: Failed to create %s\n" +"%s\n" +"\n" + +#: ../src/sat-log.c:139 +#, c-format +msgid "%s: Session started" +msgstr "%s: Session started" + +#: ../src/sat-log.c:151 +#, c-format +msgid "%s: Session ended" +msgstr "%s: Session ended" + #: ../src/sat-pass-dialogs.c:58 msgid "AOS" msgstr "AOS" @@ -2945,6 +3559,44 @@ msgid "Upcoming passes for %s" msgstr "Upcoming passes for %s" +#: ../src/sat-pref.c:56 +msgid "GPREDICT Preferences :: General" +msgstr "GPREDICT Preferences :: General" + +#: ../src/sat-pref.c:57 +msgid "GPREDICT Preferences :: Modules" +msgstr "GPREDICT Preferences :: Modules" + +#: ../src/sat-pref.c:58 +msgid "GPREDICT Preferences :: Interfaces" +msgstr "GPREDICT Preferences :: Interfaces" + +#: ../src/sat-pref.c:59 +msgid "GPREDICT Preferences :: Predict" +msgstr "GPREDICT Preferences :: Predict" + +#. create a button box and add the buttons one by one +#: ../src/sat-pref.c:101 ../src/sat-pref.c:117 +msgid "General" +msgstr "General" + +#: ../src/sat-pref.c:104 ../src/sat-pref.c:124 +msgid "Modules" +msgstr "Modules" + +#: ../src/sat-pref.c:107 ../src/sat-pref.c:131 +msgid "Interfaces" +msgstr "Interfaces" + +#: ../src/sat-pref.c:110 ../src/sat-pref.c:138 +msgid "Predict" +msgstr "Predict" + +#. create and display preferences window +#: ../src/sat-pref.c:162 +msgid "Gpredict Preferences :: General" +msgstr "Gpredict Preferences :: General" + #. minimum elevation #: ../src/sat-pref-conditions.c:76 msgid "Minimum elevation" @@ -3068,313 +3720,15 @@ "will use the time from the time controller as starting time for predicting " "satellite passes." -#: ../src/sat-pref-conditions.c:433 ../src/sat-pref-single-sat.c:229 -#: ../src/sat-pref-debug.c:144 ../src/sat-pref-layout.c:583 -#: ../src/sat-pref-list-view.c:260 ../src/sat-pref-map-view.c:651 -#: ../src/sat-pref-multi-pass.c:196 ../src/sat-pref-polar-view.c:584 -#: ../src/sat-pref-refresh.c:426 ../src/sat-pref-single-pass.c:190 +#: ../src/sat-pref-conditions.c:433 ../src/sat-pref-debug.c:144 +#: ../src/sat-pref-layout.c:583 ../src/sat-pref-list-view.c:260 +#: ../src/sat-pref-map-view.c:651 ../src/sat-pref-multi-pass.c:196 +#: ../src/sat-pref-polar-view.c:633 ../src/sat-pref-refresh.c:426 +#: ../src/sat-pref-single-pass.c:190 ../src/sat-pref-single-sat.c:229 #: ../src/sat-pref-sky-at-glance.c:497 ../src/sat-pref-tle.c:354 msgid "Reset settings to the default values." msgstr "Reset settings to the default values." -#: ../src/sat-pref-help.c:88 -msgid "<b>Html Browser:</b>" -msgstr "<b>Html Browser:</b>" - -#. browser type -#: ../src/sat-pref-help.c:98 -msgid "Browser type:" -msgstr "Browser type:" - -#. command string -#: ../src/sat-pref-help.c:109 -msgid "Command string:" -msgstr "Command string:" - -#. crate dialog and add contents -#: ../src/sat-pref-rig-editor.c:87 -msgid "Edit radio configuration" -msgstr "Edit radio configuration" - -#. Config name -#. QTH name -#: ../src/sat-pref-rig-editor.c:157 ../src/sat-pref-rot-editor.c:154 -#: ../src/sat-pref-qth.c:182 ../src/sat-pref-qth-editor.c:184 -#: ../src/qth-editor.c:200 -msgid "Name" -msgstr "Name" - -#: ../src/sat-pref-rig-editor.c:164 -msgid "" -"Enter a short name for this configuration, e.g. IC910-1.\n" -"Allowed characters: 0..9, a..z, A..Z, - and _" -msgstr "" -"Enter a short name for this configuration, e.g. IC910-1.\n" -"Allowed characters: 0..9, a..z, A..Z, - and _" - -#. Host -#: ../src/sat-pref-rig-editor.c:174 ../src/sat-pref-rot-editor.c:171 -#: ../src/sat-pref-rig.c:142 ../src/sat-pref-rot.c:125 -msgid "Host" -msgstr "Host" - -#: ../src/sat-pref-rig-editor.c:182 -msgid "" -"Enter the host where rigctld is running. You can use both host name and IP " -"address, e.g. 192.168.1.100\n" -"\n" -"If gpredict and rigctld are running on the same computer use localhost" -msgstr "" -"Enter the host where rigctld is running. You can use both host name and IP " -"address, e.g. 192.168.1.100\n" -"\n" -"If gpredict and rigctld are running on the same computer use localhost" - -#. port -#: ../src/sat-pref-rig-editor.c:190 ../src/sat-pref-rot-editor.c:187 -#: ../src/sat-pref-rig.c:149 ../src/sat-pref-rot.c:132 -msgid "Port" -msgstr "Port" - -#: ../src/sat-pref-rig-editor.c:198 -msgid "Enter the port number where rigctld is listening" -msgstr "Enter the port number where rigctld is listening" - -#. radio type -#: ../src/sat-pref-rig-editor.c:202 -msgid "Radio type" -msgstr "Radio type" - -#: ../src/sat-pref-rig-editor.c:207 ../src/sat-pref-rig.c:702 -msgid "RX only" -msgstr "RX only" - -#: ../src/sat-pref-rig-editor.c:208 ../src/sat-pref-rig.c:706 -msgid "TX only" -msgstr "TX only" - -#: ../src/sat-pref-rig-editor.c:209 -msgid "Simplex TRX" -msgstr "Simplex TRX" - -#: ../src/sat-pref-rig-editor.c:210 -msgid "Duplex TRX" -msgstr "Duplex TRX" - -#: ../src/sat-pref-rig-editor.c:214 -msgid "" -"<b>RX only:</b> The radio shall only be used as receiver. If <i>Monitor PTT " -"status</i> is checked the doppler tuning will be suspended while PTT is ON " -"(manual TX). If not, the controller will always perform doppler tuning and " -"you cannot use the same RIG for uplink.\n" -"<b>TX only:</b> The radio shall only be used for uplink. If <i>Monitor PTT " -"status</i> is checked the doppler tuning will be suspended while PTT is OFF " -"(manual RX).\n" -"<b>Simplex TRX:</b> The radio should be used for both up- and downlink but " -"in simplex mode only. This option requires that the PTT status is monitored " -"(otherwise gpredict cannot know whether to tune the RX or the TX).\n" -"<b>Duplex:</b> The radio is a full duplex radio, such as the IC910H. " -"Gpredict will be continuously tuning both uplink and downlink simultaneously " -"and not care about PTT setting." -msgstr "" -"<b>RX only:</b> The radio shall only be used as receiver. If <i>Monitor PTT " -"status</i> is checked the doppler tuning will be suspended while PTT is ON " -"(manual TX). If not, the controller will always perform doppler tuning and " -"you cannot use the same RIG for uplink.\n" -"<b>TX only:</b> The radio shall only be used for uplink. If <i>Monitor PTT " -"status</i> is checked the doppler tuning will be suspended while PTT is OFF " -"(manual RX).\n" -"<b>Simplex TRX:</b> The radio should be used for both up- and downlink but " -"in simplex mode only. This option requires that the PTT status is monitored " -"(otherwise gpredict cannot know whether to tune the RX or the TX).\n" -"<b>Duplex:</b> The radio is a full duplex radio, such as the IC910H. " -"Gpredict will be continuously tuning both uplink and downlink simultaneously " -"and not care about PTT setting." - -#. ptt -#: ../src/sat-pref-rig-editor.c:232 -msgid "PTT status" -msgstr "PTT status" - -#: ../src/sat-pref-rig-editor.c:238 -msgid "Read PTT" -msgstr "Read PTT" - -#: ../src/sat-pref-rig-editor.c:239 -msgid "Read DCD" -msgstr "Read DCD" - -#: ../src/sat-pref-rig-editor.c:243 -msgid "" -"Select PTT type.\n" -"\n" -"<b>None:</b>\n" -"Don't read PTT status from this radio.\n" -"\n" -"<b>Read PTT:</b>\n" -"Read PTT status using get_ptt CAT command. You have to check that your radio " -"and hamlib supports this.\n" -"\n" -"<b>Read DCD:</b>\n" -"Read PTT status using get_dcd command. This can be used if your radio does " -"not support the read_ptt CAT command and you have a special interface that " -"can read squelch status and send it via CTS." -msgstr "" -"Select PTT type.\n" -"\n" -"<b>None:</b>\n" -"Don't read PTT status from this radio.\n" -"\n" -"<b>Read PTT:</b>\n" -"Read PTT status using get_ptt CAT command. You have to check that your radio " -"and hamlib supports this.\n" -"\n" -"<b>Read DCD:</b>\n" -"Read PTT status using get_dcd command. This can be used if your radio does " -"not support the read_ptt CAT command and you have a special interface that " -"can read squelch status and send it via CTS." - -#. VFO Up/Down -#: ../src/sat-pref-rig-editor.c:254 -msgid "VFO Up/Down" -msgstr "VFO Up/Down" - -#: ../src/sat-pref-rig-editor.c:259 -msgid "Not applicable" -msgstr "Not applicable" - -#: ../src/sat-pref-rig-editor.c:260 -msgid "MAIN ↑ / SUB ↓" -msgstr "MAIN ↑ / SUB ↓" - -#: ../src/sat-pref-rig-editor.c:261 -msgid "SUB ↑ / MAIN ↓" -msgstr "SUB ↑ / MAIN ↓" - -#: ../src/sat-pref-rig-editor.c:262 -msgid "A ↑ / B ↓" -msgstr "A ↑ / B ↓" - -#: ../src/sat-pref-rig-editor.c:263 -msgid "B ↑ / A ↓" -msgstr "B ↑ / A ↓" - -#: ../src/sat-pref-rig-editor.c:267 -msgid "" -"Select which VFO to use for uplink and downlink. This setting is used for " -"full-duplex radios only, such as the IC-910H, FT-847 and the TS-2000.\n" -"\n" -"<b>IC-910H:</b> MAIN↑ / S... [truncated message content] |
From: <cs...@us...> - 2009-10-01 15:39:38
|
Revision: 464 http://gpredict.svn.sourceforge.net/gpredict/?rev=464&view=rev Author: csete Date: 2009-10-01 15:39:29 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Updated translation files. Modified Paths: -------------- trunk/po/POTFILES.in Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2009-10-01 15:32:41 UTC (rev 463) +++ trunk/po/POTFILES.in 2009-10-01 15:39:29 UTC (rev 464) @@ -2,50 +2,61 @@ src/about.c src/compat.c src/first-time.c +src/gpredict-help.c +src/gpredict-url-hook.c src/gpredict-utils.c src/gtk-azel-plot.c +src/gtk-freq-knob.c src/gtk-polar-plot.c -src/gtk-polar-view-popup.c src/gtk-polar-view.c +src/gtk-polar-view-popup.c src/gtk-rig-ctrl.c src/gtk-rot-ctrl.c +src/gtk-rot-knob.c src/gtk-sat-data.c src/gtk-sat-list.c src/gtk-sat-list-col-sel.c src/gtk-sat-list-popup.c +src/gtk-sat-map.c src/gtk-sat-map-ground-track.c src/gtk-sat-map-popup.c -src/gtk-sat-map.c src/gtk-sat-module.c src/gtk-sat-module-popup.c src/gtk-sat-module-tmg.c +src/gtk-sat-selector.c src/gtk-sat-tree.c +src/gtk-single-sat.c +src/gtk-sky-glance.c src/gui.c +src/locator.c src/loc-tree.c src/main.c +src/map-selector.c src/menubar.c src/mod-cfg.c +src/mod-cfg-get-param.c src/mod-mgr.c src/orbit-tools.c src/pass-popup-menu.c src/pass-to-txt.c src/predict-tools.c +src/qth-data.c +src/qth-editor.c src/radio-conf.c src/rotor-conf.c src/sat-cfg.c +src/sat-debugger.c src/sat-info.c -src/sat-log.c src/sat-log-browser.c +src/sat-log.c src/sat-monitor.c src/sat-pass-dialogs.c +src/sat-pref.c src/sat-pref-conditions.c -src/sat-pref-help.c -src/sat-pref-rig-editor.c -src/sat-pref-rot-editor.c -src/sat-pref-single-sat.c src/sat-pref-debug.c src/sat-pref-formats.c src/sat-pref-general.c +src/sat-pref-help.c src/sat-pref-interfaces.c src/sat-pref-layout.c src/sat-pref-list-view.c @@ -58,49 +69,22 @@ src/sat-pref-qth-editor.c src/sat-pref-refresh.c src/sat-pref-rig.c +src/sat-pref-rig-editor.c src/sat-pref-rot.c +src/sat-pref-rot-editor.c src/sat-pref-single-pass.c +src/sat-pref-single-sat.c src/sat-pref-sky-at-glance.c src/sat-pref-tle.c -src/sat-pref.c src/sat-vis.c src/save-pass.c -src/tle-lookup.c +src/sgpsdp/sgp4sdp4.c +src/sgpsdp/sgp_in.c +src/sgpsdp/sgp_math.c +src/sgpsdp/sgp_obs.c +src/sgpsdp/sgp_time.c +src/sgpsdp/solar.c +src/time-tools.c src/tle-tools.c src/tle-update.c -src/gpredict-help.c -src/gtk-single-sat.c -src/gtk-sky-glance.c -src/map-selector.c -src/mod-cfg-get-param.c -src/qth-editor.c -src/gpredict-help.c -src/gtk-azel-plot.c -src/gtk-polar-plot.c -src/gtk-polar-view-popup.c -src/gtk-polar-view.c -src/gtk-sat-map-ground-track.c -src/gtk-sat-map-popup.c -src/gtk-sat-map.c -src/gtk-sat-module-tmg.c -src/gtk-single-sat.c -src/gtk-sky-glance.c -src/map-selector.c -src/mod-cfg-get-param.c -src/pass-popup-menu.c -src/pass-to-txt.c -src/qth-editor.c -src/radio-conf.c -src/rotor-conf.c -src/sat-log-browser.c -src/sat-pass-dialogs.c -src/sat-pref-conditions.c -src/sat-pref-help.c -src/sat-pref-rig-editor.c -src/sat-pref-rot-editor.c -src/sat-pref-single-sat.c -src/sat-vis.c -src/save-pass.c -src/tle-tools.c -src/tle-update.c src/trsp-conf.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-10-01 15:32:47
|
Revision: 463 http://gpredict.svn.sourceforge.net/gpredict/?rev=463&view=rev Author: csete Date: 2009-10-01 15:32:41 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Freeze for release. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-10-01 14:16:29 UTC (rev 462) +++ trunk/configure.ac 2009-10-01 15:32:41 UTC (rev 463) @@ -2,7 +2,7 @@ AM_CONFIG_HEADER(build-config.h) -AM_INIT_AUTOMAKE(gpredict, 1.1svn) +AM_INIT_AUTOMAKE(gpredict, 1.1) AM_MAINTAINER_MODE AC_PROG_INTLTOOL([0.21]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-10-01 14:16:35
|
Revision: 462 http://gpredict.svn.sourceforge.net/gpredict/?rev=462&view=rev Author: csete Date: 2009-10-01 14:16:29 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Updated for version 1.1 Modified Paths: -------------- trunk/doc/um/gpredict-user-manual.odt Modified: trunk/doc/um/gpredict-user-manual.odt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-10-01 10:33:10
|
Revision: 461 http://gpredict.svn.sourceforge.net/gpredict/?rev=461&view=rev Author: csete Date: 2009-10-01 10:32:37 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Fixed a typo. Modified Paths: -------------- trunk/src/Makefile.am Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-10-01 10:29:30 UTC (rev 460) +++ trunk/src/Makefile.am 2009-10-01 10:32:37 UTC (rev 461) @@ -52,7 +52,7 @@ gtk-sat-module.c gtk-sat-module.h \ gtk-sat-module-popup.c gtk-sat-module-popup.h \ gtk-sat-module-tmg.c gtk-sat-module-tmg.h \ - gtk-sat-selector.c gtk-sat-slector.h \ + gtk-sat-selector.c gtk-sat-selector.h \ gtk-single-sat.c gtk-single-sat.h \ gtk-sky-glance.c gtk-sky-glance.h \ gui.c gui.h \ @@ -68,11 +68,11 @@ pass-popup-menu.c pass-popup-menu.h \ pass-to-txt.c pass-to-txt.h \ predict-tools.c predict-tools.h \ - qth-data.c qth-data.h \ + qth-data.c qth-data.h \ qth-editor.c qth-editor.h \ radio-conf.c radio-conf.h \ rotor-conf.c rotor-conf.h \ - trsp-conf.c trsp-conf.h \ + trsp-conf.c trsp-conf.h \ sat-cfg.c sat-cfg.h \ sat-info.c sat-info.h \ sat-log.c sat-log.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-10-01 10:29:38
|
Revision: 460 http://gpredict.svn.sourceforge.net/gpredict/?rev=460&view=rev Author: csete Date: 2009-10-01 10:29:30 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Updated. Modified Paths: -------------- trunk/NEWS Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2009-10-01 10:16:55 UTC (rev 459) +++ trunk/NEWS 2009-10-01 10:29:30 UTC (rev 460) @@ -13,6 +13,7 @@ - Fixed bug 2116693: List view does not sort properly for all time formats. - Fixed bug 2836265: Time controls should wrap around their limits. - Fixed bug 2691499: Sky at glance crashes with empty module. +- Include more maps from NASA Visible Earth: Blue Marble Next Generation. * Binary packages for Windows, Mac OS X, Ubuntu and generic Linux. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-10-01 10:17:09
|
Revision: 459 http://gpredict.svn.sourceforge.net/gpredict/?rev=459&view=rev Author: csete Date: 2009-10-01 10:16:55 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Added new maps from NASA Visible Earth: Blue Marble Next Generation. Modified Paths: -------------- trunk/pixmaps/maps/Makefile.am Added Paths: ----------- trunk/pixmaps/maps/nasa-bmng-01_1024.jpg trunk/pixmaps/maps/nasa-bmng-01_2048.jpg trunk/pixmaps/maps/nasa-bmng-03_1024.jpg trunk/pixmaps/maps/nasa-bmng-03_2048.jpg trunk/pixmaps/maps/nasa-bmng-05_1024.jpg trunk/pixmaps/maps/nasa-bmng-05_2048.jpg trunk/pixmaps/maps/nasa-bmng-07_1024.jpg trunk/pixmaps/maps/nasa-bmng-07_2048.jpg trunk/pixmaps/maps/nasa-bmng-08_1024.jpg trunk/pixmaps/maps/nasa-bmng-08_2048.jpg Modified: trunk/pixmaps/maps/Makefile.am =================================================================== --- trunk/pixmaps/maps/Makefile.am 2009-10-01 10:02:30 UTC (rev 458) +++ trunk/pixmaps/maps/Makefile.am 2009-10-01 10:16:55 UTC (rev 459) @@ -2,11 +2,21 @@ gpredict_mapsdir = $(datadir)/pixmaps/gpredict/maps gpredict_maps_DATA = \ - earth_800.png \ - nasa-topo_800.png \ - nasa-topo_1024.jpg \ - nasa-topo_1600.jpg \ - nasa-topo_2048.jpg + earth_800.png \ + nasa-bmng-01_1024.jpg \ + nasa-bmng-03_1024.jpg \ + nasa-bmng-05_1024.jpg \ + nasa-bmng-07_1024.jpg \ + nasa-bmng-08_1024.jpg \ + nasa-bmng-01_2048.jpg \ + nasa-bmng-03_2048.jpg \ + nasa-bmng-05_2048.jpg \ + nasa-bmng-07_2048.jpg \ + nasa-bmng-08_2048.jpg \ + nasa-topo_800.png \ + nasa-topo_1024.jpg \ + nasa-topo_1600.jpg \ + nasa-topo_2048.jpg EXTRA_DIST = $(gpredict_maps_DATA) Added: trunk/pixmaps/maps/nasa-bmng-01_1024.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-01_1024.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-01_2048.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-01_2048.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-03_1024.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-03_1024.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-03_2048.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-03_2048.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-05_1024.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-05_1024.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-05_2048.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-05_2048.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-07_1024.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-07_1024.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-07_2048.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-07_2048.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-08_1024.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-08_1024.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pixmaps/maps/nasa-bmng-08_2048.jpg =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/maps/nasa-bmng-08_2048.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-10-01 10:02:56
|
Revision: 458 http://gpredict.svn.sourceforge.net/gpredict/?rev=458&view=rev Author: csete Date: 2009-10-01 10:02:30 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Properly credit NASA Visible Earth for maps. Modified Paths: -------------- trunk/AUTHORS Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2009-10-01 10:01:23 UTC (rev 457) +++ trunk/AUTHORS 2009-10-01 10:02:30 UTC (rev 458) @@ -9,5 +9,8 @@ - Maidenhead locator functions are based on work done by Stephane Fillod, Nate Bargmann, Dave Hines, Mirko Caserta, and S. R. Sampson. +Imagery: +Most of the maps originate from NASA Visible Earth, http://visibleearth.nasa.gov/ + If you notice that your work has been used in in one way or other without giving you the proper credits, contact Alexandru Csete at csete at users.sourceforge.net This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-10-01 10:01:31
|
Revision: 457 http://gpredict.svn.sourceforge.net/gpredict/?rev=457&view=rev Author: csete Date: 2009-10-01 10:01:23 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Properly credit NASA Visible Earth for maps. Modified Paths: -------------- trunk/src/about.c Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-09-28 15:43:55 UTC (rev 456) +++ trunk/src/about.c 2009-10-01 10:01:23 UTC (rev 457) @@ -51,6 +51,10 @@ "Dave Hines (locator.c)", "Mirko Caserta (locator.c)", "S. R. Sampson (locator.c)", + "", + "Imagery:", + "Most of the maps originate from NASA Visible Earth", + "see http://visibleearth.nasa.gov/", NULL }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-28 15:44:02
|
Revision: 456 http://gpredict.svn.sourceforge.net/gpredict/?rev=456&view=rev Author: csete Date: 2009-09-28 15:43:55 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Removed obsolete log message. Modified Paths: -------------- trunk/src/tle-update.c Modified: trunk/src/tle-update.c =================================================================== --- trunk/src/tle-update.c 2009-09-28 15:41:01 UTC (rev 455) +++ trunk/src/tle-update.c 2009-09-28 15:43:55 UTC (rev 456) @@ -343,9 +343,6 @@ sat_log_log (SAT_LOG_LEVEL_MSG, _("%s: TLE elements updated."), __FUNCTION__); - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: FIXME: Sync of categories not implemented!"), - __FUNCTION__); } /* destroy hash tables */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-28 15:41:08
|
Revision: 455 http://gpredict.svn.sourceforge.net/gpredict/?rev=455&view=rev Author: csete Date: 2009-09-28 15:41:01 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Fixed indent. Modified Paths: -------------- trunk/src/gtk-polar-plot.c trunk/src/gtk-polar-plot.h trunk/src/gtk-rot-ctrl.c Modified: trunk/src/gtk-polar-plot.c =================================================================== --- trunk/src/gtk-polar-plot.c 2009-09-28 15:23:15 UTC (rev 454) +++ trunk/src/gtk-polar-plot.c 2009-09-28 15:41:01 UTC (rev 455) @@ -11,7 +11,7 @@ More details can be found at the project home page: http://gpredict.oz9aec.net/ - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -68,21 +68,21 @@ static void gtk_polar_plot_init (GtkPolarPlot *polview); static void gtk_polar_plot_destroy (GtkObject *object); static void size_allocate_cb (GtkWidget *widget, - GtkAllocation *allocation, - gpointer data); + GtkAllocation *allocation, + gpointer data); static void create_track (GtkPolarPlot *pv); static void update_track (GtkPolarPlot *pv); static GooCanvasItemModel *create_time_tick (GtkPolarPlot *pv, gdouble time, gfloat x, gfloat y); static void correct_pole_coor (GtkPolarPlot *polv, polar_plot_pole_t pole, - gfloat *x, gfloat *y, GtkAnchorType *anch); + gfloat *x, gfloat *y, GtkAnchorType *anch); static gboolean on_motion_notify (GooCanvasItem *item, - GooCanvasItem *target, - GdkEventMotion *event, - gpointer data); + GooCanvasItem *target, + GdkEventMotion *event, + gpointer data); static void on_item_created (GooCanvas *canvas, - GooCanvasItem *item, - GooCanvasItemModel *model, - gpointer data); + GooCanvasItem *item, + GooCanvasItemModel *model, + gpointer data); static void on_canvas_realized (GtkWidget *canvas, gpointer data); static GooCanvasItemModel* create_canvas_model (GtkPolarPlot *polv); static void get_canvas_bg_color (GtkPolarPlot *polv, GdkColor *color); @@ -94,72 +94,72 @@ GtkType -gtk_polar_plot_get_type () + gtk_polar_plot_get_type () { - static GType gtk_polar_plot_type = 0; + static GType gtk_polar_plot_type = 0; - if (!gtk_polar_plot_type) { - static const GTypeInfo gtk_polar_plot_info = { - sizeof (GtkPolarPlotClass), - NULL, /* base init */ - NULL, /* base finalise */ - (GClassInitFunc) gtk_polar_plot_class_init, - NULL, /* class finalise */ - NULL, /* class data */ - sizeof (GtkPolarPlot), - 5, /* n_preallocs */ - (GInstanceInitFunc) gtk_polar_plot_init, - }; + if (!gtk_polar_plot_type) { + static const GTypeInfo gtk_polar_plot_info = { + sizeof (GtkPolarPlotClass), + NULL, /* base init */ + NULL, /* base finalise */ + (GClassInitFunc) gtk_polar_plot_class_init, + NULL, /* class finalise */ + NULL, /* class data */ + sizeof (GtkPolarPlot), + 5, /* n_preallocs */ + (GInstanceInitFunc) gtk_polar_plot_init, + }; - gtk_polar_plot_type = g_type_register_static (GTK_TYPE_VBOX, - "GtkPolarPlot", - >k_polar_plot_info, - 0); - } + gtk_polar_plot_type = g_type_register_static (GTK_TYPE_VBOX, + "GtkPolarPlot", + >k_polar_plot_info, + 0); + } - return gtk_polar_plot_type; + return gtk_polar_plot_type; } static void -gtk_polar_plot_class_init (GtkPolarPlotClass *class) + gtk_polar_plot_class_init (GtkPolarPlotClass *class) { - GObjectClass *gobject_class; - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + GObjectClass *gobject_class; + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; - gobject_class = G_OBJECT_CLASS (class); - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + gobject_class = G_OBJECT_CLASS (class); + object_class = (GtkObjectClass*) class; + widget_class = (GtkWidgetClass*) class; + container_class = (GtkContainerClass*) class; - parent_class = g_type_class_peek_parent (class); + parent_class = g_type_class_peek_parent (class); - object_class->destroy = gtk_polar_plot_destroy; - //widget_class->size_allocate = gtk_polar_plot_size_allocate; + object_class->destroy = gtk_polar_plot_destroy; + //widget_class->size_allocate = gtk_polar_plot_size_allocate; } static void -gtk_polar_plot_init (GtkPolarPlot *polview) + gtk_polar_plot_init (GtkPolarPlot *polview) { - polview->qth = NULL; + polview->qth = NULL; polview->pass = NULL; - polview->size = 0; - polview->r = 0; - polview->cx = 0; - polview->cy = 0; - polview->swap = 0; - polview->qthinfo = FALSE; - polview->cursinfo = FALSE; - polview->extratick = FALSE; + polview->size = 0; + polview->r = 0; + polview->cx = 0; + polview->cy = 0; + polview->swap = 0; + polview->qthinfo = FALSE; + polview->cursinfo = FALSE; + polview->extratick = FALSE; polview->target = NULL; } static void -gtk_polar_plot_destroy (GtkObject *object) + gtk_polar_plot_destroy (GtkObject *object) { if (GTK_POLAR_PLOT (object)->pass != NULL) { @@ -167,7 +167,7 @@ GTK_POLAR_PLOT (object)->pass = NULL; } - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } @@ -178,57 +178,57 @@ * */ GtkWidget* -gtk_polar_plot_new (qth_t *qth, pass_t *pass) + gtk_polar_plot_new (qth_t *qth, pass_t *pass) { - GtkWidget *polv; - GooCanvasItemModel *root; - GdkColor bg_color = {0, 0xFFFF, 0xFFFF, 0xFFFF}; + GtkWidget *polv; + GooCanvasItemModel *root; + GdkColor bg_color = {0, 0xFFFF, 0xFFFF, 0xFFFF}; - polv = g_object_new (GTK_TYPE_POLAR_PLOT, NULL); + polv = g_object_new (GTK_TYPE_POLAR_PLOT, NULL); - GTK_POLAR_PLOT (polv)->qth = qth; + GTK_POLAR_PLOT (polv)->qth = qth; if (pass != NULL) GTK_POLAR_PLOT (polv)->pass = copy_pass (pass); - /* get settings */ - GTK_POLAR_PLOT (polv)->swap = sat_cfg_get_int (SAT_CFG_INT_POLAR_ORIENTATION); - GTK_POLAR_PLOT (polv)->qthinfo = sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO); - GTK_POLAR_PLOT (polv)->extratick = sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS); - GTK_POLAR_PLOT (polv)->cursinfo = TRUE; + /* get settings */ + GTK_POLAR_PLOT (polv)->swap = sat_cfg_get_int (SAT_CFG_INT_POLAR_ORIENTATION); + GTK_POLAR_PLOT (polv)->qthinfo = sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO); + GTK_POLAR_PLOT (polv)->extratick = sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS); + GTK_POLAR_PLOT (polv)->cursinfo = TRUE; - /* create the canvas */ - GTK_POLAR_PLOT (polv)->canvas = goo_canvas_new (); - get_canvas_bg_color (GTK_POLAR_PLOT (polv), &bg_color); - gtk_widget_modify_base (GTK_POLAR_PLOT (polv)->canvas, GTK_STATE_NORMAL, &bg_color); - gtk_widget_set_size_request (GTK_POLAR_PLOT (polv)->canvas, - POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE); - goo_canvas_set_bounds (GOO_CANVAS (GTK_POLAR_PLOT (polv)->canvas), 0, 0, - POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE); + /* create the canvas */ + GTK_POLAR_PLOT (polv)->canvas = goo_canvas_new (); + get_canvas_bg_color (GTK_POLAR_PLOT (polv), &bg_color); + gtk_widget_modify_base (GTK_POLAR_PLOT (polv)->canvas, GTK_STATE_NORMAL, &bg_color); + gtk_widget_set_size_request (GTK_POLAR_PLOT (polv)->canvas, + POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE); + goo_canvas_set_bounds (GOO_CANVAS (GTK_POLAR_PLOT (polv)->canvas), 0, 0, + POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE); - /* connect size-request signal */ - g_signal_connect (GTK_POLAR_PLOT (polv)->canvas, "size-allocate", - G_CALLBACK (size_allocate_cb), polv); - g_signal_connect (GTK_POLAR_PLOT (polv)->canvas, "item_created", - (GtkSignalFunc) on_item_created, polv); - g_signal_connect_after (GTK_POLAR_PLOT (polv)->canvas, "realize", - (GtkSignalFunc) on_canvas_realized, polv); + /* connect size-request signal */ + g_signal_connect (GTK_POLAR_PLOT (polv)->canvas, "size-allocate", + G_CALLBACK (size_allocate_cb), polv); + g_signal_connect (GTK_POLAR_PLOT (polv)->canvas, "item_created", + (GtkSignalFunc) on_item_created, polv); + g_signal_connect_after (GTK_POLAR_PLOT (polv)->canvas, "realize", + (GtkSignalFunc) on_canvas_realized, polv); - gtk_widget_show (GTK_POLAR_PLOT (polv)->canvas); + gtk_widget_show (GTK_POLAR_PLOT (polv)->canvas); - /* Create the canvas model */ - root = create_canvas_model (GTK_POLAR_PLOT (polv)); - goo_canvas_set_root_item_model (GOO_CANVAS (GTK_POLAR_PLOT (polv)->canvas), root); + /* Create the canvas model */ + root = create_canvas_model (GTK_POLAR_PLOT (polv)); + goo_canvas_set_root_item_model (GOO_CANVAS (GTK_POLAR_PLOT (polv)->canvas), root); - g_object_unref (root); + g_object_unref (root); if (GTK_POLAR_PLOT (polv)->pass != NULL) { - create_track (GTK_POLAR_PLOT (polv)); + create_track (GTK_POLAR_PLOT (polv)); } - gtk_container_add (GTK_CONTAINER (polv), GTK_POLAR_PLOT (polv)->canvas); + gtk_container_add (GTK_CONTAINER (polv), GTK_POLAR_PLOT (polv)->canvas); - return polv; + return polv; } @@ -377,11 +377,11 @@ /* the target object does not exist; create it */ col = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_COL); plot->ctrl = goo_canvas_ellipse_model_new (root, - x, y, 7, 7, - "fill-color-rgba", 0xFF00000F, - "stroke-color-rgba", col, - "line-width", 0.8, - NULL); + x, y, 7, 7, + "fill-color-rgba", 0xFF00000F, + "stroke-color-rgba", col, + "line-width", 0.8, + NULL); } } @@ -465,11 +465,11 @@ else { /* the target object does not exist; create it */ plot->rot1 = goo_canvas_polyline_model_new_line (root, - x, y-4, x, y-14, - "fill-color-rgba", col, - "stroke-color-rgba", col, - "line-width", 1.0, - NULL); + x, y-4, x, y-14, + "fill-color-rgba", col, + "stroke-color-rgba", col, + "line-width", 1.0, + NULL); } if (plot->rot2 != NULL) { /* the target object already exists; move it */ @@ -486,11 +486,11 @@ else { /* the target object does not exist; create it */ plot->rot2 = goo_canvas_polyline_model_new_line (root, - x+4, y, x+14, y, - "fill-color-rgba", col, - "stroke-color-rgba", col, - "line-width", 1.0, - NULL); + x+4, y, x+14, y, + "fill-color-rgba", col, + "stroke-color-rgba", col, + "line-width", 1.0, + NULL); } if (plot->rot3 != NULL) { /* the target object already exists; move it */ @@ -507,11 +507,11 @@ else { /* the target object does not exist; create it */ plot->rot3 = goo_canvas_polyline_model_new_line (root, - x, y+4, x, y+14, - "fill-color-rgba", col, - "stroke-color-rgba", col, - "line-width", 1.0, - NULL); + x, y+4, x, y+14, + "fill-color-rgba", col, + "stroke-color-rgba", col, + "line-width", 1.0, + NULL); } if (plot->rot4 != NULL) { /* the target object already exists; move it */ @@ -528,11 +528,11 @@ else { /* the target object does not exist; create it */ plot->rot4 = goo_canvas_polyline_model_new_line (root, - x-4, y, x-14, y, - "fill-color-rgba", col, - "stroke-color-rgba", col, - "line-width", 1.0, - NULL); + x-4, y, x-14, y, + "fill-color-rgba", col, + "stroke-color-rgba", col, + "line-width", 1.0, + NULL); } } @@ -552,131 +552,131 @@ static GooCanvasItemModel * -create_canvas_model (GtkPolarPlot *polv) + create_canvas_model (GtkPolarPlot *polv) { - GooCanvasItemModel *root; - gfloat x,y; - guint32 col; - GtkAnchorType anch = GTK_ANCHOR_CENTER; + GooCanvasItemModel *root; + gfloat x,y; + guint32 col; + GtkAnchorType anch = GTK_ANCHOR_CENTER; - root = goo_canvas_group_model_new (NULL, NULL); + root = goo_canvas_group_model_new (NULL, NULL); - /* graph dimensions */ - polv->size = POLV_DEFAULT_SIZE; - polv->r = (polv->size / 2) - POLV_DEFAULT_MARGIN; - polv->cx = POLV_DEFAULT_SIZE / 2; - polv->cy = POLV_DEFAULT_SIZE / 2; + /* graph dimensions */ + polv->size = POLV_DEFAULT_SIZE; + polv->r = (polv->size / 2) - POLV_DEFAULT_MARGIN; + polv->cx = POLV_DEFAULT_SIZE / 2; + polv->cy = POLV_DEFAULT_SIZE / 2; - col = sat_cfg_get_int (SAT_CFG_INT_POLAR_AXIS_COL); + col = sat_cfg_get_int (SAT_CFG_INT_POLAR_AXIS_COL); - /* Add elevation circles at 0, 30 and 60 deg */ - polv->C00 = goo_canvas_ellipse_model_new (root, - polv->cx, polv->cy, - polv->r, polv->r, - "line-width", 1.0, - "stroke-color-rgba", col, - NULL); + /* Add elevation circles at 0, 30 and 60 deg */ + polv->C00 = goo_canvas_ellipse_model_new (root, + polv->cx, polv->cy, + polv->r, polv->r, + "line-width", 1.0, + "stroke-color-rgba", col, + NULL); - polv->C30 = goo_canvas_ellipse_model_new (root, - polv->cx, polv->cy, - 0.6667 * polv->r, 0.6667 * polv->r, - "line-width", 1.0, - "stroke-color-rgba", col, - NULL); + polv->C30 = goo_canvas_ellipse_model_new (root, + polv->cx, polv->cy, + 0.6667 * polv->r, 0.6667 * polv->r, + "line-width", 1.0, + "stroke-color-rgba", col, + NULL); - polv->C60 = goo_canvas_ellipse_model_new (root, - polv->cx, polv->cy, - 0.333 * polv->r, 0.3333 * polv->r, - "line-width", 1.0, - "stroke-color-rgba", col, - NULL); + polv->C60 = goo_canvas_ellipse_model_new (root, + polv->cx, polv->cy, + 0.333 * polv->r, 0.3333 * polv->r, + "line-width", 1.0, + "stroke-color-rgba", col, + NULL); - /* add horixontal and vertical guidance lines */ - polv->hl = goo_canvas_polyline_model_new_line (root, - polv->cx - polv->r - POLV_LINE_EXTRA, - polv->cy, - polv->cx + polv->r + POLV_LINE_EXTRA, - polv->cy, - "stroke-color-rgba", col, - "line-width", 1.0, - NULL); - polv->vl = goo_canvas_polyline_model_new_line (root, - polv->cx, - polv->cy - polv->r - POLV_LINE_EXTRA, - polv->cx, - polv->cy + polv->r + POLV_LINE_EXTRA, - "stroke-color-rgba", col, - "line-width", 1.0, - NULL); + /* add horixontal and vertical guidance lines */ + polv->hl = goo_canvas_polyline_model_new_line (root, + polv->cx - polv->r - POLV_LINE_EXTRA, + polv->cy, + polv->cx + polv->r + POLV_LINE_EXTRA, + polv->cy, + "stroke-color-rgba", col, + "line-width", 1.0, + NULL); + polv->vl = goo_canvas_polyline_model_new_line (root, + polv->cx, + polv->cy - polv->r - POLV_LINE_EXTRA, + polv->cx, + polv->cy + polv->r + POLV_LINE_EXTRA, + "stroke-color-rgba", col, + "line-width", 1.0, + NULL); - /* N, S, E and W labels. */ - col = sat_cfg_get_int (SAT_CFG_INT_POLAR_TICK_COL); - azel_to_xy (polv, 0.0, 0.0, &x, &y); - correct_pole_coor (polv, POLAR_PLOT_POLE_N, &x, &y, &anch); - polv->N = goo_canvas_text_model_new (root, _("N"), - x, - y, - -1, - anch, - "font", "Sans 8", - "fill-color-rgba", col, - NULL); + /* N, S, E and W labels. */ + col = sat_cfg_get_int (SAT_CFG_INT_POLAR_TICK_COL); + azel_to_xy (polv, 0.0, 0.0, &x, &y); + correct_pole_coor (polv, POLAR_PLOT_POLE_N, &x, &y, &anch); + polv->N = goo_canvas_text_model_new (root, _("N"), + x, + y, + -1, + anch, + "font", "Sans 8", + "fill-color-rgba", col, + NULL); - azel_to_xy (polv, 180.0, 0.0, &x, &y); - correct_pole_coor (polv, POLAR_PLOT_POLE_S, &x, &y, &anch); - polv->S = goo_canvas_text_model_new (root, _("S"), - x, - y, - -1, - anch, - "font", "Sans 8", - "fill-color-rgba", col, - NULL); + azel_to_xy (polv, 180.0, 0.0, &x, &y); + correct_pole_coor (polv, POLAR_PLOT_POLE_S, &x, &y, &anch); + polv->S = goo_canvas_text_model_new (root, _("S"), + x, + y, + -1, + anch, + "font", "Sans 8", + "fill-color-rgba", col, + NULL); - azel_to_xy (polv, 90.0, 0.0, &x, &y); - correct_pole_coor (polv, POLAR_PLOT_POLE_E, &x, &y, &anch); - polv->E = goo_canvas_text_model_new (root, _("E"), - x, - y, - -1, - anch, - "font", "Sans 8", - "fill-color-rgba", col, - NULL); + azel_to_xy (polv, 90.0, 0.0, &x, &y); + correct_pole_coor (polv, POLAR_PLOT_POLE_E, &x, &y, &anch); + polv->E = goo_canvas_text_model_new (root, _("E"), + x, + y, + -1, + anch, + "font", "Sans 8", + "fill-color-rgba", col, + NULL); - azel_to_xy (polv, 270.0, 0.0, &x, &y); - correct_pole_coor (polv, POLAR_PLOT_POLE_W, &x, &y, &anch); - polv->W = goo_canvas_text_model_new (root, _("W"), - x, - y, - -1, - anch, - "font", "Sans 8", - "fill-color-rgba", col, - NULL); + azel_to_xy (polv, 270.0, 0.0, &x, &y); + correct_pole_coor (polv, POLAR_PLOT_POLE_W, &x, &y, &anch); + polv->W = goo_canvas_text_model_new (root, _("W"), + x, + y, + -1, + anch, + "font", "Sans 8", + "fill-color-rgba", col, + NULL); - /* cursor text */ - col = sat_cfg_get_int (SAT_CFG_INT_POLAR_INFO_COL); - polv->curs = goo_canvas_text_model_new (root, "", - polv->cx - polv->r - 2*POLV_LINE_EXTRA, - polv->cy + polv->r + POLV_LINE_EXTRA, - -1, - GTK_ANCHOR_W, - "font", "Sans 8", - "fill-color-rgba", col, - NULL); + /* cursor text */ + col = sat_cfg_get_int (SAT_CFG_INT_POLAR_INFO_COL); + polv->curs = goo_canvas_text_model_new (root, "", + polv->cx - polv->r - 2*POLV_LINE_EXTRA, + polv->cy + polv->r + POLV_LINE_EXTRA, + -1, + GTK_ANCHOR_W, + "font", "Sans 8", + "fill-color-rgba", col, + NULL); - /* location info */ - polv->locnam = goo_canvas_text_model_new (root, polv->qth->name, - polv->cx - polv->r - 2*POLV_LINE_EXTRA, - polv->cy - polv->r - POLV_LINE_EXTRA, - -1, - GTK_ANCHOR_SW, - "font", "Sans 8", - "fill-color-rgba", col, - NULL); + /* location info */ + polv->locnam = goo_canvas_text_model_new (root, polv->qth->name, + polv->cx - polv->r - 2*POLV_LINE_EXTRA, + polv->cy - polv->r - POLV_LINE_EXTRA, + -1, + GTK_ANCHOR_SW, + "font", "Sans 8", + "fill-color-rgba", col, + NULL); - return root; + return root; } @@ -686,73 +686,73 @@ * the orientation of the polar plot. */ static void -correct_pole_coor (GtkPolarPlot *polv, - polar_plot_pole_t pole, - gfloat *x, gfloat *y, - GtkAnchorType *anch) + correct_pole_coor (GtkPolarPlot *polv, + polar_plot_pole_t pole, + gfloat *x, gfloat *y, + GtkAnchorType *anch) { - switch (pole) { + switch (pole) { - case POLAR_PLOT_POLE_N: - if ((polv->swap == POLAR_PLOT_SENW) || - (polv->swap == POLAR_PLOT_SWNE)) { - /* North and South are swapped */ - *y = *y + POLV_LINE_EXTRA; - *anch = GTK_ANCHOR_NORTH; - } - else { - *y = *y - POLV_LINE_EXTRA; - *anch = GTK_ANCHOR_SOUTH; - } + case POLAR_PLOT_POLE_N: + if ((polv->swap == POLAR_PLOT_SENW) || + (polv->swap == POLAR_PLOT_SWNE)) { + /* North and South are swapped */ + *y = *y + POLV_LINE_EXTRA; + *anch = GTK_ANCHOR_NORTH; + } + else { + *y = *y - POLV_LINE_EXTRA; + *anch = GTK_ANCHOR_SOUTH; + } - break; + break; - case POLAR_PLOT_POLE_E: - if ((polv->swap == POLAR_PLOT_NWSE) || - (polv->swap == POLAR_PLOT_SWNE)) { - /* East and West are swapped */ - *x = *x - POLV_LINE_EXTRA; - *anch = GTK_ANCHOR_EAST; - } - else { - *x = *x + POLV_LINE_EXTRA; - *anch = GTK_ANCHOR_WEST; - } - break; + case POLAR_PLOT_POLE_E: + if ((polv->swap == POLAR_PLOT_NWSE) || + (polv->swap == POLAR_PLOT_SWNE)) { + /* East and West are swapped */ + *x = *x - POLV_LINE_EXTRA; + *anch = GTK_ANCHOR_EAST; + } + else { + *x = *x + POLV_LINE_EXTRA; + *anch = GTK_ANCHOR_WEST; + } + break; - case POLAR_PLOT_POLE_S: - if ((polv->swap == POLAR_PLOT_SENW) || - (polv->swap == POLAR_PLOT_SWNE)) { - /* North and South are swapped */ - *y = *y - POLV_LINE_EXTRA; - *anch = GTK_ANCHOR_SOUTH; - } - else { - *y = *y + POLV_LINE_EXTRA; - *anch = GTK_ANCHOR_NORTH; - } - break; + case POLAR_PLOT_POLE_S: + if ((polv->swap == POLAR_PLOT_SENW) || + (polv->swap == POLAR_PLOT_SWNE)) { + /* North and South are swapped */ + *y = *y - POLV_LINE_EXTRA; + *anch = GTK_ANCHOR_SOUTH; + } + else { + *y = *y + POLV_LINE_EXTRA; + *anch = GTK_ANCHOR_NORTH; + } + break; - case POLAR_PLOT_POLE_W: - if ((polv->swap == POLAR_PLOT_NWSE) || - (polv->swap == POLAR_PLOT_SWNE)) { - /* East and West are swapped */ - *x = *x + POLV_LINE_EXTRA; - *anch = GTK_ANCHOR_WEST; - } - else { - *x = *x - POLV_LINE_EXTRA; - *anch = GTK_ANCHOR_EAST; - } - break; + case POLAR_PLOT_POLE_W: + if ((polv->swap == POLAR_PLOT_NWSE) || + (polv->swap == POLAR_PLOT_SWNE)) { + /* East and West are swapped */ + *x = *x + POLV_LINE_EXTRA; + *anch = GTK_ANCHOR_WEST; + } + else { + *x = *x - POLV_LINE_EXTRA; + *anch = GTK_ANCHOR_EAST; + } + break; - default: - sat_log_log (SAT_LOG_LEVEL_BUG, + default: + sat_log_log (SAT_LOG_LEVEL_BUG, _("%s:%d: Incorrect polar plot orientation."), __FILE__, __LINE__); - break; - } + break; + } } @@ -763,119 +763,119 @@ * dimensions based on the new canvas size. */ static void -size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer data) + size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer data) { - GtkPolarPlot *polv; - GooCanvasPoints *prec; - gfloat x,y; - GtkAnchorType anch = GTK_ANCHOR_CENTER; + GtkPolarPlot *polv; + GooCanvasPoints *prec; + gfloat x,y; + GtkAnchorType anch = GTK_ANCHOR_CENTER; - if (GTK_WIDGET_REALIZED (widget)) { + if (GTK_WIDGET_REALIZED (widget)) { - /* get graph dimensions */ - polv = GTK_POLAR_PLOT (data); + /* get graph dimensions */ + polv = GTK_POLAR_PLOT (data); - polv->size = MIN(allocation->width, allocation->height); - polv->r = (polv->size / 2) - POLV_DEFAULT_MARGIN; - polv->cx = allocation->width / 2; - polv->cy = allocation->height / 2; + polv->size = MIN(allocation->width, allocation->height); + polv->r = (polv->size / 2) - POLV_DEFAULT_MARGIN; + polv->cx = allocation->width / 2; + polv->cy = allocation->height / 2; goo_canvas_set_bounds (GOO_CANVAS (GTK_POLAR_PLOT (polv)->canvas), 0, 0, - allocation->width, allocation->height); + allocation->width, allocation->height); - /* update coordinate system */ - g_object_set (polv->C00, - "center-x", (gdouble) polv->cx, - "center-y", (gdouble) polv->cy, - "radius-x", (gdouble) polv->r, - "radius-y", (gdouble) polv->r, - NULL); - g_object_set (polv->C30, - "center-x", (gdouble) polv->cx, - "center-y", (gdouble) polv->cy, - "radius-x", (gdouble) 0.6667*polv->r, - "radius-y", (gdouble) 0.6667*polv->r, - NULL); - g_object_set (polv->C60, - "center-x", (gdouble) polv->cx, - "center-y", (gdouble) polv->cy, - "radius-x", (gdouble) 0.333*polv->r, - "radius-y", (gdouble) 0.333*polv->r, - NULL); + /* update coordinate system */ + g_object_set (polv->C00, + "center-x", (gdouble) polv->cx, + "center-y", (gdouble) polv->cy, + "radius-x", (gdouble) polv->r, + "radius-y", (gdouble) polv->r, + NULL); + g_object_set (polv->C30, + "center-x", (gdouble) polv->cx, + "center-y", (gdouble) polv->cy, + "radius-x", (gdouble) 0.6667*polv->r, + "radius-y", (gdouble) 0.6667*polv->r, + NULL); + g_object_set (polv->C60, + "center-x", (gdouble) polv->cx, + "center-y", (gdouble) polv->cy, + "radius-x", (gdouble) 0.333*polv->r, + "radius-y", (gdouble) 0.333*polv->r, + NULL); - /* horizontal line */ - prec = goo_canvas_points_new (2); - prec->coords[0] = polv->cx - polv->r - POLV_LINE_EXTRA; - prec->coords[1] = polv->cy; - prec->coords[2] = polv->cx + polv->r + POLV_LINE_EXTRA; - prec->coords[3] = polv->cy; - g_object_set (polv->hl, - "points", prec, - NULL); + /* horizontal line */ + prec = goo_canvas_points_new (2); + prec->coords[0] = polv->cx - polv->r - POLV_LINE_EXTRA; + prec->coords[1] = polv->cy; + prec->coords[2] = polv->cx + polv->r + POLV_LINE_EXTRA; + prec->coords[3] = polv->cy; + g_object_set (polv->hl, + "points", prec, + NULL); - /* vertical line */ - prec->coords[0] = polv->cx; - prec->coords[1] = polv->cy - polv->r - POLV_LINE_EXTRA; - prec->coords[2] = polv->cx; - prec->coords[3] = polv->cy + polv->r + POLV_LINE_EXTRA; - g_object_set (polv->vl, - "points", prec, - NULL); + /* vertical line */ + prec->coords[0] = polv->cx; + prec->coords[1] = polv->cy - polv->r - POLV_LINE_EXTRA; + prec->coords[2] = polv->cx; + prec->coords[3] = polv->cy + polv->r + POLV_LINE_EXTRA; + g_object_set (polv->vl, + "points", prec, + NULL); - /* free memory */ - goo_canvas_points_unref (prec); - - /* N/E/S/W */ - azel_to_xy (polv, 0.0, 0.0, &x, &y); - correct_pole_coor (polv, POLAR_PLOT_POLE_N, &x, &y, &anch); - g_object_set (polv->N, - "x", x, - "y", y, - NULL); + /* free memory */ + goo_canvas_points_unref (prec); - azel_to_xy (polv, 90.0, 0.0, &x, &y); - correct_pole_coor (polv, POLAR_PLOT_POLE_E, &x, &y, &anch); - g_object_set (polv->E, - "x", x, - "y", y, - NULL); + /* N/E/S/W */ + azel_to_xy (polv, 0.0, 0.0, &x, &y); + correct_pole_coor (polv, POLAR_PLOT_POLE_N, &x, &y, &anch); + g_object_set (polv->N, + "x", x, + "y", y, + NULL); - azel_to_xy (polv, 180.0, 0.0, &x, &y); - correct_pole_coor (polv, POLAR_PLOT_POLE_S, &x, &y, &anch); - g_object_set (polv->S, - "x", x, - "y", y, - NULL); + azel_to_xy (polv, 90.0, 0.0, &x, &y); + correct_pole_coor (polv, POLAR_PLOT_POLE_E, &x, &y, &anch); + g_object_set (polv->E, + "x", x, + "y", y, + NULL); - azel_to_xy (polv, 270.0, 0.0, &x, &y); - correct_pole_coor (polv, POLAR_PLOT_POLE_W, &x, &y, &anch); - g_object_set (polv->W, - "x", x, - "y", y, - NULL); + azel_to_xy (polv, 180.0, 0.0, &x, &y); + correct_pole_coor (polv, POLAR_PLOT_POLE_S, &x, &y, &anch); + g_object_set (polv->S, + "x", x, + "y", y, + NULL); - /* cursor track */ - g_object_set (polv->curs, - "x", (gfloat) (polv->cx - polv->r - 2*POLV_LINE_EXTRA), - "y", (gfloat) (polv->cy + polv->r + POLV_LINE_EXTRA), - NULL); + azel_to_xy (polv, 270.0, 0.0, &x, &y); + correct_pole_coor (polv, POLAR_PLOT_POLE_W, &x, &y, &anch); + g_object_set (polv->W, + "x", x, + "y", y, + NULL); - /* location name */ - g_object_set (polv->locnam, - "x", (gfloat) (polv->cx - polv->r - 2*POLV_LINE_EXTRA), - "y", (gfloat) (polv->cy - polv->r - POLV_LINE_EXTRA), - NULL); + /* cursor track */ + g_object_set (polv->curs, + "x", (gfloat) (polv->cx - polv->r - 2*POLV_LINE_EXTRA), + "y", (gfloat) (polv->cy + polv->r + POLV_LINE_EXTRA), + NULL); + /* location name */ + g_object_set (polv->locnam, + "x", (gfloat) (polv->cx - polv->r - 2*POLV_LINE_EXTRA), + "y", (gfloat) (polv->cy - polv->r - POLV_LINE_EXTRA), + NULL); - /* sky track */ + + /* sky track */ if (polv->pass != NULL) update_track (polv); - } + } } @@ -887,313 +887,313 @@ * graphs that have not yet been realised, e.g. when opening several module */ static void -on_canvas_realized (GtkWidget *canvas, gpointer data) + on_canvas_realized (GtkWidget *canvas, gpointer data) { - GtkAllocation aloc; + GtkAllocation aloc; - aloc.width = canvas->allocation.width; - aloc.height = canvas->allocation.height; - size_allocate_cb (canvas, &aloc, data); + aloc.width = canvas->allocation.width; + aloc.height = canvas->allocation.height; + size_allocate_cb (canvas, &aloc, data); } static void -create_track (GtkPolarPlot *pv) + create_track (GtkPolarPlot *pv) { - gint i; - GooCanvasItemModel *root; - pass_detail_t *detail; - guint num; - GooCanvasPoints *points; - gfloat x,y; - guint32 col; - guint tres,ttidx; + gint i; + GooCanvasItemModel *root; + pass_detail_t *detail; + guint num; + GooCanvasPoints *points; + gfloat x,y; + guint32 col; + guint tres,ttidx; - root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); + root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); - /* create points */ - num = g_slist_length (pv->pass->details); + /* create points */ + num = g_slist_length (pv->pass->details); - /* time resolution for time ticks; we need - 3 additional points to AOS and LOS ticks. - */ - tres = (num-2) / (TRACK_TICK_NUM-1); + /* time resolution for time ticks; we need + 3 additional points to AOS and LOS ticks. + */ + tres = (num-2) / (TRACK_TICK_NUM-1); - points = goo_canvas_points_new (num); + points = goo_canvas_points_new (num); - /* first point should be (aos_az,0.0) */ - azel_to_xy (pv, pv->pass->aos_az, 0.0, &x, &y); - points->coords[0] = (double) x; - points->coords[1] = (double) y; - pv->trtick[0] = create_time_tick (pv, pv->pass->aos, x, y); + /* first point should be (aos_az,0.0) */ + azel_to_xy (pv, pv->pass->aos_az, 0.0, &x, &y); + points->coords[0] = (double) x; + points->coords[1] = (double) y; + pv->trtick[0] = create_time_tick (pv, pv->pass->aos, x, y); - ttidx = 1; + ttidx = 1; - for (i = 1; i < num-1; i++) { - detail = PASS_DETAIL(g_slist_nth_data (pv->pass->details, i)); - azel_to_xy (pv, detail->az, detail->el, &x, &y); - points->coords[2*i] = (double) x; - points->coords[2*i+1] = (double) y; + for (i = 1; i < num-1; i++) { + detail = PASS_DETAIL(g_slist_nth_data (pv->pass->details, i)); + azel_to_xy (pv, detail->az, detail->el, &x, &y); + points->coords[2*i] = (double) x; + points->coords[2*i+1] = (double) y; - if (!(i % tres)) { - /* create a time tick */ - pv->trtick[ttidx] = create_time_tick (pv, detail->time, x, y); - ttidx++; - } - } + if (!(i % tres)) { + /* create a time tick */ + pv->trtick[ttidx] = create_time_tick (pv, detail->time, x, y); + ttidx++; + } + } - /* last point should be (los_az, 0.0) */ - azel_to_xy (pv, pv->pass->los_az, 0.0, &x, &y); - points->coords[2*(num-1)] = (double) x; - points->coords[2*(num-1)+1] = (double) y; + /* last point should be (los_az, 0.0) */ + azel_to_xy (pv, pv->pass->los_az, 0.0, &x, &y); + points->coords[2*(num-1)] = (double) x; + points->coords[2*(num-1)+1] = (double) y; - /* create poly-line */ - col = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL); + /* create poly-line */ + col = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL); - pv->track = goo_canvas_polyline_model_new (root, FALSE, 0, - "points", points, - "line-width", 1.0, - "stroke-color-rgba", col, - "line-cap", CAIRO_LINE_CAP_SQUARE, - "line-join", CAIRO_LINE_JOIN_MITER, - NULL); - goo_canvas_points_unref (points); + pv->track = goo_canvas_polyline_model_new (root, FALSE, 0, + "points", points, + "line-width", 1.0, + "stroke-color-rgba", col, + "line-cap", CAIRO_LINE_CAP_SQUARE, + "line-join", CAIRO_LINE_JOIN_MITER, + NULL); + goo_canvas_points_unref (points); } static GooCanvasItemModel * -create_time_tick (GtkPolarPlot *pv, gdouble time, gfloat x, gfloat y) + create_time_tick (GtkPolarPlot *pv, gdouble time, gfloat x, gfloat y) { - GooCanvasItemModel *item; - time_t t; - gchar buff[7]; - GtkAnchorType anchor; - GooCanvasItemModel *root; - guint32 col; + GooCanvasItemModel *item; + time_t t; + gchar buff[7]; + GtkAnchorType anchor; + GooCanvasItemModel *root; + guint32 col; - root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); + root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); - col = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL); + col = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL); - /* convert julian date to struct tm */ - t = (time - 2440587.5)*86400.; + /* convert julian date to struct tm */ + t = (time - 2440587.5)*86400.; - /* format either local time or UTC depending on check box */ - if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) - strftime (buff, 8, "%H:%M", localtime (&t)); - else - strftime (buff, 8, "%H:%M", gmtime (&t)); - - buff[6]='\0'; + /* format either local time or UTC depending on check box */ + if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) + strftime (buff, 8, "%H:%M", localtime (&t)); + else + strftime (buff, 8, "%H:%M", gmtime (&t)); - if (x > pv->cx) { - anchor = GTK_ANCHOR_EAST; - x -= 5; - } - else { - anchor = GTK_ANCHOR_WEST; - x += 5; - } + buff[6]='\0'; - item = goo_canvas_text_model_new (root, buff, - (gdouble) x, (gdouble) y, - -1, anchor, - "font", "Sans 7", - "fill-color-rgba", col, - NULL); - - return item; + if (x > pv->cx) { + anchor = GTK_ANCHOR_EAST; + x -= 5; + } + else { + anchor = GTK_ANCHOR_WEST; + x += 5; + } + + item = goo_canvas_text_model_new (root, buff, + (gdouble) x, (gdouble) y, + -1, anchor, + "font", "Sans 7", + "fill-color-rgba", col, + NULL); + + return item; } /** \brief Update sky track drawing after size allocate. */ static void -update_track (GtkPolarPlot *pv) + update_track (GtkPolarPlot *pv) { - guint num,i; - GooCanvasPoints *points; - gfloat x,y; - pass_detail_t *detail; - guint tres,ttidx; + guint num,i; + GooCanvasPoints *points; + gfloat x,y; + pass_detail_t *detail; + guint tres,ttidx; - /* create points */ - num = g_slist_length (pv->pass->details); + /* create points */ + num = g_slist_length (pv->pass->details); - points = goo_canvas_points_new (num); + points = goo_canvas_points_new (num); - /* first point should be (aos_az,0.0) */ - azel_to_xy (pv, pv->pass->aos_az, 0.0, &x, &y); - points->coords[0] = (double) x; - points->coords[1] = (double) y; + /* first point should be (aos_az,0.0) */ + azel_to_xy (pv, pv->pass->aos_az, 0.0, &x, &y); + points->coords[0] = (double) x; + points->coords[1] = (double) y; - /* time tick 0 */ - g_object_set (pv->trtick[0], "x", (gdouble) x, "y", (gdouble) y, NULL); + /* time tick 0 */ + g_object_set (pv->trtick[0], "x", (gdouble) x, "y", (gdouble) y, NULL); - /* time resolution for time ticks; we need - 3 additional points to AOS and LOS ticks. - */ - tres = (num-2) / (TRACK_TICK_NUM-1); - ttidx = 1; + /* time resolution for time ticks; we need + 3 additional points to AOS and LOS ticks. + */ + tres = (num-2) / (TRACK_TICK_NUM-1); + ttidx = 1; - for (i = 1; i < num-1; i++) { - detail = PASS_DETAIL(g_slist_nth_data (pv->pass->details, i)); - azel_to_xy (pv, detail->az, detail->el, &x, &y); - points->coords[2*i] = (double) x; - points->coords[2*i+1] = (double) y; - - if (!(i % tres)) { - /* make room between text and track */ - if (x > pv->cx) { - x -= 5; - } - else { - x += 5; - } - /* update time tick */ - g_object_set (pv->trtick[ttidx], - "x", (gdouble) x, "y", (gdouble) y, - NULL); - ttidx++; - } - } - - /* last point should be (los_az, 0.0) */ - azel_to_xy (pv, pv->pass->los_az, 0.0, &x, &y); - points->coords[2*(num-1)] = (double) x; - points->coords[2*(num-1)+1] = (double) y; - - g_object_set (pv->track, "points", points, NULL); - - goo_canvas_points_unref (points); - + for (i = 1; i < num-1; i++) { + detail = PASS_DETAIL(g_slist_nth_data (pv->pass->details, i)); + azel_to_xy (pv, detail->az, detail->el, &x, &y); + points->coords[2*i] = (double) x; + points->coords[2*i+1] = (double) y; + + if (!(i % tres)) { + /* make room between text and track */ + if (x > pv->cx) { + x -= 5; + } + else { + x += 5; + } + /* update time tick */ + g_object_set (pv->trtick[ttidx], + "x", (gdouble) x, "y", (gdouble) y, + NULL); + ttidx++; + } + } + + /* last point should be (los_az, 0.0) */ + azel_to_xy (pv, pv->pass->los_az, 0.0, &x, &y); + points->coords[2*(num-1)] = (double) x; + points->coords[2*(num-1)+1] = (double) y; + + g_object_set (pv->track, "points", points, NULL); + + goo_canvas_points_unref (points); + } /** \brief Convert Az/El to canvas based XY coordinates. */ static void -azel_to_xy (GtkPolarPlot *p, gdouble az, gdouble el, gfloat *x, gfloat *y) + azel_to_xy (GtkPolarPlot *p, gdouble az, gdouble el, gfloat *x, gfloat *y) { - gdouble rel; + gdouble rel; - if (el < 0.0) { - /* FIXME: generate bug report */ + if (el < 0.0) { + /* FIXME: generate bug report */ - *x = 0.0; - *y = 0.0; + *x = 0.0; + *y = 0.0; - return; - } + return; + } - /* convert angles to radians */ - az = de2ra*az; - el = de2ra*el; + /* convert angles to radians */ + az = de2ra*az; + el = de2ra*el; - /* radius @ el */ - rel = p->r - (2*p->r*el)/M_PI; + /* radius @ el */ + rel = p->r - (2*p->r*el)/M_PI; - switch (p->swap) { + switch (p->swap) { - case POLAR_PLOT_NWSE: - az = 2 * M_PI - az; - break; + case POLAR_PLOT_NWSE: + az = 2 * M_PI - az; + break; - case POLAR_PLOT_SENW: - az = M_PI - az; - break; + case POLAR_PLOT_SENW: + az = M_PI - az; + break; - case POLAR_PLOT_SWNE: - az = M_PI + az; - break; + case POLAR_PLOT_SWNE: + az = M_PI + az; + break; - default: - break; - } + default: + break; + } - *x = (gfloat) (p->cx + rel * sin(az)); - *y = (gfloat) (p->cy - rel * cos(az)); + *x = (gfloat) (p->cx + rel * sin(az)); + *y = (gfloat) (p->cy - rel * cos(az)); } /** \brief Convert canvas based coordinates to Az/El. */ static void -xy_to_azel (GtkPolarPlot *p, gfloat x, gfloat y, gfloat *az, gfloat *el) + xy_to_azel (GtkPolarPlot *p, gfloat x, gfloat y, gfloat *az, gfloat *el) { - gfloat rel; + gfloat rel; - /* distance from center to cursor */ - rel = p->r - sqrt((x - p->cx) * (x - p->cx) + (y - p->cy) * (y - p->cy)); + /* distance from center to cursor */ + rel = p->r - sqrt((x - p->cx) * (x - p->cx) + (y - p->cy) * (y - p->cy)); - /* scale according to p->r = 90 deg */ - *el = 90.0 * rel / p->r; + /* scale according to p->r = 90 deg */ + *el = 90.0 * rel / p->r; - if (x >= p->cx) { - /* 1. and 2. quadrant */ - *az = atan2 (x-p->cx, p->cy - y) / de2ra; - } - else { - /* 3 and 4. quadrant */ - *az = 360 + atan2 (x-p->cx, p->cy - y) / de2ra; - } + if (x >= p->cx) { + /* 1. and 2. quadrant */ + *az = atan2 (x-p->cx, p->cy - y) / de2ra; + } + else { + /* 3 and 4. quadrant */ + *az = 360 + atan2 (x-p->cx, p->cy - y) / de2ra; + } - /* correct for orientation */ - switch (p->swap) { + /* correct for orientation */ + switch (p->swap) { - case POLAR_PLOT_NWSE: - *az = 360.0 - *az; - break; + case POLAR_PLOT_NWSE: + *az = 360.0 - *az; + break; - case POLAR_PLOT_SENW: - if (*az <= 180) - *az = 180.0 - *az; - else - *az = 540.0 - *az; - break; + case POLAR_PLOT_SENW: + if (*az <= 180) + *az = 180.0 - *az; + else + *az = 540.0 - *az; + break; - case POLAR_PLOT_SWNE: - if (*az >= 180.0) - *az = *az - 180.0; - else - *az = 180.0 + *az; - break; + case POLAR_PLOT_SWNE: + if (*az >= 180.0) + *az = *az - 180.0; + else + *az = 180.0 + *az; + break; - default: - break; - } + default: + break; + } } /** \brief Manage mouse motion events. */ static gboolean -on_motion_notify (GooCanvasItem *item, - GooCanvasItem *target, - GdkEventMotion *event, - gpointer data) + on_motion_notify (GooCanvasItem *item, + GooCanvasItem *target, + GdkEventMotion *event, + gpointer data) { - GtkPolarPlot *polv = GTK_POLAR_PLOT (data); - gfloat az,el; - gchar *text; + GtkPolarPlot *polv = GTK_POLAR_PLOT (data); + gfloat az,el; + gchar *text; - if (polv->cursinfo) { + if (polv->cursinfo) { - xy_to_azel (polv, event->x, event->y, &az, &el); + xy_to_azel (polv, event->x, event->y, &az, &el); - if (el > 0.0) { - /* cursor track */ - text = g_strdup_printf ("AZ %.0f\302\260\nEL %.0f\302\260",az,el); - g_object_set (polv->curs, "text", text, NULL); - g_free (text); - } - else { - g_object_set (polv->curs, "text", "", NULL); - } - } + if (el > 0.0) { + /* cursor track */ + text = g_strdup_printf ("AZ %.0f\302\260\nEL %.0f\302\260",az,el); + g_object_set (polv->curs, "text", text, NULL); + g_free (text); + } + else { + g_object_set (polv->curs, "text", "", NULL); + } + } - return TRUE; + return TRUE; } @@ -1207,16 +1207,16 @@ * the corresponding signals to the created items. */ static void -on_item_created (GooCanvas *canvas, - GooCanvasItem *item, - GooCanvasItemModel *model, - gpointer data) + on_item_created (GooCanvas *canvas, + GooCanvasItem *item, + GooCanvasItemModel *model, + gpointer data) { - if (!goo_canvas_item_model_get_parent (model)) { - /* root item / canvas */ - g_signal_connect (item, "motion_notify_event", - (GtkSignalFunc) on_motion_notify, data); - } + if (!goo_canvas_item_model_get_parent (model)) { + /* root item / canvas */ + g_signal_connect (item, "motion_notify_event", + (GtkSignalFunc) on_motion_notify, data); + } } @@ -1228,28 +1228,28 @@ * we also need to scale from [0;255] to [0;65535], i.e. multiply by 257. */ static void -get_canvas_bg_color (GtkPolarPlot *polv, GdkColor *color) + get_canvas_bg_color (GtkPolarPlot *polv, GdkColor *color) { - guint32 col,tmp; - guint16 r,g,b; + guint32 col,tmp; + guint16 r,g,b; - col = sat_cfg_get_int (SAT_CFG_INT_POLAR_BGD_COL); + col = sat_cfg_get_int (SAT_CFG_INT_POLAR_BGD_COL); - /* red */ - tmp = col & 0xFF000000; - r = (guint16) (tmp >> 24); + /* red */ + tmp = col & 0xFF000000; + r = (guint16) (tmp >> 24); - /* green */ - tmp = col & 0x00FF0000; - g = (guint16) (tmp >> 16); + /* green */ + tmp = col & 0x00FF0000; + g = (guint16) (tmp >> 16); - /* blue */ - tmp = col & 0x0000FF00; - b = (guint16) (tmp >> 8); + /* blue */ + tmp = col & 0x0000FF00; + b = (guint16) (tmp >> 8); - /* store colours */ - color->red = 257 * r; - color->green = 257 * g; - color->blue = 257 * b; + /* store colours */ + color->red = 257 * r; + color->green = 257 * g; + color->blue = 257 * b; } Modified: trunk/src/gtk-polar-plot.h =================================================================== --- trunk/src/gtk-polar-plot.h 2009-09-28 15:23:15 UTC (rev 454) +++ trunk/src/gtk-polar-plot.h 2009-09-28 15:41:01 UTC (rev 455) @@ -11,17 +11,17 @@ More details can be found at the project home page: http://gpredict.oz9aec.net/ - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, visit http://www.fsf.org/ */ @@ -43,7 +43,7 @@ #endif /* __cplusplus */ -/** \brief Number of time ticks. */ + /** \brief Number of time ticks. */ #define TRACK_TICK_NUM 5 @@ -53,81 +53,81 @@ #define GTK_TYPE_POLAR_PLOT (gtk_polar_plot_get_type ()) #define IS_GTK_POLAR_PLOT(obj) GTK_CHECK_TYPE (obj, gtk_polar_plot_get_type ()) -typedef struct _GtkPolarPlot GtkPolarPlot; -typedef struct _GtkPolarPlotClass GtkPolarPlotClass; + typedef struct _GtkPolarPlot GtkPolarPlot; + typedef struct _GtkPolarPlotClass GtkPolarPlotClass; -/* graph orientation; start at 12 + /* graph orientation; start at 12 o'clock and go clockwise */ -typedef enum { - POLAR_PLOT_NESW = 0, /*!< Normal / usual */ - POLAR_PLOT_NWSE = 1, - POLAR_PLOT_SENW = 2, - POLAR_PLOT_SWNE = 3 -} polar_plot_swap_t; + typedef enum { + POLAR_PLOT_NESW = 0, /*!< Normal / usual */ + POLAR_PLOT_NWSE = 1, + POLAR_PLOT_SENW = 2, + POLAR_PLOT_SWNE = 3 + } polar_plot_swap_t; - /* pole identifier */ -typedef enum { - POLAR_PLOT_POLE_N = 0, - POLAR_PLOT_POLE_E = 1, - POLAR_PLOT_POLE_S = 2, - POLAR_PLOT_POLE_W = 3 -} polar_plot_pole_t; + /* pole identifier */ + typedef enum { + POLAR_PLOT_POLE_N = 0, + POLAR_PLOT_POLE_E = 1, + POLAR_PLOT_POLE_S = 2, + POLAR_PLOT_POLE_W = 3 + } polar_plot_pole_t; -struct _GtkPolarPlot -{ - GtkVBox vbox; + struct _GtkPolarPlot + { + GtkVBox vbox; - GtkWidget *canvas; /*!< The canvas widget */ + GtkWidget *canvas; /*!< The canvas widget */ - GooCanvasItemModel *C00, *C30, *C60; /*!< 0, 30 and 60 deg elevation circles */ - GooCanvasItemModel *hl, *vl; /*!< horizontal and vertical lines */ - GooCanvasItemModel *N,*S,*E,*W; /*!< North, South, East and West labels */ - GooCanvasItemModel *locnam; /*!< Location name */ - GooCanvasItemModel *curs; /*!< cursor tracking text */ + GooCanvasItemModel *C00, *C30, *C60; /*!< 0, 30 and 60 deg elevation circles */ + GooCanvasItemModel *hl, *vl; /*!< horizontal and vertical lines */ + GooCanvasItemModel *N,*S,*E,*W; /*!< North, South, East and West labels */ + GooCanvasItemModel *locnam; /*!< Location name */ + GooCanvasItemModel *curs; /*!< cursor tracking text */ - pass_t *pass; - GooCanvasItemModel *track; /*!< Sky track. */ - GooCanvasItemModel *target; /*!< Target object marker */ - GooCanvasItemModel *ctrl; /*!< Position marker for the controller */ - GooCanvasItemModel *rot1,*rot2,*rot3,*rot4; /*!< Position marker for the rotor */ - GooCanvasItemModel *trtick[TRACK_TICK_NUM]; /*!< Time ticks along the sky track */ + pass_t *pass; + GooCanvasItemModel *track; /*!< Sky track. */ + GooCanvasItemModel *target; /*!< Target object marker */ + GooCanvasItemModel *ctrl; /*!< Position marker for the controller */ + GooCanvasItemModel *rot1,*rot2,*rot3,*rot4; /*!< Position marker for the rotor */ + GooCanvasItemModel *trtick[TRACK_TICK_NUM]; /*!< Time ticks along the sky track */ - qth_t *qth; /*!< Pointer to current location. */ + qth_t *qth; /*!< Pointer to current location. */ - guint cx; /*!< center X */ - guint cy; /*!< center Y */ - guint r; /*!< radius */ - guint size; /*!< Size of the box = min(h,w) */ + guint cx; /*!< center X */ + guint cy; /*!< center Y */ + guint r; /*!< radius */ + guint size; /*!< Size of the box = min(h,w) */ - polar_plot_swap_t swap; + polar_plot_swap_t swap; - gboolean qthinfo; /*!< Show the QTH info. */ - gboolean cursinfo; /*!< Track the mouse cursor. */ - gboolean extratick; /*!< Show extra ticks */ -}; + gboolean qthinfo; /*!< Show the QTH info. */ + gboolean cursinfo; /*!< Track the mouse cursor. */ + gboolean extratick; /*!< Show extra ticks */ + }; -struct _GtkPolarPlotClass -{ - GtkVBoxClass parent_class; -}; + struct _GtkPolarPlotClass + { + GtkVBoxClass parent_class; + }; -GtkType gtk_polar_plot_get_type (void); + GtkType gtk_polar_plot_get_type (void); -GtkWidget* gtk_polar_plot_new (qth_t *qth, pass_t *pass); + GtkWidget* gtk_polar_plot_new (qth_t *qth, pass_t *pass); -void gtk_polar_plot_set_pass (GtkPolarPlot *plot, pass_t *pass); -void gtk_polar_plot_set_target_pos (GtkPolarPlot *plot, gdouble az, gdouble el); -void gtk_polar_plot_set_ctrl_pos (GtkPolarPlot *plot, gdouble az, gdouble el); -void gtk_polar_plot_set_rotor_pos (GtkPolarPlot *plot, gdouble az, gdouble el); -void gtk_polar_plot_show_time_ticks (GtkPolarPlot *plot, gboolean show); + void gtk_polar_plot_set_pass (GtkPolarPlot *plot, pass_t *pass); + void gtk_polar_plot_set_target_pos (GtkPolarPlot *plot, gdouble az, gdouble el); + void gtk_polar_plot_set_ctrl_pos (GtkPolarPlot *plot, gdouble az, gdouble el); + void gtk_polar_plot_set_rotor_pos (GtkPolarPlot *plot, gdouble az, gdouble el); + void gtk_polar_plot_show_time_ticks (GtkPolarPlot *plot, gboolean show); #ifdef __cplusplus Modified: trunk/src/gtk-rot-ctrl.c =================================================================== --- trunk/src/gtk-rot-ctrl.c 2009-09-28 15:23:15 UTC (rev 454) +++ trunk/src/gtk-rot-ctrl.c 2009-09-28 15:41:01 UTC (rev 455) @@ -11,7 +11,7 @@ More details can be found at the project home page: http://gpredict.oz9aec.net/ - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -96,7 +96,7 @@ GType -gtk_rot_ctrl_get_type () + gtk_rot_ctrl_get_type () { static GType gtk_rot_ctrl_type = 0; @@ -125,7 +125,7 @@ static void -gtk_rot_ctrl_class_init (GtkRotCtrlClass *class) + gtk_rot_ctrl_class_init (GtkRotCtrlClass *class) { GObjectClass *gobject_class; GtkObjectClass *object_class; @@ -140,13 +140,13 @@ parent_class = g_type_class_peek_parent (class); object_class->destroy = gtk_rot_ctrl_destroy; - + } static void -gtk_rot_ctrl_init (GtkRotCtrl *ctrl) + gtk_rot_ctrl_init (GtkRotCtrl *ctrl) { ctrl->sats = NULL; ctrl->target = NULL; @@ -164,7 +164,7 @@ } static void -gtk_rot_ctrl_destroy (GtkObject *object) + gtk_rot_ctrl_destroy (GtkObject *object) { GtkRotCtrl *ctrl = GTK_ROT_CTRL (object); @@ -181,7 +181,7 @@ ctrl->conf = NULL; } - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } @@ -191,7 +191,7 @@ * */ GtkWidget * -gtk_rot_ctrl_new (GtkSatModule *module) + gtk_rot_ctrl_new (GtkSatModule *module) { GtkWidget *widget; GtkWidget *table; @@ -201,7 +201,7 @@ return NULL; } - widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL); + widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL); /* store satellites */ g_hash_table_foreach (module->satellites, store_sats, widget); @@ -226,8 +226,8... [truncated message content] |
From: <cs...@us...> - 2009-09-28 15:23:23
|
Revision: 454 http://gpredict.svn.sourceforge.net/gpredict/?rev=454&view=rev Author: csete Date: 2009-09-28 15:23:15 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Updated man page. Modified Paths: -------------- trunk/doc/man/gpredict.1.in Modified: trunk/doc/man/gpredict.1.in =================================================================== --- trunk/doc/man/gpredict.1.in 2009-09-27 22:25:21 UTC (rev 453) +++ trunk/doc/man/gpredict.1.in 2009-09-28 15:23:15 UTC (rev 454) @@ -11,18 +11,18 @@ .SH "DESCRIPTION" .\" Add any additional description here .PP -Gpredict is a real-time satellite tracking and orbit prediction program. It can track an infinite number of satellites and display the satellite data in various visualisation modules like lists, maps and polar plots. Gpredict can also provide detailed information about upcoming satellite passes relative to one or more ground stations. The complete user manual, as well as other documentation, is available from http://groundstation.sourceforge.net/gpredict/documents.php +Gpredict is a real-time satellite tracking and orbit prediction program. It can track an unlimitied number of satellites and display the satellite data in various visualisation modules like lists, maps and polar plots. Gpredict can also provide detailed information about upcoming satellite passes relative to one or more ground stations. Gpredict can perform Doppler tuning and antenna rotator tracking via hamlib. The complete user manual, as well as other documentation, is available from http://gpredict.oz9aec.net/documents.php .SH "AUTHOR" Gpredict is designed and written by Alexandru Csete, OZ9AEC, but many other have contributed in one way or other, see the AUTHORS file or the About box in gpredict. .SH "REPORTING BUGS" -Report bugs to \fB<groundstation\-de...@li...>\fR. +Report bugs to \fB<gpredict\-di...@li...>\fR. .SH "COPYRIGHT" -Copyright \(co 2001\-2006 Alexandru Csete. +Copyright \(co 2001\-2009 Alexandru Csete. .br -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. If it breaks you can keep both pieces. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 22:25:31
|
Revision: 453 http://gpredict.svn.sourceforge.net/gpredict/?rev=453&view=rev Author: csete Date: 2009-09-27 22:25:21 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Added TDRSS to list of default files to dosnload. Modified Paths: -------------- trunk/src/sat-cfg.c Modified: trunk/src/sat-cfg.c =================================================================== --- trunk/src/sat-cfg.c 2009-09-27 22:21:23 UTC (rev 452) +++ trunk/src/sat-cfg.c 2009-09-27 22:25:21 UTC (rev 453) @@ -222,7 +222,7 @@ "glo-ops.txt;goes.txt;gorizont.txt;gps-ops.txt;intelsat.txt;"\ "iridium.txt;military.txt;molniya.txt;musson.txt;nnss.txt;noaa.txt;"\ "orbcomm.txt;other.txt;other-comm.txt;radar.txt;raduga.txt;resource.txt;"\ - "sarsat.txt;sbas.txt;science.txt;tdrss;tle-new.txt;visual.txt;weather.txt;"\ + "sarsat.txt;sbas.txt;science.txt;tdrss.txt;tle-new.txt;visual.txt;weather.txt;"\ "x-comm.txt"}, { "TLE", "PROXY", NULL}, { "TLE", "FILE_DIR", NULL}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 22:21:29
|
Revision: 452 http://gpredict.svn.sourceforge.net/gpredict/?rev=452&view=rev Author: csete Date: 2009-09-27 22:21:23 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Added TDRSS to list of default files to dosnload. Modified Paths: -------------- trunk/src/sat-cfg.c Modified: trunk/src/sat-cfg.c =================================================================== --- trunk/src/sat-cfg.c 2009-09-27 16:45:46 UTC (rev 451) +++ trunk/src/sat-cfg.c 2009-09-27 22:21:23 UTC (rev 452) @@ -222,7 +222,8 @@ "glo-ops.txt;goes.txt;gorizont.txt;gps-ops.txt;intelsat.txt;"\ "iridium.txt;military.txt;molniya.txt;musson.txt;nnss.txt;noaa.txt;"\ "orbcomm.txt;other.txt;other-comm.txt;radar.txt;raduga.txt;resource.txt;"\ - "sarsat.txt;sbas.txt;science.txt;tle-new.txt;visual.txt;weather.txt;x-comm.txt"}, + "sarsat.txt;sbas.txt;science.txt;tdrss;tle-new.txt;visual.txt;weather.txt;"\ + "x-comm.txt"}, { "TLE", "PROXY", NULL}, { "TLE", "FILE_DIR", NULL}, { "TLE", "EXTENSION", "*.*"}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 16:46:07
|
Revision: 451 http://gpredict.svn.sourceforge.net/gpredict/?rev=451&view=rev Author: csete Date: 2009-09-27 16:45:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Updated. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-27 16:44:58 UTC (rev 450) +++ trunk/ChangeLog 2009-09-27 16:45:46 UTC (rev 451) @@ -17,7 +17,10 @@ * src/gtk-sat-module-tmg.c: Disabled tooltip since it was too annoying when using the scroll wheel. + * src/sat-pref-polar-view.c: + Added config widget for new sky track option. + 2009-09-25 Alexandru Csete <oz9aec at gmail.com> * src/gtk-sat-module-tmg.c: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 16:45:07
|
Revision: 450 http://gpredict.svn.sourceforge.net/gpredict/?rev=450&view=rev Author: csete Date: 2009-09-27 16:44:58 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Added config widget for new sky track option. Modified Paths: -------------- trunk/src/sat-pref-polar-view.c Modified: trunk/src/sat-pref-polar-view.c =================================================================== --- trunk/src/sat-pref-polar-view.c 2009-09-27 16:26:52 UTC (rev 449) +++ trunk/src/sat-pref-polar-view.c 2009-09-27 16:44:58 UTC (rev 450) @@ -11,17 +11,17 @@ More details can be found at the project home page: http://gpredict.oz9aec.net/ - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, visit http://www.fsf.org/ */ @@ -48,7 +48,10 @@ /* colour selectors */ static GtkWidget *bgd,*axis,*tick,*sat,*ssat,*track,*info; +/* Misc */ +static GtkWidget *showtrack; + /* misc bookkeeping */ static gint orient = POLAR_VIEW_NESW; static gboolean dirty = FALSE; @@ -59,6 +62,7 @@ static void create_orient_selector (GKeyFile *cfg, GtkBox *vbox); static void create_bool_selectors (GKeyFile *cfg, GtkBox *vbox); static void create_colour_selectors (GKeyFile *cfg, GtkBox *vbox); +static void create_misc_selectors (GKeyFile *cfg, GtkBox *vbox); static void create_reset_button (GKeyFile *cfg, GtkBox *vbox); /* private function: callbacks */ @@ -76,26 +80,28 @@ */ GtkWidget *sat_pref_polar_view_create (GKeyFile *cfg) { - GtkWidget *vbox; + GtkWidget *vbox; - /* create vertical box */ - vbox = gtk_vbox_new (FALSE, 5); // !!! - gtk_container_set_border_width (GTK_CONTAINER (vbox), 20); + /* create vertical box */ + vbox = gtk_vbox_new (FALSE, 5); // !!! + gtk_container_set_border_width (GTK_CONTAINER (vbox), 20); - /* create the components */ - create_orient_selector (cfg, GTK_BOX (vbox)); - gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 10); - create_bool_selectors (cfg, GTK_BOX (vbox)); - gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 10); - create_colour_selectors (cfg, GTK_BOX (vbox)); - gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 10); - create_reset_button (cfg, GTK_BOX (vbox)); + /* create the components */ + create_orient_selector (cfg, GTK_BOX (vbox)); + gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 10); + create_bool_selectors (cfg, GTK_BOX (vbox)); + gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 10); + create_colour_selectors (cfg, GTK_BOX (vbox)); + gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 10); + create_misc_selectors (cfg, GTK_BOX (vbox)); + gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 10); + create_reset_button (cfg, GTK_BOX (vbox)); - reset = FALSE; - dirty = FALSE; + reset = FALSE; + dirty = FALSE; - return vbox; + return vbox; } @@ -106,118 +112,117 @@ * The orientation selector consists of a radio-group having four radio * buttons: N/E/S/W, N/W/S/E, S/E/N/W, and S/W/N/E */ -static void -create_orient_selector (GKeyFile *cfg, GtkBox *vbox) +static void create_orient_selector (GKeyFile *cfg, GtkBox *vbox) { - GtkWidget *label; - GtkWidget *hbox; - GtkTooltips *tips; + GtkWidget *label; + GtkWidget *hbox; + GtkTooltips *tips; - /* create header */ - label = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_markup (GTK_LABEL (label), - _("<b>Orientation:</b>")); - gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); + /* create header */ + label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_markup (GTK_LABEL (label), + _("<b>Orientation:</b>")); + gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); - /* horizontal box to contain the radio buttons */ - hbox = gtk_hbox_new (TRUE, 10); - gtk_box_pack_start (vbox, hbox, FALSE, TRUE, 0); + /* horizontal box to contain the radio buttons */ + hbox = gtk_hbox_new (TRUE, 10); + gtk_box_pack_start (vbox, hbox, FALSE, TRUE, 0); - /* N/E/S/W */ - nesw = gtk_radio_button_new_with_label (NULL, "N/E/S/W"); - gtk_box_pack_start (GTK_BOX (hbox), nesw, FALSE, TRUE, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, nesw, - "\tN\n"\ - "W\t\tE\n"\ - "\tS", - NULL); + /* N/E/S/W */ + nesw = gtk_radio_button_new_with_label (NULL, "N/E/S/W"); + gtk_box_pack_start (GTK_BOX (hbox), nesw, FALSE, TRUE, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, nesw, + "\tN\n"\ + "W\t\tE\n"\ + "\tS", + NULL); - /* N/W/S/E */ - nwse = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (nesw), "N/W/S/E"); - gtk_box_pack_start (GTK_BOX (hbox), nwse, FALSE, TRUE, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, nwse, - "\tN\n"\ - "E\t\tW\n"\ - "\tS", - NULL); + /* N/W/S/E */ + nwse = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (nesw), "N/W/S/E"); + gtk_box_pack_start (GTK_BOX (hbox), nwse, FALSE, TRUE, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, nwse, + "\tN\n"\ + "E\t\tW\n"\ + "\tS", + NULL); - /* S/E/N/W */ - senw = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (nesw), "S/E/N/W"); - gtk_box_pack_start (GTK_BOX (hbox), senw, FALSE, TRUE, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, senw, - "\tS\n"\ - "W\t\tE\n"\ - "\tN", - NULL); + /* S/E/N/W */ + senw = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (nesw), "S/E/N/W"); + gtk_box_pack_start (GTK_BOX (hbox), senw, FALSE, TRUE, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, senw, + "\tS\n"\ + "W\t\tE\n"\ + "\tN", + NULL); - /* S/W/N/E */ - swne = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (nesw), "S/W/N/E"); - gtk_box_pack_start (GTK_BOX (hbox), swne, FALSE, TRUE, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, swne, - "\tS\n"\ - "E\t\tW\n"\ - "\tW", - NULL); + /* S/W/N/E */ + swne = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (nesw), "S/W/N/E"); + gtk_box_pack_start (GTK_BOX (hbox), swne, FALSE, TRUE, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, swne, + "\tS\n"\ + "E\t\tW\n"\ + "\tW", + NULL); - /* read orientation */ - if (cfg != NULL) { - orient = mod_cfg_get_int (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_ORIENTATION, - SAT_CFG_INT_POLAR_ORIENTATION); - } - else { - sat_cfg_get_int (SAT_CFG_INT_POLAR_ORIENTATION); - } + /* read orientation */ + if (cfg != NULL) { + orient = mod_cfg_get_int (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_ORIENTATION, + SAT_CFG_INT_POLAR_ORIENTATION); + } + else { + sat_cfg_get_int (SAT_CFG_INT_POLAR_ORIENTATION); + } - switch (orient) { + switch (orient) { - case POLAR_VIEW_NESW: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nesw), TRUE); - break; + case POLAR_VIEW_NESW: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nesw), TRUE); + break; - case POLAR_VIEW_NWSE: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nwse), TRUE); - break; + case POLAR_VIEW_NWSE: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nwse), TRUE); + break; - case POLAR_VIEW_SENW: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (senw), TRUE); - break; + case POLAR_VIEW_SENW: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (senw), TRUE); + break; - case POLAR_VIEW_SWNE: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (swne), TRUE); - break; + case POLAR_VIEW_SWNE: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (swne), TRUE); + break; - default: - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%f:%d: Invalid PolarView orientation (%d)"), - __FILE__, __LINE__, orient); - orient = POLAR_VIEW_NESW; - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nesw), TRUE); - break; - } + default: + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%f:%d: Invalid PolarView orientation (%d)"), + __FILE__, __LINE__, orient); + orient = POLAR_VIEW_NESW; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nesw), TRUE); + break; + } - /* finally, connect the signals */ - g_signal_connect (nesw, "toggled", - G_CALLBACK (orient_chganged), - GINT_TO_POINTER (POLAR_VIEW_NESW)); - g_signal_connect (nwse, "toggled", - G_CALLBACK (orient_chganged), - GINT_TO_POINTER (POLAR_VIEW_NWSE)); - g_signal_connect (senw, "toggled", - G_CALLBACK (orient_chganged), - GINT_TO_POINTER (POLAR_VIEW_SENW)); - g_signal_connect (swne, "toggled", - G_CALLBACK (orient_chganged), - GINT_TO_POINTER (POLAR_VIEW_SWNE)); - + /* finally, connect the signals */ + g_signal_connect (nesw, "toggled", + G_CALLBACK (orient_chganged), + GINT_TO_POINTER (POLAR_VIEW_NESW)); + g_signal_connect (nwse, "toggled", + G_CALLBACK (orient_chganged), + GINT_TO_POINTER (POLAR_VIEW_NWSE)); + g_signal_connect (senw, "toggled", + G_CALLBACK (orient_chganged), + GINT_TO_POINTER (POLAR_VIEW_SENW)); + g_signal_connect (swne, "toggled", + G_CALLBACK (orient_chganged), + GINT_TO_POINTER (POLAR_VIEW_SWNE)); + } @@ -229,105 +234,104 @@ * the satellites, should be drawn on the polar view. Choices are QTH info, next * event, cursor coordinates, and extra tick marks. */ -static void -create_bool_selectors (GKeyFile *cfg, GtkBox *vbox) +static void create_bool_selectors (GKeyFile *cfg, GtkBox *vbox) { - GtkWidget *label; - GtkTooltips *tips; - GtkWidget *hbox; + GtkWidget *label; + GtkTooltips *tips; + GtkWidget *hbox; - /* create header */ - label = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_markup (GTK_LABEL (label), - _("<b>Extra Contents:</b>")); - gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); + /* create header */ + label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_markup (GTK_LABEL (label), + _("<b>Extra Contents:</b>")); + gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); - /* horizontal box to contain the radio buttons */ - hbox = gtk_hbox_new (TRUE, 10); - gtk_box_pack_start (vbox, hbox, FALSE, TRUE, 0); + /* horizontal box to contain the radio buttons */ + hbox = gtk_hbox_new (TRUE, 10); + gtk_box_pack_start (vbox, hbox, FALSE, TRUE, 0); - /* QTH info */ - qth = gtk_check_button_new_with_label (_("QTH Info")); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, qth, - _("Show location information on the polar plot"), - NULL); - if (cfg != NULL) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qth), - mod_cfg_get_bool (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SHOW_QTH_INFO, - SAT_CFG_BOOL_POL_SHOW_QTH_INFO)); - } - else { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qth), - sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO)); - } - g_signal_connect (qth, "toggled", G_CALLBACK (content_changed), NULL); - gtk_box_pack_start (GTK_BOX (hbox), qth, FALSE, TRUE, 0); + /* QTH info */ + qth = gtk_check_button_new_with_label (_("QTH Info")); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, qth, + _("Show location information on the polar plot"), + NULL); + if (cfg != NULL) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qth), + mod_cfg_get_bool (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_QTH_INFO, + SAT_CFG_BOOL_POL_SHOW_QTH_INFO)); + } + else { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qth), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO)); + } + g_signal_connect (qth, "toggled", G_CALLBACK (content_changed), NULL); + gtk_box_pack_start (GTK_BOX (hbox), qth, FALSE, TRUE, 0); - /* Next Event */ - next = gtk_check_button_new_with_label (_("Next Event")); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, next, - _("Show which satellites comes up next and at what time"), - NULL); - if (cfg != NULL) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (next), - mod_cfg_get_bool (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SHOW_NEXT_EVENT, - SAT_CFG_BOOL_POL_SHOW_NEXT_EV)); - } - else { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (next), - sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_NEXT_EV)); - } - g_signal_connect (next, "toggled", G_CALLBACK (content_changed), NULL); - gtk_box_pack_start (GTK_BOX (hbox), next, FALSE, TRUE, 0); + /* Next Event */ + next = gtk_check_button_new_with_label (_("Next Event")); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, next, + _("Show which satellites comes up next and at what time"), + NULL); + if (cfg != NULL) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (next), + mod_cfg_get_bool (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_NEXT_EVENT, + SAT_CFG_BOOL_POL_SHOW_NEXT_EV)); + } + else { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (next), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_NEXT_EV)); + } + g_signal_connect (next, "toggled", G_CALLBACK (content_changed), NULL); + gtk_box_pack_start (GTK_BOX (hbox), next, FALSE, TRUE, 0); - /* Cursor position */ - curs = gtk_check_button_new_with_label (_("Cursor Position")); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, curs, - _("Show the azimuth and elevation of the mouse pointer"), - NULL); - if (cfg != NULL) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (curs), - mod_cfg_get_bool (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SHOW_CURS_TRACK, - SAT_CFG_BOOL_POL_SHOW_CURS_TRACK)); - } - else { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (curs), - sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_CURS_TRACK)); - } - g_signal_connect (curs, "toggled", G_CALLBACK (content_changed), NULL); - gtk_box_pack_start (GTK_BOX (hbox), curs, FALSE, TRUE, 0); + /* Cursor position */ + curs = gtk_check_button_new_with_label (_("Cursor Position")); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, curs, + _("Show the azimuth and elevation of the mouse pointer"), + NULL); + if (cfg != NULL) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (curs), + mod_cfg_get_bool (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_CURS_TRACK, + SAT_CFG_BOOL_POL_SHOW_CURS_TRACK)); + } + else { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (curs), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_CURS_TRACK)); + } + g_signal_connect (curs, "toggled", G_CALLBACK (content_changed), NULL); + gtk_box_pack_start (GTK_BOX (hbox), curs, FALSE, TRUE, 0); - /* Extra tick marks */ - xtick = gtk_check_button_new_with_label (_("Extra Az Ticks")); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, xtick, - _("Show extra tick marks for every 30\302\260"), - NULL); - if (cfg != NULL) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xtick), - mod_cfg_get_bool (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SHOW_EXTRA_AZ_TICKS, - SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS)); - } - else { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xtick), - sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS)); - } - g_signal_connect (xtick, "toggled", G_CALLBACK (content_changed), NULL); - gtk_box_pack_start (GTK_BOX (hbox), xtick, FALSE, TRUE, 0); + /* Extra tick marks */ + xtick = gtk_check_button_new_with_label (_("Extra Az Ticks")); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, xtick, + _("Show extra tick marks for every 30\302\260"), + NULL); + if (cfg != NULL) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xtick), + mod_cfg_get_bool (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_EXTRA_AZ_TICKS, + SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS)); + } + else { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xtick), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS)); + } + g_signal_connect (xtick, "toggled", G_CALLBACK (content_changed), NULL); + gtk_box_pack_start (GTK_BOX (hbox), xtick, FALSE, TRUE, 0); } @@ -339,262 +343,306 @@ * This function creates the widgets for selecting colours for the plot background, * axes, tick labels, satellites, track, and info text. */ -static void -create_colour_selectors (GKeyFile *cfg, GtkBox *vbox) +static void create_colour_selectors (GKeyFile *cfg, GtkBox *vbox) { - GtkWidget *label; - GtkTooltips *tips; - GtkWidget *table; - guint rgba; /* RRGGBBAA encoded colour */ - guint16 alpha; /* alpha channel 16 bits */ - GdkColor col; /* GdkColor colour representation */ + GtkWidget *label; + GtkTooltips *tips; + GtkWidget *table; + guint rgba; /* RRGGBBAA encoded colour */ + guint16 alpha; /* alpha channel 16 bits */ + GdkColor col; /* GdkColor colour representation */ - /* create header */ - label = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_markup (GTK_LABEL (label), - _("<b>Colours:</b>")); - gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); + /* create header */ + label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_markup (GTK_LABEL (label), + _("<b>Colours:</b>")); + gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); - /* horizontal box to contain the radio buttons */ - table = gtk_table_new (3, 6, TRUE); - gtk_table_set_col_spacings (GTK_TABLE (table), 10); - gtk_table_set_row_spacings (GTK_TABLE (table), 3); - gtk_box_pack_start (vbox, table, FALSE, TRUE, 0); + /* horizontal box to contain the radio buttons */ + table = gtk_table_new (3, 6, TRUE); + gtk_table_set_col_spacings (GTK_TABLE (table), 10); + gtk_table_set_row_spacings (GTK_TABLE (table), 3); + gtk_box_pack_start (vbox, table, FALSE, TRUE, 0); - /* background */ - label = gtk_label_new (_("Background:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, - GTK_FILL, GTK_FILL, 0, 0); - bgd = gtk_color_button_new (); - gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (bgd), TRUE); - gtk_table_attach (GTK_TABLE (table), bgd, 1, 2, 0, 1, - GTK_FILL , GTK_FILL, 0, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, bgd, - _("Click to select background colour"), - NULL); - if (cfg != NULL) { - rgba = mod_cfg_get_int (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_BGD_COL, - SAT_CFG_INT_POLAR_BGD_COL); - } - else { - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_BGD_COL); - } - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (bgd), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (bgd), alpha); - g_signal_connect (bgd, "color-set", G_CALLBACK (colour_changed), NULL); + /* background */ + label = gtk_label_new (_("Background:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, + GTK_FILL, GTK_FILL, 0, 0); + bgd = gtk_color_button_new (); + gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (bgd), TRUE); + gtk_table_attach (GTK_TABLE (table), bgd, 1, 2, 0, 1, + GTK_FILL , GTK_FILL, 0, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, bgd, + _("Click to select background colour"), + NULL); + if (cfg != NULL) { + rgba = mod_cfg_get_int (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_BGD_COL, + SAT_CFG_INT_POLAR_BGD_COL); + } + else { + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_BGD_COL); + } + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (bgd), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (bgd), alpha); + g_signal_connect (bgd, "color-set", G_CALLBACK (colour_changed), NULL); - /* Axis */ - label = gtk_label_new (_("Axes/Circles:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, - GTK_FILL, GTK_FILL, 0, 0); - axis = gtk_color_button_new (); - gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (axis), TRUE); - gtk_table_attach (GTK_TABLE (table), axis, 3, 4, 0, 1, - GTK_FILL , GTK_FILL, 0, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, axis, - _("Click to select the axis colour"), - NULL); - if (cfg != NULL) { - rgba = mod_cfg_get_int (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_AXIS_COL, - SAT_CFG_INT_POLAR_AXIS_COL); - } - else { - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_AXIS_COL); - } - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (axis), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (axis), alpha); - g_signal_connect (axis, "color-set", G_CALLBACK (colour_changed), NULL); + /* Axis */ + label = gtk_label_new (_("Axes/Circles:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, + GTK_FILL, GTK_FILL, 0, 0); + axis = gtk_color_button_new (); + gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (axis), TRUE); + gtk_table_attach (GTK_TABLE (table), axis, 3, 4, 0, 1, + GTK_FILL , GTK_FILL, 0, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, axis, + _("Click to select the axis colour"), + NULL); + if (cfg != NULL) { + rgba = mod_cfg_get_int (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_AXIS_COL, + SAT_CFG_INT_POLAR_AXIS_COL); + } + else { + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_AXIS_COL); + } + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (axis), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (axis), alpha); + g_signal_connect (axis, "color-set", G_CALLBACK (colour_changed), NULL); - /* tick labels */ - label = gtk_label_new (_("Tick Labels:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 4, 5, 0, 1, - GTK_FILL, GTK_FILL, 0, 0); - tick = gtk_color_button_new (); - gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (tick), TRUE); - gtk_table_attach (GTK_TABLE (table), tick, 5, 6, 0, 1, - GTK_FILL , GTK_FILL, 0, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, tick, - _("Click to select the colour for tick labels"), - NULL); - if (cfg != NULL) { - rgba = mod_cfg_get_int (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_TICK_COL, - SAT_CFG_INT_POLAR_TICK_COL); - } - else { - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_TICK_COL); - } - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (tick), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (tick), alpha); - g_signal_connect (tick, "color-set", G_CALLBACK (colour_changed), NULL); + /* tick labels */ + label = gtk_label_new (_("Tick Labels:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach (GTK_TABLE (table), label, 4, 5, 0, 1, + GTK_FILL, GTK_FILL, 0, 0); + tick = gtk_color_button_new (); + gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (tick), TRUE); + gtk_table_attach (GTK_TABLE (table), tick, 5, 6, 0, 1, + GTK_FILL , GTK_FILL, 0, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, tick, + _("Click to select the colour for tick labels"), + NULL); + if (cfg != NULL) { + rgba = mod_cfg_get_int (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_TICK_COL, + SAT_CFG_INT_POLAR_TICK_COL); + } + else { + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_TICK_COL); + } + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (tick), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (tick), alpha); + g_signal_connect (tick, "color-set", G_CALLBACK (colour_changed), NULL); - /* satellite */ - label = gtk_label_new (_("Satellite:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, - GTK_FILL, GTK_FILL, 0, 0); - sat = gtk_color_button_new (); - gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (sat), TRUE); - gtk_table_attach (GTK_TABLE (table), sat, 1, 2, 1, 2, - GTK_FILL , GTK_FILL, 0, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, sat, - _("Click to select satellite colour"), - NULL); - if (cfg != NULL) { - rgba = mod_cfg_get_int (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SAT_COL, - SAT_CFG_INT_POLAR_SAT_COL); - } - else { - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_COL); - } - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (sat), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (sat), alpha); - g_signal_connect (sat, "color-set", G_CALLBACK (colour_changed), NULL); + /* satellite */ + label = gtk_label_new (_("Satellite:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, + GTK_FILL, GTK_FILL, 0, 0); + sat = gtk_color_button_new (); + gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (sat), TRUE); + gtk_table_attach (GTK_TABLE (table), sat, 1, 2, 1, 2, + GTK_FILL , GTK_FILL, 0, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, sat, + _("Click to select satellite colour"), + NULL); + if (cfg != NULL) { + rgba = mod_cfg_get_int (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SAT_COL, + SAT_CFG_INT_POLAR_SAT_COL); + } + else { + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_COL); + } + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (sat), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (sat), alpha); + g_signal_connect (sat, "color-set", G_CALLBACK (colour_changed), NULL); - /* selected satellite */ - label = gtk_label_new (_("Selected Sat.:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, - GTK_FILL, GTK_FILL, 0, 0); - ssat = gtk_color_button_new (); - gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (ssat), TRUE); - gtk_table_attach (GTK_TABLE (table), ssat, 3, 4, 1, 2, - GTK_FILL , GTK_FILL, 0, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, ssat, - _("Click to select colour for selected satellites"), - NULL); - if (cfg != NULL) { - rgba = mod_cfg_get_int (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SAT_SEL_COL, - SAT_CFG_INT_POLAR_SAT_SEL_COL); - } - else { - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_SEL_COL); - } - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (ssat), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (ssat), alpha); - g_signal_connect (ssat, "color-set", G_CALLBACK (colour_changed), NULL); + /* selected satellite */ + label = gtk_label_new (_("Selected Sat.:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, + GTK_FILL, GTK_FILL, 0, 0); + ssat = gtk_color_button_new (); + gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (ssat), TRUE); + gtk_table_attach (GTK_TABLE (table), ssat, 3, 4, 1, 2, + GTK_FILL , GTK_FILL, 0, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, ssat, + _("Click to select colour for selected satellites"), + NULL); + if (cfg != NULL) { + rgba = mod_cfg_get_int (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SAT_SEL_COL, + SAT_CFG_INT_POLAR_SAT_SEL_COL); + } + else { + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_SEL_COL); + } + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (ssat), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (ssat), alpha); + g_signal_connect (ssat, "color-set", G_CALLBACK (colour_changed), NULL); - /* tack */ - label = gtk_label_new (_("Sky Track:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 4, 5, 1, 2, - GTK_FILL, GTK_FILL, 0, 0); - track = gtk_color_button_new (); - gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (track), TRUE); - gtk_table_attach (GTK_TABLE (table), track, 5, 6, 1, 2, - GTK_FILL , GTK_FILL, 0, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, track, - _("Click to select track colour"), - NULL); - if (cfg != NULL) { - rgba = mod_cfg_get_int (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_TRACK_COL, - SAT_CFG_INT_POLAR_TRACK_COL); - } - else { - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL); - } - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (track), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (track), alpha); - g_signal_connect (track, "color-set", G_CALLBACK (colour_changed), NULL); + /* tack */ + label = gtk_label_new (_("Sky Track:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach (GTK_TABLE (table), label, 4, 5, 1, 2, + GTK_FILL, GTK_FILL, 0, 0); + track = gtk_color_button_new (); + gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (track), TRUE); + gtk_table_attach (GTK_TABLE (table), track, 5, 6, 1, 2, + GTK_FILL , GTK_FILL, 0, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, track, + _("Click to select track colour"), + NULL); + if (cfg != NULL) { + rgba = mod_cfg_get_int (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_TRACK_COL, + SAT_CFG_INT_POLAR_TRACK_COL); + } + else { + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL); + } + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (track), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (track), alpha); + g_signal_connect (track, "color-set", G_CALLBACK (colour_changed), NULL); - /* Info */ - label = gtk_label_new (_("Info Text:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, - GTK_FILL, GTK_FILL, 0, 0); - info = gtk_color_button_new (); - gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (info), TRUE); - gtk_table_attach (GTK_TABLE (table), info, 1, 2, 2, 3, - GTK_FILL , GTK_FILL, 0, 0); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, info, - _("Click to select background colour"), - NULL); - if (cfg != NULL) { - rgba = mod_cfg_get_int (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_INFO_COL, - SAT_CFG_INT_POLAR_INFO_COL); - } - else { - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_INFO_COL); - } - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (info), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (info), alpha); - g_signal_connect (info, "color-set", G_CALLBACK (colour_changed), NULL); + /* Info */ + label = gtk_label_new (_("Info Text:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, + GTK_FILL, GTK_FILL, 0, 0); + info = gtk_color_button_new (); + gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (info), TRUE); + gtk_table_attach (GTK_TABLE (table), info, 1, 2, 2, 3, + GTK_FILL , GTK_FILL, 0, 0); + tips = gtk_tooltips_new (); + gtk_tooltips_set_tip (tips, info, + _("Click to select background colour"), + NULL); + if (cfg != NULL) { + rgba = mod_cfg_get_int (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_INFO_COL, + SAT_CFG_INT_POLAR_INFO_COL); + } + else { + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_INFO_COL); + } + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (info), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (info), alpha); + g_signal_connect (info, "color-set", G_CALLBACK (colour_changed), NULL); - // *info; + // *info; } +/** \brief Create miscellaneous config widgets. + * \param cfg The module configuration or NULL in global mode. + * \param vbox The container box in which the widgets should be packed into. + * + */ +static void + create_misc_selectors (GKeyFile *cfg, GtkBox *vbox) +{ + GtkWidget *label; + GtkWidget *hbox; + + + /* create header */ + label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_markup (GTK_LABEL (label), + _("<b>Miscellaneous:</b>")); + gtk_box_pack_start (vbox, label, FALSE, TRUE, 0); + + /* horizontal box to contain the radio buttons */ + hbox = gtk_hbox_new (TRUE, 10); + gtk_box_pack_start (vbox, hbox, FALSE, TRUE, 0); + + /* show sky tracks */ + showtrack = gtk_check_button_new_with_label (_("Show the sky tracks automatically")); + gtk_widget_set_tooltip_text (showtrack, + _("Automatically show the sky track of a satellite "\ + "when it comes in range. You can always turn the "\ + "sky track OFF for each individual object")); + if (cfg != NULL) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (showtrack), + mod_cfg_get_bool (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_TRACK_AUTO, + SAT_CFG_BOOL_POL_SHOW_TRACK_AUTO)); + } + else { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (showtrack), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_TRACK_AUTO)); + } + g_signal_connect (showtrack, "toggled", G_CALLBACK (content_changed), NULL); + gtk_box_pack_start (GTK_BOX (hbox), showtrack, FALSE, TRUE, 0); + +} + + + + /** \brief Create RESET button. * \param cfg Config data or NULL in global mode. * \param vbox The container. * * This function creates and sets up the RESET button. */ -static void -create_reset_button (GKeyFile *cfg, GtkBox *vbox) +static void create_reset_button (GKeyFile *cfg, GtkBox *vbox) { - GtkWidget *button; - GtkWidget *butbox; - GtkTooltips *tips; + GtkWidget *button; + GtkWidget *butbox; - button = gtk_button_new_with_label (_("Reset")); - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (reset_cb), cfg); - tips = gtk_tooltips_new (); - if (cfg == NULL) { - gtk_tooltips_set_tip (tips, button, - _("Reset settings to the default values."), - NULL); - } - else { - gtk_tooltips_set_tip (tips, button, - _("Reset module settings to the global values."), - NULL); - } + button = gtk_button_new_with_label (_("Reset")); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (reset_cb), cfg); - butbox = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (butbox), GTK_BUTTONBOX_END); - gtk_box_pack_end (GTK_BOX (butbox), button, FALSE, TRUE, 10); + if (cfg == NULL) { + gtk_widget_set_tooltip_text (button, + _("Reset settings to the default values.")); - gtk_box_pack_end (vbox, butbox, FALSE, TRUE, 0); + } + else { + gtk_widget_set_tooltip_text (button, + _("Reset module settings to the global values.")); + } + + butbox = gtk_hbutton_box_new (); + gtk_button_box_set_layout (GTK_BUTTON_BOX (butbox), GTK_BUTTONBOX_END); + gtk_box_pack_end (GTK_BOX (butbox), button, FALSE, TRUE, 10); + + gtk_box_pack_end (vbox, butbox, FALSE, TRUE, 0); } @@ -605,15 +653,14 @@ * Note that this function is called also for the button that is unchecked, * */ -static void -orient_chganged (GtkToggleButton *but, gpointer data) +static void orient_chganged (GtkToggleButton *but, gpointer data) { - if (gtk_toggle_button_get_active (but)) { + if (gtk_toggle_button_get_active (but)) { - orient = GPOINTER_TO_INT (data); - dirty = TRUE; + orient = GPOINTER_TO_INT (data); + dirty = TRUE; - } + } } @@ -624,10 +671,9 @@ * We don't need to do anything but set the dirty flag since the values can * always be obtained from the global widgets. */ -static void -content_changed (GtkToggleButton *but, gpointer data) +static void content_changed (GtkToggleButton *but, gpointer data) { - dirty = TRUE; + dirty = TRUE; } @@ -638,10 +684,9 @@ * We don't need to do anything but set the dirty flag since the values can * always be obtained from the global widgets. */ -static void -colour_changed (GtkWidget *but, gpointer data) +static void colour_changed (GtkWidget *but, gpointer data) { - dirty = TRUE; + dirty = TRUE; } @@ -654,363 +699,391 @@ * in "local" mode (when cfg != NULL) the function will reset the module settings to * the global settings. This is done by removing the corresponding key from the GKeyFile. */ -static void -reset_cb (GtkWidget *button, gpointer cfg) +static void reset_cb (GtkWidget *button, gpointer cfg) { - GdkColor col; - guint16 alpha; - guint rgba; + GdkColor col; + guint16 alpha; + guint rgba; - if (cfg == NULL) { - /* global mode, get defaults */ + if (cfg == NULL) { + /* global mode, get defaults */ - /* extra contents */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qth), - sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_QTH_INFO)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (next), - sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_NEXT_EV)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (curs), - sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_CURS_TRACK)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xtick), - sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS)); + /* extra contents */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qth), + sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_QTH_INFO)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (next), + sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_NEXT_EV)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (curs), + sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_CURS_TRACK)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xtick), + sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS)); - /* colours */ - rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_BGD_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (bgd), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (bgd), alpha); + /* colours */ + rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_BGD_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (bgd), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (bgd), alpha); - rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_AXIS_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (axis), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (axis), alpha); + rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_AXIS_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (axis), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (axis), alpha); - rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_TICK_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (tick), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (tick), alpha); - - rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_SAT_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (sat), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (sat), alpha); + rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_TICK_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (tick), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (tick), alpha); - rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_SAT_SEL_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (ssat), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (ssat), alpha); + rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_SAT_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (sat), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (sat), alpha); - rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_TRACK_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (track), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (track), alpha); + rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_SAT_SEL_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (ssat), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (ssat), alpha); - rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_INFO_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (info), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (info), alpha); - } - else { - /* local mode, get global value */ + rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_TRACK_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (track), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (track), alpha); - /* extra contents */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qth), - sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (next), - sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_NEXT_EV)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (curs), - sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_CURS_TRACK)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xtick), - sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS)); + rgba = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_INFO_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (info), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (info), alpha); - /* colours */ - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_BGD_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (bgd), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (bgd), alpha); + /* misc */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (showtrack), + sat_cfg_get_bool_def (SAT_CFG_BOOL_POL_SHOW_TRACK_AUTO)); - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_AXIS_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (axis), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (axis), alpha); + } + else { + /* local mode, get global value */ - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_TICK_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (tick), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (tick), alpha); - - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (sat), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (sat), alpha); + /* extra contents */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (qth), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (next), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_NEXT_EV)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (curs), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_CURS_TRACK)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xtick), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS)); - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_SEL_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (ssat), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (ssat), alpha); + /* colours */ + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_BGD_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (bgd), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (bgd), alpha); - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (track), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (track), alpha); + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_AXIS_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (axis), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (axis), alpha); - rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_INFO_COL); - rgba2gdk (rgba, &col, &alpha); - gtk_color_button_set_color (GTK_COLOR_BUTTON (info), &col); - gtk_color_button_set_alpha (GTK_COLOR_BUTTON (info), alpha); - } + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_TICK_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (tick), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (tick), alpha); - /* orientation needs some special attention */ - if (cfg == NULL) { - orient = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_ORIENTATION); - } - else { - orient = sat_cfg_get_int (SAT_CFG_INT_POLAR_ORIENTATION); - } + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (sat), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (sat), alpha); - switch (orient) { + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_SAT_SEL_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (ssat), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (ssat), alpha); - case POLAR_VIEW_NESW: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nesw), TRUE); - break; + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (track), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (track), alpha); - case POLAR_VIEW_NWSE: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nwse), TRUE); - break; + rgba = sat_cfg_get_int (SAT_CFG_INT_POLAR_INFO_COL); + rgba2gdk (rgba, &col, &alpha); + gtk_color_button_set_color (GTK_COLOR_BUTTON (info), &col); + gtk_color_button_set_alpha (GTK_COLOR_BUTTON (info), alpha); - case POLAR_VIEW_SENW: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (senw), TRUE); - break; + /* misc */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (showtrack), + sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_TRACK_AUTO)); - case POLAR_VIEW_SWNE: - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (swne), TRUE); - break; + } - default: - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s:%s: Invalid chart orientation %d (using N/E/S/W)"), - __FILE__, __FUNCTION__, orient); - orient = POLAR_VIEW_NESW; - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nesw), TRUE); - break; - } + /* orientation needs some special attention */ + if (cfg == NULL) { + orient = sat_cfg_get_int_def (SAT_CFG_INT_POLAR_ORIENTATION); + } + else { + orient = sat_cfg_get_int (SAT_CFG_INT_POLAR_ORIENTATION); + } - /* reset flags */ - reset = TRUE; - dirty = FALSE; + switch (orient) { + + case POLAR_VIEW_NESW: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nesw), TRUE); + break; + + case POLAR_VIEW_NWSE: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nwse), TRUE); + break; + + case POLAR_VIEW_SENW: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (senw), TRUE); + break; + + case POLAR_VIEW_SWNE: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (swne), TRUE); + break; + + default: + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s:%s: Invalid chart orientation %d (using N/E/S/W)"), + __FILE__, __FUNCTION__, orient); + orient = POLAR_VIEW_NESW; + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nesw), TRUE); + break; + } + + /* reset flags */ + reset = TRUE; + dirty = FALSE; } /** \brief User pressed cancel. Any changes to config must be cancelled. */ -void -sat_pref_polar_view_cancel (GKeyFile *cfg) +void sat_pref_polar_view_cancel (GKeyFile *cfg) { - dirty = FALSE; + dirty = FALSE; } /** \brief User pressed OK. Any changes should be stored in config. */ -void -sat_pref_polar_view_ok (GKeyFile *cfg) +void sat_pref_polar_view_ok (GKeyFile *cfg) { - guint rgba; - guint16 alpha; - GdkColor col; + guint rgba; + guint16 alpha; + GdkColor col; - if (dirty) { - if (cfg != NULL) { - /* use g_key_file_set_xxx */ + if (dirty) { + if (cfg != NULL) { + /* use g_key_file_set_xxx */ - /* orientation */ - g_key_file_set_integer (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_ORIENTATION, - orient); - /* extra contents */ - g_key_file_set_boolean (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SHOW_QTH_INFO, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (qth))); - g_key_file_set_boolean (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SHOW_NEXT_EVENT, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (next))); - g_key_file_set_boolean (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SHOW_CURS_TRACK, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (curs))); - g_key_file_set_boolean (cfg, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_SHOW_EXTRA_AZ_TICKS, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (xtick))); - /* colours */ - gtk_color_button_get_color (GTK_COLOR_BUTTON (bgd), &col); - alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (bgd)); - gdk2rgba (&col, alpha, &rgba); - g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_BGD_COL,rgba); + /* orientation */ + g_key_file_set_integer (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_ORIENTATION, + orient); + /* extra contents */ + g_key_file_set_boolean (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_QTH_INFO, + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (qth))); + g_key_file_set_boolean (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_NEXT_EVENT, + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (next))); + g_key_file_set_boolean (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_CURS_TRACK, + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (curs))); + g_key_file_set_boolean (cfg, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_EXTRA_AZ_TICKS, + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (xtick))); - gtk_color_button_get_color (GTK_COLOR_BUTTON (axis), &col); - alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (axis)); - gdk2rgba (&col, alpha, &rgba); - g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_AXIS_COL,rgba); + /* colours */ + gtk_color_button_get_color (GTK_COLOR_BUTTON (bgd), &col); + alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (bgd)); + gdk2rgba (&col, alpha, &rgba); + g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_BGD_COL,rgba); - gtk_color_button_get_color (GTK_COLOR_BUTTON (tick), &col); - alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (tick)); - gdk2rgba (&col, alpha, &rgba); - g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_TICK_COL,rgba); + gtk_color_button_get_color (GTK_COLOR_BUTTON (axis), &col); + alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (axis)); + gdk2rgba (&col, alpha, &rgba); + g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_AXIS_COL,rgba); - gtk_color_button_get_color (GTK_COLOR_BUTTON (sat), &col); - alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (sat)); - gdk2rgba (&col, alpha, &rgba); - g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_SAT_COL,rgba); + gtk_color_button_get_color (GTK_COLOR_BUTTON (tick), &col); + alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (tick)); + gdk2rgba (&col, alpha, &rgba); + g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_TICK_COL,rgba); - gtk_color_button_get_color (GTK_COLOR_BUTTON (ssat), &col); - alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (ssat)); - gdk2rgba (&col, alpha, &rgba); - g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_SAT_SEL_COL,rgba); + gtk_color_button_get_color (GTK_COLOR_BUTTON (sat), &col); + alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (sat)); + gdk2rgba (&col, alpha, &rgba); + g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_SAT_COL,rgba); - gtk_color_button_get_color (GTK_COLOR_BUTTON (info), &col); - alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (info)); - gdk2rgba (&col, alpha, &rgba); - g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_INFO_COL,rgba); + gtk_color_button_get_color (GTK_COLOR_BUTTON (ssat), &col); + alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (ssat)); + gdk2rgba (&col, alpha, &rgba); + g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_SAT_SEL_COL,rgba); - gtk_color_button_get_color (GTK_COLOR_BUTTON (track), &col); - alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (track)); - gdk2rgba (&col, alpha, &rgba); - g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_TRACK_COL,rgba); - } - else { - /* use sat_cfg_set_xxx */ + gtk_color_button_get_color (GTK_COLOR_BUTTON (info), &col); + alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (info)); + gdk2rgba (&col, alpha, &rgba); + g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_INFO_COL,rgba); - /* orientation */ - sat_cfg_set_int (SAT_CFG_INT_POLAR_ORIENTATION, orient); - /* extra contents */ - sat_cfg_set_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (qth))); - sat_cfg_set_bool (SAT_CFG_BOOL_POL_SHOW_NEXT_EV, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (next))); - sat_cfg_set_bool (SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (curs))); - sat_cfg_set_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (xtick))); + gtk_color_button_get_color (GTK_COLOR_BUTTON (track), &col); + alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON (track)); + gdk2rgba (&col, alpha, &rgba); + g_key_file_set_integer (cfg,MOD_CFG_POLAR_SECTION,MOD_CFG_POLAR_TRACK_COL,rgba); - /* colours */ - gtk_color_button_get_color (GTK_COLOR_BUTTON (bgd), &col); - alpha = gtk_color_button_get_alpha (GTK_COLOR_BUTTON ... [truncated message content] |
From: <cs...@us...> - 2009-09-27 16:27:00
|
Revision: 449 http://gpredict.svn.sourceforge.net/gpredict/?rev=449&view=rev Author: csete Date: 2009-09-27 16:26:52 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Updated. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-27 16:25:47 UTC (rev 448) +++ trunk/ChangeLog 2009-09-27 16:26:52 UTC (rev 449) @@ -6,7 +6,18 @@ * src/gtk-sky-at-glance.c: Fixed bug 2691499: Sky at glance crashes with empty module. + * src/sat-cfg.[ch]: + * src/config-keys.h: + Addd configuration flag for automatically showing the sky tracks in + the Polar views. + * src/gtk-polar-view.[ch]: + Added support for automatically showing the sky tracks. + + * src/gtk-sat-module-tmg.c: + Disabled tooltip since it was too annoying when using the scroll wheel. + + 2009-09-25 Alexandru Csete <oz9aec at gmail.com> * src/gtk-sat-module-tmg.c: Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2009-09-27 16:25:47 UTC (rev 448) +++ trunk/NEWS 2009-09-27 16:26:52 UTC (rev 449) @@ -9,6 +9,7 @@ * Added new Satellite Editor that allows adding/editing/deleting satellite data in a convenient UI, including... - Added a slider control to the Time Controller. +- Added config option to automatically show the sky tracks on the polar view. - Fixed bug 2116693: List view does not sort properly for all time formats. - Fixed bug 2836265: Time controls should wrap around their limits. - Fixed bug 2691499: Sky at glance crashes with empty module. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 16:26:04
|
Revision: 448 http://gpredict.svn.sourceforge.net/gpredict/?rev=448&view=rev Author: csete Date: 2009-09-27 16:25:47 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Tooltip is annoying when we use scroll wheel. Modified Paths: -------------- trunk/src/gtk-sat-module-tmg.c Modified: trunk/src/gtk-sat-module-tmg.c =================================================================== --- trunk/src/gtk-sat-module-tmg.c 2009-09-27 16:21:46 UTC (rev 447) +++ trunk/src/gtk-sat-module-tmg.c 2009-09-27 16:25:47 UTC (rev 448) @@ -266,9 +266,9 @@ /* add slider */ mod->tmgSlider = gtk_hscale_new_with_range (-0.1, +0.1, 0.0001); // +/- 2.5 hr - gtk_widget_set_tooltip_text (mod->tmgSlider, + /*gtk_widget_set_tooltip_text (mod->tmgSlider, _("Drag the slider to change the time up to +/- 2.5 hours.\n"\ - "Resolution is ~ 8 seconds.")); + "Resolution is ~ 8 seconds."));*/ gtk_scale_set_draw_value (GTK_SCALE (mod->tmgSlider), FALSE); gtk_range_set_value (GTK_RANGE (mod->tmgSlider), 0.0); g_signal_connect (mod->tmgSlider, "value-changed", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 16:22:01
|
Revision: 447 http://gpredict.svn.sourceforge.net/gpredict/?rev=447&view=rev Author: csete Date: 2009-09-27 16:21:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Added support for automatically showing the sky tracks. Modified Paths: -------------- trunk/src/gtk-polar-view.c trunk/src/gtk-polar-view.h Modified: trunk/src/gtk-polar-view.c =================================================================== --- trunk/src/gtk-polar-view.c 2009-09-27 16:15:21 UTC (rev 446) +++ trunk/src/gtk-polar-view.c 2009-09-27 16:21:46 UTC (rev 447) @@ -64,6 +64,7 @@ gpointer data); static void update_sat (gpointer key, gpointer value, gpointer data); static void update_track (gpointer key, gpointer value, gpointer data); +static void create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat); static void correct_pole_coor (GtkPolarView *polv, polar_view_pole_t pole, gfloat *x, gfloat *y, GtkAnchorType *anch); static gboolean on_motion_notify (GooCanvasItem *item, @@ -200,6 +201,12 @@ MOD_CFG_POLAR_REFRESH, SAT_CFG_INT_POLAR_REFRESH); + GTK_POLAR_VIEW (polv)->showtrack = mod_cfg_get_bool (cfgdata, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_SHOW_TRACK_AUTO, + SAT_CFG_BOOL_POL_SHOW_TRACK_AUTO); + + GTK_POLAR_VIEW (polv)->counter = 1; GTK_POLAR_VIEW (polv)->swap = mod_cfg_get_int (cfgdata, @@ -281,6 +288,7 @@ MOD_CFG_POLAR_AXIS_COL, SAT_CFG_INT_POLAR_AXIS_COL); + /* Add elevation circles at 0, 30 and 60 deg */ polv->C00 = goo_canvas_ellipse_model_new (root, polv->cx, polv->cy, @@ -938,7 +946,7 @@ /* add sat to canvas */ obj = g_try_new (sat_obj_t, 1); obj->selected = FALSE; - obj->showtrack = FALSE; + obj->showtrack = polv->showtrack; obj->istarget = FALSE; root = goo_canvas_get_root_item_model (GOO_CANVAS (polv->canvas)); @@ -976,6 +984,10 @@ /* add sat to hash table */ g_hash_table_insert (polv->obj, catnum, obj); + + /* Finally, create the sky track if necessary */ + if (obj->showtrack) + create_track (polv, obj, sat); } } @@ -1046,6 +1058,151 @@ } +/**** FIXME: DUPLICATE from gtk-polar-view-popup.c - needed by create_track ******/ +static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y) +{ + GooCanvasItemModel *item; + time_t t; + gchar buff[7]; + GtkAnchorType anchor; + GooCanvasItemModel *root; + guint32 col; + + root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); + + col = mod_cfg_get_int (pv->cfgdata, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_TRACK_COL, + SAT_CFG_INT_POLAR_TRACK_COL); + + /* convert julian date to struct tm */ + t = (time - 2440587.5)*86400.; + + /* format either local time or UTC depending on check box */ + if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) + strftime (buff, 8, "%H:%M", localtime (&t)); + else + strftime (buff, 8, "%H:%M", gmtime (&t)); + + buff[6]='\0'; + + if (x > pv->cx) { + anchor = GTK_ANCHOR_EAST; + x -= 5; + } + else { + anchor = GTK_ANCHOR_WEST; + x += 5; + } + + item = goo_canvas_text_model_new (root, buff, + (gdouble) x, (gdouble) y, + -1, anchor, + "font", "Sans 7", + "fill-color-rgba", col, + NULL); + + goo_canvas_item_model_lower (item, NULL); + + return item; +} + +/** \brief Create a sky track for a satellite. + * \param pv Pointer to the GtkPolarView object. + * \param obj Pointer to the sat_obj_t object. + * \param sat Pointer to the sat_t object. + * + * Note: This function is only used when the the satellite comes within range + * and the ALWAYS_SHOW_SKY_TRACK option is TRUE. + */ +static void create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat) +{ + gint i; + GooCanvasItemModel *root; + pass_detail_t *detail; + guint num; + GooCanvasPoints *points; + gfloat x,y; + guint32 col; + guint tres,ttidx; + + + /* get satellite object */ + /*obj = SAT_OBJ(g_object_get_data (G_OBJECT (item), "obj")); + sat = SAT(g_object_get_data (G_OBJECT (item), "sat")); + qth = (qth_t *)(g_object_get_data (G_OBJECT (item), "qth"));*/ + + if (obj == NULL) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s:%d: Failed to get satellite object."), + __FILE__, __LINE__); + return; + } + + root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); + + /* add sky track */ + + /* create points */ + num = g_slist_length (obj->pass->details); + + /* time resolution for time ticks; we need + 3 additional points to AOS and LOS ticks. + */ + tres = (num-2) / (TRACK_TICK_NUM-1); + + points = goo_canvas_points_new (num); + + /* first point should be (aos_az,0.0) */ + azel_to_xy (pv, obj->pass->aos_az, 0.0, &x, &y); + points->coords[0] = (double) x; + points->coords[1] = (double) y; + obj->trtick[0] = create_time_tick (pv, obj->pass->aos, x, y); + + ttidx = 1; + + for (i = 1; i < num-1; i++) { + detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i)); + azel_to_xy (pv, detail->az, detail->el, &x, &y); + points->coords[2*i] = (double) x; + points->coords[2*i+1] = (double) y; + + if (!(i % tres)) { + /* create a time tick */ + obj->trtick[ttidx] = create_time_tick (pv, detail->time, x, y); + ttidx++; + } + } + + /* last point should be (los_az, 0.0) */ + azel_to_xy (pv, obj->pass->los_az, 0.0, &x, &y); + points->coords[2*(num-1)] = (double) x; + points->coords[2*(num-1)+1] = (double) y; + + /* create poly-line */ + col = mod_cfg_get_int (pv->cfgdata, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_TRACK_COL, + SAT_CFG_INT_POLAR_TRACK_COL); + + obj->track = goo_canvas_polyline_model_new (root, FALSE, 0, + "points", points, + "line-width", 1.0, + "stroke-color-rgba", col, + "line-cap", CAIRO_LINE_CAP_SQUARE, + "line-join", CAIRO_LINE_JOIN_MITER, + NULL); + goo_canvas_points_unref (points); + + /* put track on the bottom of the sack */ + goo_canvas_item_model_lower (obj->track, NULL); + +} + + + + + /** \brief Convert Az/El to canvas based XY coordinates. */ void azel_to_xy (GtkPolarView *p, gdouble az, gdouble el, gfloat *x, gfloat *y) Modified: trunk/src/gtk-polar-view.h =================================================================== --- trunk/src/gtk-polar-view.h 2009-09-27 16:15:21 UTC (rev 446) +++ trunk/src/gtk-polar-view.h 2009-09-27 16:21:46 UTC (rev 447) @@ -130,6 +130,7 @@ gboolean eventinfo; /*!< Show info about the next event. */ gboolean cursinfo; /*!< Track the mouse cursor. */ gboolean extratick; /*!< Show extra ticks */ + gboolean showtrack; /*!< Automatically show sky tracks. */ gboolean resize; /*!< Flag indicating that the view has been resized. */ }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 16:15:31
|
Revision: 446 http://gpredict.svn.sourceforge.net/gpredict/?rev=446&view=rev Author: csete Date: 2009-09-27 16:15:21 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Addd configuration flag for automatically showing the sky tracks in the Polar views. Modified Paths: -------------- trunk/src/config-keys.h Modified: trunk/src/config-keys.h =================================================================== --- trunk/src/config-keys.h 2009-09-27 16:03:19 UTC (rev 445) +++ trunk/src/config-keys.h 2009-09-27 16:15:21 UTC (rev 446) @@ -110,6 +110,7 @@ #define MOD_CFG_POLAR_SHOW_NEXT_EVENT "NEXT_EVENT" #define MOD_CFG_POLAR_SHOW_CURS_TRACK "CURSOR_TRACK" #define MOD_CFG_POLAR_SHOW_EXTRA_AZ_TICKS "EXTRA_AZ_TICKS" +#define MOD_CFG_POLAR_SHOW_TRACK_AUTO "SHOW_TRACK" #define MOD_CFG_POLAR_BGD_COL "BGD_COLOUR" #define MOD_CFG_POLAR_AXIS_COL "AXIS_COLOUR" #define MOD_CFG_POLAR_TICK_COL "TICK_COLOUR" @@ -119,6 +120,7 @@ #define MOD_CFG_POLAR_INFO_COL "INFO_COLOUR" #define MOD_CFG_POLAR_FONT "TEXT_FONT" + /* single sat */ #define MOD_CFG_SINGLE_SAT_SECTION "SINGLE_SAT" #define MOD_CFG_SINGLE_SAT_REFRESH "REFRESH" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 16:03:27
|
Revision: 445 http://gpredict.svn.sourceforge.net/gpredict/?rev=445&view=rev Author: csete Date: 2009-09-27 16:03:19 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Addd configuration flag for automatically showing the sky tracks in the Polar views. Modified Paths: -------------- trunk/src/sat-cfg.c trunk/src/sat-cfg.h Modified: trunk/src/sat-cfg.c =================================================================== --- trunk/src/sat-cfg.c 2009-09-27 15:45:35 UTC (rev 444) +++ trunk/src/sat-cfg.c 2009-09-27 16:03:19 UTC (rev 445) @@ -130,6 +130,7 @@ { "MODULES", "POLAR_NEXT_EVENT", TRUE}, { "MODULES", "POLAR_CURSOR_TRACK", TRUE}, { "MODULES", "POLAR_EXTRA_AZ_TICKS", FALSE}, + { "MODULES", "POLAR_SHOW_TRACK_AUTO", FALSE}, { "TLE", "SERVER_AUTH", FALSE}, { "TLE", "PROXY_AUTH", FALSE}, { "TLE", "ADD_NEW_SATS", TRUE}, Modified: trunk/src/sat-cfg.h =================================================================== --- trunk/src/sat-cfg.h 2009-09-27 15:45:35 UTC (rev 444) +++ trunk/src/sat-cfg.h 2009-09-27 16:03:19 UTC (rev 445) @@ -51,6 +51,7 @@ SAT_CFG_BOOL_POL_SHOW_NEXT_EV, /*!< Show next event on polar plot */ SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, /*!< Track mouse cursor on polar plot. */ SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, /*!< Extra Az ticks at every 30 deg. */ + SAT_CFG_BOOL_POL_SHOW_TRACK_AUTO, /*!< Automatically show the sky track. */ SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */ SAT_CFG_BOOL_TLE_PROXY_AUTH, /*!< Proxy requires authentication. */ SAT_CFG_BOOL_TLE_ADD_NEW, /*!< Add new satellites to database. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 15:45:45
|
Revision: 444 http://gpredict.svn.sourceforge.net/gpredict/?rev=444&view=rev Author: csete Date: 2009-09-27 15:45:35 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Fix indent. Modified Paths: -------------- trunk/src/gtk-polar-view-popup.c Modified: trunk/src/gtk-polar-view-popup.c =================================================================== --- trunk/src/gtk-polar-view-popup.c 2009-09-27 15:36:54 UTC (rev 443) +++ trunk/src/gtk-polar-view-popup.c 2009-09-27 15:45:35 UTC (rev 444) @@ -11,17 +11,17 @@ More details can be found at the project home page: http://gpredict.oz9aec.net/ - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, visit http://www.fsf.org/ */ @@ -63,104 +63,104 @@ * */ void -gtk_polar_view_popup_exec (sat_t *sat, - qth_t *qth, - GtkPolarView *pview, - GdkEventButton *event, - GtkWidget *toplevel) + gtk_polar_view_popup_exec (sat_t *sat, + qth_t *qth, + GtkPolarView *pview, + GdkEventButton *event, + GtkWidget *toplevel) { - GtkWidget *menu; - GtkWidget *menuitem; - GtkWidget *label; - GtkWidget *image; - gchar *buff; - sat_obj_t *obj = NULL; - gint *catnum; + GtkWidget *menu; + GtkWidget *menuitem; + GtkWidget *label; + GtkWidget *image; + gchar *buff; + sat_obj_t *obj = NULL; + gint *catnum; - menu = gtk_menu_new (); + menu = gtk_menu_new (); - /* first menu item is the satellite name, centered */ - menuitem = gtk_image_menu_item_new (); - label = gtk_label_new (NULL); - gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); + /* first menu item is the satellite name, centered */ + menuitem = gtk_image_menu_item_new (); + label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); buff = g_strdup_printf ("<b>%s</b>", sat->nickname); - gtk_label_set_markup (GTK_LABEL (label), buff); - g_free (buff); - gtk_container_add (GTK_CONTAINER (menuitem), label); - image = gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + gtk_label_set_markup (GTK_LABEL (label), buff); + g_free (buff); + gtk_container_add (GTK_CONTAINER (menuitem), label); + image = gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - /* attach data to menuitem and connect callback */ - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_signal_connect (menuitem, "activate", G_CALLBACK (show_sat_info), toplevel); + /* attach data to menuitem and connect callback */ + g_object_set_data (G_OBJECT (menuitem), "sat", sat); + g_object_set_data (G_OBJECT (menuitem), "qth", qth); + g_signal_connect (menuitem, "activate", G_CALLBACK (show_sat_info), toplevel); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* separator */ - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + /* separator */ + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* next pass and predict passes */ - menuitem = gtk_image_menu_item_new_with_label (_("Show next pass")); - image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), pview); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - - menuitem = gtk_image_menu_item_new_with_label (_("Future passes")); - image = gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_passes_cb), pview); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + /* next pass and predict passes */ + menuitem = gtk_image_menu_item_new_with_label (_("Show next pass")); + image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + g_object_set_data (G_OBJECT (menuitem), "sat", sat); + g_object_set_data (G_OBJECT (menuitem), "qth", qth); + g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), pview); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* separator */ - menuitem = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + menuitem = gtk_image_menu_item_new_with_label (_("Future passes")); + image = gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); + g_object_set_data (G_OBJECT (menuitem), "sat", sat); + g_object_set_data (G_OBJECT (menuitem), "qth", qth); + g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_passes_cb), pview); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* get sat obj since we'll need it for the remaining items */ - catnum = g_new0 (gint, 1); - *catnum = sat->tle.catnr; - obj = SAT_OBJ (g_hash_table_lookup (pview->obj, catnum)); - g_free (catnum); + /* separator */ + menuitem = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* show track */ - menuitem = gtk_check_menu_item_new_with_label (_("Sky track")); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "obj", obj); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), obj->showtrack); - g_signal_connect (menuitem, "activate", G_CALLBACK (track_toggled), pview); + /* get sat obj since we'll need it for the remaining items */ + catnum = g_new0 (gint, 1); + *catnum = sat->tle.catnr; + obj = SAT_OBJ (g_hash_table_lookup (pview->obj, catnum)); + g_free (catnum); - /* disable menu item if satellite is geostationary */ - if (sat->otype == ORBIT_TYPE_GEO) - gtk_widget_set_sensitive (menuitem, FALSE); + /* show track */ + menuitem = gtk_check_menu_item_new_with_label (_("Sky track")); + g_object_set_data (G_OBJECT (menuitem), "sat", sat); + g_object_set_data (G_OBJECT (menuitem), "qth", qth); + g_object_set_data (G_OBJECT (menuitem), "obj", obj); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), obj->showtrack); + g_signal_connect (menuitem, "activate", G_CALLBACK (track_toggled), pview); - /* target */ -/* menuitem = gtk_check_menu_item_new_with_label (_("Set as target")); */ -/* g_object_set_data (G_OBJECT (menuitem), "sat", sat); */ -/* g_object_set_data (G_OBJECT (menuitem), "qth", qth); */ -/* g_object_set_data (G_OBJECT (menuitem), "obj", obj); */ -/* gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); */ -/* gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), obj->istarget); */ -/* g_signal_connect (menuitem, "activate", G_CALLBACK (target_toggled), pview); */ + /* disable menu item if satellite is geostationary */ + if (sat->otype == ORBIT_TYPE_GEO) + gtk_widget_set_sensitive (menuitem, FALSE); - gtk_widget_show_all (menu); + /* target */ + /* menuitem = gtk_check_menu_item_new_with_label (_("Set as target")); */ + /* g_object_set_data (G_OBJECT (menuitem), "sat", sat); */ + /* g_object_set_data (G_OBJECT (menuitem), "qth", qth); */ + /* g_object_set_data (G_OBJECT (menuitem), "obj", obj); */ + /* gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); */ + /* gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), obj->istarget); */ + /* g_signal_connect (menuitem, "activate", G_CALLBACK (target_toggled), pview); */ - /* Note: event can be NULL here when called from view_onPopupMenu; - * gdk_event_get_time() accepts a NULL argument */ - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, - (event != NULL) ? event->button : 0, - gdk_event_get_time ((GdkEvent*) event)); - + gtk_widget_show_all (menu); + /* Note: event can be NULL here when called from view_onPopupMenu; + * gdk_event_get_time() accepts a NULL argument */ + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, + (event != NULL) ? event->button : 0, + gdk_event_get_time ((GdkEvent*) event)); + + } @@ -171,114 +171,114 @@ * */ static void -track_toggled (GtkCheckMenuItem *item, gpointer data) + track_toggled (GtkCheckMenuItem *item, gpointer data) { - GtkPolarView *pv = GTK_POLAR_VIEW (data); - sat_obj_t *obj = NULL; - sat_t *sat; - qth_t *qth; - gint idx,i; - GooCanvasItemModel *root; - pass_detail_t *detail; - guint num; - GooCanvasPoints *points; - gfloat x,y; - guint32 col; - guint tres,ttidx; + GtkPolarView *pv = GTK_POLAR_VIEW (data); + sat_obj_t *obj = NULL; + sat_t *sat; + qth_t *qth; + gint idx,i; + GooCanvasItemModel *root; + pass_detail_t *detail; + guint num; + GooCanvasPoints *points; + gfloat x,y; + guint32 col; + guint tres,ttidx; - /* get satellite object */ - obj = SAT_OBJ(g_object_get_data (G_OBJECT (item), "obj")); - sat = SAT(g_object_get_data (G_OBJECT (item), "sat")); - qth = (qth_t *)(g_object_get_data (G_OBJECT (item), "qth")); + /* get satellite object */ + obj = SAT_OBJ(g_object_get_data (G_OBJECT (item), "obj")); + sat = SAT(g_object_get_data (G_OBJECT (item), "sat")); + qth = (qth_t *)(g_object_get_data (G_OBJECT (item), "qth")); - if (obj == NULL) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s:%d: Failed to get satellite object."), - __FILE__, __LINE__); - return; - } + if (obj == NULL) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s:%d: Failed to get satellite object."), + __FILE__, __LINE__); + return; + } - /* toggle flag */ - obj->showtrack = !obj->showtrack; - gtk_check_menu_item_set_active (item, obj->showtrack); + /* toggle flag */ + obj->showtrack = !obj->showtrack; + gtk_check_menu_item_set_active (item, obj->showtrack); - root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); + root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); - if (obj->showtrack) { - /* add sky track */ + if (obj->showtrack) { + /* add sky track */ - /* create points */ - num = g_slist_length (obj->pass->details); + /* create points */ + num = g_slist_length (obj->pass->details); - /* time resolution for time ticks; we need - 3 additional points to AOS and LOS ticks. - */ - tres = (num-2) / (TRACK_TICK_NUM-1); + /* time resolution for time ticks; we need + 3 additional points to AOS and LOS ticks. + */ + tres = (num-2) / (TRACK_TICK_NUM-1); - points = goo_canvas_points_new (num); + points = goo_canvas_points_new (num); - /* first point should be (aos_az,0.0) */ - azel_to_xy (pv, obj->pass->aos_az, 0.0, &x, &y); - points->coords[0] = (double) x; - points->coords[1] = (double) y; - obj->trtick[0] = create_time_tick (pv, obj->pass->aos, x, y); + /* first point should be (aos_az,0.0) */ + azel_to_xy (pv, obj->pass->aos_az, 0.0, &x, &y); + points->coords[0] = (double) x; + points->coords[1] = (double) y; + obj->trtick[0] = create_time_tick (pv, obj->pass->aos, x, y); - ttidx = 1; + ttidx = 1; - for (i = 1; i < num-1; i++) { - detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i)); - azel_to_xy (pv, detail->az, detail->el, &x, &y); - points->coords[2*i] = (double) x; - points->coords[2*i+1] = (double) y; + for (i = 1; i < num-1; i++) { + detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i)); + azel_to_xy (pv, detail->az, detail->el, &x, &y); + points->coords[2*i] = (double) x; + points->coords[2*i+1] = (double) y; - if (!(i % tres)) { - /* create a time tick */ - obj->trtick[ttidx] = create_time_tick (pv, detail->time, x, y); - ttidx++; - } - } + if (!(i % tres)) { + /* create a time tick */ + obj->trtick[ttidx] = create_time_tick (pv, detail->time, x, y); + ttidx++; + } + } - /* last point should be (los_az, 0.0) */ - azel_to_xy (pv, obj->pass->los_az, 0.0, &x, &y); - points->coords[2*(num-1)] = (double) x; - points->coords[2*(num-1)+1] = (double) y; + /* last point should be (los_az, 0.0) */ + azel_to_xy (pv, obj->pass->los_az, 0.0, &x, &y); + points->coords[2*(num-1)] = (double) x; + points->coords[2*(num-1)+1] = (double) y; - /* create poly-line */ - col = mod_cfg_get_int (pv->cfgdata, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_TRACK_COL, - SAT_CFG_INT_POLAR_TRACK_COL); + /* create poly-line */ + col = mod_cfg_get_int (pv->cfgdata, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_TRACK_COL, + SAT_CFG_INT_POLAR_TRACK_COL); - obj->track = goo_canvas_polyline_model_new (root, FALSE, 0, - "points", points, - "line-width", 1.0, - "stroke-color-rgba", col, - "line-cap", CAIRO_LINE_CAP_SQUARE, - "line-join", CAIRO_LINE_JOIN_MITER, - NULL); - goo_canvas_points_unref (points); + obj->track = goo_canvas_polyline_model_new (root, FALSE, 0, + "points", points, + "line-width", 1.0, + "stroke-color-rgba", col, + "line-cap", CAIRO_LINE_CAP_SQUARE, + "line-join", CAIRO_LINE_JOIN_MITER, + NULL); + goo_canvas_points_unref (points); - /* put track on the bottom of the sack */ - goo_canvas_item_model_lower (obj->track, NULL); + /* put track on the bottom of the sack */ + goo_canvas_item_model_lower (obj->track, NULL); - } - else { - /* delete sky track */ - idx = goo_canvas_item_model_find_child (root, obj->track); + } + else { + /* delete sky track */ + idx = goo_canvas_item_model_find_child (root, obj->track); - if (idx != -1) { - goo_canvas_item_model_remove_child (root, idx); - } + if (idx != -1) { + goo_canvas_item_model_remove_child (root, idx); + } - for (i = 0; i < TRACK_TICK_NUM; i++) { - idx = goo_canvas_item_model_find_child (root, obj->trtick[i]); + for (i = 0; i < TRACK_TICK_NUM; i++) { + idx = goo_canvas_item_model_find_child (root, obj->trtick[i]); - if (idx != -1) { - goo_canvas_item_model_remove_child (root, idx); - } - } - } + if (idx != -1) { + goo_canvas_item_model_remove_child (root, idx); + } + } + } } @@ -290,82 +290,82 @@ * */ static void -target_toggled (GtkCheckMenuItem *item, gpointer data) + target_toggled (GtkCheckMenuItem *item, gpointer data) { - sat_obj_t *obj = NULL; + sat_obj_t *obj = NULL; - /* get satellite object */ - obj = SAT_OBJ(g_object_get_data (G_OBJECT (item), "obj")); + /* get satellite object */ + obj = SAT_OBJ(g_object_get_data (G_OBJECT (item), "obj")); - if (obj == NULL) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s:%d: Failed to get satellite object."), - __FILE__, __LINE__); - return; - } + if (obj == NULL) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s:%d: Failed to get satellite object."), + __FILE__, __LINE__); + return; + } - /* toggle flag */ - obj->istarget = !obj->istarget; - gtk_check_menu_item_set_active (item, obj->istarget); + /* toggle flag */ + obj->istarget = !obj->istarget; + gtk_check_menu_item_set_active (item, obj->istarget); } #endif static GooCanvasItemModel * -create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y) + create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y) { - GooCanvasItemModel *item; - time_t t; - gchar buff[7]; - GtkAnchorType anchor; - GooCanvasItemModel *root; - guint32 col; + GooCanvasItemModel *item; + time_t t; + gchar buff[7]; + GtkAnchorType anchor; + GooCanvasItemModel *root; + guint32 col; - root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); + root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); - col = mod_cfg_get_int (pv->cfgdata, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_TRACK_COL, - SAT_CFG_INT_POLAR_TRACK_COL); + col = mod_cfg_get_int (pv->cfgdata, + MOD_CFG_POLAR_SECTION, + MOD_CFG_POLAR_TRACK_COL, + SAT_CFG_INT_POLAR_TRACK_COL); - /* convert julian date to struct tm */ - t = (time - 2440587.5)*86400.; + /* convert julian date to struct tm */ + t = (time - 2440587.5)*86400.; - /* format either local time or UTC depending on check box */ - if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) - strftime (buff, 8, "%H:%M", localtime (&t)); - else - strftime (buff, 8, "%H:%M", gmtime (&t)); - - buff[6]='\0'; + /* format either local time or UTC depending on check box */ + if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) + strftime (buff, 8, "%H:%M", localtime (&t)); + else + strftime (buff, 8, "%H:%M", gmtime (&t)); - if (x > pv->cx) { - anchor = GTK_ANCHOR_EAST; - x -= 5; - } - else { - anchor = GTK_ANCHOR_WEST; - x += 5; - } + buff[6]='\0'; - item = goo_canvas_text_model_new (root, buff, - (gdouble) x, (gdouble) y, - -1, anchor, - "font", "Sans 7", - "fill-color-rgba", col, - NULL); + if (x > pv->cx) { + anchor = GTK_ANCHOR_EAST; + x -= 5; + } + else { + anchor = GTK_ANCHOR_WEST; + x += 5; + } - goo_canvas_item_model_lower (item, NULL); + item = goo_canvas_text_model_new (root, buff, + (gdouble) x, (gdouble) y, + -1, anchor, + "font", "Sans 7", + "fill-color-rgba", col, + NULL); - return item; + goo_canvas_item_model_lower (item, NULL); + + return item; } static void -show_next_pass_cb (GtkWidget *menuitem, gpointer data) + show_next_pass_cb (GtkWidget *menuitem, gpointer data) { GtkPolarView *pv = GTK_POLAR_VIEW (data); sat_t *sat; @@ -381,7 +381,7 @@ /* check wheather sat actially has AOS */ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) && - has_aos (sat, qth)) { + has_aos (sat, qth)) { if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) { pass = get_next_pass (sat, qth, sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD)); @@ -409,24 +409,24 @@ gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } - } - else { - /* show dialog telling that this sat never reaches AOS*/ - dialog = gtk_message_dialog_new (toplevel, - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, + } + else { + /* show dialog telling that this sat never reaches AOS*/ + dialog = gtk_message_dialog_new (toplevel, + GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, _("Satellite %s has no passes for\n"\ "the current ground station!\n\n"\ "This can be because the satellite\n"\ "is geostationary, decayed or simply\n"\ "never comes above the horizon"), - sat->nickname); + sat->nickname); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } } @@ -446,7 +446,7 @@ /* check wheather sat actially has AOS */ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) && - has_aos (sat, qth)) { + has_aos (sat, qth)) { if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) { passes = get_next_passes (sat, qth, @@ -480,22 +480,22 @@ gtk_widget_destroy (dialog); } - } - else { - /* show dialog */ - GtkWidget *dialog; + } + else { + /* show dialog */ + GtkWidget *dialog; - dialog = gtk_message_dialog_new (toplevel, - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("Satellite %s has no passes for\n"\ - "the current ground station!"), - sat->nickname); + dialog = gtk_message_dialog_new (toplevel, + GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Satellite %s has no passes for\n"\ + "the current ground station!"), + sat->nickname); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 15:37:01
|
Revision: 443 http://gpredict.svn.sourceforge.net/gpredict/?rev=443&view=rev Author: csete Date: 2009-09-27 15:36:54 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Fixed bug 2691499: Sky at glance crashes with empty module. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/gtk-sky-glance.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-27 14:15:02 UTC (rev 442) +++ trunk/ChangeLog 2009-09-27 15:36:54 UTC (rev 443) @@ -3,7 +3,10 @@ * src/tle-update.c: Synchronise satellite categories during TLE update. + * src/gtk-sky-at-glance.c: + Fixed bug 2691499: Sky at glance crashes with empty module. + 2009-09-25 Alexandru Csete <oz9aec at gmail.com> * src/gtk-sat-module-tmg.c: Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2009-09-27 14:15:02 UTC (rev 442) +++ trunk/NEWS 2009-09-27 15:36:54 UTC (rev 443) @@ -11,6 +11,7 @@ - Added a slider control to the Time Controller. - Fixed bug 2116693: List view does not sort properly for all time formats. - Fixed bug 2836265: Time controls should wrap around their limits. +- Fixed bug 2691499: Sky at glance crashes with empty module. * Binary packages for Windows, Mac OS X, Ubuntu and generic Linux. Modified: trunk/src/gtk-sky-glance.c =================================================================== --- trunk/src/gtk-sky-glance.c 2009-09-27 14:15:02 UTC (rev 442) +++ trunk/src/gtk-sky-glance.c 2009-09-27 15:36:54 UTC (rev 443) @@ -228,7 +228,18 @@ GtkWidget *skg; GooCanvasItemModel *root; GdkColor bg_color = {0, 0xFFFF, 0xFFFF, 0xFFFF}; + guint number; + + /* check that we have at least one satellite */ + number = g_hash_table_size (sats); + if (number == 0) { + /* no satellites */ + skg = gtk_label_new (_("This module has no satellites!")); + + return skg; + } + skg = g_object_new (GTK_TYPE_SKY_GLANCE, NULL); /* FIXME? */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-09-27 14:15:20
|
Revision: 442 http://gpredict.svn.sourceforge.net/gpredict/?rev=442&view=rev Author: csete Date: 2009-09-27 14:15:02 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Updated year. Modified Paths: -------------- trunk/src/about.c trunk/src/about.h trunk/src/compat.c trunk/src/compat.h trunk/src/config-keys.h trunk/src/defaults.h trunk/src/first-time.c trunk/src/first-time.h trunk/src/gpredict-help.c trunk/src/gpredict-help.h trunk/src/gpredict-url-hook.c trunk/src/gpredict-url-hook.h trunk/src/gpredict-utils.c trunk/src/gpredict-utils.h trunk/src/gtk-azel-plot.c trunk/src/gtk-azel-plot.h trunk/src/gtk-freq-knob.c trunk/src/gtk-freq-knob.h trunk/src/gtk-polar-plot.c trunk/src/gtk-polar-plot.h trunk/src/gtk-polar-view-popup.c trunk/src/gtk-polar-view-popup.h trunk/src/gtk-polar-view.c trunk/src/gtk-polar-view.h trunk/src/gtk-rig-ctrl.c trunk/src/gtk-rig-ctrl.h trunk/src/gtk-rot-ctrl.c trunk/src/gtk-rot-ctrl.h trunk/src/gtk-rot-knob.c trunk/src/gtk-rot-knob.h trunk/src/gtk-sat-data.c trunk/src/gtk-sat-data.h trunk/src/gtk-sat-list-col-sel.c trunk/src/gtk-sat-list-col-sel.h trunk/src/gtk-sat-list-popup.c trunk/src/gtk-sat-list-popup.h trunk/src/gtk-sat-list.c trunk/src/gtk-sat-list.h trunk/src/gtk-sat-map-ground-track.c trunk/src/gtk-sat-map-ground-track.h trunk/src/gtk-sat-map-popup.c trunk/src/gtk-sat-map-popup.h trunk/src/gtk-sat-map.c trunk/src/gtk-sat-map.h trunk/src/gtk-sat-module-popup.c trunk/src/gtk-sat-module-popup.h trunk/src/gtk-sat-module-tmg.c trunk/src/gtk-sat-module-tmg.h trunk/src/gtk-sat-module.c trunk/src/gtk-sat-module.h trunk/src/gtk-sat-selector.c trunk/src/gtk-sat-selector.h trunk/src/gtk-sat-tree.c trunk/src/gtk-sat-tree.h trunk/src/gtk-single-sat.c trunk/src/gtk-single-sat.h trunk/src/gtk-sky-glance.c trunk/src/gtk-sky-glance.h trunk/src/gui.c trunk/src/gui.h trunk/src/loc-tree.c trunk/src/loc-tree.h trunk/src/locator.c trunk/src/locator.h trunk/src/main.c trunk/src/map-selector.c trunk/src/map-selector.h trunk/src/menubar.c trunk/src/menubar.h trunk/src/mod-cfg-get-param.c trunk/src/mod-cfg-get-param.h trunk/src/mod-cfg.c trunk/src/mod-cfg.h trunk/src/mod-mgr.c trunk/src/mod-mgr.h trunk/src/orbit-tools.c trunk/src/orbit-tools.h trunk/src/pass-popup-menu.c trunk/src/pass-popup-menu.h trunk/src/pass-to-txt.c trunk/src/pass-to-txt.h trunk/src/predict-tools.c trunk/src/predict-tools.h trunk/src/qth-data.c trunk/src/qth-editor.c trunk/src/qth-editor.h trunk/src/radio-conf.c trunk/src/radio-conf.h trunk/src/rotor-conf.c trunk/src/rotor-conf.h trunk/src/sat-cfg.c trunk/src/sat-cfg.h trunk/src/sat-info.c trunk/src/sat-info.h trunk/src/sat-log-browser.c trunk/src/sat-log-browser.h trunk/src/sat-log.c trunk/src/sat-log.h trunk/src/sat-monitor.c trunk/src/sat-monitor.h trunk/src/sat-pass-dialogs.c trunk/src/sat-pass-dialogs.h trunk/src/sat-pref-conditions.c trunk/src/sat-pref-conditions.h trunk/src/sat-pref-debug.c trunk/src/sat-pref-debug.h trunk/src/sat-pref-formats.c trunk/src/sat-pref-formats.h trunk/src/sat-pref-general.c trunk/src/sat-pref-general.h trunk/src/sat-pref-help.c trunk/src/sat-pref-help.h trunk/src/sat-pref-interfaces.c trunk/src/sat-pref-interfaces.h trunk/src/sat-pref-layout.c trunk/src/sat-pref-layout.h trunk/src/sat-pref-list-view.c trunk/src/sat-pref-list-view.h trunk/src/sat-pref-map-view.c trunk/src/sat-pref-map-view.h trunk/src/sat-pref-modules.c trunk/src/sat-pref-modules.h trunk/src/sat-pref-multi-pass.c trunk/src/sat-pref-multi-pass.h trunk/src/sat-pref-polar-view.c trunk/src/sat-pref-polar-view.h trunk/src/sat-pref-predict.c trunk/src/sat-pref-predict.h trunk/src/sat-pref-qth-data.h trunk/src/sat-pref-qth-editor.c trunk/src/sat-pref-qth-editor.h trunk/src/sat-pref-qth.c trunk/src/sat-pref-qth.h trunk/src/sat-pref-refresh.c trunk/src/sat-pref-refresh.h trunk/src/sat-pref-rig-data.h trunk/src/sat-pref-rig-editor.c trunk/src/sat-pref-rig-editor.h trunk/src/sat-pref-rig.c trunk/src/sat-pref-rig.h trunk/src/sat-pref-rot-data.h trunk/src/sat-pref-rot-editor.c trunk/src/sat-pref-rot-editor.h trunk/src/sat-pref-rot.c trunk/src/sat-pref-rot.h trunk/src/sat-pref-single-pass.c trunk/src/sat-pref-single-pass.h trunk/src/sat-pref-single-sat.c trunk/src/sat-pref-single-sat.h trunk/src/sat-pref-sky-at-glance.c trunk/src/sat-pref-sky-at-glance.h trunk/src/sat-pref-tle.c trunk/src/sat-pref-tle.h trunk/src/sat-pref.c trunk/src/sat-pref.h trunk/src/sat-vis.c trunk/src/sat-vis.h trunk/src/save-pass.c trunk/src/save-pass.h trunk/src/time-tools.c trunk/src/time-tools.h trunk/src/tle-tools.c trunk/src/tle-tools.h trunk/src/tle-update.c trunk/src/tle-update.h trunk/src/trsp-conf.c trunk/src/trsp-conf.h Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/about.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> @@ -90,7 +90,7 @@ gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (dialog), _("GPREDICT")); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (dialog), VERSION); gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (dialog), - _("Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n\n"\ + _("Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n\n"\ "Gpredict is available free of charge from:")); gtk_about_dialog_set_url_hook (gpredict_url_hook_cb, NULL, NULL); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (dialog), Modified: trunk/src/about.h =================================================================== --- trunk/src/about.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/about.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/compat.c =================================================================== --- trunk/src/compat.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/compat.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/compat.h =================================================================== --- trunk/src/compat.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/compat.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/config-keys.h =================================================================== --- trunk/src/config-keys.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/config-keys.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/defaults.h =================================================================== --- trunk/src/defaults.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/defaults.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/first-time.c =================================================================== --- trunk/src/first-time.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/first-time.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/first-time.h =================================================================== --- trunk/src/first-time.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/first-time.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gpredict-help.c =================================================================== --- trunk/src/gpredict-help.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gpredict-help.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gpredict-help.h =================================================================== --- trunk/src/gpredict-help.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gpredict-help.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gpredict-url-hook.c =================================================================== --- trunk/src/gpredict-url-hook.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gpredict-url-hook.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gpredict-url-hook.h =================================================================== --- trunk/src/gpredict-url-hook.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gpredict-url-hook.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gpredict-utils.c =================================================================== --- trunk/src/gpredict-utils.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gpredict-utils.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gpredict-utils.h =================================================================== --- trunk/src/gpredict-utils.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gpredict-utils.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-azel-plot.c =================================================================== --- trunk/src/gtk-azel-plot.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-azel-plot.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-azel-plot.h =================================================================== --- trunk/src/gtk-azel-plot.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-azel-plot.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-freq-knob.c =================================================================== --- trunk/src/gtk-freq-knob.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-freq-knob.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-freq-knob.h =================================================================== --- trunk/src/gtk-freq-knob.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-freq-knob.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-polar-plot.c =================================================================== --- trunk/src/gtk-polar-plot.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-polar-plot.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-polar-plot.h =================================================================== --- trunk/src/gtk-polar-plot.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-polar-plot.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-polar-view-popup.c =================================================================== --- trunk/src/gtk-polar-view-popup.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-polar-view-popup.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-polar-view-popup.h =================================================================== --- trunk/src/gtk-polar-view-popup.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-polar-view-popup.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-polar-view.c =================================================================== --- trunk/src/gtk-polar-view.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-polar-view.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-polar-view.h =================================================================== --- trunk/src/gtk-polar-view.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-polar-view.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-rig-ctrl.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-rig-ctrl.h =================================================================== --- trunk/src/gtk-rig-ctrl.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-rig-ctrl.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-rot-ctrl.c =================================================================== --- trunk/src/gtk-rot-ctrl.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-rot-ctrl.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-rot-ctrl.h =================================================================== --- trunk/src/gtk-rot-ctrl.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-rot-ctrl.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-rot-knob.c =================================================================== --- trunk/src/gtk-rot-knob.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-rot-knob.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-rot-knob.h =================================================================== --- trunk/src/gtk-rot-knob.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-rot-knob.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-data.c =================================================================== --- trunk/src/gtk-sat-data.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-data.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-data.h =================================================================== --- trunk/src/gtk-sat-data.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-data.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-list-col-sel.c =================================================================== --- trunk/src/gtk-sat-list-col-sel.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-list-col-sel.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-list-col-sel.h =================================================================== --- trunk/src/gtk-sat-list-col-sel.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-list-col-sel.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-list-popup.c =================================================================== --- trunk/src/gtk-sat-list-popup.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-list-popup.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-list-popup.h =================================================================== --- trunk/src/gtk-sat-list-popup.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-list-popup.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-list.c =================================================================== --- trunk/src/gtk-sat-list.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-list.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-list.h =================================================================== --- trunk/src/gtk-sat-list.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-list.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-map-ground-track.c =================================================================== --- trunk/src/gtk-sat-map-ground-track.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-map-ground-track.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-map-ground-track.h =================================================================== --- trunk/src/gtk-sat-map-ground-track.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-map-ground-track.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-map-popup.c =================================================================== --- trunk/src/gtk-sat-map-popup.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-map-popup.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-map-popup.h =================================================================== --- trunk/src/gtk-sat-map-popup.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-map-popup.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-map.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Copyright (C) 2006-2007 William J Beksi, KC2EXL. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-map.h =================================================================== --- trunk/src/gtk-sat-map.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-map.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Copyright (C) 2006-2007 William J Beksi, KC2EXL. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-module-popup.c =================================================================== --- trunk/src/gtk-sat-module-popup.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-module-popup.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-module-popup.h =================================================================== --- trunk/src/gtk-sat-module-popup.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-module-popup.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-module-tmg.c =================================================================== --- trunk/src/gtk-sat-module-tmg.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-module-tmg.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-module-tmg.h =================================================================== --- trunk/src/gtk-sat-module-tmg.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-module-tmg.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-module.c =================================================================== --- trunk/src/gtk-sat-module.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-module.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-module.h =================================================================== --- trunk/src/gtk-sat-module.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-module.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-selector.c =================================================================== --- trunk/src/gtk-sat-selector.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-selector.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-selector.h =================================================================== --- trunk/src/gtk-sat-selector.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-selector.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-tree.c =================================================================== --- trunk/src/gtk-sat-tree.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-tree.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sat-tree.h =================================================================== --- trunk/src/gtk-sat-tree.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sat-tree.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-single-sat.c =================================================================== --- trunk/src/gtk-single-sat.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-single-sat.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-single-sat.h =================================================================== --- trunk/src/gtk-single-sat.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-single-sat.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sky-glance.c =================================================================== --- trunk/src/gtk-sky-glance.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sky-glance.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gtk-sky-glance.h =================================================================== --- trunk/src/gtk-sky-glance.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gtk-sky-glance.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gui.c =================================================================== --- trunk/src/gui.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gui.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/gui.h =================================================================== --- trunk/src/gui.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/gui.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/loc-tree.c =================================================================== --- trunk/src/loc-tree.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/loc-tree.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/loc-tree.h =================================================================== --- trunk/src/loc-tree.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/loc-tree.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/locator.c =================================================================== --- trunk/src/locator.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/locator.c 2009-09-27 14:15:02 UTC (rev 442) @@ -11,7 +11,7 @@ /* * Hamlib Interface - locator and bearing conversion calls - * Copyright (c) 2001-2008 by Stephane Fillod + * Copyright (c) 2001-2009 by Stephane Fillod * Copyright (c) 2003 by Nate Bargmann * Copyright (c) 2003 by Dave Hines * Modified: trunk/src/locator.h =================================================================== --- trunk/src/locator.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/locator.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/main.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/map-selector.c =================================================================== --- trunk/src/map-selector.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/map-selector.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/map-selector.h =================================================================== --- trunk/src/map-selector.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/map-selector.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/menubar.c =================================================================== --- trunk/src/menubar.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/menubar.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/menubar.h =================================================================== --- trunk/src/menubar.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/menubar.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/mod-cfg-get-param.c =================================================================== --- trunk/src/mod-cfg-get-param.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/mod-cfg-get-param.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/mod-cfg-get-param.h =================================================================== --- trunk/src/mod-cfg-get-param.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/mod-cfg-get-param.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/mod-cfg.c =================================================================== --- trunk/src/mod-cfg.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/mod-cfg.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/mod-cfg.h =================================================================== --- trunk/src/mod-cfg.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/mod-cfg.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/mod-mgr.c =================================================================== --- trunk/src/mod-mgr.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/mod-mgr.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/mod-mgr.h =================================================================== --- trunk/src/mod-mgr.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/mod-mgr.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/orbit-tools.c =================================================================== --- trunk/src/orbit-tools.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/orbit-tools.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Parts are Copyright John A. Magliacane, KD2BD 1991-2003 (indicated below) Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/orbit-tools.h =================================================================== --- trunk/src/orbit-tools.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/orbit-tools.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/pass-popup-menu.c =================================================================== --- trunk/src/pass-popup-menu.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/pass-popup-menu.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/pass-popup-menu.h =================================================================== --- trunk/src/pass-popup-menu.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/pass-popup-menu.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/pass-to-txt.c =================================================================== --- trunk/src/pass-to-txt.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/pass-to-txt.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/pass-to-txt.h =================================================================== --- trunk/src/pass-to-txt.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/pass-to-txt.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/predict-tools.c =================================================================== --- trunk/src/predict-tools.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/predict-tools.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Parts are Copyright John A. Magliacane, KD2BD 1991-2003 (indicated below) Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/predict-tools.h =================================================================== --- trunk/src/predict-tools.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/predict-tools.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/qth-data.c =================================================================== --- trunk/src/qth-data.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/qth-data.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/qth-editor.c =================================================================== --- trunk/src/qth-editor.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/qth-editor.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/qth-editor.h =================================================================== --- trunk/src/qth-editor.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/qth-editor.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/radio-conf.c =================================================================== --- trunk/src/radio-conf.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/radio-conf.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete. + Copyright (C) 2001-2009 Alexandru Csete. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/radio-conf.h =================================================================== --- trunk/src/radio-conf.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/radio-conf.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete. + Copyright (C) 2001-2009 Alexandru Csete. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/rotor-conf.c =================================================================== --- trunk/src/rotor-conf.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/rotor-conf.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete. + Copyright (C) 2001-2009 Alexandru Csete. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/rotor-conf.h =================================================================== --- trunk/src/rotor-conf.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/rotor-conf.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete. + Copyright (C) 2001-2009 Alexandru Csete. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-cfg.c =================================================================== --- trunk/src/sat-cfg.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-cfg.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-cfg.h =================================================================== --- trunk/src/sat-cfg.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-cfg.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-info.c =================================================================== --- trunk/src/sat-info.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-info.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-info.h =================================================================== --- trunk/src/sat-info.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-info.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-log-browser.c =================================================================== --- trunk/src/sat-log-browser.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-log-browser.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-log-browser.h =================================================================== --- trunk/src/sat-log-browser.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-log-browser.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-log.c =================================================================== --- trunk/src/sat-log.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-log.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-log.h =================================================================== --- trunk/src/sat-log.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-log.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-monitor.c =================================================================== --- trunk/src/sat-monitor.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-monitor.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-monitor.h =================================================================== --- trunk/src/sat-monitor.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-monitor.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pass-dialogs.c =================================================================== --- trunk/src/sat-pass-dialogs.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pass-dialogs.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pass-dialogs.h =================================================================== --- trunk/src/sat-pass-dialogs.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pass-dialogs.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-conditions.c =================================================================== --- trunk/src/sat-pref-conditions.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-conditions.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-conditions.h =================================================================== --- trunk/src/sat-pref-conditions.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-conditions.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-debug.c =================================================================== --- trunk/src/sat-pref-debug.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-debug.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-debug.h =================================================================== --- trunk/src/sat-pref-debug.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-debug.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-formats.c =================================================================== --- trunk/src/sat-pref-formats.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-formats.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-formats.h =================================================================== --- trunk/src/sat-pref-formats.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-formats.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-general.c =================================================================== --- trunk/src/sat-pref-general.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-general.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-general.h =================================================================== --- trunk/src/sat-pref-general.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-general.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-help.c =================================================================== --- trunk/src/sat-pref-help.c 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-help.c 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC. Authors: Alexandru Csete <oz...@gm...> Modified: trunk/src/sat-pref-help.h =================================================================== --- trunk/src/sat-pref-help.h 2009-09-27 13:45:38 UTC (rev 441) +++ trunk/src/sat-pref-help.h 2009-09-27 14:15:02 UTC (rev 442) @@ -2,7 +2,7 @@ /* Gpredict: Real-time satellite tracking and orbit prediction program - Copyr... [truncated message content] |