X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ui_aboutdialog.ui;h=019eaeb3742bdc453c8b588f8eb6343dc1fecdfb;hb=b1ea52cceb54d4fee1f718de89551a1064aba16f;hp=53863281a3109380e1dd0752dbd1cddc7d86dbb3;hpb=e28cf300a89811daa3421e07a3377f617c23b3c1;p=nageru
diff --git a/ui_aboutdialog.ui b/ui_aboutdialog.ui
index 5386328..019eaeb 100644
--- a/ui_aboutdialog.ui
+++ b/ui_aboutdialog.ui
@@ -17,7 +17,7 @@
-
- <p><b>Nageru v1.0.0</b></p>
+ <p><b>Nageru 1.7.1</b></p>
<p>Realtime video mixer</p>
@@ -25,14 +25,18 @@
-
+
+ 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" /></head><body>
<p>
-Nageru is Copyright (C) 2015 Steinar H. Gunderson <sgunderson@bigfoot.com><br />
+Nageru is Copyright (C) 2015 Steinar H. Gunderson <steinar+nageru@gunderson.no><br />
Portions Copyright (C) 2003 Rune Holm.<br />
Portions Copyright (C) 2010-2011 Fons Adriaensen <fons@linuxaudio.org><br />
Portions Copyright (C) 2012-2015 Fons Adriaensen <fons@linuxaudio.org><br />
+Portions Copyright (C) 2008-2015 Fons Adriaensen <fons@linuxaudio.org><br />
Portions Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.</p>
<p>This program is free software: you can redistribute it and/or modify<br />
@@ -72,13 +76,63 @@ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,<br /
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE<br />
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+<p><br />All files in decklink/:</p>
+
+<p>Copyright (c) 2009 Blackmagic Design<br />
+Copyright (c) 2015 Blackmagic Design</p>
+
+<p>Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:</p>
+
+<p>The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.</p>
+
+<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.</p>
+
+<p>Marked parts of theme.cpp (Lua shims):</p>
+
+<p>The MIT License (MIT)</p>
+
+<p>Copyright (c) 2013 Hisham Muhammad</p>
+
+<p>Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:</p>
+
+<p>The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.</p>
+
+<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+
</body></html>
-
-
+
Qt::Horizontal
@@ -92,7 +146,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
- buttonBox
+ button_box
accepted()
Dialog
accept()
@@ -108,7 +162,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
- buttonBox
+ button_box
rejected()
Dialog
reject()