diff --git a/debian/control b/debian/control index caf1821..dfd09e4 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Rules-Requires-Root: no Package: python3-damaris Architecture: all Provides: damaris-frontend-py3 -Depends: ${python3:Depends}, python3-numpy, python3-scipy, python3-gi, python3-matplotlib, python3-tables, lzop, python3-xdg, libgtksourceview-3.0-1, libgirepository1.0-dev | libgirepository-2.0-dev +Depends: ${python3:Depends}, python3-numpy, python3-scipy, python3-gi, python3-matplotlib, python3-tables, lzop, python3-xdg, libgtksourceview-3.0-1, libgirepository1.0-dev | libgirepository-2.0-dev, breeze-icon-theme Recommends: damaris-backends, python3-numpy-ext Suggests: python3-doc, python3-tables-doc, python3-numpy-doc Description: python frontend for DAMARIS project diff --git a/debian/damaris3.desktop b/debian/damaris3.desktop index 6000421..fe6c94d 100644 --- a/debian/damaris3.desktop +++ b/debian/damaris3.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=DAMARIS3 Comment=DArmstadt MAgnetic Resonance Instrument Software -Exec=/usr/bin/DAMARIS3 %F +Exec=DAMARIS3 %F X-MultipleArgs=true Terminal=false MimeType=text/x-python;text/plain; diff --git a/debian/install b/debian/install index 8ec5064..2fa4ada 100644 --- a/debian/install +++ b/debian/install @@ -1 +1,4 @@ doc/ usr/share/doc/python3-damaris/ +debian/damaris3.desktop usr/share/applications/ +src/damaris/gui/DAMARIS3.png usr/share/pixmaps/ +src/damaris/gui/DAMARIS3.ico usr/share/pixmaps/ diff --git a/debian/python3-damaris.menu b/debian/python3-damaris.menu index 38c677a..4031b2d 100644 --- a/debian/python3-damaris.menu +++ b/debian/python3-damaris.menu @@ -1 +1 @@ -?package(python-damaris): needs="X11" section="Apps/Science" title="DAMARIS3" longtitle="DArmstadt Magnetic Resonance Instrument Software" command="DAMARIS3" icon="/usr/share/python-damaris/images/DAMARIS3.png" +?package(python3-damaris): needs="X11" section="Applications/Science" title="DAMARIS3" longtitle="DArmstadt Magnetic Resonance Instrument Software" command="DAMARIS3" icon="/usr/share/pixmaps/DAMARIS3.png" diff --git a/src/damaris/gui/DamarisGUI.py b/src/damaris/gui/DamarisGUI.py index 62f8395..ce60797 100644 --- a/src/damaris/gui/DamarisGUI.py +++ b/src/damaris/gui/DamarisGUI.py @@ -253,7 +253,11 @@ class DamarisGUI: self.xml_gui.add_from_file(glade_file) self.main_window = self.xml_gui.get_object( "main_window" ) self.main_window.connect( "delete-event", self.quit_event ) - self.main_window.set_icon_from_file( os.path.join( os.path.dirname( __file__ ), "DAMARIS3.png" ) ) + for icon_path in ["/usr/share/pixmaps/DAMARIS3.png", + os.path.join( os.path.dirname( __file__ ), "DAMARIS3.png" )]: + if os.path.exists(icon_path): + self.main_window.set_icon_from_file(icon_path) + break self.main_window.set_title( "DAMARIS-%s" % __version__ )