[pygccxml-commit] SF.net SVN: pygccxml: [1031] pyplusplus_dev/ide
Brought to you by:
mbaas,
roman_yakovenko
Menu
▾
▴
[pygccxml-commit] SF.net SVN: pygccxml: [1031] pyplusplus_dev/ide
|
From: <ale...@us...> - 2007-05-04 13:31:21
|
Revision: 1031
http://svn.sourceforge.net/pygccxml/?rev=1031&view=rev
Author: alex_eisen
Date: 2007-05-04 06:31:21 -0700 (Fri, 04 May 2007)
Log Message:
-----------
Fixed some complains of Roman
Modified Paths:
--------------
pyplusplus_dev/ide/controllers/controller_main.py
pyplusplus_dev/ide/model/code_generator.py
pyplusplus_dev/ide/views/frame_main.py
Modified: pyplusplus_dev/ide/controllers/controller_main.py
===================================================================
--- pyplusplus_dev/ide/controllers/controller_main.py 2007-05-02 19:22:25 UTC (rev 1030)
+++ pyplusplus_dev/ide/controllers/controller_main.py 2007-05-04 13:31:21 UTC (rev 1031)
@@ -319,8 +319,8 @@
Open dialog to get header file
'''
self._open_file_dlg_text_ctrl( self._view.textHeader,
- "Choose a Header file",
- "Header (*.h)|*.h|All Files(*)|*")
+ "Choose a Header file","C/C++ files (*.h,*.hpp,*.hxx,*.c,"\
+ "*.cpp,*.cxx)|*.h;*.hpp;*.hxx;*.c;*.cpp;*.cxx|All Files(*)|*")
def OpenDlgGccXml(self):
'''
@@ -415,7 +415,7 @@
dialog = wx.FileDialog(self._view, "Load existing Py++ project",
self.param.last_prj_path.get(),
- "", "Project files (*.xml)|*.xml|All Files(*)|*", wx.OPEN)
+ "", "Project files (*.pypp)|*.pypp|All Files(*)|*", wx.OPEN)
try:
if dialog.ShowModal() == wx.ID_OK:
@@ -544,7 +544,7 @@
dialog = wx.FileDialog(self._view,
"Save Py++ project to new file", self.param.last_prj_path.get(), "",
- "Project files (*.xml)|*.xml|All Files(*)|*", wx.FD_SAVE)
+ "Project files (*.pypp)|*.pypp|All Files(*)|*", wx.FD_SAVE)
if dialog.ShowModal() == wx.ID_OK:
@@ -594,6 +594,12 @@
file_filter="All Files(*)|*",
dir_path="."):
"""Open file open dialog and insert file in related wxText ctrl"""
+
+ cur_file = related_wx_text.GetValue()
+
+ if cur_file != "":
+ dir_path = os.path.dirname(related_wx_text.GetValue())
+
dialog = wx.FileDialog(self._view, caption_txt,
dir_path, "", file_filter, wx.OPEN)
try:
@@ -643,17 +649,23 @@
prj_list.reverse()
for prj in prj_list:
self._add_to_prj_history(prj)
-
+
+ # Change the title string:
+ # tilte := "<ConstPart> (<prj_name> in <prj_path>) <changedTag>"
def _set_prj_filename_in_title(self, filename):
-
+
if filename == self._prjTemplateFile:
- filename = "New project"
+ prj_description = "New project"
+ else:
+ prj_name = os.path.basename(filename)
+ prj_path = os.path.dirname(filename)
+ prj_description = prj_name + " in " + prj_path
title_str = self._view.GetTitle()
start_idx = title_str.find("(")
end_idx = title_str.find(")")
fnamstr = title_str[start_idx:end_idx+1]
- title_str = title_str.replace(fnamstr, "(" + filename + ")")
+ title_str = title_str.replace(fnamstr, "(" + prj_description + ")")
self._view.SetTitle(title_str)
def _reset_settings_changed(self):
Modified: pyplusplus_dev/ide/model/code_generator.py
===================================================================
--- pyplusplus_dev/ide/model/code_generator.py 2007-05-02 19:22:25 UTC (rev 1030)
+++ pyplusplus_dev/ide/model/code_generator.py 2007-05-04 13:31:21 UTC (rev 1031)
@@ -64,7 +64,7 @@
, working_directory=os.path.split( header_file )[0]
, include_paths=include_paths
, define_symbols=params[2] )
-
+
mb.build_code_creator( "pyplusplus" )
mb.code_creator.user_defined_directories.extend( include_paths )
code = mb.code_creator.create()
Modified: pyplusplus_dev/ide/views/frame_main.py
===================================================================
--- pyplusplus_dev/ide/views/frame_main.py 2007-05-02 19:22:25 UTC (rev 1030)
+++ pyplusplus_dev/ide/views/frame_main.py 2007-05-04 13:31:21 UTC (rev 1031)
@@ -318,69 +318,71 @@
self.panelSHUp = wx.Panel(id=wxID_MAINFRAMEPANELSHUP, name=u'panelSHUp',
parent=self.splitterHorizontal, pos=wx.Point(0, 0),
- size=wx.Size(782, 40), style=wx.TAB_TRAVERSAL)
+ size=wx.Size(782, 290), style=wx.TAB_TRAVERSAL)
self.panelSHLow = wx.Panel(id=wxID_MAINFRAMEPANELSHLOW,
name=u'panelSHLow', parent=self.splitterHorizontal,
- pos=wx.Point(0, 44), size=wx.Size(782, 469),
+ pos=wx.Point(0, 294), size=wx.Size(782, 219),
style=wx.TAB_TRAVERSAL)
self.splitterHorizontal.SplitHorizontally(self.panelSHUp,
self.panelSHLow, 300)
self.nbLow = wx.Notebook(id=wxID_MAINFRAMENBLOW, name=u'nbLow',
parent=self.panelSHLow, pos=wx.Point(0, 0), size=wx.Size(782,
- 469), style=0)
+ 219), style=0)
self.nbLow.SetLabel(u'Label')
self.textOutput = wx.TextCtrl(id=wxID_MAINFRAMETEXTOUTPUT,
name=u'textOutput', parent=self.nbLow, pos=wx.Point(0, 0),
- size=wx.Size(774, 443),
+ size=wx.Size(774, 193),
style=wx.TE_RICH | wx.TE_READONLY | wx.TE_MULTILINE, value=u'')
self.splitterVertical = wx.SplitterWindow(id=wxID_MAINFRAMESPLITTERVERTICAL,
name=u'splitterVertical', parent=self.panelSHUp, pos=wx.Point(0,
- 0), size=wx.Size(782, 35), style=wx.SP_3D)
+ 0), size=wx.Size(782, 285), style=wx.SP_3D)
self.splitterVertical.SetMinimumPaneSize(40)
self.panelUpLeft = wx.Panel(id=wxID_MAINFRAMEPANELUPLEFT,
name=u'panelUpLeft', parent=self.splitterVertical, pos=wx.Point(0,
- 0), size=wx.Size(40, 35), style=wx.TAB_TRAVERSAL)
+ 0), size=wx.Size(298, 285), style=wx.TAB_TRAVERSAL)
self.panelUpRight = wx.Panel(id=wxID_MAINFRAMEPANELUPRIGHT,
name=u'panelUpRight', parent=self.splitterVertical,
- pos=wx.Point(44, 0), size=wx.Size(738, 35),
+ pos=wx.Point(302, 0), size=wx.Size(480, 285),
style=wx.TAB_TRAVERSAL)
self.splitterVertical.SplitVertically(self.panelUpLeft,
self.panelUpRight, 50)
self.nbUpLeft = wx.Notebook(id=wxID_MAINFRAMENBUPLEFT, name=u'nbUpLeft',
- parent=self.panelUpLeft, pos=wx.Point(0, 0), size=wx.Size(40, 35),
- style=0)
+ parent=self.panelUpLeft, pos=wx.Point(0, 0), size=wx.Size(298,
+ 285), style=0)
self.nbUpLeft.SetLabel(u'Label')
self.nbUpLeft.SetHelpText(u'')
self.nbUpRight = wx.Notebook(id=wxID_MAINFRAMENBUPRIGHT,
name=u'nbUpRight', parent=self.panelUpRight, pos=wx.Point(0, 0),
- size=wx.Size(738, 35), style=0)
+ size=wx.Size(480, 285), style=0)
self.panelNbSettings = wx.Panel(id=wxID_MAINFRAMEPANELNBSETTINGS,
name=u'panelNbSettings', parent=self.nbUpLeft, pos=wx.Point(0, 0),
- size=wx.Size(32, 9), style=wx.TAB_TRAVERSAL)
+ size=wx.Size(290, 259), style=wx.TAB_TRAVERSAL)
self.panelNbSettings.Show(True)
self.panelNbSettings.SetMinSize(wx.Size(100, 100))
self.panelNbCode = wx.Panel(id=wxID_MAINFRAMEPANELNBCODE,
name=u'panelNbCode', parent=self.nbUpRight, pos=wx.Point(0, 0),
- size=wx.Size(730, 9), style=wx.TAB_TRAVERSAL)
+ size=wx.Size(472, 259), style=wx.TAB_TRAVERSAL)
self.textCode = wx.TextCtrl(id=wxID_MAINFRAMETEXTCODE, name=u'textCode',
- parent=self.panelNbCode, pos=wx.Point(0, 0), size=wx.Size(730, 0),
- style=wx.TE_READONLY | wx.TE_MULTILINE, value=u'')
+ parent=self.panelNbCode, pos=wx.Point(0, 0), size=wx.Size(472,
+ 225),
+ style=wx.VSCROLL | wx.HSCROLL | wx.TE_READONLY | wx.TE_MULTILINE,
+ value=u'')
self.textCode.SetHelpText(u'')
self.panelButtons = wx.Panel(id=wxID_MAINFRAMEPANELBUTTONS,
- name=u'panelButtons', parent=self.panelNbCode, pos=wx.Point(156,
- -20), size=wx.Size(418, 24), style=wx.TAB_TRAVERSAL)
+ name=u'panelButtons', parent=self.panelNbCode, pos=wx.Point(27,
+ 230), size=wx.Size(418, 24), style=wx.TAB_TRAVERSAL)
self.butGenXml = wx.Button(id=wxID_MAINFRAMEBUTGENXML,
label=u'Generate XML code', name=u'butGenXml',
@@ -407,17 +409,17 @@
self.textHeader = wx.TextCtrl(id=wxID_MAINFRAMETEXTHEADER,
name=u'textHeader', parent=self.panelNbSettings, pos=wx.Point(56,
- 20), size=wx.Size(0, 21), style=wx.TE_READONLY, value=u'')
+ 20), size=wx.Size(181, 21), style=wx.TE_READONLY, value=u'')
self.butHeaders = wx.Button(id=wxID_MAINFRAMEBUTHEADERS, label=u'...',
- name=u'butHeaders', parent=self.panelNbSettings, pos=wx.Point(-11,
+ name=u'butHeaders', parent=self.panelNbSettings, pos=wx.Point(247,
19), size=wx.Size(28, 23), style=0)
self.butHeaders.Bind(wx.EVT_BUTTON, self.OnButHeadersButton,
id=wxID_MAINFRAMEBUTHEADERS)
self.textGccXml = wx.TextCtrl(id=wxID_MAINFRAMETEXTGCCXML,
name=u'textGccXml', parent=self.panelNbSettings, pos=wx.Point(56,
- 61), size=wx.Size(0, 21), style=wx.TE_READONLY, value=u'')
+ 61), size=wx.Size(181, 21), style=wx.TE_READONLY, value=u'')
self.staticText1 = wx.StaticText(id=wxID_MAINFRAMESTATICTEXT1,
label=u'Header\nFile', name='staticText1',
@@ -426,26 +428,27 @@
self.staticText4 = wx.StaticText(id=wxID_MAINFRAMESTATICTEXT4,
label=u'Macros', name='staticText4', parent=self.panelNbSettings,
- pos=wx.Point(5, 31), size=wx.Size(51, 25), style=wx.ALIGN_CENTRE)
+ pos=wx.Point(5, 212), size=wx.Size(51, 25),
+ style=wx.ALIGN_CENTRE)
self.staticText2 = wx.StaticText(id=wxID_MAINFRAMESTATICTEXT2,
label=u'GccXml', name='staticText2', parent=self.panelNbSettings,
pos=wx.Point(5, 60), size=wx.Size(51, 23), style=wx.ALIGN_CENTRE)
self.butGccXml = wx.Button(id=wxID_MAINFRAMEBUTGCCXML, label=u'...',
- name=u'butGccXml', parent=self.panelNbSettings, pos=wx.Point(-11,
+ name=u'butGccXml', parent=self.panelNbSettings, pos=wx.Point(247,
60), size=wx.Size(28, 23), style=0)
self.butGccXml.Bind(wx.EVT_BUTTON, self.OnButGccXmlButton,
id=wxID_MAINFRAMEBUTGCCXML)
self.staticText3 = wx.StaticText(id=wxID_MAINFRAMESTATICTEXT3,
label=u'Include\nPath', name='staticText3',
- parent=self.panelNbSettings, pos=wx.Point(5, 74), size=wx.Size(51,
- 37), style=wx.ALIGN_CENTRE)
+ parent=self.panelNbSettings, pos=wx.Point(5, 123),
+ size=wx.Size(51, 37), style=wx.ALIGN_CENTRE)
self.listIncludes = wx.ListCtrl(id=wxID_MAINFRAMELISTINCLUDES,
name=u'listIncludes', parent=self.panelNbSettings,
- pos=wx.Point(56, 102), size=wx.Size(0, 0),
+ pos=wx.Point(56, 102), size=wx.Size(219, 80),
style=wx.LC_HRULES | wx.LC_NO_HEADER | wx.LC_REPORT)
self.listIncludes.Bind(wx.EVT_RIGHT_DOWN, self.OnListIncludesRightDown)
self.listIncludes.Bind(wx.EVT_SIZE, self.OnListIncludesSize)
@@ -460,7 +463,7 @@
self.listMacros = wx.ListCtrl(id=wxID_MAINFRAMELISTMACROS,
name=u'listMacros', parent=self.panelNbSettings, pos=wx.Point(56,
- 53), size=wx.Size(0, 0),
+ 202), size=wx.Size(219, 46),
style=wx.LC_HRULES | wx.LC_NO_HEADER | wx.LC_REPORT)
self.listMacros.Bind(wx.EVT_RIGHT_DOWN, self.OnListMacrosRightDown)
self.listMacros.Bind(wx.EVT_SIZE, self.OnListMacrosSize)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
