correct the path to all the packages moved to the widget folder

gmapcatcher/mapConst.py

@@ -2,7 +2,6 @@
 ## @package gmapcatcher.mapConst
 # Place to keep all constants
 
-# from changeableConst import STRICT_LEGAL
 import os
 
 NAME = "GMapCatcher"
@@ -142,3 +141,4 @@
 ENTRY_SUB_MENU = ['Starts With...', 'Ends With...',
         'Contains...', 'Regular Expression...']
 
+STRICT_LEGAL = False

gmapcatcher/mapGPS.py

@@ -8,7 +8,7 @@
 except:
     available = False
 import mapConst
-import mapPixbuf
+import widgets.mapPixbuf as mapPixbuf
 from threading import Event, Thread
 import time
 import mapUtils

gmapcatcher/mapMark.py

@@ -3,7 +3,7 @@
 
 import os
 import fileUtils
-import mapPixbuf
+import widgets.mapPixbuf as mapPixbuf
 from mapConst import *
 
 

gmapcatcher/mapUpdate.py

@@ -3,7 +3,7 @@
 
 from mapConst import *
 import gtk
-from customMsgBox import updateMsgBox
+from widgets.customMsgBox import updateMsgBox
 import openanything
 from threading import Timer
 

gmapcatcher/mapUtils.py

@@ -2,12 +2,12 @@
 ## @package gmapcatcher.mapUtils
 # A group of map utilities
 
+import re
 import math
 from mapConst import *
-from customWidgets import FileChooser, FileSaveChooser
+from widgets.customWidgets import FileChooser, FileSaveChooser
 from time import gmtime, strftime
 from htmlentitydefs import name2codepoint
-import re
 from gmapcatcher import gpxpy
 
 

gmapcatcher/tilesRepo/tilesRepoFS.py

@@ -10,8 +10,8 @@
 
 import os
 import gmapcatcher.lrucache as lrucache
-import gmapcatcher.mapPixbuf as mapPixbuf
 import gmapcatcher.fileUtils as fileUtils
+import gmapcatcher.widgets.mapPixbuf as mapPixbuf
 
 from threading import Lock
 from gmapcatcher.mapConst import *

gmapcatcher/tilesRepo/tilesRepoMGMaps.py

@@ -10,8 +10,8 @@
 
 import os
 import gmapcatcher.lrucache as lrucache
-import gmapcatcher.mapPixbuf as mapPixbuf
 import gmapcatcher.fileUtils as fileUtils
+import gmapcatcher.widgets.mapPixbuf as mapPixbuf
 
 from threading import Lock
 from gmapcatcher.mapConst import *

gmapcatcher/tilesRepo/tilesRepoOSM.py

@@ -10,8 +10,8 @@
 
 import os
 import gmapcatcher.lrucache as lrucache
-import gmapcatcher.mapPixbuf as mapPixbuf
 import gmapcatcher.fileUtils as fileUtils
+import gmapcatcher.widgets.mapPixbuf as mapPixbuf
 
 from threading import Lock
 from gmapcatcher.mapConst import *

gmapcatcher/tilesRepo/tilesRepoRMaps.py

@@ -18,7 +18,7 @@
 import traceback
 
 import gmapcatcher.lrucache as lrucache
-import gmapcatcher.mapPixbuf as mapPixbuf
+import gmapcatcher.widgets.mapPixbuf as mapPixbuf
 from threading import Lock, Thread
 from gmapcatcher.mapConst import *
 

gmapcatcher/tilesRepo/tilesRepoSQLite3.py

@@ -17,7 +17,7 @@
 import traceback
 
 import gmapcatcher.lrucache as lrucache
-import gmapcatcher.mapPixbuf as mapPixbuf
+import gmapcatcher.widgets.mapPixbuf as mapPixbuf
 from threading import Lock, Thread
 from gmapcatcher.mapConst import *
 

gmapcatcher/widgets/DLWindow.py

@@ -6,16 +6,16 @@
 pygtk.require('2.0')
 import gtk
 
-from mapConst import *
-from mapArgs import MapArgs
-from fileUtils import check_dir
-from mapDownloader import MapDownloader
+from gmapcatcher.mapConst import *
+from gmapcatcher.mapArgs import MapArgs
+from gmapcatcher.fileUtils import check_dir
+from gmapcatcher.mapDownloader import MapDownloader
 from customWidgets import lbl, myEntry, myFrame, SpinBtn
 
 import mapPixbuf
-import mapUtils
-import mapServices
-from gtkThread import gui_callback
+import gmapcatcher.mapUtils as mapUtils
+import gmapcatcher.mapServices as mapServices
+from gmapcatcher.gtkThread import gui_callback
 from os.path import join, isdir
 
 

gmapcatcher/widgets/EXWindow.py

@@ -6,15 +6,13 @@
 pygtk.require('2.0')
 import gtk
 
-from mapConst import *
+from gmapcatcher.mapConst import *
 from customWidgets import lbl, myEntry, myFrame, SpinBtn, FolderChooser
 
-import tilesRepo.Factory as trFactory
-import mapTilesTransfer
-
+import gmapcatcher.tilesRepo.Factory as trFactory
+import gmapcatcher.mapTilesTransfer as mapTilesTransfer
+import gmapcatcher.mapUtils as mapUtils
 import mapPixbuf
-import mapUtils
-# from gtkThread import gui_callback
 
 
 class EXWindow(gtk.Window):

gmapcatcher/widgets/customWidgets.py

@@ -5,7 +5,7 @@
 import gtk
 import gobject
 import mapPixbuf
-from mapConst import *
+from gmapcatcher.mapConst import *
 from inputValidation import allow_only_numbers
 
 import warnings

gmapcatcher/widgets/gpsWindow.py

@@ -8,7 +8,7 @@
 
 from gobject import timeout_add_seconds
 from pango import FontDescription
-from mapConst import MODE_NO_FIX
+from gmapcatcher.mapConst import MODE_NO_FIX
 
 
 class gpsWindow(gtk.Window):

gmapcatcher/widgets/inputValidation.py

@@ -1,4 +1,4 @@
-## @package gmapcatcher.inputValidation
+## @package gmapcatcher.widgets.inputValidation
 # Validation of all the user input.
 
 

gmapcatcher/widgets/mapHideMapServers.py

@@ -5,7 +5,7 @@
 import pygtk
 pygtk.require('2.0')
 import gtk
-from mapConst import *
+from gmapcatcher.mapConst import *
 from widMapServers import WidMapServers
 
 

gmapcatcher/widgets/mapPixbuf.py

@@ -3,15 +3,15 @@
 # Get the Pixbuf from image files.
 
 import gtk
-from mapConst import *
+from gmapcatcher.mapConst import *
 from os.path import join, dirname, abspath, exists, isfile
 
 
 ## Absolute Path to the images directory
 if 'library.zip' in __file__:
-    _prefix = abspath(join(dirname(__file__), "../../images"))
+    _prefix = abspath(join(dirname(__file__), "../../../images"))
 else:
-    _prefix = abspath(join(dirname(__file__), "../images"))
+    _prefix = abspath(join(dirname(__file__), "../../images"))
 
 if not isfile(join(_prefix, 'missing.png')):
     _prefix = '/usr/share/pixmaps/gmapcatcher'

gmapcatcher/widgets/mapTools.py

@@ -9,7 +9,7 @@
 import widMySettings
 import widChangeTheme
 import widMyGPS
-from mapConst import *
+from gmapcatcher.mapConst import *
 
 
 class MapTools():

gmapcatcher/widgets/trackWindow.py

@@ -7,7 +7,7 @@
 import gtk
 
 from customMsgBox import error_msg_non_blocking
-from mapUtils import openGPX, saveGPX
+from gmapcatcher.mapUtils import openGPX, saveGPX
 
 
 class trackWindow(gtk.Window):

gmapcatcher/widgets/widChangeTheme.py

@@ -4,9 +4,9 @@
 # Displayed inside a tab in MapTools.
 
 import gtk
-import fileUtils
 import mapHideMapServers
-from mapConst import *
+import gmapcatcher.fileUtils as fileUtils
+from gmapcatcher.mapConst import *
 from customWidgets import myFrame, lbl
 
 

gmapcatcher/widgets/widComboBoxEntry.py

@@ -3,7 +3,7 @@
 # ComboBoxEntry widget used to collect data to search
 
 import gtk
-from mapConst import *
+from gmapcatcher.mapConst import *
 
 
 ## This widget is where we collect data to search

gmapcatcher/widgets/widComboBoxLayer.py

@@ -3,7 +3,7 @@
 # ComboBoxLayer widget used to collect data to search
 
 import gtk
-from mapConst import *
+from gmapcatcher.mapConst import *
 from gobject import TYPE_STRING, TYPE_INT
 
 

gmapcatcher/widgets/widCredits.py

@@ -3,7 +3,7 @@
 # AboutDialog widget used to show credits
 
 import gtk
-from mapConst import *
+from gmapcatcher.mapConst import *
 
 
 class OurCredits(gtk.AboutDialog):

gmapcatcher/widgets/widDrawingArea.py

@@ -5,8 +5,8 @@
 import gtk
 import pango
 import math
-import mapUtils
-from mapConst import *
+import gmapcatcher.mapUtils as mapUtils
+from gmapcatcher.mapConst import *
 from threading import Timer
 
 ternary = lambda a, b, c: (b, c)[not a]

gmapcatcher/widgets/widMapServers.py

@@ -4,7 +4,7 @@
 # Displayed inside MapHideMapServers.
 
 import gtk
-from mapConst import *
+from gmapcatcher.mapConst import *
 
 
 ## This widget allows the user to modify visible map services

gmapcatcher/widgets/widMyGPS.py

@@ -4,9 +4,9 @@
 # Displayed inside a tab in MapTools.
 
 import gtk
-from mapConst import *
+from gmapcatcher.mapConst import *
+from gmapcatcher.serialGPS import serialPortScan, BAUDRATES
 from customWidgets import myEntry, SpinBtn, myFrame, lbl
-from serialGPS import serialPortScan, BAUDRATES
 
 
 ## This widget lets the user change GPS settings

gmapcatcher/widgets/widMySettings.py

@@ -5,7 +5,7 @@
 
 import os
 import gtk
-from mapConst import *
+from gmapcatcher.mapConst import *
 from customWidgets import SpinBtn, myFrame, lbl, FolderChooser
 
 

gmapcatcher/widgets/widTreeView.py

@@ -4,8 +4,8 @@
 # Displayed inside a tab in MapTools.
 
 import gtk
-import fileUtils
-from mapConst import *
+import gmapcatcher.fileUtils as fileUtils
+from gmapcatcher.mapConst import *
 
 
 ## This widget allows the user to modify the locations and markers

maps.py

@@ -5,34 +5,34 @@
 # This is the Main Window
 
 import os
-import gmapcatcher.mapGPS as mapGPS
-import gmapcatcher.mapUtils as mapUtils
-import gmapcatcher.mapTools as mapTools
-import gmapcatcher.mapPixbuf as mapPixbuf
-import signal
-import gobject
-import sys
 import re
+import sys
 import time
+import signal
+import gobject
+import gmapcatcher.mapGPS as mapGPS
+import gmapcatcher.mapUtils as mapUtils
+import gmapcatcher.widgets.mapTools as mapTools
+import gmapcatcher.widgets.mapPixbuf as mapPixbuf
 
 from gmapcatcher.mapConst import *
 from gmapcatcher.gtkThread import gui_callback
 from gmapcatcher.mapConf import MapConf
 from gmapcatcher.mapMark import MyMarkers
-from gmapcatcher.DLWindow import DLWindow
-from gmapcatcher.EXWindow import EXWindow
-from gmapcatcher.gpsWindow import gpsWindow
-from gmapcatcher.trackWindow import trackWindow
 from gmapcatcher.mapUpdate import CheckForUpdates
 from gmapcatcher.mapServices import MapServ
-from gmapcatcher.customMsgBox import user_confirm, error_msg, error_msg_non_blocking
 from gmapcatcher.mapDownloader import MapDownloader
-from gmapcatcher.customWidgets import gtk, gtk_menu, myToolTip, myFrame, lbl, legal_warning, ProgressBar, SpinBtn
 from gmapcatcher.xmlUtils import kml_to_markers
-from gmapcatcher.widDrawingArea import DrawingArea
-from gmapcatcher.widComboBoxLayer import ComboBoxLayer
-from gmapcatcher.widComboBoxEntry import ComboBoxEntry
-from gmapcatcher.widCredits import OurCredits
+from gmapcatcher.widgets.DLWindow import DLWindow
+from gmapcatcher.widgets.EXWindow import EXWindow
+from gmapcatcher.widgets.gpsWindow import gpsWindow
+from gmapcatcher.widgets.trackWindow import trackWindow
+from gmapcatcher.widgets.customMsgBox import user_confirm, error_msg, error_msg_non_blocking
+from gmapcatcher.widgets.customWidgets import gtk, gtk_menu, myToolTip, myFrame, lbl, legal_warning, ProgressBar, SpinBtn
+from gmapcatcher.widgets.widDrawingArea import DrawingArea
+from gmapcatcher.widgets.widComboBoxLayer import ComboBoxLayer
+from gmapcatcher.widgets.widComboBoxEntry import ComboBoxEntry
+from gmapcatcher.widgets.widCredits import OurCredits
 
 
 class MainWindow(gtk.Window):