Commit 64622c2e authored by Olivier Langella's avatar Olivier Langella
Browse files

new debian package files

svg icon installed
desktop launchers

git-svn-id: https://subversion.renater.fr/masschroq/trunk@2434 e4b6dbb4-9209-464b-83f7-6257456c460c
parent 500991ce
......@@ -187,6 +187,7 @@ MESSAGE("configuring file ${masschroq_SOURCE_DIR}/src/config.h.cmake")
configure_file (${masschroq_SOURCE_DIR}/src/config.h.cmake ${masschroq_SOURCE_DIR}/src/config.h)
SET(CPACK_PACKAGE_EXECUTABLES "masschroq" "masschroq")
......@@ -200,12 +201,22 @@ INCLUDE(CPack)
# Recurse into the "src" subdirectories. This does not actually
# cause another cmake executable to run. The same process will walk through
# the project's entire directory structure.
MESSAGE("configuring debian/masschroq-common.install")
configure_file (${masschroq_SOURCE_DIR}/templates/debian/masschroq-common.install.cmake ${masschroq_SOURCE_DIR}/debian/masschroq-common.install)
MESSAGE("configuring masschroq-gui.desktop")
configure_file (${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-gui.desktop.cmake ${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-gui.desktop)
MESSAGE("configuring masschroq-studio.desktop")
configure_file (${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-studio.desktop.cmake ${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-studio.desktop)
add_subdirectory (src)
#INSTALL library libmasschroq is in the src/CMakeLists file
INSTALL(PROGRAMS src/masschroq DESTINATION bin)
INSTALL(PROGRAMS src/masschroq_gui DESTINATION bin)
INSTALL(PROGRAMS src/masschroq_studio DESTINATION bin)
INSTALL(FILES ${MASSCHROQ_XSD_LOCATION_DIR}/${MASSCHROQ_SCHEMA_FILE} DESTINATION share/xml/schema)
INSTALL(FILES ${masschroq_SOURCE_DIR}/doc/logo/masschroq.svg DESTINATION share/masschroq)
INSTALL(FILES ${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-gui.desktop DESTINATION share/applications)
INSTALL(FILES ${masschroq_SOURCE_DIR}/templates/share/applications/masschroq-studio.desktop DESTINATION share/applications)
INSTALL(FILES doc/man1/masschroq.1.gz DESTINATION share/man/man1)
#INSTALL(FILES doc/manual/masschroq_manual.pdf DESTINATION share/doc/masschroq)
#INSTALL(FILES doc/debian/changelog DESTINATION share/doc/masschroq)
......
......@@ -25,7 +25,7 @@ Description: Mass Chromatogram Quantification shared libraries
Package: masschroq
Architecture: any
Depends: masschroq-common (= ${binary:Version}), ${shlibs:Depends}, libqt4-network (>= 4.6.3), libqt4-xmlpatterns (>= 4.6.3), libqt4-xml (>= 4.6.3)
Depends: ${shlibs:Depends}, masschroq-common (= ${binary:Version}), libqt4-xml (>= 4.6.3)
Suggests: masschroq-gui, masschroq-studio
Description: Mass Chromatogram Quantification CLI (Command Line Interface)
MassChroQ (Mass Chromatogram Quantification) software performs quantification
......@@ -37,7 +37,7 @@ Description: Mass Chromatogram Quantification CLI (Command Line Interface)
Package: masschroq-gui
Architecture: any
Depends: masschroq (= ${binary:Version}), ${shlibs:Depends},libqtgui4 (>= 4.6.3),libqwt5-qt4 (>= 5.2.0)
Depends: ${shlibs:Depends}, masschroq (= ${binary:Version}), libqtgui4 (>= 4.6.3), libqt4-xmlpatterns (>= 4.6.3), libqt4-network (>= 4.6.3)
Suggests: masschroq-studio
Description: Mass Chromatogram Quantification graphical user interface
MassChroQ (Mass Chromatogram Quantification) software performs quantification
......@@ -49,7 +49,7 @@ Description: Mass Chromatogram Quantification graphical user interface
Package: masschroq-studio
Architecture: any
Depends: masschroq (= ${binary:Version}), ${shlibs:Depends},libqtgui4 (>= 4.6.3),libqwt5-qt4 (>= 5.2.0)
Depends: ${shlibs:Depends}, masschroq (= ${binary:Version}), libqtgui4 (>= 4.6.3),libqwt5-qt4 (>= 5.2.0), libqt4-xml (>= 4.6.3)
Suggests: masschroq-gui
Description: Mass Chromatogram Quantification graphical user interface to edit parameters
MassChroQ (Mass Chromatogram Quantification) software performs quantification
......
/usr/lib/libmasschroq.so.1.0.0
/usr/lib/libmasschroq.so.1
/usr/lib/libmasschroq.so
\ No newline at end of file
/usr/local/lib/libmasschroq.so.1.0.0
/usr/local/lib/libmasschroq.so.1
/usr/local/lib/libmasschroq.so
/usr/local/share/xml/schema/masschroq-2.0.xsd
/usr/local/share/masschroq/masschroq.svg
/usr/bin/masschroq_gui
\ No newline at end of file
/usr/bin/masschroq_gui
/usr/share/applications/masschroq-gui.desktop
\ No newline at end of file
/usr/bin/masschroq_studio
\ No newline at end of file
/usr/bin/masschroq_studio
/usr/share/applications/masschroq-studio.desktop
\ No newline at end of file
......@@ -9,6 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export QTVERSION=4.6.3
export DESTDIR=$(CURDIR)/debian/tmp
......
......@@ -20,6 +20,16 @@
LauncherMainWindow::LauncherMainWindow(QWidget *parent) :
QMainWindow(parent) {
QFileInfo mcq_icon;
mcq_icon.setFile("/usr/share/masschroq.svg");
if (mcq_icon.exists()) {
setWindowIcon(QIcon(mcq_icon.filePath()));
}
mcq_icon.setFile("/usr/local/share/masschroq.svg");
if (mcq_icon.exists()) {
setWindowIcon(QIcon(mcq_icon.filePath()));
}
_logQTextEdit = 0;
_masschroqRunningThread = 0;
_masschroq = new MassChroq();
......
......@@ -24,6 +24,15 @@
ParameterMainWindow::ParameterMainWindow(QWidget *parent) :
QMainWindow(parent) {
QFileInfo mcq_icon;
mcq_icon.setFile("/usr/share/masschroq.svg");
if (mcq_icon.exists()) {
setWindowIcon(QIcon(mcq_icon.filePath()));
}
mcq_icon.setFile("/usr/local/share/masschroq.svg");
if (mcq_icon.exists()) {
setWindowIcon(QIcon(mcq_icon.filePath()));
}
dock = 0;
_dockLog = 0;
_plot_area = 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment