It is AUTHORS-SHORT.txt in Windows
authoralagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 2 Jan 2014 20:21:09 +0000 (20:21 +0000)
committeralagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 2 Jan 2014 20:21:09 +0000 (20:21 +0000)
Kept comment about dev release (and change logo)
Use the some order like Wireshark GTK (Authors before Folders)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54569 f5534014-38df-0310-8fa8-9805f1628bb7

ui/qt/about_dialog.cpp
ui/qt/about_dialog.ui

index 51aebdfff5be8bcc399e223bd0d02f32aba39095..5015d38f11ff17380105bd93442ed578898067e8 100644 (file)
@@ -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);
 
index 66e3c0e4110144691d7c70c618188e14fd6e6c10..adf914ed2bb4f292113de978f75d3c9ada851e72 100644 (file)
      </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>
      </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>