[Roreditor-svn] SF.net SVN: roreditor: [147] trunk/tools

[<ror...@us...>]

Revision: 147
          http://roreditor.svn.sourceforge.net/roreditor/?rev=147&view=rev
Author:   rorthomas
Date:     2007-07-29 09:07:10 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
* modgui can now uninstall and repoinstall
* removed gui options from modtool command line version

Modified Paths:
--------------
    trunk/tools/modgui.py
    trunk/tools/modtool.py

Modified: trunk/tools/modgui.py
===================================================================
--- trunk/tools/modgui.py	2007-07-29 15:44:48 UTC (rev 146)
+++ trunk/tools/modgui.py	2007-07-29 16:07:10 UTC (rev 147)
@@ -9,13 +9,49 @@
 import wx
 
 def main():
-    app = wx.PySimpleApp(0)
-    wx.InitAllImageHandlers()
-    frame_1 = ror.modgui.ModGUI(None, -1, "")
-    app.SetTopWindow(frame_1)
-    frame_1.Show()
-    app.MainLoop()
+    log().info("modgui started")
+    import wx
+    app = wx.PySimpleApp(0) 
+    wx.InitAllImageHandlers() #you may or may not need this    
+    
+    # check for valid RoR Directory!
+    import ror.settingsManager
+    rorpath = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
+    if not os.path.isfile(os.path.join(rorpath,"RoR.exe")):
+        import ror.starter
+        ror.starter.startApp()
+        return
 
+    if len(sys.argv) == 1:
+        log().error("missing arguments")
+        return
+    mode = sys.argv[1]
+    if mode in ["uninstall"]:
+        frame_1 = ror.modgui.ModGUI(None, -1, "")
+        app.SetTopWindow(frame_1)
+        frame_1.Show()
+        app.MainLoop()
 
+    elif mode in ['installrepo']:
+        if len(sys.argv) != 3:
+            return
+        targetfile = sys.argv[2]    
+        import ror.modtool
+        result = ror.modtool.ModTool().work(mode, targetfile, False, False)
+        if result == False or result is None:
+            msg = "Installation failed! :( Please have a look at the file editorlog.log"
+        else:
+            msg = "Installation successfull! Mods installed:\n %s" % ", ".join(result)
+        dlg = wx.MessageDialog(None, msg, "Info", wx.OK | wx.ICON_INFORMATION)
+        dlg.ShowModal()
+        dlg.Destroy()
+    else:
+        log().error("function %s not implemented in gui version!" % mode)
+        return
+
+
+
+
+
 if __name__=="__main__":
     main()

Modified: trunk/tools/modtool.py
===================================================================
--- trunk/tools/modtool.py	2007-07-29 15:44:48 UTC (rev 146)
+++ trunk/tools/modtool.py	2007-07-29 16:07:10 UTC (rev 147)
@@ -34,13 +34,6 @@
     sys.exit(0)
 
 def main():
-    guiVersion = True #(os.path.basename(sys.executable).lower() == "pythonw.exe")
-    if guiVersion:
-        log().info("using GUI version")
-        import wx
-        MainApp = wx.PySimpleApp(0) 
-        wx.InitAllImageHandlers() #you may or may not need this    
-    
     # check for valid RoR Directory!
     import ror.settingsManager
     rorpath = ror.settingsManager.getSettingsManager().getSetting("RigsOfRods", "BasePath")
@@ -91,13 +84,7 @@
         installtarget = None
     import ror.modtool
     result = ror.modtool.ModTool().work(mode, targetfile, verbose, dryrun, installtarget)
-    if guiVersion:
-        msg = "Installation failed! :( Please have a look at the file editorlog.log"
-        if result:
-            msg = "Installation successfull! You can now use the Mod.\n more details can be found in the log window!\n(The Log Window will close when you click OK)"
-        dlg = wx.MessageDialog(None, msg, "Info", wx.OK | wx.ICON_INFORMATION)
-        dlg.ShowModal()
-        dlg.Destroy()
+    
 
 if __name__=="__main__":
     main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.