* Start changing names around

git-svn-id: svn+ssh://svn.marcochapeau.org/laditools/trunk@135 bfe161da-02ef-4cea-8c43-ae261ea21ac6

g15jackmon

@@ -21,7 +21,7 @@ import sys
 import os
 import time
 import signal
-import pyjackctl
+import laditools
 
 pipe_filename = "/dev/shm/g15log.pipe"
 

jackconf

@@ -21,7 +21,7 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 import gtk.glade
-import pyjackctl
+import laditools
 
 class jackctl_conf(gtk.glade.XML):
     def __init__(self):

jacktray

@@ -21,7 +21,7 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 from gobject import timeout_add
-import pyjackctl
+import laditools
 
 # Default configuration
 autostart_default = 0

ladilog

@@ -32,7 +32,7 @@ try:
     import gtk
     import gtk.glade
     import vte
-    import pyjackctl
+    import laditools
 except:
     error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, "Wow dude...\n\nYou really need to get you dependencies right before you run this program. Ask your package maintainer why he didn't do his job properly")
     error.run ()
@@ -40,7 +40,7 @@ except:
 
 # Default configuration
 max_lines_default = 100
-good_term = [11522, 5, 1215, 35387, 15, 15, ['\x03', '\x1c', '\x7f', '\x15', '\x04', '\x00', '\x01', '\xff', '\x11', '\x13', '\x1a', '\xff', '\x12', '\x0f', '\x17', '\x16', '\xff', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00']]
+# good_term = [11522, 5, 1215, 35387, 15, 15, ['\x03', '\x1c', '\x7f', '\x15', '\x04', '\x00', '\x01', '\xff', '\x11', '\x13', '\x1a', '\xff', '\x12', '\x0f', '\x17', '\x16', '\xff', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00']]
 
 class ladilog (gtk.glade.XML):
     def __init__ (self):
@@ -108,7 +108,8 @@ class ladilog (gtk.glade.XML):
                 tty.setcbreak (log["masterfd"], termios.TCSANOW)
                 tty.setcbreak (log["slavefd"], termios.TCSANOW)
                 log["term"].set_pty (log["slavefd"])
-                log["tail_process"] = Popen (self.tail_cmd + [log['logfile_path']], stdout = log["masterfd"])
+                log["tail_process"] = Popen (self.tail_cmd + [log['logfile_path']], stdout = PIPE)
+                log["sed_process"] = Popen (["/bin/sed", "-e", "s/$/\\r/"], stdin = log["tail_process"].stdout, stdout = log["masterfd"])
 
             except ValueError:
                 print "You called Popen with invalid arguments... dumbass"
@@ -123,7 +124,8 @@ class ladilog (gtk.glade.XML):
 
     def on_clear_text (self, data=None):
         current_view = self.logview_notebook.get_current_page ()
-        self.log_files[current_view]["term"].feed ("\033[2J\033[;f")
+#        self.log_files[current_view]["term"].feed ("\033[2J\033[;f")
+
 
     def on_purge (self, data=None):
         current_view = self.logview_notebook.get_current_page ()

setup.py

@@ -18,16 +18,16 @@
 
 from distutils.core import setup
 
-setup(name='pyjackctl',
+setup(name='laditools',
     version='1.0',
     description='The pyjackctl controller suite',
     author='Marc-Olivier Barre and Nedko Arnaudov',
     author_email='marco@marcochapeau.org',
-    url='http://www.marcochapeau.org/software/pyjackctl',
+    url='http://www.marcochapeau.org/software/laditools'
-    packages=['pyjackctl'],
+    packages=['laditools'],
-    package_dir={'pyjackctl': 'lib/pyjackctl'},
+    package_dir={'laditools': 'lib/laditools'},
     scripts=['jacktray', 'wmjackctl', 'g15jackmon', 'ladilog', 'jackconf', 'wma2jctl'],
-    data_files=[('share/doc/pyjackctl', ['README', 'COPYING', 'INSTALL', 'TODO']),
+    data_files=[('share/doc/laditools', ['README', 'COPYING', 'INSTALL', 'TODO']),
         ('share/pixmaps', ['data/pyjackctl.svg']),
         ('share/pyjackctl/data', ['data/pyjackctl.svg']),
         ('share/pyjackctl/data', ['data/pyjackctl_logo.svg',

wmjackctl

@@ -20,7 +20,7 @@
 import sys
 import os
 from wmdocklib import wmoo, pywmhelpers
-import pyjackctl
+import laditools
 import time
 
 import pygtk