Menu
▾
▴
[Roreditor-svn] SF.net SVN: roreditor: [145] trunk/lib/ror
|
From: <ror...@us...> - 2007-07-29 14:46:29
|
Revision: 145
http://roreditor.svn.sourceforge.net/roreditor/?rev=145&view=rev
Author: rorthomas
Date: 2007-07-29 07:46:14 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
* packed controls in the starter
* fixed some minor bugs
Modified Paths:
--------------
trunk/lib/ror/bugreport.py
trunk/lib/ror/repomanager.py
trunk/lib/ror/starter.py
Modified: trunk/lib/ror/bugreport.py
===================================================================
--- trunk/lib/ror/bugreport.py 2007-07-28 15:37:02 UTC (rev 144)
+++ trunk/lib/ror/bugreport.py 2007-07-29 14:46:14 UTC (rev 145)
@@ -77,7 +77,7 @@
try:
import sysinfo
except:
- dlg = wx.MessageDialog(self, "You must install pywin32 first.\nYou can find the setup in INSTALLDIR\tools\3rdparty\pywin32-setup.exe (This means you must install it by hand!)\nPlease note that you must restart this program after the pywin installation.", "Error", wx.OK | wx.ICON_INFORMATION)
+ dlg = wx.MessageDialog(self, "You must install pywin32 first.\nYou can find the setup in INSTALLDIR\\tools\\3rdparty\\pywin32-setup.exe (This means you must install it by hand!)\nPlease note that you must restart this program after the pywin installation.", "Error", wx.OK | wx.ICON_INFORMATION)
dlg.ShowModal()
dlg.Destroy()
self.Close()
Modified: trunk/lib/ror/repomanager.py
===================================================================
--- trunk/lib/ror/repomanager.py 2007-07-28 15:37:02 UTC (rev 144)
+++ trunk/lib/ror/repomanager.py 2007-07-29 14:46:14 UTC (rev 145)
@@ -1,7 +1,8 @@
#Thomas Fischer 31/05/2007, th...@th...
import repoclient
-
+from logger import log
+from settingsManager import getSettingsManager
import wx, wx.grid, wx.html, os, os.path, base64, sys
from datetime import *
@@ -81,7 +82,8 @@
self.grid_1 = wx.grid.Grid(self, -1, size=(1, 1))
try:
self.data = repoclient.getFiles(-1)
- except:
+ except Exception, err:
+ log().error(err)
dlg = wx.MessageDialog(self, "Repository Server is unavailable right now. Please note that the server is in a beta stage and that it is not online every time.", "Info", wx.OK | wx.ICON_INFORMATION)
dlg.ShowModal()
dlg.Destroy()
Modified: trunk/lib/ror/starter.py
===================================================================
--- trunk/lib/ror/starter.py 2007-07-28 15:37:02 UTC (rev 144)
+++ trunk/lib/ror/starter.py 2007-07-29 14:46:14 UTC (rev 145)
@@ -61,13 +61,13 @@
self.btnUpdate = wx.Button(self.panel, wx.ID_ANY, "Update")
self.Bind(wx.EVT_BUTTON, self.OnUpdate, self.btnUpdate)
- self.btnDepGraph = wx.Button(self.panel, wx.ID_ANY, "Create dependency Graph")
+ self.btnDepGraph = wx.Button(self.panel, wx.ID_ANY, "Dependency Graph")
self.Bind(wx.EVT_BUTTON, self.OnDepGraph, self.btnDepGraph)
self.btnModUninstaller = wx.Button(self.panel, wx.ID_ANY, "Mod Uninstaller")
self.Bind(wx.EVT_BUTTON, self.OnModUninstaller, self.btnModUninstaller)
- self.btnRepClient = wx.Button(self.panel, wx.ID_ANY, "Open Repository Client")
+ self.btnRepClient = wx.Button(self.panel, wx.ID_ANY, "Repository Client")
self.Bind(wx.EVT_BUTTON, self.OnRepClient, self.btnRepClient)
self.btnExit = wx.Button(self.panel, wx.ID_ANY, "Exit")
@@ -241,27 +241,45 @@
sys.exit(0)
def __set_properties(self):
- try:
- import ror.svn
- self.SetTitle("RoR Toolkit r%d" % ror.svn.getRevision())
- except:
- self.SetTitle("RoR Toolkit")
+ #try:
+ import ror.svn
+ self.SetTitle("RoR Toolkit r%d" % ror.svn.getRevision())
+ #except:
+ # self.SetTitle("RoR Toolkit")
def __do_layout(self):
sizer_panel = wx.BoxSizer(wx.VERTICAL)
sizer_panel.Add(self.image, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.lblRoRDir, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnSelectRoRDir, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.cbbRenderEngine, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnStartRoR, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnStartTerrainEditor, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnStartTruckEditor, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnBugReport, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnUpdate, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnDepGraph, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnRepClient, 0, wx.EXPAND, 0)
- sizer_panel.Add(self.btnModUninstaller, 0, wx.EXPAND, 0)
+
+ sizer_a = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_a.Add(self.lblRoRDir, 1, wx.EXPAND, 0)
+ sizer_a.Add(self.btnSelectRoRDir, 0, wx.EXPAND, 0)
+ sizer_panel.Add(sizer_a, 0, wx.EXPAND, 0)
+
+ sizer_b = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_b.Add(self.btnStartRoR, 0, wx.EXPAND, 0)
+
+ sizer_c = wx.BoxSizer(wx.VERTICAL)
+ sizer_c.Add(self.btnStartTruckEditor, 1, wx.EXPAND, 0)
+ sizer_c.Add(self.btnStartTerrainEditor, 1, wx.EXPAND, 0)
+ sizer_b.Add(sizer_c, 1, wx.EXPAND, 0)
+
+ sizer_b.Add(self.cbbRenderEngine, 0, wx.EXPAND, 0)
+ sizer_panel.Add(sizer_b, 1, wx.EXPAND, 0)
+
+ sizer_d = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_d.Add(self.btnBugReport, 1, wx.EXPAND, 0)
+ sizer_d.Add(self.btnUpdate, 1, wx.EXPAND, 0)
+ sizer_panel.Add(sizer_d, 0, wx.EXPAND, 0)
+
+
+ sizer_e = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_e.Add(self.btnDepGraph, 1, wx.EXPAND, 0)
+ sizer_e.Add(self.btnRepClient, 1, wx.EXPAND, 0)
+ sizer_e.Add(self.btnModUninstaller, 1, wx.EXPAND, 0)
+ sizer_panel.Add(sizer_e, 0, wx.EXPAND, 0)
+
sizer_panel.Add(self.btnExit, 0, wx.EXPAND, 0)
self.panel.SetSizer(sizer_panel)
@@ -275,11 +293,15 @@
self.Layout()
def startApp():
- MainApp = wx.PySimpleApp(0)
+ MainApp = wx.PySimpleApp()
wx.InitAllImageHandlers() #you may or may not need this
- myFrame = SettingsDialog(None, -1, "")
+ myFrame = SettingsDialog(None, -1, "")
- MainApp.SetTopWindow(myFrame)
+ # add icon to the window
+ icon = wx.Icon("ror.ico",wx.BITMAP_TYPE_ICO)
+ myFrame.SetIcon(icon)
+ MainApp.SetTopWindow(myFrame)
+
myFrame.Show()
MainApp.MainLoop()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
