diff --git a/WSJT-X_Users_Guide.docx b/WSJT-X_Users_Guide.docx
index fbc84137a..2669d63bc 100644
Binary files a/WSJT-X_Users_Guide.docx and b/WSJT-X_Users_Guide.docx differ
diff --git a/main.cpp b/main.cpp
index 59441af50..4bf16f144 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,8 +4,21 @@
int main(int argc, char *argv[])
{
- QApplication a(argc, argv);
- MainWindow w;
- w.show();
- return a.exec();
+ QApplication a(argc, argv);
+
+ QFile f("fonts.txt");
+ if(f.open(QIODevice::ReadOnly)) {
+ QTextStream in(&f); //Example:
+ QString fontFamily; // helvetica
+ qint32 fontSize,fontWeight; // 8,50
+ in >> fontFamily >> fontSize >> fontWeight;
+ f.close();
+ QFont font;
+ font=QFont(fontFamily,fontSize,fontWeight);
+ a.setFont(font);
+ }
+
+ MainWindow w;
+ w.show();
+ return a.exec();
}
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8ea23c817..7cf4e8a62 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1089,8 +1089,8 @@ void MainWindow::decode() //decode()
jt9com_.ndepth=m_ndepth;
jt9com_.ndiskdat=0;
if(m_diskData) jt9com_.ndiskdat=1;
- jt9com_.nfa=1000; //### temporary ###
- jt9com_.nfb=2000;
+ jt9com_.nfa=g_pWideGraph->getFmin();
+ jt9com_.nfb=g_pWideGraph->getFmax();
jt9com_.ntol=10;
if(jt9com_.nutc < m_nutc0) m_RxLog |= 1; //Date and Time to all65.txt
diff --git a/mainwindow.ui b/mainwindow.ui
index a1964981e..2b81fcb98 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1614,7 +1614,7 @@ p, li { white-space: pre-wrap; }
- Generate Std Messages
+ Generate Std Msgs
@@ -1774,7 +1774,7 @@ p, li { white-space: pre-wrap; }
2
-
+
5
diff --git a/widegraph.cpp b/widegraph.cpp
index 6d2e27fe6..dae6d209f 100644
--- a/widegraph.cpp
+++ b/widegraph.cpp
@@ -212,6 +212,16 @@ void WideGraph::setRxRange(int fMin, int fMax)
ui->widePlot->update();
}
+int WideGraph::getFmin()
+{
+ return m_fMin;
+}
+
+int WideGraph::getFmax()
+{
+ return m_fMax;
+}
+
void WideGraph::setfMax(int n)
{
m_fMax = n;
diff --git a/widegraph.h b/widegraph.h
index b65b48f56..195c3c3ca 100644
--- a/widegraph.h
+++ b/widegraph.h
@@ -20,6 +20,8 @@ public:
int QSOfreq();
int nSpan();
int nStartFreq();
+ int getFmin();
+ int getFmax();
float fSpan();
void saveSettings();
void setRxRange(int fMin, int fMax);
diff --git a/widegraph.ui b/widegraph.ui
index c7af74fbd..bb8788e4f 100644
--- a/widegraph.ui
+++ b/widegraph.ui
@@ -317,7 +317,7 @@
true
- fMin
+ f Min
2
@@ -371,7 +371,7 @@
true
- fMax
+ f Max
2
diff --git a/wsjtx.iss b/wsjtx.iss
index de1498c4c..1fdcbdb64 100644
--- a/wsjtx.iss
+++ b/wsjtx.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=wsjtx
-AppVerName=wsjtx Version 0.9 r3143
+AppVerName=wsjtx Version 0.9 r3148
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx