gnue designer/src/base/Config.py designer/src/b...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/05 21:01:14

Modified files:
        designer/src/base: Config.py Icons.py 
        designer/src/base/tools: DataSourceEditor.py 
        designer/src/forms/LayoutEditor: LayoutEditorTools.py 
Added files:
        designer/images: deslay_box.png deslay_box.xpm deslay_button.png 
                         deslay_button.xpm deslay_entrycheck.png 
                         deslay_entrydate.png deslay_entrydate.xpm 
                         deslay_entrydrop.png deslay_entrynum.png 
                         deslay_entrynum.xpm deslay_entrytext.png 
                         deslay_entrytext.xpm deslay_label.png 
                         deslay_label.xpm deslay_scrollbar.png 
                         deslay_scrollbar.xpm destree_block.ico 
                         destree_block.xpm destree_datasource.ico 
                         destree_datasource.xpm destree_entry.ico 
                         destree_entry.xpm destree_import.ico 
                         destree_import.xpm destree_page.ico 
                         destree_page.xpm destree_pagewidget.ico 
                         destree_pagewidget.xpm destree_properties.ico 
                         destree_properties.xpm destree_trigger.ico 
                         destree_trigger.xpm tb_new.png tb_save.png 
        designer/src/base/preferences: __init__.py 
        designer/src/forms/preferences: __init__.py 
        designer/src/navigator/preferences: __init__.py 
        designer/src/reports/preferences: __init__.py 
        designer/src/schema/preferences: __init__.py 
Removed files:
        common/images  : deslay_box.png deslay_box.xpm deslay_button.png 
                         deslay_button.xpm deslay_entrycheck.png 
                         deslay_entrydate.png deslay_entrydate.xpm 
                         deslay_entrydrop.png deslay_entrynum.png 
                         deslay_entrynum.xpm deslay_entrytext.png 
                         deslay_entrytext.xpm deslay_label.png 
                         deslay_label.xpm deslay_scrollbar.png 
                         deslay_scrollbar.xpm destree_block.ico 
                         destree_block.xpm destree_datasource.ico 
                         destree_datasource.xpm destree_entry.ico 
                         destree_entry.xpm destree_import.ico 
                         destree_import.xpm destree_page.ico 
                         destree_page.xpm destree_pagewidget.ico 
                         destree_pagewidget.xpm destree_properties.ico 
                         destree_properties.xpm destree_trigger.ico 
                         destree_trigger.xpm tb_bottom.bmp tb_bottom.png 
                         tb_delete.png tb_down_arrow.bmp 
                         tb_down_arrow.png tb_exec.bmp tb_exec.png 
                         tb_exit.bmp tb_exit.png tb_first.png 
                         tb_help.png tb_jump-to.bmp tb_jump-to.png 
                         tb_left_arrow.png tb_new.bmp tb_new.png 
                         tb_preferences.png tb_right_arrow.png 
                         tb_save.bmp tb_save.png tb_search.bmp 
                         tb_search.png tb_top.bmp tb_top.png 
                         tb_trash.bmp tb_trash.png tb_undo.bmp 
                         tb_undo.png tb_up_arrow.bmp tb_up_arrow.png 

Log message:
        Moved icons to designer/images instead of common/images (as they aren't 
exactly "common" :)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_box.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_box.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_button.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_button.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_entrycheck.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_entrydate.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_entrydate.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_entrydrop.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_entrynum.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_entrynum.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_entrytext.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_entrytext.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_label.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_label.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_scrollbar.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/deslay_scrollbar.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_block.ico?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_block.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_datasource.ico?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_datasource.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_entry.ico?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_entry.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_import.ico?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_import.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_page.ico?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_page.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_pagewidget.ico?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_pagewidget.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_properties.ico?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_properties.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_trigger.ico?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/destree_trigger.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_new.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_save.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Config.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Icons.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/preferences/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/DataSourceEditor.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/preferences/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/navigator/preferences/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/preferences/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/preferences/__init__.py?rev=1.1

Patches:
Index: gnue/designer/src/base/Config.py
diff -c gnue/designer/src/base/Config.py:1.4 
gnue/designer/src/base/Config.py:1.5
*** gnue/designer/src/base/Config.py:1.4        Mon Feb 17 02:32:50 2003
--- gnue/designer/src/base/Config.py    Wed Mar  5 21:01:14 2003
***************
*** 57,68 ****
      'Comment'    : 'Location of "Insert" toolbar icon (PNG format)',
      'Description': 'Location of "Insert" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : '%(prefix)s/shared/images/tb_new.png' },
    { 'Name'       : 'tb_delete',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Delete" toolbar icon (PNG format)',
      'Description': 'Location of "Delete" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : '%(prefix)s/shared/images/tb_trash.png' },
  
  )
--- 57,68 ----
      'Comment'    : 'Location of "Insert" toolbar icon (PNG format)',
      'Description': 'Location of "Insert" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : '%(prefix)s/shared/images/designer/tb_new.png' },
    { 'Name'       : 'tb_delete',
      'Type'       : 'Setting',
      'Comment'    : 'Location of "Delete" toolbar icon (PNG format)',
      'Description': 'Location of "Delete" toolbar icon (PNG format)',
      'Typecast'   : GTypecast.text,
!     'Default'    : '%(prefix)s/shared/images/designer/tb_trash.png' },
  
  )
Index: gnue/designer/src/base/Icons.py
diff -c gnue/designer/src/base/Icons.py:1.13 
gnue/designer/src/base/Icons.py:1.14
*** gnue/designer/src/base/Icons.py:1.13        Mon Feb 17 02:32:50 2003
--- gnue/designer/src/base/Icons.py     Wed Mar  5 21:01:14 2003
***************
*** 39,45 ****
  treeIconMap = {}
  treeIconList = myImageList(16,16,false)
  
! iconlocation = GConfig.getInstalledBase('designer_images','common_images') + 
'/'
  
  if sys.platform != 'win32':
    icontype = wxBITMAP_TYPE_XPM
--- 39,45 ----
  treeIconMap = {}
  treeIconList = myImageList(16,16,false)
  
! iconlocation = 
os.path.join(GConfig.getInstalledBase('designer_images','common_images'),'designer')
  
  if sys.platform != 'win32':
    icontype = wxBITMAP_TYPE_XPM
Index: gnue/designer/src/base/tools/DataSourceEditor.py
diff -c gnue/designer/src/base/tools/DataSourceEditor.py:1.34 
gnue/designer/src/base/tools/DataSourceEditor.py:1.35
*** gnue/designer/src/base/tools/DataSourceEditor.py:1.34       Sun Mar  2 
14:58:28 2003
--- gnue/designer/src/base/tools/DataSourceEditor.py    Wed Mar  5 21:01:14 2003
***************
*** 678,683 ****
  
  
  # Shortcut
! images_dir = GConfig.getInstalledBase('designer_images','common_images') + '/'
  
  
--- 678,683 ----
  
  
  # Shortcut
! images_dir = 
os.path.join(GConfig.getInstalledBase('designer_images','common_images'),'designer')
  
  
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.17 
gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.18
*** gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.17      Mon Feb 
17 02:32:52 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py   Wed Mar  5 
21:01:14 2003
***************
*** 31,37 ****
  
  from gnue.common.events import Event, EventAware
  
! iconlocation = GConfig.getInstalledBase('designer_images','common_images') + 
'/'
  
  
  ToolbarMapping = 'File|New|Form,tb_new.png;'   \
--- 31,37 ----
  
  from gnue.common.events import Event, EventAware
  
! iconlocation = 
os.path.join(GConfig.getInstalledBase('designer_images','common_images') 
,'designer')
  
  
  ToolbarMapping = 'File|New|Form,tb_new.png;'   \