change subdirectory name to gmapcatcher as package name

for potential installation in a system package directory
among installed python packages

download.py

@@ -1,15 +1,16 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 ## @package download
 # Downloader tool without GUI
 
 import sys
-import src.mapConf as mapConf
+import gmapcatcher.mapConf as mapConf
 
-from src.mapUtils import *
-from src.mapArgs import MapArgs
-from src.mapServices import MapServ
-from src.mapDownloader import MapDownloader
+from gmapcatcher.mapUtils import *
+from gmapcatcher.mapArgs import MapArgs
+from gmapcatcher.mapServices import MapServ
+from gmapcatcher.mapDownloader import MapDownloader
 
 mConf = mapConf.MapConf()
 ctx_map = MapServ(mConf.init_path, mConf.repository_type)
@@ -18,7 +19,6 @@
 def do_nothing(*args, **kwargs):
     pass
 
-
 def download(lat, lng, lat_range, lng_range, max_zl, min_zl, layer):
     for zl in range(max_zl, min_zl - 1, -1):
         print "Downloading zl %d" % zl

src/DLWindow.py → gmapcatcher/DLWindow.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.DLWindow
+## @package gmapcatcher.DLWindow
 # Widget that allows Download of entire locations
 
 import pygtk

src/customMsgBox.py → gmapcatcher/customMsgBox.py

@@ -1,4 +1,4 @@
-## @package src.customMsgBox
+## @package gmapcatcher.customMsgBox
 # A group of custom message box widgets.
 
 import pygtk

src/customWidgets.py → gmapcatcher/customWidgets.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.customWidgets
+## @package gmapcatcher.customWidgets
 # This is a collection of Custom Widgets
 
 import gtk

src/fileUtils.py → gmapcatcher/fileUtils.py

@@ -1,4 +1,4 @@
-## @package src.fileUtils
+## @package gmapcatcher.fileUtils
 # A common location for all the File I/O Utilities
 
 import os

src/gtkThread.py → gmapcatcher/gtkThread.py

@@ -1,4 +1,4 @@
-## @package src.gtkThread
+## @package gmapcatcher.gtkThread
 # ---
 
 import sys

src/inputValidation.py → gmapcatcher/inputValidation.py

@@ -1,4 +1,4 @@
-## @package src.inputValidation
+## @package gmapcatcher.inputValidation
 # Validation of all the user input.
 
 ## Validate the text on all the "input" widgets

src/mapArgs.py → gmapcatcher/mapArgs.py

@@ -1,4 +1,4 @@
-## @package src.mapArgs
+## @package gmapcatcher.mapArgs
 # Parsing of the array of arguments
 
 from mapConst import *

src/mapConf.py → gmapcatcher/mapConf.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.mapConf
+## @package gmapcatcher.mapConf
 # Read and write to the configuration file
 
 import os

src/mapConst.py → gmapcatcher/mapConst.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.mapConst
+## @package gmapcatcher.mapConst
 # Place to keep all constants
 
 NAME = "GMapCatcher"

src/mapDownloader.py → gmapcatcher/mapDownloader.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.mapDownloader
+## @package gmapcatcher.mapDownloader
 # All downloading is done here
 
 from __future__ import division

src/mapGPS.py → gmapcatcher/mapGPS.py

@@ -1,4 +1,4 @@
-## @package src.mapGPS
+## @package gmapcatcher.mapGPS
 # GPS Support
 
 try:

src/mapMark.py → gmapcatcher/mapMark.py

@@ -1,4 +1,4 @@
-## @package src.mapMark
+## @package gmapcatcher.mapMark
 # Read and Write the locations of the Markers
 
 import os

src/mapPixbuf.py → gmapcatcher/mapPixbuf.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.mapPixbuf
+## @package gmapcatcher.mapPixbuf
 # Get the Pixbuf from image files.
 #
 

src/mapServers/cloudMade.py → gmapcatcher/mapServers/cloudMade.py

@@ -1,7 +1,7 @@
-## @package src.mapServers.cloudMade
+## @package gmapcatcher.mapServers.cloudMade
 # All the interaction with CloudMade.com
 
-from src.mapConst import MAP_MAX_ZOOM_LEVEL
+from gmapcatcher.mapConst import MAP_MAX_ZOOM_LEVEL
 
 API_KEY = "333d990d389d5e65a7714dd738b2fc77"
 

src/mapServers/googleMapMaker.py → gmapcatcher/mapServers/googleMapMaker.py

@@ -1,9 +1,9 @@
-## @package src.mapServers.googleMapMaker
+## @package gmapcatcher.mapServers.googleMapMaker
 # All the interaction with Google Map Maker
 
 import re
-import src.openanything as openanything
-from src.mapConst import MAP_MAX_ZOOM_LEVEL
+import gmapcatcher.openanything as openanything
+from gmapcatcher.mapConst import MAP_MAX_ZOOM_LEVEL
 
 known_layers = {}
 

src/mapServers/googleMaps.py → gmapcatcher/mapServers/googleMaps.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-## @package src.mapServers.googleMaps
+## @package gmapcatcher.mapServers.googleMaps
 # All the interaction with google.com
 
 import re
 import urllib
-import src.openanything as openanything
-from src.mapConst import MAP_MAX_ZOOM_LEVEL, MAP_MIN_ZOOM_LEVEL, MAP_SERVICES
+import gmapcatcher.openanything as openanything
+from gmapcatcher.mapConst import MAP_MAX_ZOOM_LEVEL, MAP_MIN_ZOOM_LEVEL, MAP_SERVICES
 
 known_layers = {}
 

src/mapServers/informationFreeway.py → gmapcatcher/mapServers/informationFreeway.py

@@ -1,7 +1,7 @@
-## @package src.mapServers.informationFreeway
+## @package gmapcatcher.mapServers.informationFreeway
 # All the interaction with InformationFreeway.org
 
-from src.mapConst import MAP_MAX_ZOOM_LEVEL
+from gmapcatcher.mapConst import MAP_MAX_ZOOM_LEVEL
 
 ## Returns a template URL for the informationFreeway
 def layer_url_template():

src/mapServers/openCycleMap.py → gmapcatcher/mapServers/openCycleMap.py

@@ -1,7 +1,7 @@
-## @package src.mapServers.openCycleMap
+## @package gmapcatcher.mapServers.openCycleMap
 # All the interaction with OpenCycleMap.org
 
-from src.mapConst import MAP_MAX_ZOOM_LEVEL
+from gmapcatcher.mapConst import MAP_MAX_ZOOM_LEVEL
 
 ## Returns a template URL for the OpenCycleMap
 def layer_url_template():

src/mapServers/openStreetMaps.py → gmapcatcher/mapServers/openStreetMaps.py

@@ -1,7 +1,7 @@
-## @package src.mapServers.openStreetMaps
+## @package gmapcatcher.mapServers.openStreetMaps
 # All the interaction with OpenStreetMap.org
 
-from src.mapConst import MAP_MAX_ZOOM_LEVEL
+from gmapcatcher.mapConst import MAP_MAX_ZOOM_LEVEL
 
 ## Returns a template URL for the openStreetMaps
 def layer_url_template():

src/mapServers/virtualEarth.py → gmapcatcher/mapServers/virtualEarth.py

@@ -1,7 +1,7 @@
-## @package src.mapServers.virtualEarth
+## @package gmapcatcher.mapServers.virtualEarth
 # All the interaction with maps.live.com
 
-#from src.mapConst import MAP_MAX_ZOOM_LEVEL
+#from gmapcatcher.mapConst import MAP_MAX_ZOOM_LEVEL
 
 ## Returns a template URL for the virtualEarth
 def layer_url_template(layer):

src/mapServers/yahoo.py → gmapcatcher/mapServers/yahoo.py

@@ -1,7 +1,7 @@
-## @package src.mapServers.yahoo
+## @package gmapcatcher.mapServers.yahoo
 # All the interaction with yahoo.com
 
-from src.mapConst import MAP_MAX_ZOOM_LEVEL, LAYER_MAP
+from gmapcatcher.mapConst import MAP_MAX_ZOOM_LEVEL, LAYER_MAP
 
 ## Returns a template URL for the Yahoo mas
 def layer_url_template(layer):

src/mapServices.py → gmapcatcher/mapServices.py

@@ -1,4 +1,4 @@
-## @package src.mapServices
+## @package gmapcatcher.mapServices
 # All the interaction with the map services
 
 import os

src/mapTools.py → gmapcatcher/mapTools.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.mapTools
+## @package gmapcatcher.mapTools
 # The tools widget, items are displayed in multiple tabs.
 
 import pygtk

src/mapUpdate.py → gmapcatcher/mapUpdate.py

@@ -1,4 +1,4 @@
-## @package src.mapUpdate
+## @package gmapcatcher.mapUpdate
 # All the update related logic
 
 import gtk

src/mapUtils.py → gmapcatcher/mapUtils.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.mapUtils
+## @package gmapcatcher.mapUtils
 # A group of map utilities
 
 import math

src/tilesRepoFS.py → gmapcatcher/tilesRepoFS.py

@@ -1,4 +1,4 @@
-## @package src.tilesRepoFS
+## @package gmapcatcher.tilesRepoFS
 # This modul provides filebased tile repository functions
 #
 # Usage:

src/tilesRepoFactory.py → gmapcatcher/tilesRepoFactory.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.tilesRepoFactory
+## @package gmapcatcher.tilesRepoFactory
 # Place to set the correct repository
 
 import sys

src/tilesRepoSQLite3.py → gmapcatcher/tilesRepoSQLite3.py

@@ -1,4 +1,4 @@
-## @package src.tilesRepoSQLite3
+## @package gmapcatcher.tilesRepoSQLite3
 # This modul provides sqlite3 tile repository functions
 #
 # Usage:

src/widChangeTheme.py → gmapcatcher/widChangeTheme.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.widChangeTheme
+## @package gmapcatcher.widChangeTheme
 # Change Theme widget used to change the GTK theme.
 # Displayed inside a tab in MapTools.
 

src/widCredits.py → gmapcatcher/widCredits.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import gtk
-from src.mapConst import *
+from mapConst import *
 
 class OurCredits(gtk.AboutDialog):
     def __init__(self):

src/widDrawingArea.py → gmapcatcher/widDrawingArea.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.widDrawingArea
+## @package gmapcatcher.widDrawingArea
 # DrawingArea widget used to display the map
 
 import gtk

src/widMyGPS.py → gmapcatcher/widMyGPS.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.widMyGPS
+## @package gmapcatcher.widMyGPS
 # GPS widget used to modify some GPS settings
 # Displayed inside a tab in MapTools.
 

src/widMySettings.py → gmapcatcher/widMySettings.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.widMySettings
+## @package gmapcatcher.widMySettings
 # Settings widget that displays common settings.
 # Displayed inside a tab in MapTools.
 

src/widTreeView.py → gmapcatcher/widTreeView.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-## @package src.widTreeView
+## @package gmapcatcher.widTreeView
 # TreeView widget used to display the list of the locations.
 # Displayed inside a tab in MapTools.
 

installer/setup.py

@@ -3,7 +3,7 @@
 # Setup file used to build the Windows Installer
 
 from distutils.core import setup
-from src.mapConst import *
+from gmapcatcher.mapConst import *
 import os
 
 if os.name == "posix":
@@ -16,10 +16,10 @@
         data_files = [('share/doc/mapcatcher', ['README', 'Changelog']),
                     ('share/applications', ['gmapcatcher.desktop']),
                     ('share/man/man1', 
-                        ['man/mapcatcher.1.gz', 'man/mapdownloader.1.gz'])
+                        ['man/mapcatcher.1.gz', 'man/mapdownloader.1.gz']),
+                    ('share/pixmaps', ['images/map.png'])
         ],
         scripts = ['mapcatcher', 'mapdownloader'],
-        package_dir = {'gmapcatcher' : 'src'},
         packages = ['gmapcatcher']
     )
 else:

maps.py

@@ -4,26 +4,26 @@
 ## @package maps
 # This is the Main Window
 
-import src.mapGPS as mapGPS
-import src.mapUtils as mapUtils
-import src.mapTools as mapTools
-import src.mapPixbuf as mapPixbuf
+import gmapcatcher.mapGPS as mapGPS
+import gmapcatcher.mapUtils as mapUtils
+import gmapcatcher.mapTools as mapTools
+import gmapcatcher.mapPixbuf as mapPixbuf
 import os
 import signal
 
-from src.mapConst import *
-from src.gtkThread import *
-from src.mapConf import MapConf
-from src.mapMark import MyMarkers
-from src.DLWindow import DLWindow
-from src.mapUpdate import CheckForUpdates
-from src.mapServices import MapServ
-from src.customMsgBox import error_msg
-from src.mapDownloader import MapDownloader
-from src.customWidgets import myToolTip, gtk_menu, FileChooser, lbl, _frame, _myEntry
-from src.xmlUtils import kml_to_markers
-from src.widDrawingArea import DrawingArea
-from src.widCredits import OurCredits
+from gmapcatcher.mapConst import *
+from gmapcatcher.gtkThread import *
+from gmapcatcher.mapConf import MapConf
+from gmapcatcher.mapMark import MyMarkers
+from gmapcatcher.DLWindow import DLWindow
+from gmapcatcher.mapUpdate import CheckForUpdates
+from gmapcatcher.mapServices import MapServ
+from gmapcatcher.customMsgBox import error_msg
+from gmapcatcher.mapDownloader import MapDownloader
+from gmapcatcher.customWidgets import myToolTip, gtk_menu, FileChooser, lbl, _frame, _myEntry
+from gmapcatcher.xmlUtils import kml_to_markers
+from gmapcatcher.widDrawingArea import DrawingArea
+from gmapcatcher.widCredits import OurCredits
 
 class MainWindow(gtk.Window):