[Commit-gnuradio] r9705 - in gnuradio/trunk/grc: . freedesktop src/gui

[jblum]

Author: jblum
Date: 2008-10-02 23:27:52 -0600 (Thu, 02 Oct 2008)
New Revision: 9705

Modified:
   gnuradio/trunk/grc/freedesktop/Makefile.am
   gnuradio/trunk/grc/freedesktop/grc_setup_freedesktop.in
   gnuradio/trunk/grc/src/gui/MainWindow.py
   gnuradio/trunk/grc/todo.txt
Log:
verbose messages for freedesktop installer, added missing import for main window

Modified: gnuradio/trunk/grc/freedesktop/Makefile.am
===================================================================
--- gnuradio/trunk/grc/freedesktop/Makefile.am  2008-10-03 00:48:47 UTC (rev 
9704)
+++ gnuradio/trunk/grc/freedesktop/Makefile.am  2008-10-03 05:27:52 UTC (rev 
9705)
@@ -43,4 +43,4 @@
 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)

Modified: gnuradio/trunk/grc/freedesktop/grc_setup_freedesktop.in
===================================================================
--- gnuradio/trunk/grc/freedesktop/grc_setup_freedesktop.in     2008-10-03 
00:48:47 UTC (rev 9704)
+++ gnuradio/trunk/grc/freedesktop/grc_setup_freedesktop.in     2008-10-03 
05:27:52 UTC (rev 9705)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ##################################################
 # setup grc on a freedesktop platform
 # $1 should be install or uninstall
@@ -16,26 +16,38 @@
 
 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]"

Modified: gnuradio/trunk/grc/src/gui/MainWindow.py
===================================================================
--- gnuradio/trunk/grc/src/gui/MainWindow.py    2008-10-03 00:48:47 UTC (rev 
9704)
+++ gnuradio/trunk/grc/src/gui/MainWindow.py    2008-10-03 05:27:52 UTC (rev 
9705)
@@ -21,7 +21,9 @@
        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

Modified: gnuradio/trunk/grc/todo.txt
===================================================================
--- gnuradio/trunk/grc/todo.txt 2008-10-03 00:48:47 UTC (rev 9704)
+++ gnuradio/trunk/grc/todo.txt 2008-10-03 05:27:52 UTC (rev 9705)
@@ -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