Show ruler timestamps in cursors and popups

[pulseview.git] / README

diff --git a/README b/README
index 4aaa8780090605f44215d1c4a4e740b77422b8c2..588edc4cc6a32ceb34daf712977f5d7afca402a2 100644 (file)
--- a/README
+++ b/README
@@ -6,18 +6,27 @@ The sigrok project aims at creating a portable, cross-platform,
 Free/Libre/Open-Source signal analysis software suite that supports various
 device types (such as logic analyzers, oscilloscopes, multimeters, and more).
 
-PulseView is a Qt-based GUI for sigrok.
+PulseView is a Qt-based LA/scope/MSO GUI for sigrok.
 
 
 Status
 ------
 
-PulseView is currently work in progress. Some basic functionality
-is there, but it should still be considered alpha/beta stage software.
+PulseView is in a usable state and has had official tarball releases.
 
-There have been no official tarball releases, yet.
 
-Distro packagers should NOT package this, yet.
+Copyright and license
+---------------------
+
+PulseView is licensed under the terms of the GNU General Public License
+(GPL), version 3 or later.
+
+While some individual source code files are licensed under the GPLv2+, and
+some files are licensed under the GPLv3+, this doesn't change the fact that
+the program as a whole is licensed under the terms of the GPLv3+ (e.g. also
+due to the fact that it links against GPLv3+ libraries).
+
+Please see the individual source files for the full list of copyright holders.
 
 
 Copyright notices
@@ -35,13 +44,49 @@ is to be interpreted as
  Copyright (C) 2010,2011,2012,2013 Contributor Name
 
 
-Mailing lists
--------------
-
-There are two mailing lists for sigrok/PulseView:
+Resource authors and licenses
+-----------------------------
+
+icons/application-exit.png,
+icons/document-new.png,
+icons/document-open.png,
+icons/document-save-as.png,
+icons/help-browser.png,
+icons/media-playback-pause.png,
+icons/media-playback-start.png,
+icons/preferences-system.png,
+icons/search.svg,
+icons/window-new.png,
+icons/zoom-fit-best.png,
+icons/zoom-in.png,
+icons/zoom-out.png: Tango Icon Library
+  http://tango.freedesktop.org/Tango_Desktop_Project
+  License:
+    Public Domain
+
+icons/information.svg: Bobarino
+  https://en.wikipedia.org/wiki/File:Information.svg
+  License:
+    GFDL 1.2 or later / CC-BY-SA 3.0
+    https://en.wikipedia.org/wiki/File:Information.svg#Licensing
+
+QDarkStyleSheet: Colin Duquesnoy
+  https://github.com/ColinDuquesnoy/QDarkStyleSheet
+  License:
+    CC-BY 4.0
+    https://github.com/ColinDuquesnoy/QDarkStyleSheet/blob/master/LICENSE.md
+
+DarkStyle: Juergen Skrotzky
+  https://github.com/Jorgen-VikingGod/Qt-Frameless-Window-DarkStyle
+  License:
+    MIT license
+    https://github.com/Jorgen-VikingGod/Qt-Frameless-Window-DarkStyle#licence
+
+
+Mailing list
+------------
 
  https://lists.sourceforge.net/lists/listinfo/sigrok-devel
- https://lists.sourceforge.net/lists/listinfo/sigrok-commits
 
 
 IRC