Merge branch 'master' of ssh://git.renater.fr:2222/xtandempipeline

CMakeLists.txt

@@ -41,7 +41,7 @@ SET(SOFTWARE_NAME "XTPcpp")
 
 SET(XTPCPP_VERSION_MAJOR "0")
 SET(XTPCPP_VERSION_MINOR "1")
-SET(XTPCPP_VERSION_PATCH "16")
+SET(XTPCPP_VERSION_PATCH "17")
 SET(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}")
 
 # Set the CMAKE_PREFIX_PATH for the find_library fonction when using non

debian/changelog

+xtpcpp (0.1.17-2) stretch; urgency=medium
+
+  * fix desktop file
+
+ -- Olivier Langella <olivier.langella@u-psud.fr>  Fri, 22 Sep 2017 15:42:11 +0200
+
+xtpcpp (0.1.17-1) stretch; urgency=medium
+
+  * better tandem run dialog box
+  * success message after tandem run (thanks T. Balliau)
+  * condor/tmp_dir_autoremove parameter to keep log files
+  * choose number of threads for tandem run
+  * XPIP mime type associated to xtpcpp
+
+ -- Olivier Langella <olivier.langella@u-psud.fr>  Fri, 22 Sep 2017 14:36:15 +0200
+
 xtpcpp (0.1.16-1) stretch; urgency=medium
 
   * qt5 switch

src/gui/tandem_run_dialog/tandem_run_dialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Load identification results</string>
+   <string>X!Tandem run settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>

templates/share/applications/xtpcpp.desktop.cmake

@@ -4,7 +4,7 @@ Version=1.0
 Name=X!TandemPipeline C++
 Categories=Science;Biology;Education;Qt;
 Comment=Protein inference tool
-Exec=${CMAKE_INSTALL_PREFIX}/bin/xtpcpp %U
+Exec=${CMAKE_INSTALL_PREFIX}/bin/xtpcpp %f
 Icon=${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/xtpcpp.svg
 Terminal=false
 Type=Application