diff options
| -rw-r--r-- | grc/freedesktop/Makefile.am | 2 | ||||
| -rw-r--r-- | grc/freedesktop/grc_setup_freedesktop.in | 14 | ||||
| -rw-r--r-- | grc/src/gui/MainWindow.py | 4 | ||||
| -rw-r--r-- | grc/todo.txt | 3 |
4 files changed, 19 insertions, 4 deletions
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 9595af88c..3ec4ac5b2 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -43,4 +43,4 @@ MOSTLYCLEANFILES = $(BUILT_SOURCES) install-data-hook: grc_setup_freedesktop grc_setup_freedesktop install uninstall-hook: grc_setup_freedesktop - sh grc_setup_freedesktop uninstall . + bash $(srcdir)/grc_setup_freedesktop uninstall $(srcdir) diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index b904ffff2..526cc27e4 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ################################################## # setup grc on a freedesktop platform # $1 should be install or uninstall @@ -16,26 +16,38 @@ fi case "$1" in 'install') + echo "Begin freedesktop install..." for size in ${ICON_SIZES}; do \ + echo "Install icon: ${size}x${size}" xdg-icon-resource install --context mimetypes --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ xdg-icon-resource install --context mimetypes --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ xdg-icon-resource install --context apps --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ xdg-icon-resource install --context apps --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ done + echo "Install mime type" xdg-mime install ${SRCDIR}/gnuradio-grc.xml + echo "Install menu items" xdg-desktop-menu install ${SRCDIR}/gnuradio-grc.desktop xdg-desktop-menu install ${SRCDIR}/gnuradio-usrp_diagnostics.desktop + echo "Done!" + echo "" ;; 'uninstall') + echo "Begin freedesktop uninstall..." for size in ${ICON_SIZES}; do \ + echo "Uninstall icon: ${size}x${size}" xdg-icon-resource uninstall --context mimetypes --theme gnome --size ${size} application-gnuradio-grc; \ xdg-icon-resource uninstall --context mimetypes --size ${size} application-gnuradio-grc; \ xdg-icon-resource uninstall --context apps --theme gnome --size ${size} gnuradio-grc; \ xdg-icon-resource uninstall --context apps --size ${size} gnuradio-grc; \ done + echo "Uninstall mime type" xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml + echo "Uninstall menu items" xdg-desktop-menu uninstall gnuradio-grc.desktop xdg-desktop-menu uninstall gnuradio-usrp_diagnostics.desktop + echo "Done!" + echo "" ;; *) echo "Usage: $0 [install|uninstall]" diff --git a/grc/src/gui/MainWindow.py b/grc/src/gui/MainWindow.py index 647c4db1e..b86ec4cbd 100644 --- a/grc/src/gui/MainWindow.py +++ b/grc/src/gui/MainWindow.py @@ -21,7 +21,9 @@ from Constants import \ MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT, \ NEW_FLOGRAPH_TITLE, REPORTS_WINDOW_HEIGHT, \ FLOW_GRAPH_FILE_EXTENSION -from Actions import APPLICATION_QUIT, FLOW_GRAPH_KILL +from Actions import \ + APPLICATION_QUIT, FLOW_GRAPH_KILL, \ + FLOW_GRAPH_SAVE import pygtk pygtk.require('2.0') import gtk diff --git a/grc/todo.txt b/grc/todo.txt index 807b01e48..d74f7c858 100644 --- a/grc/todo.txt +++ b/grc/todo.txt @@ -16,8 +16,9 @@ -hotkeys in action descriptions -log slider gui control -icons for certain blocks, + for add --zoom in/out (cairo vector graphics) +-zoom in/out (cairo vector graphics) (use scroll wheel as control) -search for blocks +-click and drag on whitespace to scroll ################################################## # Problems |