Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Tooltips, bug found file.endswith and file.append #9

Merged
merged 3 commits into from
Feb 12, 2017
Merged

Update Tooltips, bug found file.endswith and file.append #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ef997f
Update radio.cpp
andimik Feb 12, 2017
33325c4
Update radio.cpp
andimik Feb 12, 2017
88244bb
Update tooltips
andimik Feb 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions forms/dabradio.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</rect>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button for saving the audio output into a file. First push will show a menu for file selection. &gt;&lt;/p&gt;&gt;&lt;p&gt;Push again to stop recording.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button for saving the audio output into a file. First push will show a menu for file selection. &lt;/p&gt;&lt;p&gt;Push again to stop recording.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>audio</string>
Expand All @@ -81,7 +81,7 @@
</rect>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button for saving the raw input. Pushing will cause a menu to appear where a filename can be selected. &gt;&lt;/p&gt;&gt;&lt;p&gt;Push again to stop recording.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Push this button for saving the raw input. Pushing will cause a menu to appear where a filename can be selected. Please note the big filesizes!&lt;/p&gt;&lt;p&gt;Push again to stop recording. You can reload it by using the file input (*.sdr) option. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>dump</string>
Expand Down Expand Up @@ -319,7 +319,7 @@
</rect>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright (C) 2016, 2017 Jan van Katwijk ([email protected]), Lazy Chair Programming&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;QtDAB 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.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright (C) 2016, 2017 Jan van Katwijk ([email protected]), Lazy Chair Programming&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt-DAB 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.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
Expand All @@ -335,7 +335,7 @@
</rect>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indicator for time synchronization. Green means that the software recognizes that there are DAB frames, not necessarily that the software is able to decode the DAB stream.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indicator for time synchronization&lt;/p&gt;&lt;p&gt;Green means that the software recognizes that there are DAB frames, not necessarily that the software is able to decode the DAB stream.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
Expand All @@ -354,7 +354,7 @@
</rect>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A signal Noise indicator. In general: higher is better, Do not take the value as a serious measure of the snr, that strongly depending on the device. and the amount of filtering applied in the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A signal Noise indicator&lt;/p&gt;&lt;p&gt;In general: higher is better. But do not take the value as a serious measure of the SNR, it strongly dependson the device and the amount of filtering applied in the device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
Expand Down
32 changes: 16 additions & 16 deletions radio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ void RadioInterface::init_your_gui (void) {
autoStart = false;

// display the version
QString v = "QT-DAB(+) " ;
QString v = "Qt-DAB " ;
v. append (CURRENT_VERSION);
versionName -> setText (v);
// and start the timer
Expand All @@ -614,7 +614,7 @@ void RadioInterface::init_your_gui (void) {
crcErrors_2 -> hide ();
if (show_crcErrors) {
QString file = QFileDialog::getSaveFileName (this,
tr ("Save file .."),
tr ("Save file ..."),
QDir::homePath (),
tr ("Text (*.txt)"));
file = QDir::toNativeSeparators (file);
Expand Down Expand Up @@ -993,7 +993,7 @@ bool r = 0;
r = inputDevice -> restartReader ();
qDebug ("Starting %d\n", r);
if (!r) {
QMessageBox::warning (this, tr ("sdr"),
QMessageBox::warning (this, tr ("Warning"),
tr ("Opening input stream failed\n"));
return;
}
Expand Down Expand Up @@ -1270,7 +1270,7 @@ QString file;
inputDevice = new airspyHandler (dabSettings, &success);
if (!success) {
delete inputDevice;
QMessageBox::warning (this, tr ("sdr"),
QMessageBox::warning (this, tr ("Warning"),
tr ("Airspy not found\n"));
inputDevice = new virtualInput ();
resetSelector ();
Expand All @@ -1287,7 +1287,7 @@ QString file;
inputDevice = new extioHandler (dabSettings, &success);
if (!success) {
delete inputDevice;
QMessageBox::warning( this, tr ("sdr"), tr ("extio: no luck\n") );
QMessageBox::warning( this, tr ("Warning"), tr ("extio: no luck\n") );
inputDevice = new virtualInput();
resetSelector ();
}
Expand All @@ -1302,7 +1302,7 @@ QString file;
inputDevice = new rtl_tcp_client (dabSettings, &success);
if (!success) {
delete inputDevice;
QMessageBox::warning( this, tr ("sdr"), tr ("rtl_tcp: no luck\n") );
QMessageBox::warning( this, tr ("Warning"), tr ("rtl_tcp: no luck\n") );
inputDevice = new virtualInput();
resetSelector ();
}
Expand All @@ -1316,7 +1316,7 @@ QString file;
inputDevice = new sdrplay (dabSettings, &success);
if (!success) {
delete inputDevice;
QMessageBox::warning (this, tr ("sdr"),
QMessageBox::warning (this, tr ("Warning"),
tr ("SDRplay: no library\n"));
inputDevice = new virtualInput ();
resetSelector ();
Expand All @@ -1331,8 +1331,8 @@ QString file;
inputDevice = new dabStick (dabSettings, &success);
if (!success) {
delete inputDevice;
QMessageBox::warning (this, tr ("sdr"),
tr ("DAB-Stick not found\n"));
QMessageBox::warning (this, tr ("Warning"),
tr ("DAB Stick not found! Please use one with RTL2832U or similar chipset!\n"));
inputDevice = new virtualInput ();
resetSelector ();
}
Expand All @@ -1345,7 +1345,7 @@ QString file;
// We always have fileinput!!
if (s == "file input (.raw)") {
file = QFileDialog::getOpenFileName (this,
tr ("open file ..."),
tr ("Open file ..."),
QDir::homePath (),
tr ("raw data (*.raw)"));
file = QDir::toNativeSeparators (file);
Expand All @@ -1359,7 +1359,7 @@ QString file;
else
if (s == "file input (.sdr)") {
file = QFileDialog::getOpenFileName (this,
tr ("open file ..."),
tr ("Open file ..."),
QDir::homePath (),
tr ("raw data (*.sdr)"));
file = QDir::toNativeSeparators (file);
Expand Down Expand Up @@ -1549,8 +1549,8 @@ SF_INFO *sf_info = (SF_INFO *)alloca (sizeof (SF_INFO));
QDir::homePath (),
tr ("raw data (*.sdr)"));
file = QDir::toNativeSeparators (file);
if (!file. endsWith (".sdr", Qt::CaseInsensitive))
file. append (".sdr");
if (!file.endsWith (".sdr", Qt::CaseInsensitive))
file.append (".sdr");
sf_info -> samplerate = INPUT_RATE;
sf_info -> channels = 2;
sf_info -> format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
Expand Down Expand Up @@ -1580,10 +1580,10 @@ SF_INFO *sf_info = (SF_INFO *)alloca (sizeof (SF_INFO));
QString file = QFileDialog::getSaveFileName (this,
tr ("Save file ..."),
QDir::homePath (),
tr ("Sound (*.wav)"));
tr ("PCM wave file (*.wav)"));
file = QDir::toNativeSeparators (file);
if (!file. endsWith (".wav", Qt::CaseInsensitive))
file. append (".wav");
if (!file.endsWith (".wav", Qt::CaseInsensitive))
file.append (".wav");
sf_info -> samplerate = 48000;
sf_info -> channels = 2;
sf_info -> format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
Expand Down