From 8fe98678e55251019b940d7b312db3879a91955f Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 12 Aug 2008 15:37:10 +0000 Subject: [PATCH] * Start changing names around git-svn-id: svn+ssh://svn.marcochapeau.org/laditools/trunk@135 bfe161da-02ef-4cea-8c43-ae261ea21ac6 --- g15jackmon | 2 +- icons/96x96/{pyjackctl.png => laditools.png} | Bin jackconf | 2 +- jacktray | 2 +- ladilog | 10 ++++++---- lib/{pyjackctl => laditools}/__init__.py | 0 lib/{pyjackctl => laditools}/a2j_controller.py | 0 lib/{pyjackctl => laditools}/a2j_menu.py | 0 lib/{pyjackctl => laditools}/config.py | 0 lib/{pyjackctl => laditools}/error.py | 0 lib/{pyjackctl => laditools}/jack_configure.py | 0 lib/{pyjackctl => laditools}/jack_controller.py | 0 lib/{pyjackctl => laditools}/jack_menu.py | 0 setup.py | 10 +++++----- wmjackctl | 2 +- 15 files changed, 15 insertions(+), 13 deletions(-) rename icons/96x96/{pyjackctl.png => laditools.png} (100%) rename lib/{pyjackctl => laditools}/__init__.py (100%) rename lib/{pyjackctl => laditools}/a2j_controller.py (100%) rename lib/{pyjackctl => laditools}/a2j_menu.py (100%) rename lib/{pyjackctl => laditools}/config.py (100%) rename lib/{pyjackctl => laditools}/error.py (100%) rename lib/{pyjackctl => laditools}/jack_configure.py (100%) rename lib/{pyjackctl => laditools}/jack_controller.py (100%) rename lib/{pyjackctl => laditools}/jack_menu.py (100%) diff --git a/g15jackmon b/g15jackmon index 26733be..1916cab 100755 --- a/g15jackmon +++ b/g15jackmon @@ -21,7 +21,7 @@ import sys import os import time import signal -import pyjackctl +import laditools pipe_filename = "/dev/shm/g15log.pipe" diff --git a/icons/96x96/pyjackctl.png b/icons/96x96/laditools.png similarity index 100% rename from icons/96x96/pyjackctl.png rename to icons/96x96/laditools.png diff --git a/jackconf b/jackconf index 4ec071d..5d19b7c 100755 --- a/jackconf +++ b/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): diff --git a/jacktray b/jacktray index 4ad6d32..3ee7d88 100755 --- a/jacktray +++ b/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 diff --git a/ladilog b/ladilog index f9b3c16..4a13ff9 100755 --- a/ladilog +++ b/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 () diff --git a/lib/pyjackctl/__init__.py b/lib/laditools/__init__.py similarity index 100% rename from lib/pyjackctl/__init__.py rename to lib/laditools/__init__.py diff --git a/lib/pyjackctl/a2j_controller.py b/lib/laditools/a2j_controller.py similarity index 100% rename from lib/pyjackctl/a2j_controller.py rename to lib/laditools/a2j_controller.py diff --git a/lib/pyjackctl/a2j_menu.py b/lib/laditools/a2j_menu.py similarity index 100% rename from lib/pyjackctl/a2j_menu.py rename to lib/laditools/a2j_menu.py diff --git a/lib/pyjackctl/config.py b/lib/laditools/config.py similarity index 100% rename from lib/pyjackctl/config.py rename to lib/laditools/config.py diff --git a/lib/pyjackctl/error.py b/lib/laditools/error.py similarity index 100% rename from lib/pyjackctl/error.py rename to lib/laditools/error.py diff --git a/lib/pyjackctl/jack_configure.py b/lib/laditools/jack_configure.py similarity index 100% rename from lib/pyjackctl/jack_configure.py rename to lib/laditools/jack_configure.py diff --git a/lib/pyjackctl/jack_controller.py b/lib/laditools/jack_controller.py similarity index 100% rename from lib/pyjackctl/jack_controller.py rename to lib/laditools/jack_controller.py diff --git a/lib/pyjackctl/jack_menu.py b/lib/laditools/jack_menu.py similarity index 100% rename from lib/pyjackctl/jack_menu.py rename to lib/laditools/jack_menu.py diff --git a/setup.py b/setup.py index cafdb25..52372d7 100644 --- a/setup.py +++ b/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', - packages=['pyjackctl'], - package_dir={'pyjackctl': 'lib/pyjackctl'}, + url='http://www.marcochapeau.org/software/laditools' + packages=['laditools'], + 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', diff --git a/wmjackctl b/wmjackctl index ae6c50c..179ba2a 100755 --- a/wmjackctl +++ b/wmjackctl @@ -20,7 +20,7 @@ import sys import os from wmdocklib import wmoo, pywmhelpers -import pyjackctl +import laditools import time import pygtk