diff --git a/CMakeLists.txt b/CMakeLists.txt index 23390595d3450c80e328454e63c3e6748a0ed630..3a37b542c2cd5046c86fa8484dc4ee8a516d0b7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ ENDIF( CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" ) set(CMAKE_CXX_STANDARD 14) #depending on libpappsomspp version : -SET(LIBPAPPSOMSPP_VERSION "0.3.0-3") +SET(LIBPAPPSOMSPP_VERSION "0.3.1-1") configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY) @@ -41,7 +41,7 @@ SET(SOFTWARE_NAME "XTPcpp") SET(XTPCPP_VERSION_MAJOR "0") SET(XTPCPP_VERSION_MINOR "2") -SET(XTPCPP_VERSION_PATCH "4") +SET(XTPCPP_VERSION_PATCH "5") 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 diff --git a/debian/changelog b/debian/changelog index 5faed3e12cbac5a4d3787e671f257472dae4c369..93457e009ac8d06c22b6698ba87338fa77f10817 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xtpcpp (0.2.5-1) stretch; urgency=medium + + * search on msrun and scan, better individual mode, better widgets + + -- Olivier Langella <olivier.langella@u-psud.fr> Wed, 10 Jan 2018 14:50:52 +0100 + xtpcpp (0.2.4-1) stretch; urgency=medium * new peptide widget diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a65ad069755f111e8b9709f537a4afde51751ab3..2548c7a419aead0c24f79f52174c951b4bdb57c0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,12 +27,12 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5 #sudo apt-get install libpappsomspp-dev -#FIND_PACKAGE( Pappsomspp REQUIRED ) - SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp") +FIND_PACKAGE( Pappsomspp REQUIRED ) +# SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp") # SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp") - SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src") - SET (PAPPSOMSPP_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so") - SET (PAPPSOMSPP_WIDGET_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so") +# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src") +# SET (PAPPSOMSPP_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so") +# SET (PAPPSOMSPP_WIDGET_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so") # SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so") IF (PAPPSOMSPP_QT5_FOUND) ELSE (PAPPSOMSPP_QT5_FOUND) diff --git a/src/gui/project_view/project_view.ui b/src/gui/project_view/project_view.ui index 5540a46603486f9144ee9889421c96c9062afa9f..b6425a66ad6810815c5e3bf2c8689d721166bc37 100644 --- a/src/gui/project_view/project_view.ui +++ b/src/gui/project_view/project_view.ui @@ -32,7 +32,11 @@ </attribute> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> - <widget class="QComboBox" name="identifications_combobox"/> + <widget class="QComboBox" name="identifications_combobox"> + <property name="editable"> + <bool>false</bool> + </property> + </widget> </item> <item row="1" column="0"> <widget class="QWidget" name="identifications_widget" native="true"/>