[GRASS-SVN] r32743 - in grass/branches/develbranch_6: gui gui/icons
gui/images gui/wxpython gui/wxpython/gui_modules lib/init
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 13 12:08:14 EDT 2008
Author: martinl
Date: 2008-08-13 12:08:13 -0400 (Wed, 13 Aug 2008)
New Revision: 32743
Added:
grass/branches/develbranch_6/gui/icons/grass.ico
grass/branches/develbranch_6/gui/icons/grass_dialog.ico
grass/branches/develbranch_6/gui/icons/grass_error.ico
grass/branches/develbranch_6/gui/icons/grass_map.ico
grass/branches/develbranch_6/gui/icons/grass_nviz.ico
grass/branches/develbranch_6/gui/icons/grass_sql.ico
grass/branches/develbranch_6/gui/images/
grass/branches/develbranch_6/gui/images/Makefile
grass/branches/develbranch_6/gui/images/gintro.gif
Removed:
grass/branches/develbranch_6/lib/init/gintro.gif
grass/branches/develbranch_6/lib/init/grass.ico
grass/branches/develbranch_6/lib/init/grass_dialog.ico
grass/branches/develbranch_6/lib/init/grass_error.ico
grass/branches/develbranch_6/lib/init/grass_map.ico
grass/branches/develbranch_6/lib/init/grass_nviz.ico
grass/branches/develbranch_6/lib/init/grass_sql.ico
Modified:
grass/branches/develbranch_6/gui/Makefile
grass/branches/develbranch_6/gui/icons/Makefile
grass/branches/develbranch_6/gui/wxpython/gis_set.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/gcmd.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/profile.py
grass/branches/develbranch_6/gui/wxpython/gui_modules/sqlbuilder.py
grass/branches/develbranch_6/gui/wxpython/wxgui.py
grass/branches/develbranch_6/lib/init/Makefile
grass/branches/develbranch_6/lib/init/gis_set.tcl
Log:
lib/init: ICO files moved to gui/icons, intro image to gui/images
Modified: grass/branches/develbranch_6/gui/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/Makefile 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/Makefile 2008-08-13 16:08:13 UTC (rev 32743)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ..
-SUBDIRS = icons scripts xml tcltk wxpython
+SUBDIRS = icons images scripts xml tcltk wxpython
include $(MODULE_TOPDIR)/include/Make/Platform.make
@@ -9,4 +9,3 @@
default: parsubdirs
clean: cleansubdirs
-
Modified: grass/branches/develbranch_6/gui/icons/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/icons/Makefile 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/icons/Makefile 2008-08-13 16:08:13 UTC (rev 32743)
@@ -2,13 +2,14 @@
include $(MODULE_TOPDIR)/include/Make/Dir.make
-default:
- if [ ! -d $(GISBASE)/etc/gui ] ; then $(MKDIR) $(GISBASE)/etc/gui ; fi
- if [ ! -d $(GISBASE)/etc/gui/icons ] ; then $(MKDIR) $(GISBASE)/etc/gui/icons ; fi
- if [ ! -d $(GISBASE)/etc/gui/icons/grass ] ; then $(MKDIR) $(GISBASE)/etc/gui/icons/grass ; fi
- if [ ! -d $(GISBASE)/etc/gui/icons/silk ] ; then $(MKDIR) $(GISBASE)/etc/gui/icons/silk ; fi
- for icon in grass/*.gif ; do $(INSTALL_DATA) $$icon $(GISBASE)/etc/gui/icons/grass ; done
- for icon in silk/*.png ; do $(INSTALL_DATA) $$icon $(GISBASE)/etc/gui/icons/silk ; done
+default: $(ICONS)
+ if [ ! -d $(ETC)/gui ] ; then $(MKDIR) $(ETC)/gui ; fi
+ if [ ! -d $(ETC)/gui/icons ] ; then $(MKDIR) $(ETC)/gui/icons ; fi
+ if [ ! -d $(ETC)/gui/icons/grass ] ; then $(MKDIR) $(ETC)/gui/icons/grass ; fi
+ if [ ! -d $(ETC)/gui/icons/silk ] ; then $(MKDIR) $(ETC)/gui/icons/silk ; fi
+ for icon in grass/*.gif ; do $(INSTALL_DATA) $$icon $(ETC)/gui/icons/grass ; done
+ for icon in silk/*.png ; do $(INSTALL_DATA) $$icon $(ETC)/gui/icons/silk ; done
+ for icon in *.ico ; do $(INSTALL_DATA) $$icon $(ETC)/gui/icons ; done
if [ ! -d $(GISBASE)/docs ] ; then $(MKDIR) $(GISBASE)/docs ; fi
if [ ! -d $(GISBASE)/docs/html ] ; then $(MKDIR) $(GISBASE)/docs/html ; fi
if [ ! -d $(GISBASE)/docs/html/icons ] ; then $(MKDIR) $(GISBASE)/docs/html/icons ; fi
@@ -16,3 +17,4 @@
if [ ! -d $(GISBASE)/docs/html/icons/silk ] ; then $(MKDIR) $(GISBASE)/docs/html/icons/silk ; fi
for icon in grass/*.gif ; do $(INSTALL_DATA) $$icon $(GISBASE)/docs/html/icons/grass ; done
for icon in silk/*.png ; do $(INSTALL_DATA) $$icon $(GISBASE)/docs/html/icons/silk ; done
+
Copied: grass/branches/develbranch_6/gui/icons/grass.ico (from rev 32736, grass/branches/develbranch_6/lib/init/grass.ico)
===================================================================
(Binary files differ)
Property changes on: grass/branches/develbranch_6/gui/icons/grass.ico
___________________________________________________________________
Name: svn:mime-type
+ image/x-icon
Name: svn:mergeinfo
+
Copied: grass/branches/develbranch_6/gui/icons/grass_dialog.ico (from rev 32736, grass/branches/develbranch_6/lib/init/grass_dialog.ico)
===================================================================
(Binary files differ)
Property changes on: grass/branches/develbranch_6/gui/icons/grass_dialog.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:mergeinfo
+
Copied: grass/branches/develbranch_6/gui/icons/grass_error.ico (from rev 32736, grass/branches/develbranch_6/lib/init/grass_error.ico)
===================================================================
(Binary files differ)
Property changes on: grass/branches/develbranch_6/gui/icons/grass_error.ico
___________________________________________________________________
Name: svn:mime-type
+ image/x-icon
Name: svn:mergeinfo
+
Copied: grass/branches/develbranch_6/gui/icons/grass_map.ico (from rev 32736, grass/branches/develbranch_6/lib/init/grass_map.ico)
===================================================================
(Binary files differ)
Property changes on: grass/branches/develbranch_6/gui/icons/grass_map.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:mergeinfo
+
Copied: grass/branches/develbranch_6/gui/icons/grass_nviz.ico (from rev 32736, grass/branches/develbranch_6/lib/init/grass_nviz.ico)
===================================================================
(Binary files differ)
Property changes on: grass/branches/develbranch_6/gui/icons/grass_nviz.ico
___________________________________________________________________
Name: svn:mime-type
+ image/x-icon
Name: svn:mergeinfo
+
Copied: grass/branches/develbranch_6/gui/icons/grass_sql.ico (from rev 32736, grass/branches/develbranch_6/lib/init/grass_sql.ico)
===================================================================
(Binary files differ)
Property changes on: grass/branches/develbranch_6/gui/icons/grass_sql.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:mergeinfo
+
Added: grass/branches/develbranch_6/gui/images/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/images/Makefile (rev 0)
+++ grass/branches/develbranch_6/gui/images/Makefile 2008-08-13 16:08:13 UTC (rev 32743)
@@ -0,0 +1,9 @@
+MODULE_TOPDIR = ../..
+
+include $(MODULE_TOPDIR)/include/Make/Dir.make
+
+default:
+ if [ ! -d $(ETC)/gui ] ; then $(MKDIR) $(ETC)/gui ; fi
+ if [ ! -d $(ETC)/gui/images ] ; then $(MKDIR) $(ETC)/gui/images ; fi
+ $(INSTALL_DATA) gintro.gif $(ETC)/gui/images/gintro.gif
+
Property changes on: grass/branches/develbranch_6/gui/images/Makefile
___________________________________________________________________
Name: svn:mime-type
+ text/x-sh
Name: svn:keywords
+ Author Date Id
Name: svn:eol-style
+ native
Copied: grass/branches/develbranch_6/gui/images/gintro.gif (from rev 32736, grass/branches/develbranch_6/lib/init/gintro.gif)
===================================================================
(Binary files differ)
Property changes on: grass/branches/develbranch_6/gui/images/gintro.gif
___________________________________________________________________
Name: svn:mime-type
+ image/gif
Name: svn:mergeinfo
+
Modified: grass/branches/develbranch_6/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gis_set.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gis_set.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -64,7 +64,7 @@
#
# image
try:
- name = os.path.join(globalvar.ETCDIR, "gintro.gif")
+ name = os.path.join(globalvar.ETCDIR, "gui", "images", "gintro.gif")
self.hbitmap = wx.StaticBitmap(self.panel, wx.ID_ANY,
wx.Bitmap(name=name,
type=wx.BITMAP_TYPE_GIF))
@@ -170,7 +170,7 @@
def _set_properties(self):
"""Set frame properties"""
self.SetTitle(_("Welcome to GRASS GIS"))
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, "grass.ico"),
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, "grass.ico"),
wx.BITMAP_TYPE_ICO))
self.lwelcome.SetForegroundColour(wx.Colour(35, 142, 35))
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -390,7 +390,7 @@
wx.Frame.__init__(self, parent, id, title, style=style)
# icon
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_sql.ico'), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_sql.ico'), wx.BITMAP_TYPE_ICO))
self.panel = wx.Panel(parent=self, id=wx.ID_ANY)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gcmd.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gcmd.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gcmd.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -66,7 +66,7 @@
caption=self.title,
message=self.message,
style=wx.ICON_ERROR | wx.CENTRE)
- dlg.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_error.ico'), wx.BITMAP_TYPE_ICO))
+ dlg.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_error.ico'), wx.BITMAP_TYPE_ICO))
if self.parent:
dlg.CentreOnParent()
else:
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/georect.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -607,7 +607,7 @@
wx.Frame.__init__(self, parent, id, title, size=(625, 300))
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_map.ico'), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_map.ico'), wx.BITMAP_TYPE_ICO))
#
# init variables
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -71,6 +71,7 @@
# path to python scripts
ETCDIR = os.path.join(os.getenv("GISBASE"), "etc")
+ETCICONDIR = os.path.join(os.getenv("GISBASE"), "etc", "gui", "icons")
ETCWXDIR = os.path.join(ETCDIR, "wxpython")
"""Style definition for FlatNotebook pages"""
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -2422,7 +2422,7 @@
self.SetClientSize(size)
self.iconsize = (16, 16)
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_map.ico'), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_map.ico'), wx.BITMAP_TYPE_ICO))
#
# Fancy gui
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -588,7 +588,7 @@
self.CreateStatusBar()
# icon
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_dialog.ico'), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_dialog.ico'), wx.BITMAP_TYPE_ICO))
# menu
# menu = wx.Menu()
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/nviz.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -1141,7 +1141,7 @@
#
# icon
#
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_nviz.ico'), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_nviz.ico'), wx.BITMAP_TYPE_ICO))
#
# dialog body
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/profile.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/profile.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/profile.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -84,7 +84,7 @@
#
# Icon
#
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_map.ico'), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_map.ico'), wx.BITMAP_TYPE_ICO))
#
# Add toolbar
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/sqlbuilder.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/sqlbuilder.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/sqlbuilder.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -41,7 +41,7 @@
wx.Frame.__init__(self, parent, id, title)
self.SetTitle(_("GRASS SQL Builder: %s") % (qtype.upper()))
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass_sql.ico'), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass_sql.ico'), wx.BITMAP_TYPE_ICO))
#
# variables
Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py 2008-08-13 16:08:13 UTC (rev 32743)
@@ -107,7 +107,7 @@
style=wx.DEFAULT_FRAME_STYLE)
self.SetTitle(self.baseTitle)
- self.SetIcon(wx.Icon(os.path.join(globalvar.ETCDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
+ self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
self._auimgr = wx.aui.AuiManager(self)
Modified: grass/branches/develbranch_6/lib/init/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/init/Makefile 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/lib/init/Makefile 2008-08-13 16:08:13 UTC (rev 32743)
@@ -48,17 +48,9 @@
$(ETC)/gis_set.tcl \
$(ETC)/epsg_option.tcl \
$(ETC)/file_option.tcl \
- $(ETC)/gintro.gif \
$(ETC)/grass-run.sh \
$(ETC)/grass-xterm-wrapper
-ICONS = $(ETC)/grass.ico \
- $(ETC)/grass_map.ico \
- $(ETC)/grass_dialog.ico \
- $(ETC)/grass_sql.ico \
- $(ETC)/grass_nviz.ico \
- $(ETC)/grass_error.ico
-
ifeq ($(findstring darwin,$(ARCH)),darwin)
FILES += \
$(ETC)/grass-xterm-mac \
@@ -72,7 +64,7 @@
$(ETC)/grass-run.bat
endif
-default: $(FILES) $(ICONS)
+default: $(FILES)
$(MKDIR) $(GISBASE)/docs/html
$(INSTALL_DATA) variables.html $(GISBASE)/docs/html/variables.html
$(INSTALL_DATA) grass6.html $(GISBASE)/docs/html/grass6.html
@@ -163,14 +155,6 @@
$(MKDIR) $@
$(INSTALL_DATA) msgs/*.msg $@
-$(ETC)/gintro.gif: gintro.gif
- rm -f $@
- $(INSTALL_DATA) gintro.gif $@
-
-$(ICONS): grass.ico grass_map.ico grass_sql.ico grass_dialog.ico grass_nviz.ico grass_error.ico
- rm -f $@
- $(INSTALL_DATA) $< $@
-
$(ETC)/gis_set.tcl: gis_set.tcl
rm -f $@
$(INSTALL) gis_set.tcl $(ETC)
Deleted: grass/branches/develbranch_6/lib/init/gintro.gif
===================================================================
(Binary files differ)
Modified: grass/branches/develbranch_6/lib/init/gis_set.tcl
===================================================================
--- grass/branches/develbranch_6/lib/init/gis_set.tcl 2008-08-13 15:13:43 UTC (rev 32742)
+++ grass/branches/develbranch_6/lib/init/gis_set.tcl 2008-08-13 16:08:13 UTC (rev 32743)
@@ -187,7 +187,7 @@
set titlefrm [frame .frame0.intro -borderwidth 2 ]
set introimg [label $titlefrm.img -image [image create photo -file \
- "$env(GISBASE)/etc/gintro.gif"]]
+ "$env(GISBASE)/etc/gui/images/gintro.gif"]]
set introtitle [text $titlefrm.msg -height 5 \
-relief flat -fg darkgreen \
-bg #dddddd \
Deleted: grass/branches/develbranch_6/lib/init/grass.ico
===================================================================
(Binary files differ)
Deleted: grass/branches/develbranch_6/lib/init/grass_dialog.ico
===================================================================
(Binary files differ)
Deleted: grass/branches/develbranch_6/lib/init/grass_error.ico
===================================================================
(Binary files differ)
Deleted: grass/branches/develbranch_6/lib/init/grass_map.ico
===================================================================
(Binary files differ)
Deleted: grass/branches/develbranch_6/lib/init/grass_nviz.ico
===================================================================
(Binary files differ)
Deleted: grass/branches/develbranch_6/lib/init/grass_sql.ico
===================================================================
(Binary files differ)
More information about the grass-commit
mailing list