diff --git a/src/base/scion.py b/src/base/scion.py index 37407fa4..5e4b1d6b 100644 --- a/src/base/scion.py +++ b/src/base/scion.py @@ -4,25 +4,25 @@ __author__="bjschuma" __date__ ="$Dec 4, 2009 3:37:21 PM$" -global name -name = "scion" +#global name +#name = "scion" # We need to import settings before we can use disp() import settings +settings.set("appname","scion") # The first thing we do is import write() so we can occasionally print messages from bt.message import write -write("Welcome to " + name) +#write("Welcome to " + name) # Next, we set the process name to ocarina2 from bt.proc import setname -setname(name) +#setname() # Import the plugin loader class! import loader import manager - def loadPluginPath(path): loader.load.loaddir(path) manager.manager.addPlugins(loader.load.getPlugins()) @@ -30,12 +30,15 @@ def loadPluginPath(path): # Begin our main loop def main(): + write("Welcome to "+settings.get("appname")) + setname(settings.get("appname")) for path in settings.get("PLUGPATH",True): loadPluginPath(path) manager.manager.restoresession() manager.manager.startup() - settings.pop("loop")() + settings.get("loop")() + #settings.pop("loop")() diff --git a/src/core/cli.py b/src/core/cli.py index 278847bc..bcb0b641 100644 --- a/src/core/cli.py +++ b/src/core/cli.py @@ -14,23 +14,29 @@ opt = [] from bt.message import * import cline.loop import cline.message -import settings +#import settings +from bt.needle import Needle # Called every time the plugin is enabled def open(): write("Starting CLI", True) + + #thread = Needle(cline.loop.loop) + #thread.start() # Tell settings to run this loop settings.set("loop",cline.loop.loop) settings.set("loopquit",cline.loop.quit) + # Called every time the plugin is stopped def close(): - settings.pop("loop") - settings.pop("loopquit")() + #settings.pop("loop") + #settings.pop("loopquit")() + cline.loop.quit() write("CLI has been stopped", True) #cline.loop.quit() diff --git a/src/extra/guiGTK/box.py b/src/extra/guiGTK/box.py index 11727f11..fe520f02 100644 --- a/src/extra/guiGTK/box.py +++ b/src/extra/guiGTK/box.py @@ -7,17 +7,17 @@ __author__="bjschuma" __date__ ="$Jan 8, 2010 12:17:55 AM$" import gtk -from manager import manager +#from manager import manager class HBox(gtk.HBox): - def __init__(self, name, homogeneous=False, spacing=0): + def __init__(self, homogeneous=False, spacing=0): gtk.HBox.__init__(homogeneous, spacing) - manager.run("sgtk", (name,self)) + #manager.run("sgtk", (name,self)) self.show() class VBox(gtk.VBox): - def __init__(self, name, homogeneous=False, spacing=0): + def __init__(self, homogeneous=False, spacing=0): gtk.VBox.__init__(homogeneous, spacing) - manager.run("sgtk", (name,self)) + #manager.run("sgtk", (name,self)) self.show() \ No newline at end of file diff --git a/src/extra/guiGTK/window.py b/src/extra/guiGTK/window.py index c9be4b77..27ac2fbf 100644 --- a/src/extra/guiGTK/window.py +++ b/src/extra/guiGTK/window.py @@ -8,7 +8,7 @@ __date__ ="$Jan 6, 2010 10:07:31 PM$" import gtk from manager import manager -import settings +#import settings def quit(a,b): @@ -16,11 +16,11 @@ def quit(a,b): class Window(gtk.Window): - def __init__(self, title, name, type=gtk.WINDOW_TOPLEVEL, icon=None): + def __init__(self, title, type=gtk.WINDOW_TOPLEVEL, icon=None): gtk.Window.__init__(self,type) self.set_title(title) self.connect("delete_event",quit) - manager.run("sgtk", (name,self)) + #manager.run("sgtk", (name,self)) if not (icon == None): self.set_icon_from_file(icon) diff --git a/src/extra/sgtk.py b/src/extra/sgtk.py index 5459b985..4360f8d3 100644 --- a/src/extra/sgtk.py +++ b/src/extra/sgtk.py @@ -1,7 +1,7 @@ # This is a simple test plugin, to make sure everything is working __author__="bjschuma" -__date__ ="$Jan 6, 2010 9:50:31 PM$" +__date__ ="$Jan 13, 2010 12:02:58 AM$" global name, app, type, path, opt @@ -11,79 +11,26 @@ type = "extra" path = "" opt = [] +from bt.message import write +from manager import manager from guiGTK import * import gtk -import gobject -gobject.threads_init() - -import settings -global running -running = False -from manager import manager - - -def register(name=None, object=None): - #gui = settings.get("gui") - #gui[name] = object - return - - -# Called when the plugin needs to perform some action -def run(args=None): - #if args == None: - #running = settings.get("guirunning") - - # Main window - #win = window.Window("Scion", "gui") - - # Horizontal box - #box = HBox("MainBox") - #win.add(box) - - # Start gtk main - #if running == False: - manager.run("disable", ["cli"] ) - #settings.set("guirunning",True) - #if settings.has("loop") == False: - #gtk.main() - #else: - # if len(args) == 2: - # register(args[0],args[1]) - - -def loop(): - #write(settings.get("guirunning")) - if settings.get("guirunning") == True: - run() - gtk.main() - else: - #settings.pop("loop") - settings.pop("loop")() - - -# Called every time the plugin is stopped -def close(): - running = settings.get("guirunning") - if running == True: - gtk.main_quit() - settings.delete("gui") # Called every time the plugin is enabled def open(): - settings.init("guirunning",False) - settings.set("loop",loop) - settings.set("loopquit", close) - settings.init("gui",dict()) - #if settings.get("guirunning") == True: - # run() - # settings.set("loop",gtk.main) + pass +# Called every time the plugin is stopped +def close(): + gtk.main_quit() + pass - -#print loop -#settings.set("loop",loop) - +# Called when the plugin needs to perform some action +def run(args=None): + manager.run("disable", ["cli"]) + win = window.Window("Scion") + gtk.main()