diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-01-02 20:21:09 +0000 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-01-02 20:21:09 +0000 |
commit | 5acabc99b0755be8d199d20f5aff96c3e3873845 (patch) | |
tree | cb7a7318f04fb83734cdad1c25e14bcdbef9b290 /ui/qt | |
parent | 11e4e670a4578ea7f8efc0902b2353e9aea1c32a (diff) |
It is AUTHORS-SHORT.txt in Windows
Kept comment about dev release (and change logo)
Use the some order like Wireshark GTK (Authors before Folders)
svn path=/trunk/; revision=54569
Diffstat (limited to 'ui/qt')
-rw-r--r-- | ui/qt/about_dialog.cpp | 6 | ||||
-rw-r--r-- | ui/qt/about_dialog.ui | 36 |
2 files changed, 24 insertions, 18 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 51aebdfff5..5015d38f11 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -143,13 +143,19 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->label_wireshark->setTextInteractionFlags(Qt::TextSelectableByMouse); ui->label_wireshark->setText(message); +/* Check if it is a dev release... (VERSION_MINOR is odd in dev release) */ #if VERSION_MINOR & 1 ui->label_logo->setPixmap( QPixmap( ":/about/wssplash_dev.png" ) ); #endif /* 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.open(QFile::ReadOnly | QFile::Text); QTextStream ReadFile_authors(&f_authors); diff --git a/ui/qt/about_dialog.ui b/ui/qt/about_dialog.ui index 66e3c0e411..adf914ed2b 100644 --- a/ui/qt/about_dialog.ui +++ b/ui/qt/about_dialog.ui @@ -94,6 +94,24 @@ </property> </widget> </widget> + <widget class="QWidget" name="tab_authors"> + <attribute name="title"> + <string>Authors</string> + </attribute> + <widget class="QPlainTextEdit" name="pte_Authors"> + <property name="geometry"> + <rect> + <x>10</x> + <y>10</y> + <width>561</width> + <height>491</height> + </rect> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </widget> <widget class="QWidget" name="tab_folders"> <attribute name="title"> <string>Folders</string> @@ -142,24 +160,6 @@ </column> </widget> </widget> - <widget class="QWidget" name="tab_authors"> - <attribute name="title"> - <string>Authors</string> - </attribute> - <widget class="QPlainTextEdit" name="pte_Authors"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>561</width> - <height>491</height> - </rect> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </widget> <widget class="QWidget" name="tab_plugins"> <attribute name="title"> <string>Plugins</string> |