mirror of
https://github.com/martinrotter/rssguard.git
synced 2025-02-04 03:08:04 +01:00
Added BSD license text for QtSingleApplication.
This commit is contained in:
Martin Rotter
parent
6ecf9b2e40
commit
d17110d1b8
@ -236,6 +236,7 @@ set(APP_MISC
|
||||
resources/text/CHANGELOG
|
||||
resources/text/COPYING_GNU_GPL
|
||||
resources/text/COPYING_GNU_GPL_HTML
|
||||
resources/text/COPYING_BSD
|
||||
)
|
||||
|
||||
# Wrap files, create moc files.
|
||||
|
||||
30
resources/text/COPYING_BSD
Normal file
30
resources/text/COPYING_BSD
Normal file
@ -0,0 +1,30 @@
|
||||
Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
Contact: http://www.qt-project.org/legal
|
||||
QtSingleApplication is part of the Qt Solutions component.
|
||||
|
||||
You may use this file under the terms of the BSD license as follows:
|
||||
|
||||
"Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in
|
||||
the documentation and/or other materials provided with the
|
||||
distribution.
|
||||
* Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
|
||||
of its contributors may be used to endorse or promote products derived
|
||||
from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||
@ -19,7 +19,7 @@ DynamicShortcutsWidget::~DynamicShortcutsWidget() {
|
||||
|
||||
void DynamicShortcutsWidget::updateShortcuts() {
|
||||
foreach (ActionBinding binding, m_actionBindings) {
|
||||
binding.first->setShortcut(binding.second->keySequence());
|
||||
binding.first->setShortcut(binding.second->shortcut());
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ void DynamicShortcutsWidget::populate(const QList<QAction *> actions) {
|
||||
foreach (QAction *action, actions) {
|
||||
// Create shortcut catcher for this action and set default shortcut.
|
||||
ShortcutCatcher *catcher = new ShortcutCatcher(this);
|
||||
catcher->setKeySequence(action->shortcut());
|
||||
catcher->setShortcut(action->shortcut());
|
||||
|
||||
// Store information for re-initialization of shortcuts
|
||||
// of actions when widget gets "confirmed".
|
||||
|
||||
@ -26,6 +26,15 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout)
|
||||
}
|
||||
file.close();
|
||||
|
||||
file.setFileName(APP_INFO_PATH + "/COPYING_BSD");
|
||||
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
m_ui->m_txtLicenseBsd->setText(str.readAll());
|
||||
}
|
||||
else {
|
||||
m_ui->m_txtLicenseBsd->setText(tr("License not found."));
|
||||
}
|
||||
file.close();
|
||||
|
||||
file.setFileName(APP_INFO_PATH + "/CHANGELOG");
|
||||
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
m_ui->m_txtChangelog->setText(str.readAll());
|
||||
@ -53,8 +62,9 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout)
|
||||
m_ui->m_txtThanks->setText(tr("<body>"
|
||||
"Authors and contributors:"
|
||||
"<ul>"
|
||||
"<li>Martin Rotter (<a href=\"mailto://rotter.martinos@gmail.com\">rotter.martinos@gmail.com</a>)</li>"
|
||||
"<li>KDE (author of Oxygen (GNU Lesser General Public License) icon theme)</li>"
|
||||
"<li>Martin Rotter (<a href=\"mailto://rotter.martinos@gmail.com\">rotter.martinos@gmail.com</a>) (author of RSS Guard)</li>"
|
||||
"<li>KDE (author of Oxygen icon theme)</li>"
|
||||
"<li>Digia Plc (author of QtSingleApplication component)</li>"
|
||||
"</ul>"
|
||||
"</body>"));
|
||||
|
||||
|
||||
@ -135,8 +135,8 @@
|
||||
<string notr="true"><!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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<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; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html></string>
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
|
||||
<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;"><br /></p></body></html></string>
|
||||
</property>
|
||||
<property name="acceptRichText">
|
||||
<bool>false</bool>
|
||||
@ -169,8 +169,8 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>685</width>
|
||||
<height>230</height>
|
||||
<width>687</width>
|
||||
<height>180</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
@ -227,8 +227,8 @@ p, li { white-space: pre-wrap; }
|
||||
<string notr="true"><!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:'DejaVu Sans Mono'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<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; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html></string>
|
||||
</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:9pt; font-weight:400; font-style:normal;">
|
||||
<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; font-family:'Sans Serif';"><br /></p></body></html></string>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
|
||||
@ -237,6 +237,72 @@ p, li { white-space: pre-wrap; }
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="page_BSD">
|
||||
<attribute name="label">
|
||||
<string>BSD License (applies to QtSingleApplication component)</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_5">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QTextBrowser" name="m_txtLicenseBsd">
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>DejaVu Sans Mono</family>
|
||||
</font>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="horizontalScrollBarPolicy">
|
||||
<enum>Qt::ScrollBarAlwaysOff</enum>
|
||||
</property>
|
||||
<property name="autoFormatting">
|
||||
<set>QTextEdit::AutoNone</set>
|
||||
</property>
|
||||
<property name="undoRedoEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="lineWrapMode">
|
||||
<enum>QTextEdit::WidgetWidth</enum>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="html">
|
||||
<string notr="true"><!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:'DejaVu Sans Mono'; font-size:9pt; font-weight:400; font-style:normal;">
|
||||
<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; font-family:'Sans Serif';"><br /></p></body></html></string>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="m_lblLicenses">
|
||||
<property name="text">
|
||||
<string>Licenses page is available only in English language.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
@ -258,8 +324,8 @@ p, li { white-space: pre-wrap; }
|
||||
<string notr="true"><!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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;"><br /></span></p></body></html></string>
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html></string>
|
||||
</property>
|
||||
<property name="tabStopWidth">
|
||||
<number>30</number>
|
||||
@ -291,8 +357,8 @@ p, li { white-space: pre-wrap; }
|
||||
<string notr="true"><!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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<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; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html></string>
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
|
||||
<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;"><br /></p></body></html></string>
|
||||
</property>
|
||||
<property name="acceptRichText">
|
||||
<bool>false</bool>
|
||||
|
||||
@ -55,7 +55,7 @@ ShortcutCatcher::ShortcutCatcher(QWidget *parent)
|
||||
m_layout->addWidget(m_clearButton);
|
||||
|
||||
// Establish needed connections.
|
||||
connect(m_clearButton, &QToolButton::clicked, this, &ShortcutCatcher::clearKeySequence);
|
||||
connect(m_clearButton, &QToolButton::clicked, this, &ShortcutCatcher::clearShortcut);
|
||||
connect(m_sequenceButton, &ShortcutButton::clicked, this, &ShortcutCatcher::startRecording);
|
||||
|
||||
// Prepare initial state of the control.
|
||||
@ -86,7 +86,7 @@ void ShortcutCatcher::doneRecording() {
|
||||
|
||||
updateDisplayShortcut();
|
||||
|
||||
emit keySequenceChanged(m_currentSequence);
|
||||
emit shortcutChanged(m_currentSequence);
|
||||
}
|
||||
|
||||
void ShortcutCatcher::controlModifierlessTimout() {
|
||||
@ -123,15 +123,15 @@ void ShortcutCatcher::updateDisplayShortcut()
|
||||
m_sequenceButton->setText(str);
|
||||
}
|
||||
|
||||
QKeySequence ShortcutCatcher::keySequence() const {
|
||||
QKeySequence ShortcutCatcher::shortcut() const {
|
||||
return m_currentSequence;
|
||||
}
|
||||
|
||||
void ShortcutCatcher::setKeySequence(const QKeySequence &key) {
|
||||
void ShortcutCatcher::setShortcut(const QKeySequence &key) {
|
||||
m_currentSequence = m_defaultSequence = key;
|
||||
doneRecording();
|
||||
}
|
||||
|
||||
void ShortcutCatcher::clearKeySequence() {
|
||||
setKeySequence(m_defaultSequence);
|
||||
void ShortcutCatcher::clearShortcut() {
|
||||
setShortcut(m_defaultSequence);
|
||||
}
|
||||
|
||||
@ -38,9 +38,9 @@ class QToolButton;
|
||||
class ShortcutButton;
|
||||
|
||||
class ShortcutCatcher : public QWidget {
|
||||
Q_OBJECT
|
||||
friend class ShortcutButton;
|
||||
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit ShortcutCatcher(QWidget *parent = 0);
|
||||
virtual ~ShortcutCatcher();
|
||||
@ -48,17 +48,18 @@ class ShortcutCatcher : public QWidget {
|
||||
void controlModifierlessTimout();
|
||||
void updateDisplayShortcut();
|
||||
|
||||
QKeySequence shortcut() const;
|
||||
void setShortcut(const QKeySequence& key);
|
||||
|
||||
protected slots:
|
||||
void startRecording();
|
||||
void doneRecording();
|
||||
|
||||
public slots:
|
||||
QKeySequence keySequence() const;
|
||||
void setKeySequence(const QKeySequence& key);
|
||||
void clearKeySequence();
|
||||
void clearShortcut();
|
||||
|
||||
signals:
|
||||
void keySequenceChanged(QKeySequence seguence);
|
||||
void shortcutChanged(QKeySequence seguence);
|
||||
|
||||
private:
|
||||
QToolButton *m_clearButton;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user