diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | include-gpl/gui/aboutdialog.h | 21 | ||||
| -rw-r--r-- | include-gpl/mainwindow.h | 1 | ||||
| -rw-r--r-- | sdrbase/gui/aboutdialog.cpp | 14 | ||||
| -rw-r--r-- | sdrbase/gui/aboutdialog.ui | 165 | ||||
| -rw-r--r-- | sdrbase/mainwindow.cpp | 7 | ||||
| -rw-r--r-- | sdrbase/resources/logo.png | bin | 0 -> 35172 bytes | |||
| -rw-r--r-- | sdrbase/resources/res.qrc | 1 |
8 files changed, 212 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f458258..941082a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,7 @@ set(sdrbase_SOURCES sdrbase/dsp/spectrumvis.cpp sdrbase/dsp/threadedsamplesink.cpp + sdrbase/gui/aboutdialog.cpp sdrbase/gui/addpresetdialog.cpp sdrbase/gui/glscope.cpp sdrbase/gui/glspectrum.cpp @@ -104,6 +105,7 @@ set(sdrbase_HEADERS include-gpl/dsp/spectrumvis.h include/dsp/threadedsamplesink.h + include-gpl/gui/aboutdialog.h include-gpl/gui/addpresetdialog.h include-gpl/gui/glscope.h include-gpl/gui/glspectrum.h @@ -145,6 +147,7 @@ set(sdrbase_SOURCES set(sdrbase_FORMS sdrbase/mainwindow.ui + sdrbase/gui/aboutdialog.ui sdrbase/gui/addpresetdialog.ui sdrbase/gui/glspectrumgui.ui sdrbase/gui/pluginsdialog.ui diff --git a/include-gpl/gui/aboutdialog.h b/include-gpl/gui/aboutdialog.h new file mode 100644 index 0000000..cf5559d --- /dev/null +++ b/include-gpl/gui/aboutdialog.h @@ -0,0 +1,21 @@ +#ifndef INCLUDE_ABOUTDIALOG_H +#define INCLUDE_ABOUTDIALOG_H + +#include <QDialog> + +namespace Ui { + class AboutDialog; +} + +class AboutDialog : public QDialog { + Q_OBJECT + +public: + explicit AboutDialog(QWidget* parent = NULL); + ~AboutDialog(); + +private: + Ui::AboutDialog* ui; +}; + +#endif // INCLUDE_ABOUTDIALOG_H diff --git a/include-gpl/mainwindow.h b/include-gpl/mainwindow.h index 0cda76f..8d944f4 100644 --- a/include-gpl/mainwindow.h +++ b/include-gpl/mainwindow.h @@ -131,6 +131,7 @@ private slots: void on_action_Loaded_Plugins_triggered(); void on_action_Preferences_triggered(); void on_sampleSource_currentIndexChanged(int index); + void on_action_About_triggered(); }; #endif // INCLUDE_MAINWINDOW_H diff --git a/sdrbase/gui/aboutdialog.cpp b/sdrbase/gui/aboutdialog.cpp new file mode 100644 index 0000000..1c6f87b --- /dev/null +++ b/sdrbase/gui/aboutdialog.cpp @@ -0,0 +1,14 @@ +#include "gui/aboutdialog.h" +#include "ui_aboutdialog.h" + +AboutDialog::AboutDialog(QWidget* parent) : + QDialog(parent), + ui(new Ui::AboutDialog) +{ + ui->setupUi(this); +} + +AboutDialog::~AboutDialog() +{ + delete ui; +} diff --git a/sdrbase/gui/aboutdialog.ui b/sdrbase/gui/aboutdialog.ui new file mode 100644 index 0000000..9e8c187 --- /dev/null +++ b/sdrbase/gui/aboutdialog.ui @@ -0,0 +1,165 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>AboutDialog</class> + <widget class="QDialog" name="AboutDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>476</width> + <height>499</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="sizeConstraint"> + <enum>QLayout::SetFixedSize</enum> + </property> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::Panel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../resources/res.qrc">:/logo.png</pixmap> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Höchberg, Germany<br />Written by Christian Daniel.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Many thanks to the osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SDRangelove itself is licensed as &quot;GPL2+&quot; with the added exception, that plugins using only header files from the &quot;include&quot;-subdirectory and not from the &quot;include-gpl&quot;-subdirectory do not count as derived works.</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The following rules applie to the SDRangelove main application and libsdrbase:</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">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.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">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.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/"><span style=" text-decoration: underline; color:#502878;">http://www.gnu.org/licenses/</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#502878;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">For the license of installed plugins, look into the plugin list.</p></body></html></string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources> + <include location="../resources/res.qrc"/> + </resources> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>AboutDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>AboutDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index dd11af9..b31f9c2 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -28,6 +28,7 @@ #include "gui/addpresetdialog.h" #include "gui/pluginsdialog.h" #include "gui/preferencesdialog.h" +#include "gui/aboutdialog.h" #include "dsp/dspengine.h" #include "dsp/spectrumvis.h" #include "dsp/dspcommands.h" @@ -504,3 +505,9 @@ void MainWindow::on_sampleSource_currentIndexChanged(int index) { m_pluginManager->selectSampleSource(ui->sampleSource->currentIndex()); } + +void MainWindow::on_action_About_triggered() +{ + AboutDialog dlg(this); + dlg.exec(); +} diff --git a/sdrbase/resources/logo.png b/sdrbase/resources/logo.png Binary files differnew file mode 100644 index 0000000..686a5ee --- /dev/null +++ b/sdrbase/resources/logo.png diff --git a/sdrbase/resources/res.qrc b/sdrbase/resources/res.qrc index e2a87d8..9e348a1 100644 --- a/sdrbase/resources/res.qrc +++ b/sdrbase/resources/res.qrc @@ -9,5 +9,6 @@ <file>preset-delete.png</file> <file>horizontal.png</file> <file>vertical.png</file> + <file>logo.png</file> </qresource> </RCC> |
