Fix label at top of waterfall in Linux.

Fix restoration of SaveDir from MAP65.INI.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@500 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-07-12 14:47:41 +00:00
parent 9c4114cd67
commit 5a3aa6839a
2 changed files with 10 additions and 15 deletions

View File

@ -18,6 +18,7 @@ import array
root = Tk() root = Tk()
Version="0.8 r" + "$Rev$"[6:-1] Version="0.8 r" + "$Rev$"[6:-1]
Version=Version.strip()
print "******************************************************************" print "******************************************************************"
print "MAP65 Version " + Version + ", by K1JT" print "MAP65 Version " + Version + ", by K1JT"
print "Revision date: " + \ print "Revision date: " + \
@ -616,9 +617,7 @@ F4 Clear "To Radio"
F5 What message to send? F5 What message to send?
F6 Open next file in directory F6 Open next file in directory
Shift+F6 Decode all wave files in directory Shift+F6 Decode all wave files in directory
F8 Set JT65A mode Shift+F8 JT65B
Shift+F8 Set JT65B mode
Ctrl+F8 Set JT65C mode
F10 Show Waterfall F10 Show Waterfall
Shift+F10 Show astronomical data Shift+F10 Show astronomical data
F11 Decrease DF F11 Decrease DF
@ -1336,12 +1335,12 @@ modebutton['menu'] = modemenu
# Can use the following to retrieve the state: # Can use the following to retrieve the state:
# state=modemenu.entrycget(0,"state") # state=modemenu.entrycget(0,"state")
modemenu.add_radiobutton(label = 'JT65A', variable=mode, command = ModeJT65A, \ #modemenu.add_radiobutton(label = 'JT65A', variable=mode, command = ModeJT65A, \
state=DISABLED, accelerator='F8') # state=DISABLED, accelerator='F8')
modemenu.add_radiobutton(label = 'JT65B', variable=mode, command = ModeJT65B, \ modemenu.add_radiobutton(label = 'JT65B', variable=mode, command = ModeJT65B, \
accelerator='Shift+F8') accelerator='Shift+F8')
modemenu.add_radiobutton(label = 'JT65C', variable=mode, command = ModeJT65C, \ #modemenu.add_radiobutton(label = 'JT65C', variable=mode, command = ModeJT65C, \
state=DISABLED, accelerator='Ctrl+F8') # state=DISABLED, accelerator='Ctrl+F8')
modemenu.add_radiobutton(label = 'Measure', variable=mode) modemenu.add_radiobutton(label = 'Measure', variable=mode)
modemenu.add_radiobutton(label = 'Pulsar', variable=mode,state=DISABLED) modemenu.add_radiobutton(label = 'Pulsar', variable=mode,state=DISABLED)
@ -1425,9 +1424,9 @@ root.bind_all('<F4>', clrToRadio)
root.bind_all('<F5>', what2send) root.bind_all('<F5>', what2send)
root.bind_all('<F6>', opennext) root.bind_all('<F6>', opennext)
root.bind_all('<Shift-F6>', decodeall) root.bind_all('<Shift-F6>', decodeall)
root.bind_all('<F8>', ModeJT65A) #root.bind_all('<F8>', ModeJT65A)
root.bind_all('<Shift-F8>', ModeJT65B) root.bind_all('<Shift-F8>', ModeJT65B)
root.bind_all('<Control-F8>', ModeJT65C) #root.bind_all('<Control-F8>', ModeJT65C)
root.bind_all('<F10>', showspecjt) root.bind_all('<F10>', showspecjt)
root.bind_all('<Shift-F10>', astro1) root.bind_all('<Shift-F10>', astro1)
root.bind_all('<F11>',left_arrow) root.bind_all('<F11>',left_arrow)
@ -1740,7 +1739,7 @@ try:
elif key == 'fcal': options.fcal.set(value) elif key == 'fcal': options.fcal.set(value)
elif key == 'CSmin': options.ncsmin.set(value) elif key == 'CSmin': options.ncsmin.set(value)
elif key == 'dphi': options.dphi.set(value) elif key == 'dphi': options.dphi.set(value)
elif key == 'savedir': options.savedir.set(value) elif key == 'SaveDir': options.savedir.set(value)
elif key == 'TxFirst': TxFirst.set(value) elif key == 'TxFirst': TxFirst.set(value)
elif key == 'KB8RQ': kb8rq.set(value) elif key == 'KB8RQ': kb8rq.set(value)

View File

@ -1,4 +1,4 @@
#----------------------------------------------------- SpecJT ----------------------------------------------------- SpecJT
from Tkinter import * from Tkinter import *
from tkMessageBox import showwarning from tkMessageBox import showwarning
import time import time
@ -404,12 +404,8 @@ lab1=Label(mbar,width=20,padx=20,bd=0)
lab1.pack(side=LEFT) lab1.pack(side=LEFT)
fdf=Label(mbar,width=30,bd=0,anchor=W) fdf=Label(mbar,width=30,bd=0,anchor=W)
fdf.pack(side=LEFT) fdf.pack(side=LEFT)
fdf2=Label(mbar,width=15,bd=0)
fdf2.pack(side=LEFT)
lab3=Label(mbar,padx=13,bd=0) lab3=Label(mbar,padx=13,bd=0)
lab3.pack(side=LEFT) lab3.pack(side=LEFT)
lab0=Label(mbar,padx=10,bd=0) lab0=Label(mbar,padx=10,bd=0)
lab0.pack(side=LEFT) lab0.pack(side=LEFT)