From 0174f42a56c3e95008ffc6a9771f2bb2d155f0f5 Mon Sep 17 00:00:00 2001 From: jblum Date: Sun, 28 Sep 2008 03:35:21 +0000 Subject: [PATCH] freedesktop git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9668 221aa14e-8319-0410-a670-987f0aec2ac5 --- config/grc_grc.m4 | 1 + grc/Makefile.am | 1 + grc/data/platforms/base/Makefile.am | 5 +- grc/data/platforms/python/flow_graph.tmpl | 7 ++- grc/freedesktop/Makefile.am | 46 ++++++++++++++++++ grc/freedesktop/gnuradio-grc.desktop | 8 +++ grc/freedesktop/gnuradio-grc.xml | 8 +++ .../gnuradio-usrp_diagnostics.desktop | 7 +++ .../base => freedesktop}/grc-icon-256.png | Bin .../base => freedesktop}/grc-icon-256.svg | 0 .../base => freedesktop}/grc-icon-32.png | Bin grc/freedesktop/grc-icon-48.png | Bin 0 -> 1691 bytes grc/scripts/grc | 3 +- grc/src/gui/ActionHandler.py | 9 ++-- grc/src/gui/Constants.py | 13 ++++- grc/src/gui/FileDialogs.py | 5 +- grc/src/gui/MainWindow.py | 4 +- grc/src/gui/Preferences.py | 4 +- grc/src/platforms/base/Constants.py.in | 24 ++------- grc/src/platforms/base/Platform.py | 4 +- grc/src/platforms/gui/Param.py | 1 + grc/src/platforms/python/Platform.py | 1 - 22 files changed, 107 insertions(+), 44 deletions(-) create mode 100644 grc/freedesktop/Makefile.am create mode 100644 grc/freedesktop/gnuradio-grc.desktop create mode 100644 grc/freedesktop/gnuradio-grc.xml create mode 100644 grc/freedesktop/gnuradio-usrp_diagnostics.desktop rename grc/{data/platforms/base => freedesktop}/grc-icon-256.png (100%) rename grc/{data/platforms/base => freedesktop}/grc-icon-256.svg (100%) rename grc/{data/platforms/base => freedesktop}/grc-icon-32.png (100%) create mode 100644 grc/freedesktop/grc-icon-48.png diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index c8ea1099..f82c5558 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -76,6 +76,7 @@ AC_DEFUN([GRC_GRC],[ grc/data/platforms/python/Makefile \ grc/data/platforms/python/blocks/Makefile \ grc/scripts/Makefile \ + grc/freedesktop/Makefile \ ]) GRC_BUILD_CONDITIONAL(grc) diff --git a/grc/Makefile.am b/grc/Makefile.am index 5e03d627..104ff186 100644 --- a/grc/Makefile.am +++ b/grc/Makefile.am @@ -24,5 +24,6 @@ include $(top_srcdir)/grc/Makefile.inc SUBDIRS = \ data \ examples \ + freedesktop \ scripts \ src diff --git a/grc/data/platforms/base/Makefile.am b/grc/data/platforms/base/Makefile.am index 56ff5939..aaf53b4f 100644 --- a/grc/data/platforms/base/Makefile.am +++ b/grc/data/platforms/base/Makefile.am @@ -25,7 +25,4 @@ ourdatadir = $(grc_base_data_dir) dist_ourdata_DATA = \ block_tree.dtd \ - flow_graph.dtd \ - grc-icon-256.png \ - grc-icon-256.svg \ - grc-icon-32.png + flow_graph.dtd diff --git a/grc/data/platforms/python/flow_graph.tmpl b/grc/data/platforms/python/flow_graph.tmpl index 0d02d258..6bf79fc8 100644 --- a/grc/data/platforms/python/flow_graph.tmpl +++ b/grc/data/platforms/python/flow_graph.tmpl @@ -41,15 +41,18 @@ $imp #set $class_name = $flow_graph.get_option('id') #set $param_str = ', '.join(['self'] + ['%s=%s'%(param.get_id(), param.get_make()) for param in $parameters]) #if $generate_options == 'wx_gui' - #from gnuradio.grc.platforms.base.Constants import DATA_DIR #from gnuradio.grc.gui import Preferences + #import gtk + #set $icon = gtk.IconTheme().lookup_icon('gnuradio-grc', 32, 0) class $(class_name)(grc_wxgui.top_block_gui): def __init__($param_str): grc_wxgui.top_block_gui.__init__( self, title="$Preferences.window_prefix() - Executing: $flow_graph.get_option('title')", - icon="$(os.path.join($DATA_DIR, 'grc-icon-32.png'))", + #if $icon + icon="$icon.get_filename()", + #end if ) #elif $generate_options == 'no_gui' class $(class_name)(gr.top_block): diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am new file mode 100644 index 00000000..196d3a78 --- /dev/null +++ b/grc/freedesktop/Makefile.am @@ -0,0 +1,46 @@ +# +# Copyright 2008 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/grc/Makefile.inc + +install-data-local: + xdg-icon-resource install --context mimetypes --mode system --size 48 $(srcdir)/grc-icon-48.png application-gnuradio-grc + xdg-icon-resource install --context apps --mode system --size 256 $(srcdir)/grc-icon-256.png gnuradio-grc + xdg-icon-resource install --context apps --mode system --size 32 $(srcdir)/grc-icon-32.png gnuradio-grc + xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop + +uninstall-local: + xdg-icon-resource uninstall --context mimetypes --mode system --size 48 application-gnuradio-grc + xdg-icon-resource uninstall --context apps --mode system --size 256 gnuradio-grc + xdg-icon-resource uninstall --context apps --mode system --size 32 gnuradio-grc + xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop + +EXTRA_DIST = \ + $(srcdir)/grc-icon-256.png \ + $(srcdir)/grc-icon-48.png \ + $(srcdir)/grc-icon-32.png \ + $(srcdir)/gnuradio-grc.xml \ + $(srcdir)/gnuradio-grc.desktop \ + $(srcdir)/gnuradio-usrp_diagnostics.desktop diff --git a/grc/freedesktop/gnuradio-grc.desktop b/grc/freedesktop/gnuradio-grc.desktop new file mode 100644 index 00000000..d9c70ca9 --- /dev/null +++ b/grc/freedesktop/gnuradio-grc.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=GRC +Exec=grc %F +Categories=Development; +MimeType=application/gnuradio-grc; +Icon=gnuradio-grc diff --git a/grc/freedesktop/gnuradio-grc.xml b/grc/freedesktop/gnuradio-grc.xml new file mode 100644 index 00000000..a5cb95d9 --- /dev/null +++ b/grc/freedesktop/gnuradio-grc.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/grc/freedesktop/gnuradio-usrp_diagnostics.desktop b/grc/freedesktop/gnuradio-usrp_diagnostics.desktop new file mode 100644 index 00000000..9a5000bb --- /dev/null +++ b/grc/freedesktop/gnuradio-usrp_diagnostics.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=USRP Diagnostics +Exec=usrp_diagnostics +Categories=Development; +Icon=gnuradio-grc diff --git a/grc/data/platforms/base/grc-icon-256.png b/grc/freedesktop/grc-icon-256.png similarity index 100% rename from grc/data/platforms/base/grc-icon-256.png rename to grc/freedesktop/grc-icon-256.png diff --git a/grc/data/platforms/base/grc-icon-256.svg b/grc/freedesktop/grc-icon-256.svg similarity index 100% rename from grc/data/platforms/base/grc-icon-256.svg rename to grc/freedesktop/grc-icon-256.svg diff --git a/grc/data/platforms/base/grc-icon-32.png b/grc/freedesktop/grc-icon-32.png similarity index 100% rename from grc/data/platforms/base/grc-icon-32.png rename to grc/freedesktop/grc-icon-32.png diff --git a/grc/freedesktop/grc-icon-48.png b/grc/freedesktop/grc-icon-48.png new file mode 100644 index 0000000000000000000000000000000000000000..caddc92ad45d023c4c5627599e976bc2f05a3025 GIT binary patch literal 1691 zcmV;M24wk(P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iOT5 z0S`I+IY2}J00tXLL_t(&-qo0YOw?r@$6sF#4mcE2hn_?oDrJHjqNXd3aWqz-sSKr3 za5I-J(vmG1vsnlISZ%bLOY!^kZV^9is$Wce@7=|l-IVdW_ql~vmKrB!UR09Q`&b5a)m3ReE z13ySrDF#$7Qi=J%J~@};QH6Hx+C@o8Nzf&boScl+YDM1kB48D87lor z8B9%0MX%S>*w{#3UY<8cY5<3f15o}R1~vju1GOIAXjN5}a7P0J1466S zijtBNw`-hEr_kwiV)N$B!V|^B#0j zHHxB8P*8x$WWs8-5*-~q-m!xgKOh6w`@m098uR2+Cx15qpZg^Nhr=N`a&Mb{v$mdLt#k)HIRaI3&Q4~>ES0~0Jr_(76 z27{P8cdqE^=@}2e3o-+^ERER&JPO<`?PHK0lRQ2H(5u($h0$mf@$vCOiMU@x#%&j% zi~(Ran?+e!nNX=zqNu1ycuO4}9U>|!O6c`^(b?JQ34m_c1)6}wQCcxw=07JSz{LQ) z<>lo<2q98ZQiLjcm59}K2?!ek(BI!LQd3ifTCEm}qKHkKHVKQxB7C9R+FGH}XhcLr zgh)$E69*0)a0TE+DS<{Afo;I=z**oD&@aJt0c(cpfts2c+S}Xd?(W8U`w#leYvlg_ zjB)<_`Q+r}P*_+P{k z_7ADha8jvMp-iO*RS004l)`mjk1T95-L-(+#sRb0j1VGdw?1puEP!`_s$s26B-72n zPMKamFEwQi@TJ!Pe9R*KrCwR%j;5bwUKAxOv%|8C3{Gb*08+;J-Y+v!?^}zNm6a%p z643C00@hKtDpZ`i)91rZpKs;#`IbAQFI1fSvd@R@Z+OdB0N#izNFy z;yo!TiKL_?e^n?`KF@>ARUYGW`M#@K)a&edV77e4X9!hhcTasPNxffAPa