[Commit-gnuradio] r9603 - in gnuradio/trunk/grc/src: gui platforms/base

[jblum]

Author: jblum
Date: 2008-09-18 12:52:42 -0600 (Thu, 18 Sep 2008)
New Revision: 9603

Modified:
   gnuradio/trunk/grc/src/gui/Dialogs.py
   gnuradio/trunk/grc/src/gui/Messages.py
   gnuradio/trunk/grc/src/platforms/base/Constants.py.in
   gnuradio/trunk/grc/src/platforms/base/Makefile.am
Log:
making use of PACKAGE

Modified: gnuradio/trunk/grc/src/gui/Dialogs.py
===================================================================
--- gnuradio/trunk/grc/src/gui/Dialogs.py       2008-09-18 17:01:46 UTC (rev 
9602)
+++ gnuradio/trunk/grc/src/gui/Dialogs.py       2008-09-18 18:52:42 UTC (rev 
9603)
@@ -21,7 +21,7 @@
 pygtk.require('2.0')
 import gtk
 from Constants import MIN_DIALOG_WIDTH, MIN_DIALOG_HEIGHT
-from .. platforms.base.Constants import VERSION
+from .. platforms.base.Constants import PACKAGE, VERSION
 import Preferences
 
 class TextDisplay(gtk.TextView):
@@ -85,8 +85,8 @@
        def __init__(self):
                """AboutDialog constructor."""
                gtk.AboutDialog.__init__(self)
+               self.set_name(PACKAGE)
                self.set_version(VERSION)
-               self.set_name('GNU Radio Companion')
                self.set_license(__doc__)
                self.set_copyright(__doc__.strip().splitlines()[0])
                
self.set_website('http://gnuradio.org/trac/wiki/GNURadioCompanion')

Modified: gnuradio/trunk/grc/src/gui/Messages.py
===================================================================
--- gnuradio/trunk/grc/src/gui/Messages.py      2008-09-18 17:01:46 UTC (rev 
9602)
+++ gnuradio/trunk/grc/src/gui/Messages.py      2008-09-18 18:52:42 UTC (rev 
9603)
@@ -17,7 +17,7 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from .. platforms.base.Constants import VERSION
+from .. platforms.base.Constants import PACKAGE, VERSION
 import traceback
 import sys
 
@@ -45,7 +45,7 @@
 # Special functions for specific program functionalities
 ###########################################################################
 def send_init():
-       send("""<<< Welcome to GNU Radio Companion %s >>>\n"""%VERSION)
+       send("""<<< Welcome to %s %s >>>\n"""%(PACKAGE, VERSION))
 
 def send_page_switch(file_path):
        send('\nShowing: "%s"\n'%file_path)

Modified: gnuradio/trunk/grc/src/platforms/base/Constants.py.in
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Constants.py.in       2008-09-18 
17:01:46 UTC (rev 9602)
+++ gnuradio/trunk/grc/src/platforms/base/Constants.py.in       2008-09-18 
18:52:42 UTC (rev 9603)
@@ -19,7 +19,10 @@
 
 import os
 
-##The current version of this code
+##The package name.
+PACKAGE = '@PACKAGE@'
+
+##The current version.
 VERSION = '@VERSION@'
 
 ##Location of external data files.

Modified: gnuradio/trunk/grc/src/platforms/base/Makefile.am
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Makefile.am   2008-09-18 17:01:46 UTC 
(rev 9602)
+++ gnuradio/trunk/grc/src/platforms/base/Makefile.am   2008-09-18 18:52:42 UTC 
(rev 9603)
@@ -38,6 +38,7 @@
 
 Constants.py: Makefile $(srcdir)/Constants.py.in
        sed \
+               -e 's|@address@hidden|$(PACKAGE)|g' \
                -e 's|@address@hidden|$(VERSION)|g' \
                -e 's|@address@hidden|$(grc_base_data_dir)|g' \
        $(srcdir)/Constants.py.in > $@