[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/designer/src GFDesigner.py Instance.py Men...
|
From: |
Jason Cater |
|
Subject: |
gnue/designer/src GFDesigner.py Instance.py Men... |
|
Date: |
Tue, 22 Jan 2002 14:19:16 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/01/22 14:19:15
Modified files:
designer/src : GFDesigner.py Instance.py MenuBar.py
ToolSupport.py
designer/src/forms: __init__.py
designer/src/navigator: Instance.py __init__.py
Log message:
misc changes for File|New to support multiple project types
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/GFDesigner.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Instance.py.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/MenuBar.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/ToolSupport.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/__init__.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/navigator/Instance.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/navigator/__init__.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnue/designer/src/GFDesigner.py
diff -c gnue/designer/src/GFDesigner.py:1.32
gnue/designer/src/GFDesigner.py:1.33
*** gnue/designer/src/GFDesigner.py:1.32 Fri Jan 18 22:02:55 2002
--- gnue/designer/src/GFDesigner.py Tue Jan 22 14:19:15 2002
***************
*** 59,65 ****
from StringIO import StringIO
from wxPython.wx import *
! from gnue.common import GDebug, GConfig
from gnue.designer import VERSION, PACKAGE
from ToolSupport import SupportedTools
import TemplateParser, TemplateChooser, MRUManager
--- 59,65 ----
from StringIO import StringIO
from wxPython.wx import *
! from gnue.common import GDebug, GConfig, dyn_import
from gnue.designer import VERSION, PACKAGE
from ToolSupport import SupportedTools
import TemplateParser, TemplateChooser, MRUManager
***************
*** 67,73 ****
# TODO: Must go!!
from gnue.forms import UIwxpython, GFForm
! from gnue.designer.forms.Instance import Instance as GFDInstance
class GFDesigner(GClientApp, wxApp):
--- 67,73 ----
# TODO: Must go!!
from gnue.forms import UIwxpython, GFForm
! from gnue.designer import forms
class GFDesigner(GClientApp, wxApp):
***************
*** 100,106 ****
# TODO: jcater thinks of some task selector like kword uses,
# TODO: or, restore the session to the way it was (same files, etc)
! self.SetTopWindow(GFDInstance(self, None))
return 1
--- 100,106 ----
# TODO: jcater thinks of some task selector like kword uses,
# TODO: or, restore the session to the way it was (same files, etc)
! self.SetTopWindow(self.newInstance(forms))
return 1
***************
*** 125,132 ****
return isdirty
! def OnNew(self, event):
! GFDInstance(self, None)
def OnWizard(self, event):
--- 125,132 ----
return isdirty
! ## def OnNew(self, event):
! ## GFDInstance(self, None)
def OnWizard(self, event):
***************
*** 166,172 ****
dlg = wxFileDialog(NULL, "Open GNUe File...", defaultDir=os.getcwd(),
wildcard = self.supportedOpenWildcard,
style=wxOPEN)
!
if dlg.ShowModal() == wxID_OK:
if self.isFileOpened(dlg.GetPath()):
# TODO: Um, something better than this!!!
--- 166,172 ----
dlg = wxFileDialog(NULL, "Open GNUe File...", defaultDir=os.getcwd(),
wildcard = self.supportedOpenWildcard,
style=wxOPEN)
!
if dlg.ShowModal() == wxID_OK:
if self.isFileOpened(dlg.GetPath()):
# TODO: Um, something better than this!!!
***************
*** 287,295 ****
print "I do not know what to do with a .%s file!" % extension
return None
! instanceClass = self.toolExtensionMapping[extension].Instance
! return instanceClass.Instance(self, file)
#
#
--- 287,301 ----
print "I do not know what to do with a .%s file!" % extension
return None
! return self.newInstance(self.toolExtensionMapping[extension], file)
!
+ #
+ # Create a new instance
+ #
+ def newInstance(self, module, *args, **parms):
+ c = dyn_import("%s.%s" % (module.__name__,'Instance')).Instance
+ return c(self, *args, **parms)
#
#
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.44 gnue/designer/src/Instance.py:1.45
*** gnue/designer/src/Instance.py:1.44 Tue Jan 22 13:17:14 2002
--- gnue/designer/src/Instance.py Tue Jan 22 14:19:15 2002
***************
*** 387,392 ****
--- 387,395 ----
print "Unable to connect to %s" % conn
+ def OnNew(self, event):
+ self._app.newInstance(self._fileNewMap[event.GetId()])
+
def OnSave(self, event):
if not len(self._path):
Index: gnue/designer/src/MenuBar.py
diff -c gnue/designer/src/MenuBar.py:1.16 gnue/designer/src/MenuBar.py:1.17
*** gnue/designer/src/MenuBar.py:1.16 Tue Jan 15 18:12:56 2002
--- gnue/designer/src/MenuBar.py Tue Jan 22 14:19:15 2002
***************
*** 29,34 ****
--- 29,35 ----
from wxPython.wx import *
from gnue.common import GDebug, GConfig
import Incubator, MRUManager
+ from ToolSupport import SupportedTools
# File menu
ID_NEW = wxNewId()
***************
*** 80,86 ****
"Open an existing object")
self._file.AppendSeparator()
self._file.Append(ID_SAVE, "&Save", "Save the current object")
! self._file.Append(ID_SAVE_AS, "Save &As...",
"Save the current form under a new name")
self._file.Append(ID_SAVE_ALL, "Save A&ll",
"Save all open objects")
--- 81,87 ----
"Open an existing object")
self._file.AppendSeparator()
self._file.Append(ID_SAVE, "&Save", "Save the current object")
! self._file.Append(ID_SAVE_AS, "Save &As...",
"Save the current form under a new name")
self._file.Append(ID_SAVE_ALL, "Save A&ll",
"Save all open objects")
***************
*** 95,101 ****
self._file.AppendSeparator()
self._file.Append(ID_EXIT, "E&xit", "Exit GNUe Designer")
! EVT_MENU (frame, ID_NEW_FORM, frame._app.OnNew)
EVT_MENU (frame, ID_NEW_WIZARD, frame._app.OnWizard)
EVT_MENU (frame, ID_OPEN, frame._app.OnOpen)
EVT_MENU (frame, ID_SAVE, frame.OnSave)
--- 96,102 ----
self._file.AppendSeparator()
self._file.Append(ID_EXIT, "E&xit", "Exit GNUe Designer")
!
EVT_MENU (frame, ID_NEW_WIZARD, frame._app.OnWizard)
EVT_MENU (frame, ID_OPEN, frame._app.OnOpen)
EVT_MENU (frame, ID_SAVE, frame.OnSave)
***************
*** 108,115 ****
# Set up out MRU list
frame._app.mru.addMenu(self._fileRecent, frame)
! self._fileNew.Append(ID_NEW_FORM,'&Form', "Create a new form")
! self._fileNew.Append(ID_NEW_REPORT,'&Report', "Create a new report")
self._fileNew.AppendSeparator()
self._fileNew.Append(ID_NEW_WIZARD,'from &Wizard...', \
"Create a new object from a wizard")
--- 109,127 ----
# Set up out MRU list
frame._app.mru.addMenu(self._fileRecent, frame)
!
! frame._fileNewMap = {}
! for tool in SupportedTools:
! id = wxNewId()
! frame._fileNewMap[id] = tool
! self._fileNew.Append(id, '&%s' % tool.properties.nickname,
! 'Create a new %s' % string.lower(tool.properties.nickname))
! EVT_MENU (frame, id, frame.OnNew)
!
!
!
! ## self._fileNew.Append(ID_NEW_FORM,'&Form', "Create a new form")
! ## self._fileNew.Append(ID_NEW_REPORT,'&Report', "Create a new report")
self._fileNew.AppendSeparator()
self._fileNew.Append(ID_NEW_WIZARD,'from &Wizard...', \
"Create a new object from a wizard")
Index: gnue/designer/src/ToolSupport.py
diff -c gnue/designer/src/ToolSupport.py:1.3
gnue/designer/src/ToolSupport.py:1.4
*** gnue/designer/src/ToolSupport.py:1.3 Tue Jan 22 01:17:03 2002
--- gnue/designer/src/ToolSupport.py Tue Jan 22 14:19:15 2002
***************
*** 38,44 ****
for tool in Tools:
try:
! SupportedTools.append(dyn_import("gnue.designer.%s" % tool))
_GDebug.printMesg(1,'Loaded Designer support for %s' % tool)
except ImportError, mesg:
UnsupportedTools.append(tool)
--- 38,44 ----
for tool in Tools:
try:
! SupportedTools.append(dyn_import("gnue/designer/%s" % tool))
_GDebug.printMesg(1,'Loaded Designer support for %s' % tool)
except ImportError, mesg:
UnsupportedTools.append(tool)
Index: gnue/designer/src/forms/__init__.py
diff -c gnue/designer/src/forms/__init__.py:1.5
gnue/designer/src/forms/__init__.py:1.6
*** gnue/designer/src/forms/__init__.py:1.5 Thu Jan 17 11:55:04 2002
--- gnue/designer/src/forms/__init__.py Tue Jan 22 14:19:15 2002
***************
*** 31,36 ****
--- 31,39 ----
#from gnue.designer import Instance as _BaseInstance
+ # See if forms is installed
+ import gnue.forms as _test
+
class FormToolProperties: #(_BaseInstance.ToolProperties):
application = 'GNUe Forms'
***************
*** 45,48 ****
properties = FormToolProperties()
! import Instance
--- 48,52 ----
properties = FormToolProperties()
!
! ##import Instance
Index: gnue/designer/src/navigator/Instance.py
diff -c gnue/designer/src/navigator/Instance.py:1.2
gnue/designer/src/navigator/Instance.py:1.3
*** gnue/designer/src/navigator/Instance.py:1.2 Tue Jan 22 01:17:04 2002
--- gnue/designer/src/navigator/Instance.py Tue Jan 22 14:19:15 2002
***************
*** 60,66 ****
def loadEmpty(self):
object = GNObjects.GNProcesses()
object.title = "Untitled Process"
- GFObjects.GFPage(object)
return object
--- 60,65 ----
Index: gnue/designer/src/navigator/__init__.py
diff -c gnue/designer/src/navigator/__init__.py:1.3
gnue/designer/src/navigator/__init__.py:1.4
*** gnue/designer/src/navigator/__init__.py:1.3 Fri Jan 11 18:35:20 2002
--- gnue/designer/src/navigator/__init__.py Tue Jan 22 14:19:15 2002
***************
*** 29,38 ****
# the Instance class plus a properties object.
#
! from gnue.designer import Instance as _BaseInstance
! class NavigatorToolProperties(_BaseInstance.ToolProperties):
application = 'GNUe Navigator'
nickname = 'Navigation'
--- 29,40 ----
# the Instance class plus a properties object.
#
+ # See if forms is installed
+ import gnue.navigator as _test
! #from gnue.designer import Instance as _BaseInstance
! class NavigatorToolProperties: #(_BaseInstance.ToolProperties):
application = 'GNUe Navigator'
nickname = 'Navigation'
***************
*** 45,48 ****
properties = NavigatorToolProperties()
! import Instance
\ No newline at end of file
--- 47,50 ----
properties = NavigatorToolProperties()
! ##import Instance
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/designer/src GFDesigner.py Instance.py Men...,
Jason Cater <=