diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-01-03 10:21:56 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-01-03 10:21:56 +0000 |
| commit | ff19d5726da88617ea74caba53e68c8a3d6363d0 (patch) | |
| tree | 8f5d4b2ca0ddc822e786cecc15e9017513b10a36 | |
| parent | dd03231870be8447ed335414435d8789e9b8965f (diff) | |
Update NEWS and Release note
Revert part of last commit about AUTHORS-SHORT in Windows....
svn path=/trunk/; revision=54577
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | docbook/release-notes.asciidoc | 1 | ||||
| -rw-r--r-- | ui/qt/about_dialog.cpp | 16 |
3 files changed, 8 insertions, 10 deletions
@@ -25,6 +25,7 @@ What's New The following features are new (or have been significantly updated) since version 1.11.2: * Qt port: + + The About dialog has been added + The Capture Interfaces dialog has been added. + The Decode As dialog has been added. + Several SCTP dialogs have been added. diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 15694c66ac..72aa2dc6c8 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -28,6 +28,7 @@ since version 1.11.2: * Qt port: +** The About dialog has been added ** The Capture Interfaces dialog has been added. ** The Decode As dialog has been added. ** Several SCTP dialogs have been added. diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 5015d38f11..72e5eb89f3 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -150,12 +150,8 @@ AboutDialog::AboutDialog(QWidget *parent) : /* Authors */ -#if defined(_WIN32) - f_authors.setFileName(get_datafile_path("AUTHORS-SHORT.txt")); -#else - f_authors.setFileName(get_datafile_path("AUTHORS-SHORT")); -#endif + f_authors.setFileName(get_datafile_path("AUTHORS-SHORT")); f_authors.open(QFile::ReadOnly | QFile::Text); QTextStream ReadFile_authors(&f_authors); @@ -249,11 +245,11 @@ AboutDialog::AboutDialog(QWidget *parent) : /* License */ - #if defined(_WIN32) - f_license.setFileName(get_datafile_path("COPYING.txt")); - #else - f_license.setFileName(get_datafile_path("COPYING")); - #endif +#if defined(_WIN32) + f_license.setFileName(get_datafile_path("COPYING.txt")); +#else + f_license.setFileName(get_datafile_path("COPYING")); +#endif f_license.open(QFile::ReadOnly | QFile::Text); QTextStream ReadFile_license(&f_license); |