From Thomas ERSFELD (GSoC13) Apply changes of revision 50107 to qtshark man pages sorted and added capinfos & reordercap

svn path=/trunk/; revision=50826

3 files changed, 40 insertions, 18 deletions

diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 9e07825ebb..75a96a9a85 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -262,12 +262,14 @@ private slots:
     void on_actionHelpContents_triggered();
     void on_actionHelpMPWireshark_triggered();
     void on_actionHelpMPWireshark_Filter_triggered();
-    void on_actionHelpMPTShark_triggered();
-    void on_actionHelpMPRawShark_triggered();
+    void on_actionHelpMPCapinfos_triggered();
     void on_actionHelpMPDumpcap_triggered();
-    void on_actionHelpMPMergecap_triggered();
     void on_actionHelpMPEditcap_triggered();
+    void on_actionHelpMPMergecap_triggered();
+    void on_actionHelpMPRawShark_triggered();
+    void on_actionHelpMPReordercap_triggered();
     void on_actionHelpMPText2cap_triggered();
+    void on_actionHelpMPTShark_triggered();
     void on_actionHelpWebsite_triggered();
     void on_actionHelpFAQ_triggered();
     void on_actionHelpAsk_triggered();
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index f4feb4fd31..29fb1cc118 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -97,7 +97,7 @@
      <x>0</x>
      <y>0</y>
      <width>960</width>
-     <height>22</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -222,12 +222,14 @@
      <addaction name="actionHelpMPWireshark"/>
      <addaction name="actionHelpMPWireshark_Filter"/>
      <addaction name="separator"/>
-     <addaction name="actionHelpMPTShark"/>
-     <addaction name="actionHelpMPRawShark"/>
+     <addaction name="actionHelpMPCapinfos"/>
      <addaction name="actionHelpMPDumpcap"/>
-     <addaction name="actionHelpMPMergecap"/>
      <addaction name="actionHelpMPEditcap"/>
+     <addaction name="actionHelpMPMergecap"/>
+     <addaction name="actionHelpMPRawShark"/>
+     <addaction name="actionHelpMPReordercap"/>
      <addaction name="actionHelpMPText2cap"/>
+     <addaction name="actionHelpMPTShark"/>
     </widget>
     <addaction name="actionHelpContents"/>
     <addaction name="menuHelpManualPages"/>
@@ -1220,6 +1222,16 @@
     <string>Protocol Hierarchy</string>
    </property>
   </action>
+  <action name="actionHelpMPCapinfos">
+   <property name="text">
+    <string>Capinfos</string>
+   </property>
+  </action>
+  <action name="actionHelpMPReordercap">
+   <property name="text">
+    <string>Reordercap</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index e5b60d4710..cf4d2881dc 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -1584,35 +1584,43 @@ void MainWindow::on_actionHelpMPWireshark_triggered() {
 
     wsApp->helpTopicAction(LOCALPAGE_MAN_WIRESHARK);
 }
-void MainWindow::on_actionHelpMPWireshark_Filter_triggered() {
 
+void MainWindow::on_actionHelpMPWireshark_Filter_triggered() {
     wsApp->helpTopicAction(LOCALPAGE_MAN_WIRESHARK_FILTER);
 }
-void MainWindow::on_actionHelpMPTShark_triggered() {
 
-    wsApp->helpTopicAction(LOCALPAGE_MAN_TSHARK);
+void MainWindow::on_actionHelpMPCapinfos_triggered() {
+    wsApp->helpTopicAction(LOCALPAGE_MAN_CAPINFOS);
 }
-void MainWindow::on_actionHelpMPRawShark_triggered() {
 
-    wsApp->helpTopicAction(LOCALPAGE_MAN_RAWSHARK);
-}
 void MainWindow::on_actionHelpMPDumpcap_triggered() {
-
     wsApp->helpTopicAction(LOCALPAGE_MAN_DUMPCAP);
 }
-void MainWindow::on_actionHelpMPMergecap_triggered() {
 
+void MainWindow::on_actionHelpMPEditcap_triggered() {
+    wsApp->helpTopicAction(LOCALPAGE_MAN_EDITCAP);
+}
+
+void MainWindow::on_actionHelpMPMergecap_triggered() {
     wsApp->helpTopicAction(LOCALPAGE_MAN_MERGECAP);
 }
-void MainWindow::on_actionHelpMPEditcap_triggered() {
 
-    wsApp->helpTopicAction(LOCALPAGE_MAN_EDITCAP);
+void MainWindow::on_actionHelpMPRawShark_triggered() {
+    wsApp->helpTopicAction(LOCALPAGE_MAN_RAWSHARK);
 }
-void MainWindow::on_actionHelpMPText2cap_triggered() {
 
+void MainWindow::on_actionHelpMPReordercap_triggered() {
+    wsApp->helpTopicAction(LOCALPAGE_MAN_REORDERCAP);
+}
+
+ void MainWindow::on_actionHelpMPText2cap_triggered() {
     wsApp->helpTopicAction(LOCALPAGE_MAN_TEXT2PCAP);
 }
 
+void MainWindow::on_actionHelpMPTShark_triggered() {
+    wsApp->helpTopicAction(LOCALPAGE_MAN_TSHARK);
+}
+
 void MainWindow::on_actionHelpWebsite_triggered() {
 
     wsApp->helpTopicAction(ONLINEPAGE_HOME);