Merge lp:~lfaraone/ubuntu/lucid/autokey/merge0.61.5-1ubuntu1 into lp:ubuntu/lucid/autokey

[Luke Faraone]

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-01-08 08:52:58 +0000
+++ PKG-INFO	2010-03-26 15:01:22 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: autokey
-Version: 0.61.2
+Version: 0.61.5
 Summary: Desktop automation utility
 Home-page: http://autokey.googlecode.com/
 Author: Chris Dekter
 
=== removed file 'autokey'
--- autokey	2009-09-27 15:08:28 +0000
+++ autokey	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import sys
-from autokey.autokey import Application
-
-a = Application()
-try:
-    a.main()
-except KeyboardInterrupt:
-    a.shutdown()
-sys.exit(0)
-
 
=== added file 'autokey-gtk'
--- autokey-gtk	1970-01-01 00:00:00 +0000
+++ autokey-gtk	2010-03-26 15:01:22 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys
+from autokey.gtkapp import Application
+
+a = Application()
+try:
+    a.main()
+except KeyboardInterrupt:
+    a.shutdown()
+sys.exit(0)
+
 
=== added file 'autokey-qt'
--- autokey-qt	1970-01-01 00:00:00 +0000
+++ autokey-qt	2010-03-26 15:01:22 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys
+from autokey.qtapp import Application
+
+a = Application()
+try:
+    a.main()
+except KeyboardInterrupt:
+    a.shutdown()
+sys.exit(0)
+
 
=== added file 'config/akicon-status.png'
 Binary files config/akicon-status.png	1970-01-01 00:00:00 +0000 and config/akicon-status.png	2010-03-26 15:01:22 +0000 differ
=== added file 'config/autokey-gtk.desktop'
--- config/autokey-gtk.desktop	1970-01-01 00:00:00 +0000
+++ config/autokey-gtk.desktop	2010-03-26 15:01:22 +0000
@@ -0,0 +1,10 @@
+# $Id: autokey.desktop 22 2008-01-29 11:29:13Z peabody $
+[Desktop Entry]
+Name=AutoKey (GTK)
+GenericName=Keyboard Automation
+Comment=Program keyboard shortcuts
+Exec=autokey-gtk
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/akicon.png
+Categories=GNOME;Utility;
 
=== added file 'config/autokey-qt.desktop'
--- config/autokey-qt.desktop	1970-01-01 00:00:00 +0000
+++ config/autokey-qt.desktop	2010-03-26 15:01:22 +0000
@@ -0,0 +1,10 @@
+# $Id: autokey.desktop 22 2008-01-29 11:29:13Z peabody $
+[Desktop Entry]
+Name=AutoKey (QT)
+GenericName=Keyboard Automation
+Comment=Program keyboard shortcuts
+Exec=autokey-qt
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/akicon.png
+Categories=KDE;Utility;
 
=== removed file 'config/autokey.desktop'
--- config/autokey.desktop	2009-09-27 15:08:28 +0000
+++ config/autokey.desktop	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# $Id: autokey.desktop 22 2008-01-29 11:29:13Z peabody $
-[Desktop Entry]
-Name=AutoKey
-GenericName=Keyboard Automation
-Comment=Program keyboard shortcuts
-Exec=autokey
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/akicon.png
-Categories=GNOME;KDE;Utility
 
=== added file 'debian/autokey-common.init'
--- debian/autokey-common.init	1970-01-01 00:00:00 +0000
+++ debian/autokey-common.init	2010-03-26 15:01:22 +0000
@@ -0,0 +1,150 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+### BEGIN INIT INFO
+# Provides:          autokey
+# Required-Start:    $local_fs 
+# Required-Stop:     $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start AutoKey daemon.
+# Description:       Enable AutoKey's EvDev interface daemon.
+### END INIT INFO
+
+import sys, os, socket, glob, shutil, time
+try:
+    from autokey import evdev, daemon
+    from autokey.common import DOMAIN_SOCKET_PATH, PACKET_SIZE
+except ImportError:
+    # Per DPM § 9.3.2 script should fail gracefully if not installed.
+    print "It does not seem Autokey is installed. Exiting..."
+    sys.exit(0)
+
+PACKET_STRING = "%s,%s,%s"
+
+BUTTON_MAP = {
+              "BTN_LEFT" : '1',
+              "BTN_MIDDLE": '2',
+              "BTN_RIGHT" : '3'
+             }
+
+class AutoKeyDaemon(daemon.Daemon):
+
+    def __init__(self):
+        logFile = "/var/log/autokey-daemon.log"
+        if os.path.exists(logFile):
+            shutil.move(logFile, logFile + '.old')
+        daemon.Daemon.__init__(self, '/var/run/autokey-daemon.pid', stdout=logFile, stderr=logFile)
+
+    def get_device_paths(self):
+        keyboardLocations = glob.glob("/dev/input/by-path/*-event-kbd")
+        mouseLocations = glob.glob("/dev/input/by-path/*-event-mouse")
+    
+        sys.stdout.write("Keyboards: %s\nMice: %s\n" % (repr(keyboardLocations), repr(mouseLocations)))
+        return keyboardLocations + mouseLocations
+    
+    def run(self):
+        print "AutoKey daemon starting"
+        if os.path.exists(DOMAIN_SOCKET_PATH):
+            os.remove(DOMAIN_SOCKET_PATH)
+        s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        s.bind(DOMAIN_SOCKET_PATH)
+        os.chmod(DOMAIN_SOCKET_PATH, 0777)
+        print "Created domain socket"
+
+        while True:
+            time.sleep(5) # sleep 5 seconds, waiting for devices to appear after resume from S3
+            s.listen(1)
+            try:
+                conn, addr = s.accept()
+                print "Accepted connection"
+            except Exception, e:
+                print "Fatal error while accepting connections - daemon shutting down"
+                print str(e)
+                break
+            
+            devices = evdev.DeviceGroup(self.get_device_paths())
+            sys.stdout.flush()
+            sys.stderr.flush()
+            
+            while True:
+                try:
+                    event = devices.next_event()
+                except OSError:
+                    print "Unable to read from device(s). Connection will be closed and restarted"
+                    break
+                    
+                if event is not None:
+                    if event.type == "EV_KEY" and isinstance(event.code, str):
+                        if event.code.startswith("KEY"):
+                            # Keyboard event
+                            code = event.scanCode
+                            button = ''
+                            state = event.value
+                            
+                            try:
+                                self.send_packet(conn, code, button, state)
+                            except:
+                                break
+    
+                        elif event.code.startswith("BTN") and event.value == 1:
+                            # Mouse event - only care about button press, not release
+                            code = ''
+                            if event.code in BUTTON_MAP:
+                                button = BUTTON_MAP[event.code]
+                            else:
+                                button = -1
+                            state = event.value
+    
+                            try:
+                                self.send_packet(conn, code, button, state)
+                            except:
+                                break
+
+            conn.close()
+            devices.close()
+            print "Connection closed"
+            sys.stdout.flush()
+            sys.stderr.flush()
+                       
+    def send_packet(self, conn, code, button, state):
+        if code:
+            code = self.translate_keycode(code)
+        sendData = PACKET_STRING % (code, button, state)
+        sendData += (PACKET_SIZE - len(sendData)) * ' '
+        conn.send(sendData)
+    
+    def translate_keycode(self, keyCode):
+        if keyCode < 151:
+            keyCode += 8
+        else:
+            print "Got untranslatable evdev keycode: %d\n" % keyCode
+            keyCode = 0
+        return keyCode
+    
+
+if __name__ == "__main__":
+    #daemon = AutoKeyDaemon('/tmp/autokey-daemon.pid', stdout=sys.__stdout__, stderr=sys.__stderr__)
+    daemon = AutoKeyDaemon()
+    if len(sys.argv) == 2:
+        if 'start' == sys.argv[1]:
+            daemon.start()
+        elif 'stop' == sys.argv[1]:
+            daemon.stop()
+        elif 'restart' == sys.argv[1]:
+            daemon.restart()
+        elif 'force-reload' == sys.argv[1]:
+            # we don't support on-the-fly reloading,
+            # so just restart the daemon per DPM 9.3.2
+            daemon.restart()            
+        else:
+            print "Unknown command"
+            sys.exit(2)
+        sys.exit(0)
+    else:
+        print "usage: %s {start|stop|restart|force-reload}" % sys.argv[0]
+        sys.exit(2)
+    
+    sys.exit(0)
+            
+    
 
=== added file 'debian/autokey-common.install'
--- debian/autokey-common.install	1970-01-01 00:00:00 +0000
+++ debian/autokey-common.install	2010-03-26 15:01:22 +0000
@@ -0,0 +1,13 @@
+usr/lib/python*/*-packages/autokey/common.py
+usr/lib/python*/*-packages/autokey/configmanager.py
+usr/lib/python*/*-packages/autokey/daemon.py 
+usr/lib/python*/*-packages/autokey/evdev.py
+usr/lib/python*/*-packages/autokey/__init__.py
+usr/lib/python*/*-packages/autokey/interface.py
+usr/lib/python*/*-packages/autokey/iomediator.py
+usr/lib/python*/*-packages/autokey/model.py
+usr/lib/python*/*-packages/autokey/nogui.py
+usr/lib/python*/*-packages/autokey/scripting.py
+usr/lib/python*/*-packages/autokey/service.py
+usr/lib/python*/*-packages/autokey-*.egg-info
+usr/share/pixmaps/akicon.png
 
=== added file 'debian/autokey-common.lintian-overrides'
--- debian/autokey-common.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/autokey-common.lintian-overrides	2010-03-26 15:01:22 +0000
@@ -0,0 +1,1 @@
+autokey-common binary: init.d-script-uses-usr-interpreter
 
=== added file 'debian/autokey-common.postinst'
--- debian/autokey-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/autokey-common.postinst	2010-03-26 15:01:22 +0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+# postinst script for test
+#
+# see: dh_installdeb(1)
+
+set -e
+
+
+# We need python-support triggers activated before we start the daemon.
+update-python-modules -p
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+# Automatically added by dh_installinit
+if [ -x "/etc/init.d/autokey" ]; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d autokey start || exit $?
+	else
+		/etc/init.d/autokey start || exit $?
+	fi
+fi
+# End automatically added section
+
+
+exit 0
 
=== added file 'debian/autokey-common.prerm'
--- debian/autokey-common.prerm	1970-01-01 00:00:00 +0000
+++ debian/autokey-common.prerm	2010-03-26 15:01:22 +0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+# prerm script for test
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+# Automatically added by dh_installinit
+if [ -x "/etc/init.d/autokey" ]; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d autokey stop || exit $?
+	else
+		/etc/init.d/autokey stop || exit $?
+	fi
+fi
+# End automatically added section
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
 
=== added file 'debian/autokey-gtk.install'
--- debian/autokey-gtk.install	1970-01-01 00:00:00 +0000
+++ debian/autokey-gtk.install	2010-03-26 15:01:22 +0000
@@ -0,0 +1,6 @@
+usr/lib/python*/*-packages/autokey/gtkui/
+usr/lib/python*/*-packages/autokey/gtkapp.py
+usr/bin/autokey-gtk
+usr/share/applications/autokey-gtk.desktop
+usr/share/man/man1/autokey-gtk.1
+usr/share/pixmaps/akicon-status.png
 \ No newline at end of file
 
=== added file 'debian/autokey-gtk.postinst'
--- debian/autokey-gtk.postinst	1970-01-01 00:00:00 +0000
+++ debian/autokey-gtk.postinst	2010-03-26 15:01:22 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+update-alternatives --install /usr/bin/autokey autokey \
+  /usr/bin/autokey-gtk 50 \
+  --slave /usr/share/man/man1/autokey.1.gz autokey.1.gz  \
+  /usr/share/man/man1/autokey-gtk.1.gz
+
+#DEBHELPER#
+
 
=== added file 'debian/autokey-gtk.prerm'
--- debian/autokey-gtk.prerm	1970-01-01 00:00:00 +0000
+++ debian/autokey-gtk.prerm	2010-03-26 15:01:22 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --remove autokey /usr/bin/autokey-gtk
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
 
=== added file 'debian/autokey-qt.install'
--- debian/autokey-qt.install	1970-01-01 00:00:00 +0000
+++ debian/autokey-qt.install	2010-03-26 15:01:22 +0000
@@ -0,0 +1,5 @@
+usr/lib/python*/*-packages/autokey/qtui/
+usr/lib/python*/*-packages/autokey/qtapp.py
+usr/bin/autokey-qt
+usr/share/applications/autokey-qt.desktop
+usr/share/man/man1/autokey-qt.1
 
=== added file 'debian/autokey-qt.postinst'
--- debian/autokey-qt.postinst	1970-01-01 00:00:00 +0000
+++ debian/autokey-qt.postinst	2010-03-26 15:01:22 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+update-alternatives --install /usr/bin/autokey autokey \
+  /usr/bin/autokey-qt 60 \
+  --slave /usr/share/man/man1/autokey.1.gz autokey.1.gz  \
+  /usr/share/man/man1/autokey-qt.1.gz
+
+#DEBHELPER#
+
 
=== added file 'debian/autokey-qt.prerm'
--- debian/autokey-qt.prerm	1970-01-01 00:00:00 +0000
+++ debian/autokey-qt.prerm	2010-03-26 15:01:22 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --remove autokey /usr/bin/autokey-qt
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
 
=== removed file 'debian/autokey.1'
--- debian/autokey.1	2009-09-27 15:08:28 +0000
+++ debian/autokey.1	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH AUTOKEY "1" "August 19, 2009"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-autokey \- keyboard automation utility
-.SH SYNOPSIS
-.B autokey
-.RI [ options ]
-.SH DESCRIPTION
-This manual page briefly documents the
-.B autokey
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBautokey\fP AutoKey is a desktop automation utility for Linux and X11. It allows
-the automation of virtually any task by responding to typed abbreviations and hotkeys. It 
-offers a full-featured GUI that makes it highly accessible for novices, as well as a scripting 
-interface offering the full flexibility and power of the Python language.
-.br
-For more information refer to the online wiki at:
-    http://code.google.com/p/autokey/w/list
-.SH OPTIONS
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-l, \-\-verbose
-Enable verbose (debug) logging.
-.TP
-.B \-c, \-\-configure
-Show the configuration window on startup, even if this is not the first run.
-.SH AUTHOR
-AutoKey was written by Chris Dekter, loosely based on a script by Sam Peterson.
-.PP
-This manual page was written by Chris Dekter <[e-mail]>.
 
=== removed file 'debian/autokey.init'
--- debian/autokey.init	2010-01-08 08:52:58 +0000
+++ debian/autokey.init	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-### BEGIN INIT INFO
-# Provides:          autokey
-# Required-Start:    $local_fs 
-# Required-Stop:     $local_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start AutoKey daemon.
-# Description:       Enable AutoKey's EvDev interface daemon.
-### END INIT INFO
-
-import sys, os, socket, glob, shutil, time
-from autokey import evdev, daemon
-from autokey.interface import DOMAIN_SOCKET_PATH, PACKET_SIZE
-
-PACKET_STRING = "%s,%s,%s"
-
-BUTTON_MAP = {
-              "BTN_LEFT" : '1',
-              "BTN_MIDDLE": '2',
-              "BTN_RIGHT" : '3'
-             }
-
-class AutoKeyDaemon(daemon.Daemon):
-
-    def __init__(self):
-        logFile = "/var/log/autokey-daemon.log"
-        if os.path.exists(logFile):
-            shutil.move(logFile, logFile + '.old')
-        daemon.Daemon.__init__(self, '/tmp/autokey-daemon.pid', stdout=logFile, stderr=logFile)
-
-    def get_device_paths(self):
-        keyboardLocations = glob.glob("/dev/input/by-path/*-event-kbd")
-        mouseLocations = glob.glob("/dev/input/by-path/*-event-mouse")
-    
-        sys.stdout.write("Keyboards: %s\nMice: %s\n" % (repr(keyboardLocations), repr(mouseLocations)))
-        return keyboardLocations + mouseLocations
-    
-    def run(self):
-        print "AutoKey daemon starting"
-        if os.path.exists(DOMAIN_SOCKET_PATH):
-            os.remove(DOMAIN_SOCKET_PATH)
-        s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        s.bind(DOMAIN_SOCKET_PATH)
-        os.chmod(DOMAIN_SOCKET_PATH, 0777)
-        print "Created domain socket"
-
-        while True:
-            time.sleep(5) # sleep 5 seconds, waiting for devices to appear after resume from S3
-            s.listen(1)
-            try:
-                conn, addr = s.accept()
-                print "Accepted connection"
-            except Exception, e:
-                print "Fatal error while accepting connections - daemon shutting down"
-                print str(e)
-                break
-            
-            devices = evdev.DeviceGroup(self.get_device_paths())
-            sys.stdout.flush()
-            sys.stderr.flush()
-            
-            while True:
-                try:
-                    event = devices.next_event()
-                except OSError:
-                    print "Unable to read from device(s). Connection will be closed and restarted"
-                    break
-                    
-                if event is not None:
-                    if event.type == "EV_KEY" and isinstance(event.code, str):
-                        if event.code.startswith("KEY"):
-                            # Keyboard event
-                            code = event.scanCode
-                            button = ''
-                            state = event.value
-                            
-                            try:
-                                self.send_packet(conn, code, button, state)
-                            except:
-                                break
-    
-                        elif event.code.startswith("BTN") and event.value == 1:
-                            # Mouse event - only care about button press, not release
-                            code = ''
-                            if event.code in BUTTON_MAP:
-                                button = BUTTON_MAP[event.code]
-                            else:
-                                button = -1
-                            state = event.value
-    
-                            try:
-                                self.send_packet(conn, code, button, state)
-                            except:
-                                break
-
-            conn.close()
-            devices.close()
-            print "Connection closed"
-            sys.stdout.flush()
-            sys.stderr.flush()
-                       
-    def send_packet(self, conn, code, button, state):
-        if code:
-            code = self.translate_keycode(code)
-        sendData = PACKET_STRING % (code, button, state)
-        sendData += (PACKET_SIZE - len(sendData)) * ' '
-        conn.send(sendData)
-    
-    def translate_keycode(self, keyCode):
-        if keyCode < 151:
-            keyCode += 8
-        else:
-            print "Got untranslatable evdev keycode: %d\n" % keyCode
-            keyCode = 0
-        return keyCode
-    
-
-if __name__ == "__main__":
-    #daemon = AutoKeyDaemon('/tmp/autokey-daemon.pid', stdout=sys.__stdout__, stderr=sys.__stderr__)
-    daemon = AutoKeyDaemon()
-    if len(sys.argv) == 2:
-        if 'start' == sys.argv[1]:
-            daemon.start()
-        elif 'stop' == sys.argv[1]:
-            daemon.stop()
-        elif 'restart' == sys.argv[1]:
-            daemon.restart()
-        elif 'force-reload' == sys.argv[1]:
-            # we don't support on-the-fly reloading,
-            # so just restart the daemon per DPM 9.3.2
-            daemon.restart()            
-        else:
-            print "Unknown command"
-            sys.exit(2)
-        sys.exit(0)
-    else:
-        print "usage: %s {start|stop|restart|force-reload}" % sys.argv[0]
-        sys.exit(2)
-    
-    sys.exit(0)
-            
-    
 
=== removed file 'debian/autokey.lintian-overrides'
--- debian/autokey.lintian-overrides	2009-07-20 23:19:40 +0000
+++ debian/autokey.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-autokey binary: init.d-script-uses-usr-interpreter
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-01-08 08:52:58 +0000
+++ debian/changelog	2010-03-26 15:01:22 +0000
@@ -1,3 +1,48 @@
+autokey (0.61.5-1ubuntu1) lucid; urgency=low
+
+  * Make "autokey" a transitional package for autokey-gtk rather than -qt.
+
+ -- Luke Faraone <[e-mail]>  Wed, 24 Mar 2010 22:06:35 -0400
+
+autokey (0.61.5-1) unstable; urgency=low
+
+  * New upstream version:
+     - Combine GTK and QT versions into single source tree 
+  * Provide "autokey" as a transitional package to autokey-common and autokey-qt
+  * debian/autokey-common.postinst: call `update-python-modules -p` so that
+    starting the daemon does not fail if qt4 was not fully configured. 
+    (LP: #543654)
+
+ -- Luke Faraone <[e-mail]>  Tue, 23 Mar 2010 10:19:47 -0400
+
+autokey (0.61.3-2) unstable; urgency=high
+
+  * SECURITY UPDATE: arbitrary file overwriting via symlinks (LP: #538471)
+    - Store files for the EvDev daamon in FHS-specified locations
+    - debian/autokey.init: Set pidfile path to '/var/run/autokey-daemon.pid'
+    - src/lib/interface.py: Set DOMAIN_SOCKET_PATH to "/var/run/autokey-daemon"
+    - CVE-2010-0398
+
+ -- Luke Faraone <[e-mail]>  Sat, 13 Mar 2010 22:25:44 -0500
+
+autokey (0.61.3-1) unstable; urgency=low
+
+  * debian/rules: call dh_installinit with --error-handler so that install
+    doesn't fail if Autokey cannot be restarted during configure (LP: #479131)
+  * New upstream version:
+    - Merge changes to interface.py from GTK branch that were missed
+
+ -- Luke Faraone <[e-mail]>  Sat, 27 Feb 2010 11:05:08 -0500
+
+autokey (0.61.2-2) unstable; urgency=low
+
+  * Set DM-Upload-Allowed to Yes in control
+  * Patch src/lib/daemon.py to handle empty or invalid PIDs (closes: #568070)
+  * Fix typo in Vcs-Browser
+  * Bump standards version
+
+ -- Luke Faraone <[e-mail]>  Wed, 03 Feb 2010 09:16:24 -0500
+
 autokey (0.61.2-1) unstable; urgency=low
 
   * New upstream version:   
 
=== modified file 'debian/compat'
--- debian/compat	2009-07-20 23:19:40 +0000
+++ debian/compat	2010-03-26 15:01:22 +0000
@@ -1,1 +1,1 @@
-6
+7
 
=== modified file 'debian/control'
--- debian/control	2009-12-16 08:46:43 +0000
+++ debian/control	2010-03-26 15:01:22 +0000
@@ -1,23 +1,68 @@
 Source: autokey
-Section: kde
 Priority: optional
-Maintainer: Luke Faraone <[e-mail]>
+Section: utils
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Luke Faraone <[e-mail]>
 Uploaders: Debian Python Modules Team <[e-mail]>
-Build-Depends: python (>= 2.5), cdbs (>= 0.4.49), debhelper (>= 6), dpatch
-Build-Depends-indep: python-central (>= 0.6.0)
-Standards-Version: 3.8.3
+Build-Depends: python (>= 2.5), cdbs (>= 0.4.49), debhelper (>= 7)
+Build-Depends-indep: python-central, dpatch
+Standards-Version: 3.8.4
+DM-Upload-Allowed: yes
 XS-Python-Version: >= 2.5
 Homepage: http://code.google.com/p/autokey/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/autokey/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/autokeyp/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/autokey/trunk/
 
 Package: autokey
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-kde4, python-qt4, python-qscintilla2, python-xlib, wmctrl
-XB-Python-Version: ${python:Versions}
-Description: desktop automation utility
- AutoKey is a desktop automation utility for Linux and X11. It allows the 
- automation of virtually any task by responding to typed abbreviations and 
- hotkeys. It offers a full-featured GUI that makes it highly accessible for 
- novices, as well as a scripting interface offering the full flexibility and 
- power of the Python language.
+Depends: ${misc:Depends}, autokey-gtk, autokey-common
+Description: dummy transitional package for autokey-gtk
+ This transitional package helps users transition to the autokey-gtk package. 
+ Once this package and its dependencies are installed you can safely remove it.
+
+Package: autokey-common
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-xlib, wmctrl
+Replaces: autokey (<<0.61.4-0~0)
+Breaks: autokey (<<0.61.4-0~0)
+XB-Python-Version: ${python:Versions}
+Description: desktop automation utility - common data
+ AutoKey is a desktop automation utility for Linux and X11. It allows the 
+ automation of virtually any task by responding to typed abbreviations and 
+ hotkeys. It offers a full-featured GUI that makes it highly accessible for 
+ novices, as well as a scripting interface offering the full flexibility and 
+ power of the Python language.
+ . 
+ This package contains the common data shared between the various frontends.
+
+Package: autokey-qt
+Section: kde
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-kde4, python-qt4, python-qscintilla2, python-xlib, wmctrl, autokey-common
+Replaces: autokey (<<0.61.4-0~0)
+Breaks: autokey (<<0.61.4-0~0)
+XB-Python-Version: ${python:Versions}
+Description: desktop automation utility - QT version
+ AutoKey is a desktop automation utility for Linux and X11. It allows the 
+ automation of virtually any task by responding to typed abbreviations and 
+ hotkeys. It offers a full-featured GUI that makes it highly accessible for 
+ novices, as well as a scripting interface offering the full flexibility and 
+ power of the Python language.
+ . 
+ This package contains the QT frontend.
+
+Package: autokey-gtk
+Section: gnome
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-gtk2, python-gtksourceview2, python-glade2, python-xlib, python-notify, wmctrl, autokey-common
+Replaces: autokey (<<0.61.4-0~0)
+Breaks: autokey (<<0.61.4-0~0)
+XB-Python-Version: ${python:Versions}
+Description: desktop automation utility - GTK+ version
+ AutoKey is a desktop automation utility for Linux and X11. It allows the
+ automation of virtually any task by responding to typed abbreviations and
+ hotkeys. It offers a full-featured GUI that makes it highly accessible for
+ novices, as well as a scripting interface offering the full flexibility and
+ power of the Python language.
+ .
+ This package contains the GTK+ frontend.
 
=== modified file 'debian/copyright'
--- debian/copyright	2009-09-27 15:08:28 +0000
+++ debian/copyright	2010-03-26 15:01:22 +0000
@@ -34,6 +34,6 @@
 The Debian packaging is 
 
     Copyright © 2009, Chris Dekter <[e-mail]> 
-    Copyright © 2009, Luke Faraone <[e-mail]>
+    Copyright © 2009 - 2010, Luke Faraone <[e-mail]>
 
 and is licensed under the GPL, see above.
 
=== modified file 'debian/patches/00list'
--- debian/patches/00list	2009-12-16 08:46:43 +0000
+++ debian/patches/00list	2010-03-26 15:01:22 +0000
@@ -1,2 +1,1 @@
 # no comment
-
 
=== added file 'debian/patches/README'
--- debian/patches/README	1970-01-01 00:00:00 +0000
+++ debian/patches/README	2010-03-26 15:01:22 +0000
@@ -0,0 +1,4 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
+
 
=== removed file 'debian/postinst'
--- debian/postinst	2009-07-20 23:19:40 +0000
+++ debian/postinst	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/bin/sh
-# postinst script for test
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/autokey" ]; then
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d autokey start || exit $?
-	else
-		/etc/init.d/autokey start || exit $?
-	fi
-fi
-# End automatically added section
-
-
-exit 0
 
=== removed file 'debian/prerm'
--- debian/prerm	2009-07-20 23:19:40 +0000
+++ debian/prerm	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#!/bin/sh
-# prerm script for test
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/autokey" ]; then
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d autokey stop || exit $?
-	else
-		/etc/init.d/autokey stop || exit $?
-	fi
-fi
-# End automatically added section
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
 
=== modified file 'debian/rules'
--- debian/rules	2009-12-06 14:21:22 +0000
+++ debian/rules	2010-03-26 15:01:22 +0000
@@ -5,11 +5,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-include /usr/share/cdbs/1/rules/dpatch.mk
-# needed to use the dpatch tools (like dpatch-edit-patch)
-include /usr/share/dpatch/dpatch.make
 
 # Add here any variable or target overrides you need.
-DEB_INSTALL_MANPAGES_autokey = debian/autokey.1
-DEB_DH_INSTALLINIT_ARGS := --no-start
-
+DEB_INSTALL_MANPAGES_autokey_qt = debian/autokey-qt.1
+DEB_INSTALL_MANPAGES_autokey_gtk = debian/autokey-gtk.1
+DEB_DH_INSTALLINIT_ARGS := --no-start --init-script=autokey --error-handler=true
 
=== added directory 'doc/man'
=== added file 'doc/man/autokey-gtk.1'
--- doc/man/autokey-gtk.1	1970-01-01 00:00:00 +0000
+++ doc/man/autokey-gtk.1	2010-03-26 15:01:22 +0000
@@ -0,0 +1,54 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH AUTOKEY-GTK "1" "August 19, 2009"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+autokey-gtk \- keyboard automation utility for GNOME and GTK
+.SH SYNOPSIS
+.B autokey-gtk
+.RI [ options ]
+.SH DESCRIPTION
+This manual page briefly documents the
+.B autokey-gtk
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBautokey-gtk\fP AutoKey is a desktop automation utility for Linux and X11. It allows
+the automation of virtually any task by responding to typed abbreviations and hotkeys. It 
+offers a full-featured GUI that makes it highly accessible for novices, as well as a scripting 
+interface offering the full flexibility and power of the Python language.
+.br
+For more information refer to the online wiki at:
+    http://code.google.com/p/autokey/w/list
+.SH OPTIONS
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-\-help
+Show summary of options.
+.TP
+.B \-l, \-\-verbose
+Enable verbose (debug) logging.
+.TP
+.B \-c, \-\-configure
+Show the configuration window on startup, even if this is not the first run.
+.SH AUTHOR
+AutoKey was written by Chris Dekter, loosely based on a script by Sam Peterson.
+.PP
+This manual page was written by Chris Dekter <[e-mail]>.
 
=== added file 'doc/man/autokey-qt.1'
--- doc/man/autokey-qt.1	1970-01-01 00:00:00 +0000
+++ doc/man/autokey-qt.1	2010-03-26 15:01:22 +0000
@@ -0,0 +1,54 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH AUTOKEY-QT "1" "August 19, 2009"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+autokey-qt \- keyboard automation utility for KDE and QT
+.SH SYNOPSIS
+.B autokey-qt
+.RI [ options ]
+.SH DESCRIPTION
+This manual page briefly documents the
+.B autokey-qt
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBautokey-qt\fP AutoKey is a desktop automation utility for Linux and X11. It allows
+the automation of virtually any task by responding to typed abbreviations and hotkeys. It 
+offers a full-featured GUI that makes it highly accessible for novices, as well as a scripting 
+interface offering the full flexibility and power of the Python language.
+.br
+For more information refer to the online wiki at:
+    http://code.google.com/p/autokey/w/list
+.SH OPTIONS
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-\-help
+Show summary of options.
+.TP
+.B \-l, \-\-verbose
+Enable verbose (debug) logging.
+.TP
+.B \-c, \-\-configure
+Show the configuration window on startup, even if this is not the first run.
+.SH AUTHOR
+AutoKey was written by Chris Dekter, loosely based on a script by Sam Peterson.
+.PP
+This manual page was written by Chris Dekter <[e-mail]>.
 
=== added directory 'glade'
=== added file 'glade/abbrselector.glade'
--- glade/abbrselector.glade	1970-01-01 00:00:00 +0000
+++ glade/abbrselector.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Wed Sep  2 16:40:47 2009 -->
+<glade-interface>
+  <widget class="GtkDialog" id="abbrselector">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Enter Abbreviation</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <signal name="hide" handler="on_close"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkEntry" id="entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <signal name="activate" handler="on_entry_activated"/>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/abbrsettings.glade'
--- glade/abbrsettings.glade	1970-01-01 00:00:00 +0000
+++ glade/abbrsettings.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Fri Oct  2 11:21:20 2009 -->
+<glade-interface>
+  <widget class="GtkDialog" id="abbrsettings">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Set Abbreviation</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <signal name="response" handler="on_response"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Abbreviation:</property>
+                  </widget>
+                  <packing>
+                    <property name="padding">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="abbrEntry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="is_focus">True</property>
+                    <property name="activates_default">True</property>
+                  </widget>
+                  <packing>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Trigger on:</property>
+                  </widget>
+                  <packing>
+                    <property name="padding">5</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkComboBox" id="wordCharCombo">
+                    <property name="visible">True</property>
+                    <property name="active">1</property>
+                    <property name="items" translatable="yes">Default
+Space and Enter</property>
+                  </widget>
+                  <packing>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="removeTypedCheckbox">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Remove typed abbreviation</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="omitTriggerCheckbox">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Omit trigger character</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="matchCaseCheckbox">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Match phrase case to typed abbreviation</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_matchCaseCheckbox_stateChanged"/>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="ignoreCaseCheckbox">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Ignore case of typed abbreviation</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_ignoreCaseCheckbox_stateChanged"/>
+              </widget>
+              <packing>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="triggerInsideCheckbox">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Trigger when typed as part of a word</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="immediateCheckbox">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Trigger immediately (don't require a trigger character)</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_immediateCheckbox_stateChanged"/>
+              </widget>
+              <packing>
+                <property name="position">6</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancelButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_cancel"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="okButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_ok"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/akicon.png'
 Binary files glade/akicon.png	1970-01-01 00:00:00 +0000 and glade/akicon.png	2010-03-26 15:01:22 +0000 differ
=== added file 'glade/folderpage.glade'
--- glade/folderpage.glade	1970-01-01 00:00:00 +0000
+++ glade/folderpage.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <widget class="GtkWindow" id="window1">
+    <child>
+      <widget class="GtkAlignment" id="folderpage">
+        <property name="visible">True</property>
+        <property name="yalign">0</property>
+        <property name="yscale">0</property>
+        <property name="top_padding">5</property>
+        <property name="bottom_padding">5</property>
+        <child>
+          <widget class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <widget class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="top_padding">5</property>
+                <property name="bottom_padding">5</property>
+                <property name="left_padding">10</property>
+                <child>
+                  <widget class="GtkVBox" id="settingsVbox">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="showInTrayCheckbox">
+                        <property name="label" translatable="yes">Show in tray menu	</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_modified"/>
+                      </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHSeparator" id="hseparator1">
+                        <property name="visible">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Folder Settings&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/hotkeysettings.glade'
--- glade/hotkeysettings.glade	1970-01-01 00:00:00 +0000
+++ glade/hotkeysettings.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Wed Sep  2 10:54:51 2009 -->
+<glade-interface>
+  <widget class="GtkDialog" id="hotkeysettings">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Set Hotkey</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <signal name="response" handler="on_response"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="spacing">5</property>
+        <child>
+          <widget class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">10</property>
+            <child>
+              <widget class="GtkHBox" id="hbox2">
+                <property name="visible">True</property>
+                <property name="homogeneous">True</property>
+                <child>
+                  <widget class="GtkToggleButton" id="controlButton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Control</property>
+                    <property name="response_id">0</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkToggleButton" id="altButton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Alt</property>
+                    <property name="response_id">0</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkToggleButton" id="shiftButton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Shift</property>
+                    <property name="response_id">0</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkToggleButton" id="superButton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Super</property>
+                    <property name="response_id">0</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox3">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="keyLabel">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Key: %s</property>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="setButton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Press to Set</property>
+                    <property name="response_id">0</property>
+                    <signal name="clicked" handler="on_setButton_pressed"/>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancelButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_cancel"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="okButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_ok"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/mainwindow.glade'
--- glade/mainwindow.glade	1970-01-01 00:00:00 +0000
+++ glade/mainwindow.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <widget class="GtkWindow" id="mainwindow">
+    <property name="title" translatable="yes">AutoKey - Configuration</property>
+    <property name="default_width">600</property>
+    <property name="default_height">400</property>
+    <property name="icon">akicon.png</property>
+    <signal name="delete_event" handler="on_close"/>
+    <child>
+      <widget class="GtkVBox" id="vbox">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkHPaned" id="hpaned">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="position">150</property>
+            <property name="position_set">True</property>
+            <child>
+              <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <widget class="GtkTreeView" id="treeWidget">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <signal name="button_press_event" handler="on_treeview_buttonpress"/>
+                    <signal name="row_activated" handler="on_treeWidget_row_activated"/>
+                    <signal name="drag_drop" handler="on_drag_drop"/>
+                    <signal name="button_release_event" handler="on_treeview_buttonrelease"/>
+                    <signal name="drag_data_received" handler="on_drag_data_received"/>
+                    <signal name="cursor_changed" handler="on_tree_selection_changed"/>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="bottom_padding">5</property>
+                <property name="right_padding">5</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox2">
+                    <property name="visible">True</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <widget class="GtkNotebook" id="stack">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="show_tabs">False</property>
+                        <property name="show_border">False</property>
+                      </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHButtonBox" id="hbuttonbox1">
+                        <property name="visible">True</property>
+                        <property name="spacing">5</property>
+                        <property name="homogeneous">True</property>
+                        <property name="layout_style">end</property>
+                        <child>
+                          <widget class="GtkButton" id="saveButton">
+                            <property name="label">gtk-save</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_stock">True</property>
+                            <signal name="clicked" handler="on_save"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="revertButton">
+                            <property name="label">gtk-revert-to-saved</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_stock">True</property>
+                            <signal name="clicked" handler="on_reset"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/phrasepage-old.glade'
--- glade/phrasepage-old.glade	1970-01-01 00:00:00 +0000
+++ glade/phrasepage-old.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Wed Sep  2 11:38:57 2009 -->
+<glade-interface>
+  <widget class="GtkWindow" id="window1">
+    <child>
+      <widget class="GtkAlignment" id="phrasepage">
+        <property name="visible">True</property>
+        <property name="top_padding">5</property>
+        <property name="bottom_padding">5</property>
+        <child>
+          <widget class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="spacing">5</property>
+            <child>
+              <widget class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Description</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="descriptionEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <signal name="changed" handler="on_modified"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="shadow_type">GTK_SHADOW_IN</property>
+                <child>
+                  <widget class="GtkTextView" id="phraseText">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="accepts_tab">False</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="frame1">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="top_padding">5</property>
+                    <property name="bottom_padding">5</property>
+                    <property name="left_padding">10</property>
+                    <child>
+                      <widget class="GtkVBox" id="settingsVbox">
+                        <property name="visible">True</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="promptCheckbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Always prompt before pasting this phrase</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_modified"/>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="showInTrayCheckbox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Show in tray menu	</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_modified"/>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Settings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/phrasepage.glade'
--- glade/phrasepage.glade	1970-01-01 00:00:00 +0000
+++ glade/phrasepage.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <widget class="GtkWindow" id="window1">
+    <child>
+      <widget class="GtkAlignment" id="phrasepage">
+        <property name="visible">True</property>
+        <property name="top_padding">5</property>
+        <property name="bottom_padding">5</property>
+        <child>
+          <widget class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">5</property>
+            <child>
+              <widget class="GtkScrolledWindow" id="scrolledWindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="frame1">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="top_padding">5</property>
+                    <property name="bottom_padding">5</property>
+                    <property name="left_padding">10</property>
+                    <child>
+                      <widget class="GtkVBox" id="settingsVbox">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="promptCheckbox">
+                            <property name="label" translatable="yes">Always prompt before pasting this phrase</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_modified"/>
+                          </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="showInTrayCheckbox">
+                            <property name="label" translatable="yes">Show in tray menu	</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_modified"/>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHSeparator" id="hseparator1">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Phrase Settings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/recorddialog.glade'
--- glade/recorddialog.glade	1970-01-01 00:00:00 +0000
+++ glade/recorddialog.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Fri Oct 30 16:24:33 2009 -->
+<glade-interface>
+  <widget class="GtkDialog" id="recorddialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Record Macro</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <signal name="response" handler="on_response"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Record a keyboard/mouse macro&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="padding">5</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="keyboardButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Record keyboard events</property>
+                <property name="response_id">0</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="padding">3</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="mouseButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Record mouse events (experimental)</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+              </widget>
+              <packing>
+                <property name="padding">3</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <property name="spacing">5</property>
+                <child>
+                  <widget class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Start recording after</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkSpinButton" id="spinButton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="adjustment">5 1 20 1 10 10</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">seconds</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="padding">5</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancelButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_cancel"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="okButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_ok"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/scriptpage.glade'
--- glade/scriptpage.glade	1970-01-01 00:00:00 +0000
+++ glade/scriptpage.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <widget class="GtkWindow" id="window1">
+    <child>
+      <widget class="GtkAlignment" id="scriptpage">
+        <property name="visible">True</property>
+        <property name="top_padding">5</property>
+        <property name="bottom_padding">5</property>
+        <child>
+          <widget class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">5</property>
+            <child>
+              <widget class="GtkScrolledWindow" id="scrolledWindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="frame1">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="top_padding">5</property>
+                    <property name="bottom_padding">5</property>
+                    <property name="left_padding">10</property>
+                    <child>
+                      <widget class="GtkVBox" id="settingsVbox">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="promptCheckbox">
+                            <property name="label" translatable="yes">Always prompt before executing this script</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_modified"/>
+                          </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="showInTrayCheckbox">
+                            <property name="label" translatable="yes">Show in tray menu	</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_modified"/>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHSeparator" id="hseparator1">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Script Settings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/settingsdialog.glade'
--- glade/settingsdialog.glade	1970-01-01 00:00:00 +0000
+++ glade/settingsdialog.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,762 @@
+<?xml version="1.0"?>
+<glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy project-wide -->
+  <widget class="GtkDialog" id="settingsdialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">AutoKey - Preferences</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkNotebook" id="notebook1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <widget class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="yscale">0</property>
+                <property name="top_padding">5</property>
+                <property name="bottom_padding">5</property>
+                <property name="left_padding">5</property>
+                <property name="right_padding">5</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox1">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <widget class="GtkFrame" id="frame8">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment11">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox7">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="autoStartCheckbox">
+                                    <property name="label" translatable="yes">Automatically start AutoKey at login</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="promptToSaveCheckbox">
+                                    <property name="label" translatable="yes">Prompt for unsaved changes</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="showTrayCheckbox">
+                                    <property name="label" translatable="yes">Show a tray icon (requires restart)</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Application&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkFrame" id="frame2">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment3">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox3">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="allowKbNavCheckbox">
+                                    <property name="label" translatable="yes">Allow keyboard navigation of popup menu</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="sortByUsageCheckbox">
+                                    <property name="label" translatable="yes">Sort menu items with most frequently used first</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label5">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Popup Menu&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkFrame" id="frame3">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment4">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="enableUndoCheckbox">
+                                <property name="label" translatable="yes">Enable undo by pressing backspace</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label6">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Expansions&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">General</property>
+              </widget>
+              <packing>
+                <property name="tab_fill">False</property>
+                <property name="type">tab</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment5">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="yscale">0</property>
+                <property name="top_padding">5</property>
+                <property name="bottom_padding">5</property>
+                <property name="left_padding">5</property>
+                <property name="right_padding">5</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox4">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">10</property>
+                    <child>
+                      <widget class="GtkFrame" id="frame4">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment6">
+                            <property name="visible">True</property>
+                            <property name="top_padding">5</property>
+                            <property name="bottom_padding">5</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox1">
+                                <property name="visible">True</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label10">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Hotkey:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="monitorKeyLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">$hotkey</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="setMonitorButton">
+                                    <property name="label" translatable="yes">Set</property>
+                                    <property name="width_request">80</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <signal name="clicked" handler="on_setMonitorButton_pressed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="clearMonitorButton">
+                                    <property name="label">gtk-clear</property>
+                                    <property name="width_request">80</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_stock">True</property>
+                                    <signal name="clicked" handler="on_clearMonitorButton_pressed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label7">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Toggle monitoring using a hotkey&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkFrame" id="frame5">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment7">
+                            <property name="visible">True</property>
+                            <property name="top_padding">5</property>
+                            <property name="bottom_padding">5</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox2">
+                                <property name="visible">True</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label12">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Hotkey:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="configKeyLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">$hotkey</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="setConfigButton">
+                                    <property name="label" translatable="yes">Set</property>
+                                    <property name="width_request">80</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <signal name="clicked" handler="on_setConfigButton_pressed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="clearConfigButton">
+                                    <property name="label">gtk-clear</property>
+                                    <property name="width_request">80</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_stock">True</property>
+                                    <signal name="clicked" handler="on_clearConfigButton_pressed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label8">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Show configuration window using a hotkey&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkFrame" id="frame6">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment8">
+                            <property name="visible">True</property>
+                            <property name="top_padding">5</property>
+                            <property name="bottom_padding">5</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox3">
+                                <property name="visible">True</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label14">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Hotkey:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="popupKeyLabel">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">$hotkey</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="setPopupButton">
+                                    <property name="label" translatable="yes">Set</property>
+                                    <property name="width_request">80</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <signal name="clicked" handler="on_setPopupButton_pressed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="clearPopupButton">
+                                    <property name="label">gtk-clear</property>
+                                    <property name="width_request">80</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_stock">True</property>
+                                    <signal name="clicked" handler="on_clearPopupButton_pressed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label9">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Show abbreviation popup using a hotkey&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Special Hotkeys</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+                <property name="type">tab</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="top_padding">5</property>
+                <property name="bottom_padding">5</property>
+                <property name="left_padding">5</property>
+                <property name="right_padding">5</property>
+                <child>
+                  <widget class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment12">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox2">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <widget class="GtkLabel" id="label17">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="ypad">5</property>
+                                <property name="label" translatable="yes">Any Python modules placed in this folder will be available for
+import by scripts.</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkFileChooserButton" id="userModuleChooserButton">
+                                <property name="visible">True</property>
+                                <property name="action">select-folder</property>
+                                <property name="title" translatable="yes">Select A Folder</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label16">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;User Module Folder&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Script Engine</property>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+                <property name="type">tab</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment9">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="yscale">0</property>
+                <property name="top_padding">5</property>
+                <property name="bottom_padding">5</property>
+                <property name="left_padding">5</property>
+                <property name="right_padding">5</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox5">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <widget class="GtkFrame" id="frame7">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment10">
+                            <property name="visible">True</property>
+                            <property name="top_padding">5</property>
+                            <property name="bottom_padding">5</property>
+                            <property name="right_padding">5</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox6">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label15">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Configure the method AutoKey uses to receive keyboard and
+mouse events. Only change this option if AutoKey is not 
+responding to abbreviations and hotkeys.
+
+After changing this option, you will need to restart AutoKey for
+it to take effect.</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="xRecordButton">
+                                    <property name="label" translatable="yes">X Record - Preferred option when using X.org server v1.5 or older</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">xEvdevButton</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="xEvdevButton">
+                                    <property name="label" translatable="yes">X EvDev - Preferred option when using X.org server v1.6 or newer</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="atspiButton">
+                                    <property name="label" translatable="yes">AT-SPI - Fallback option for Gnome users when other methods fail</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">xEvdevButton</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label13">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Interface Type&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label11">
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Enable this option only if you experience randomly garbled text in KDE4</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="checkBox">
+                        <property name="label" translatable="yes">Enable QT4 workaround</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Interface</property>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+                <property name="type">tab</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <widget class="GtkButton" id="button1">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_cancel"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="button2">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_save"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/settingswidget.glade'
--- glade/settingswidget.glade	1970-01-01 00:00:00 +0000
+++ glade/settingswidget.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Tue Sep  1 17:30:47 2009 -->
+<glade-interface>
+  <widget class="GtkWindow" id="window1">
+    <child>
+      <widget class="GtkAlignment" id="settingswidget">
+        <property name="visible">True</property>
+        <property name="top_padding">5</property>
+        <property name="bottom_padding">5</property>
+        <child>
+          <widget class="GtkTable" id="table1">
+            <property name="visible">True</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">4</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <widget class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Abbreviation:</property>
+              </widget>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Hotkey:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Window Filter:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="abbrLabel">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">$abbr</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="hotkeyLabel">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">$hotkey</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="windowFilterLabel">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">$filter</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="setAbbrButton">
+                <property name="width_request">80</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">Set</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_setAbbrButton_clicked"/>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="clearAbbrButton">
+                <property name="width_request">80</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-clear</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_clearAbbrButton_clicked"/>
+              </widget>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="setHotkeyButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">Set</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_setHotkeyButton_clicked"/>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="setFilterButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">Set</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_setFilterButton_clicked"/>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="clearHotkeyButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-clear</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_clearHotkeyButton_clicked"/>
+              </widget>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="clearFilterButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-clear</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_clearFilterButton_clicked"/>
+              </widget>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="right_attach">4</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== added file 'glade/windowfiltersettings.glade'
--- glade/windowfiltersettings.glade	1970-01-01 00:00:00 +0000
+++ glade/windowfiltersettings.glade	2010-03-26 15:01:22 +0000
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Fri Oct  2 11:17:13 2009 -->
+<glade-interface>
+  <widget class="GtkDialog" id="windowfiltersettings">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Set Window Filter</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="spacing">5</property>
+        <child>
+          <widget class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="spacing">5</property>
+            <child>
+              <widget class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Only trigger in windows with title matching:</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="triggerRegexEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="is_focus">True</property>
+                <property name="tooltip" translatable="yes">Enter a regular expression that matches the title of windows in which you want this item to trigger.</property>
+                <property name="activates_default">True</property>
+                <property name="truncate_multiline">True</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="fill">False</property>
+            <property name="padding">5</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancelButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_cancel"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="okButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_ok"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
 
=== modified file 'setup.py'
--- setup.py	2010-01-08 08:52:58 +0000
+++ setup.py	2010-03-26 15:01:22 +0000
@@ -20,7 +20,7 @@
 
 setup(
       name="autokey",
-      version="0.61.2", 
+      version="0.61.5", 
       author="Chris Dekter",
       author_email="[e-mail]",
       url="http://autokey.googlecode.com/",
@@ -33,10 +33,12 @@
       #py_modules=["autokey", "configurationmanager", "expansionservice", "interface",
       #            "iomediator", "phrase", "phrasemenu", "ui"],
       package_dir={"autokey": "src/lib"},
-      packages=["autokey", "autokey.ui"],
-      package_data={"autokey.ui" : ["data/gui.xml", "data/api.txt"]},
-      data_files=[("/usr/share/pixmaps", ["config/akicon.png"]),
-                  ("/usr/share/applications", ["config/autokey.desktop"])],
-      scripts=['autokey']
+      packages=["autokey", "autokey.gtkui", "autokey.qtui"],
+      package_data={"autokey.qtui" : ["data/*"],
+                    "autokey.gtkui" : ["data/*"]},
+      data_files=[("/usr/share/pixmaps", ["config/akicon.png", "config/akicon-status.png"]),
+                  ("/usr/share/applications", ["config/autokey-qt.desktop", "config/autokey-gtk.desktop"]),
+                  ('share/man/man1/', ['doc/man/autokey-qt.1', 'doc/man/autokey-gtk.1'])],
+      scripts=['autokey-qt', 'autokey-gtk']
       #packages=["plugin"]
       )
 
=== removed file 'src/lib/autokey.py'
--- src/lib/autokey.py	2010-01-08 08:52:58 +0000
+++ src/lib/autokey.py	1970-01-01 00:00:00 +0000
@@ -1,280 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2008 Chris Dekter
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-import sys, traceback, os.path, signal, logging, logging.handlers, subprocess, Queue
-from PyKDE4.kdecore import KCmdLineArgs, KCmdLineOptions, KAboutData, ki18n, i18n
-from PyKDE4.kdeui import KMessageBox, KApplication
-from PyQt4.QtCore import SIGNAL, Qt, QObject, QEvent
-from PyQt4.QtGui import QCursor
-
-import service, ui.notifier, ui.popupmenu
-from configmanager import *
-
-CONFIG_DIR = os.path.expanduser("~/.config/autokey")
-LOCK_FILE = CONFIG_DIR + "/autokey.pid"
-LOG_FILE = CONFIG_DIR + "/autokey.log"
-MAX_LOG_SIZE = 5 * 1024 * 1024 # 5 megabytes
-MAX_LOG_COUNT = 3
-LOG_FORMAT = "%(levelname)s - %(name)s - %(message)s"
-
-APP_NAME = "AutoKey"
-CATALOG = ""
-PROGRAM_NAME = ki18n("AutoKey")
-VERSION = "0.61.2"
-DESCRIPTION = ki18n("Desktop automation utility")
-LICENSE = KAboutData.License_GPL_V3
-COPYRIGHT = ki18n("(c) 2009 Chris Dekter")
-TEXT = ki18n("")
-HOMEPAGE  = "http://autokey.sourceforge.net/"
-BUG_EMAIL = "[e-mail]"
-
-
-
-class Application:
-    """
-    Main application class; starting and stopping of the application is controlled
-    from here, together with some interactions from the tray icon.
-    """
-    
-    def __init__(self):
-        
-        aboutData = KAboutData(APP_NAME, CATALOG, PROGRAM_NAME, VERSION, DESCRIPTION,
-                                    LICENSE, COPYRIGHT, TEXT, HOMEPAGE, BUG_EMAIL)
-
-        aboutData.addAuthor(ki18n("Chris Dekter"), ki18n("Developer"), "[e-mail]", "")
-        aboutData.addAuthor(ki18n("Sam Peterson"), ki18n("Original developer"), "[e-mail]", "")
-        aboutData.setProgramIconName(ui.notifier.ICON_FILE)
-        
-        KCmdLineArgs.init(sys.argv, aboutData)
-        options = KCmdLineOptions()
-        options.add("l").add("verbose", ki18n("Enable verbose logging"))
-        options.add("c").add("configure", ki18n("Show the configuration window on startup"))
-        KCmdLineArgs.addCmdLineOptions(options)
-        args = KCmdLineArgs.parsedArgs()
-        
-        
-        self.app = KApplication()
-        
-        try:
-            # Create configuration directory
-            if not os.path.exists(CONFIG_DIR):
-                os.makedirs(CONFIG_DIR)
-            # Initialise logger
-            rootLogger = logging.getLogger()
-            
-            if args.isSet("verbose"):
-                rootLogger.setLevel(logging.DEBUG)
-                handler = logging.StreamHandler(sys.stdout)
-            else:           
-                rootLogger.setLevel(logging.INFO)
-                handler = logging.handlers.RotatingFileHandler(LOG_FILE, 
-                                        maxBytes=MAX_LOG_SIZE, backupCount=MAX_LOG_COUNT)
-            
-            handler.setFormatter(logging.Formatter(LOG_FORMAT))
-            rootLogger.addHandler(handler)
-            
-            
-            if self.__verifyNotRunning():
-                self.__createLockFile()
-                
-            self.initialise(args.isSet("configure"))
-            
-        except Exception, e:
-            self.show_error_dialog(i18n("Fatal error starting AutoKey.\n") + str(e))
-            logging.exception("Fatal error starting AutoKey: " + str(e))
-            sys.exit(1)
-            
-            
-    def __createLockFile(self):
-        f = open(LOCK_FILE, 'w')
-        f.write(str(os.getpid()))
-        f.close()
-        
-    def __verifyNotRunning(self):
-        if os.path.exists(LOCK_FILE):
-            f = open(LOCK_FILE, 'r')
-            pid = f.read()
-            f.close()
-            
-            # Check that the found PID is running and is autokey
-            p = subprocess.Popen(["ps", "-p", pid, "-o", "command"], stdout=subprocess.PIPE)
-            p.wait()
-            output = p.stdout.readlines()
-            if len(output) > 1:
-                # process exists
-                if "autokey" in output[1]:
-                    logging.error("AutoKey is already running - exiting")
-                    self.show_error_dialog(i18n("AutoKey is already running as pid: ") + pid)
-                    sys.exit(1)
-         
-        return True
-
-    def main(self):
-        self.app.exec_()
-
-    def initialise(self, configure):
-        logging.info("Initialising application")
-        self.configManager = get_config_manager(self)
-        self.service = service.Service(self)
-        self.serviceDisabled = False
-        
-        # Initialise user code dir
-        if self.configManager.userCodeDir is not None:
-            sys.path.append(self.configManager.userCodeDir)
-        
-        try:
-            self.service.start()
-        except Exception, e:
-            logging.exception("Error starting interface: " + str(e))
-            self.serviceDisabled = True
-            self.show_error_dialog(i18n("Error starting interface. Keyboard monitoring will be disabled.\n" +
-                                    "Check your system/configuration."), str(e))
-        
-        self.notifier = ui.notifier.Notifier(self)
-        self.configWindow = None
-        
-        if ConfigManager.SETTINGS[IS_FIRST_RUN] or configure:
-            ConfigManager.SETTINGS[IS_FIRST_RUN] = False
-            self.show_configure()
-            
-        self.handler = CallbackEventHandler()
-            
-    def init_global_hotkeys(self, configManager):
-        logging.info("Initialise global hotkeys")
-        configManager.toggleServiceHotkey.set_closure(self.toggle_service)
-        configManager.configHotkey.set_closure(self.show_configure_async)
-        
-    def config_altered(self):
-        self.configManager.config_altered()
-        self.notifier.build_menu()
-        
-    def unpause_service(self):
-        """
-        Unpause the expansion service (start responding to keyboard and mouse events).
-        """
-        self.service.unpause()
-        self.notifier.update_tool_tip()
-    
-    def pause_service(self):
-        """
-        Pause the expansion service (stop responding to keyboard and mouse events).
-        """
-        self.service.pause()
-        self.notifier.update_tool_tip()
-        
-    def toggle_service(self):
-        """
-        Convenience method for toggling the expansion service on or off.
-        """
-        if self.service.is_running():
-            self.pause_service()
-        else:
-            self.unpause_service()
-            
-    def shutdown(self):
-        """
-        Shut down the entire application.
-        """
-        logging.info("Shutting down")
-        self.app.closeAllWindows()
-        self.service.shutdown()
-        self.app.quit()
-        os.remove(LOCK_FILE)
-            
-    def show_notify(self, message, isError=False, details=''):
-        """
-        Show a notification popup.
-        
-        @param message: Message to show in the popup
-        @param isError: Whether the message is an error (shows with an error icon)
-        @param details: Error details, which the user can view in a dialog by clicking
-        the "View Details" button.
-        """
-        self.notifier.show_notify(message, isError, details)
-        
-    def show_configure(self):
-        """
-        Show the configuration window, or deiconify (un-minimise) it if it's already open.
-        """
-        logging.info("Displaying configuration window")
-        try:
-            self.configWindow.showNormal()
-            self.configWindow.activateWindow()            
-        except:
-            self.configWindow = ui.configwindow.ConfigWindow(self)
-            self.configWindow.show()
-            
-    def show_configure_async(self):
-        self.exec_in_main(self.show_configure)
-
-    def show_error_dialog(self, message, details=None):
-        """
-        Convenience method for showing an error dialog.
-        """
-        if details is None:
-            KMessageBox.error(None, message)
-        else:
-            KMessageBox.detailedError(None, message, details)
-            
-    def show_script_error(self):
-        """
-        Show the last script error (if any)
-        """
-        if self.service.scriptRunner.error != '':
-            KMessageBox.information(None, self.service.scriptRunner.error, i18n("View Script Error Details"))
-            self.service.scriptRunner.error = ''
-        else:
-            KMessageBox.information(None, i18n("No error information available"), i18n("View Script Error Details"))
-        
-    def show_popup_menu(self, folders=[], items=[], onDesktop=True, title=None):
-        self.exec_in_main(self.__createMenu, folders, items, onDesktop, title)
-        
-    def hide_menu(self):
-        self.exec_in_main(self.menu.hide)
-        
-    def __createMenu(self, folders, items, onDesktop, title):
-        self.menu = ui.popupmenu.PopupMenu(self.service, folders, items, onDesktop, title)
-        self.menu.popup(QCursor.pos())
-        
-    def exec_in_main(self, callback, *args):
-        self.handler.postEventWithCallback(callback, *args)
-        
-        
-class CallbackEventHandler(QObject):
-
-    def __init__(self):
-        QObject.__init__(self)
-        self.queue = Queue.Queue()
-
-    def customEvent(self, event):
-        while True:
-            try:
-                callback, args = self.queue.get_nowait()
-            except Queue.Empty:
-                break
-            try:
-                callback(*args)
-            except Exception:
-                logging.warn("callback event failed: %r %r", callback, args, exc_info=True)
-
-    def postEventWithCallback(self, callback, *args):
-        self.queue.put((callback, args))
-        app = KApplication.kApplication()
-        app.postEvent(self, QEvent(QEvent.User))
 
=== added file 'src/lib/common.py'
--- src/lib/common.py	1970-01-01 00:00:00 +0000
+++ src/lib/common.py	2010-03-26 15:01:22 +0000
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2008 Chris Dekter
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import os.path
+CONFIG_DIR = os.path.expanduser("~/.config/autokey")
+LOCK_FILE = CONFIG_DIR + "/autokey.pid"
+LOG_FILE = CONFIG_DIR + "/autokey.log"
+MAX_LOG_SIZE = 5 * 1024 * 1024 # 5 megabytes
+MAX_LOG_COUNT = 3
+LOG_FORMAT = "%(levelname)s - %(name)s - %(message)s"
+
+APP_NAME = "AutoKey"
+CATALOG = ""
+VERSION = "0.61.5"
+HOMEPAGE  = "http://autokey.sourceforge.net/"
+BUG_EMAIL = "[e-mail]"
+
+FAQ_URL = "http://code.google.com/p/autokey/wiki/FAQ"
+HELP_URL = "http://code.google.com/p/autokey/w/list"
+DONATE_URL = "https://sourceforge.net/donate/index.php?group_id=216191"
+
+CONFIG_WINDOW_TITLE = "Configuration"
+
+ICON_FILE = "/usr/share/pixmaps/akicon.png"
+
+USING_QT = True
+
+# Misc
+DOMAIN_SOCKET_PATH = "/var/run/autokey-daemon"
+PACKET_SIZE = 32
+
+
 
=== modified file 'src/lib/configmanager.py'
--- src/lib/configmanager.py	2010-01-08 08:52:58 +0000
+++ src/lib/configmanager.py	2010-03-26 15:01:22 +0000
@@ -19,7 +19,7 @@
 import os, os.path, shutil, logging, pickle
 import iomediator, interface
 
-APP_VERSION = "0.61.2"
+APP_VERSION = "0.61.5"
 
 _logger = logging.getLogger("config-manager")
 
 
=== modified file 'src/lib/daemon.py'
--- src/lib/daemon.py	2009-12-16 08:46:43 +0000
+++ src/lib/daemon.py	2010-03-26 15:01:22 +0000
@@ -62,18 +62,27 @@
 	
 	def delpid(self):
 		os.remove(self.pidfile)
-
+	def checkpid(self):
+		"""Check for a pidfile to see if the daemon already runs
+		
+		@references self.pidfile
+		@returns pid, an int representing the running daemon or None"""
+		try:
+			pf = file(self.pidfile,'r')
+			pid = int(pf.read().strip())
+			pf.close()
+		except IOError:
+			pid = None
+		except ValueError: 
+			# the pidfile doesn't match our syntax, ignore it
+			pid = None
+		return pid
+	
 	def start(self):
 		"""
 		Start the daemon
 		"""
-		# Check for a pidfile to see if the daemon already runs
-		try:
-			pf = file(self.pidfile,'r')
-			pid = int(pf.read().strip())
-			pf.close()
-		except IOError:
-			pid = None
+		pid = self.checkpid()
 	
 		if pid:
 			message = "pidfile %s already exist. Daemon already running?\n"
@@ -89,13 +98,8 @@
 		Stop the daemon
 		"""
 		# Get the pid from the pidfile
-		try:
-			pf = file(self.pidfile,'r')
-			pid = int(pf.read().strip())
-			pf.close()
-		except IOError:
-			pid = None
-	
+		pid = self.checkpid()
+		
 		if not pid:
 			message = "pidfile %s does not exist. Daemon not running?\n"
 			sys.stderr.write(message % self.pidfile)
 
=== added file 'src/lib/gtkapp.py'
--- src/lib/gtkapp.py	1970-01-01 00:00:00 +0000
+++ src/lib/gtkapp.py	2010-03-26 15:01:22 +0000
@@ -0,0 +1,262 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2008 Chris Dekter
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import common
+common.USING_QT = False
+
+import sys, traceback, os.path, signal, logging, logging.handlers, subprocess, Queue, optparse
+import gettext, gtk
+gettext.install("autokey")
+
+import service
+from gtkui.notifier import Notifier
+from gtkui.popupmenu import PopupMenu
+from gtkui.configwindow import ConfigWindow
+from gtkui.abbrselector import AbbrSelectorDialog
+from configmanager import *
+from common import *
+
+PROGRAM_NAME = _("AutoKey")
+DESCRIPTION = _("Desktop automation utility")
+#LICENSE = KAboutData.License_GPL_V3
+COPYRIGHT = _("(c) 2009 Chris Dekter")
+#TEXT = _("")
+
+
+class Application:
+    """
+    Main application class; starting and stopping of the application is controlled
+    from here, together with some interactions from the tray icon.
+    """
+    
+    def __init__(self):
+        gtk.gdk.threads_init()
+        
+        p = optparse.OptionParser()
+        p.add_option("-l", "--verbose", help="Enable verbose logging", action="store_true", default=False)
+        p.add_option("-c", "--configure", help="Show the configuration window on startup", action="store_true", default=False)
+        options, args = p.parse_args()
+        
+        try:
+            # Create configuration directory
+            if not os.path.exists(CONFIG_DIR):
+                os.makedirs(CONFIG_DIR)
+                
+            # Initialise logger
+            rootLogger = logging.getLogger()
+            
+            if options.verbose:
+                rootLogger.setLevel(logging.DEBUG)
+                handler = logging.StreamHandler(sys.stdout)
+            else:
+                rootLogger.setLevel(logging.INFO)
+                handler = logging.handlers.RotatingFileHandler(LOG_FILE, 
+                                        maxBytes=MAX_LOG_SIZE, backupCount=MAX_LOG_COUNT)
+            
+            handler.setFormatter(logging.Formatter(LOG_FORMAT))
+            rootLogger.addHandler(handler)
+            
+            
+            if self.__verifyNotRunning():
+                self.__createLockFile()
+                
+            self.initialise(options.configure)
+            
+        except Exception, e:
+            self.show_error_dialog(_("Fatal error starting AutoKey.\n") + str(e))
+            logging.exception("Fatal error starting AutoKey: " + str(e))
+            sys.exit(1)
+            
+            
+    def __createLockFile(self):
+        f = open(LOCK_FILE, 'w')
+        f.write(str(os.getpid()))
+        f.close()
+        
+    def __verifyNotRunning(self):
+        if os.path.exists(LOCK_FILE):
+            f = open(LOCK_FILE, 'r')
+            pid = f.read()
+            f.close()
+            
+            # Check that the found PID is running and is autokey
+            p = subprocess.Popen(["ps", "-p", pid, "-o", "command"], stdout=subprocess.PIPE)
+            p.wait()
+            output = p.stdout.readlines()
+            if len(output) > 1:
+                # process exists
+                if "autokey" in output[1]:
+                    logging.error("AutoKey is already running - exiting")
+                    self.show_error_dialog(_("AutoKey is already running as pid: ") + pid)
+                    sys.exit(1)
+         
+        return True
+
+    def main(self):
+        gtk.main()
+
+    def initialise(self, configure):
+        logging.info("Initialising application")
+        self.configManager = get_config_manager(self)
+        self.service = service.Service(self)
+        self.serviceDisabled = False
+        
+        # Initialise user code dir
+        if self.configManager.userCodeDir is not None:
+            sys.path.append(self.configManager.userCodeDir)
+                
+        try:
+            self.service.start()
+        except Exception, e:
+            logging.exception("Error starting interface: " + str(e))
+            self.serviceDisabled = True
+            self.show_error_dialog(_("Error starting interface. Keyboard monitoring will be disabled.\n" +
+                                    "Check your system/configuration."), str(e))
+        
+        self.notifier = Notifier(self)
+        self.configWindow = None
+        self.abbrPopup = None
+        
+        if ConfigManager.SETTINGS[IS_FIRST_RUN] or configure:
+            ConfigManager.SETTINGS[IS_FIRST_RUN] = False
+            self.show_configure()
+            
+    def init_global_hotkeys(self, configManager):
+        logging.info("Initialise global hotkeys")
+        configManager.toggleServiceHotkey.set_closure(self.toggle_service)
+        configManager.configHotkey.set_closure(self.show_configure_async)
+        configManager.showPopupHotkey.set_closure(self.show_abbr_async)        
+        
+    def config_altered(self):
+        self.configManager.config_altered()
+        #self.notifier.build_menu()
+        
+    def unpause_service(self):
+        """
+        Unpause the expansion service (start responding to keyboard and mouse events).
+        """
+        self.service.unpause()
+        self.notifier.update_tool_tip()
+    
+    def pause_service(self):
+        """
+        Pause the expansion service (stop responding to keyboard and mouse events).
+        """
+        self.service.pause()
+        self.notifier.update_tool_tip()
+        
+    def toggle_service(self):
+        """
+        Convenience method for toggling the expansion service on or off.
+        """
+        if self.service.is_running():
+            self.pause_service()
+        else:
+            self.unpause_service()
+            
+    def shutdown(self):
+        """
+        Shut down the entire application.
+        """
+        if self.configWindow is not None:
+            if self.configWindow.promptToSave():
+               return
+             
+        logging.info("Shutting down")
+        self.service.shutdown()
+        gtk.main_quit()
+        os.remove(LOCK_FILE)
+            
+    def show_notify(self, message, isError=False, details=''):
+        """
+        Show a notification popup.
+        
+        @param message: Message to show in the popup
+        @param isError: Whether the message is an error (shows with an error icon)
+        @param details: Error details, which the user can view in a dialog by clicking
+        the "View Details" button.
+        """
+        self.notifier.show_notify(message, isError, details)
+        
+    def show_configure(self):
+        """
+        Show the configuration window, or deiconify (un-minimise) it if it's already open.
+        """
+        logging.info("Displaying configuration window")
+        if self.configWindow is None:
+            self.configWindow = ConfigWindow(self)
+            self.configWindow.show()
+        else:    
+            self.configWindow.deiconify()
+            
+    def show_configure_async(self):
+        gtk.gdk.threads_enter()
+        self.show_configure()
+        gtk.gdk.threads_leave()
+
+    def show_abbr_selector(self):
+        """
+        Show the abbreviation autocompletion popup.
+        """
+        if self.abbrPopup is None:
+            logging.info("Displaying abbreviation popup")
+            self.abbrPopup = AbbrSelectorDialog(self)
+            self.abbrPopup.present()
+            
+    def show_abbr_async(self):
+        gtk.gdk.threads_enter()
+        self.show_abbr_selector()
+        gtk.gdk.threads_leave()
+                
+    def main(self):
+        logging.info("Entering main()")
+        gtk.main()
+            
+    def show_error_dialog(self, message, details=None):
+        """
+        Convenience method for showing an error dialog.
+        """
+        dlg = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK,
+                                 message_format=message)
+        if details is not None:
+            dlg.format_secondary_text(details)
+        dlg.run()
+        dlg.destroy()
+        
+    def show_script_error(self):
+        """
+        Show the last script error (if any)
+        """
+        if self.service.scriptRunner.error != '':
+            dlg = gtk.MessageDialog(type=gtk.MESSAGE_INFO, buttons=gtk.BUTTONS_OK,
+                                     message_format=self.service.scriptRunner.error)
+            self.service.scriptRunner.error = ''
+        else:
+            dlg = gtk.MessageDialog(type=gtk.MESSAGE_INFO, buttons=gtk.BUTTONS_OK,
+                                     message_format=_("No error information available"))
+                        
+        dlg.run()
+        dlg.destroy()        
+        
+    def show_popup_menu(self, folders=[], items=[], onDesktop=True, title=None):
+        self.menu = PopupMenu(self.service, folders, items, onDesktop, title)
+        self.menu.show_on_desktop()
+    
+    def hide_menu(self):
+        self.menu.remove_from_desktop()
 
=== added directory 'src/lib/gtkui'
=== added file 'src/lib/gtkui/__init__.py'
=== added file 'src/lib/gtkui/abbrselector.py'
--- src/lib/gtkui/abbrselector.py	1970-01-01 00:00:00 +0000
+++ src/lib/gtkui/abbrselector.py	2010-03-26 15:01:22 +0000
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2008 Chris Dekter
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import gtk
+
+from autokey.configmanager import *
+import configwindow
+
+
+class AbbrSelectorDialog:
+    
+    def __init__(self, app):
+        builder = configwindow.get_ui("abbrselector.xml")
+        self.ui = builder.get_object("abbrselector")
+        builder.connect_signals(self)
+        self.entry = builder.get_object("entry")
+        
+        self.service = app.service
+        self.app = app
+        self.abbreviations = self.service.configManager.abbreviations
+        
+        self.completion = gtk.EntryCompletion()
+        self.entry.set_completion(self.completion)
+        model = AbbreviationModel(self.abbreviations)
+        self.completion.set_model(model)
+        self.completion.set_text_column(0)
+        
+        descriptionCell = gtk.CellRendererText()
+        self.completion.pack_start(descriptionCell)
+        self.completion.add_attribute(descriptionCell, "text", 1)
+        self.completion.set_inline_completion(True)
+        self.completion.set_inline_selection(True)
+        self.completion.connect("match-selected", self.on_match_selected)
+        
+        self.set_keep_above(True)
+        
+        
+    def on_match_selected(self, completion, model, iter, data=None):
+        theItem = model.get_value(iter, AbbreviationModel.OBJECT_COLUMN)
+        self.service.item_selected(theItem)
+        self.hide()
+        
+    def on_entry_activated(self, widget, data=None):
+        entered = self.entry.get_text()
+        for thePhrase in self.abbreviations:
+            if theItem.abbreviation == entered:
+                self.service.phrase_selected(None, theItem)
+        self.hide()
+    
+    def on_close(self, widget, data=None):
+        self.destroy()
+        self.app.abbrPopup = None
+
+    def __getattr__(self, attr):
+        # Magic fudge to allow us to pretend to be the ui class we encapsulate
+        return getattr(self.ui, attr)
+    
+    
+class AbbreviationModel(gtk.ListStore):
+    
+    OBJECT_COLUMN = 2
+        
+    def __init__(self, abbreviations):
+        gtk.ListStore.__init__(self, str, str, object)
+        
+        for item in abbreviations:
+            self.append((item.abbreviation, item.description, item))
+            
+    def match(self, completion, keyString, iter, data=None):
+        abbreviation = self.get_value(iter, 0)
+        description = self.get_value(iter, 1)
+        if abbreviation.startswith(keyString):
+            return True
+        elif len(keyString) > 1:
+            if keyString in description:
+                return True
+
+        return False
 
=== added file 'src/lib/gtkui/configwindow.py'
--- src/lib/gtkui/configwindow.py	1970-01-01 00:00:00 +0000
+++ src/lib/gtkui/configwindow.py	2010-03-26 15:01:22 +0000
@@ -0,0 +1,1120 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2009 Chris Dekter
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import logging, sys, os, webbrowser, re
+import gtk, gtk.glade, gtksourceview2
+
+from dialogs import *
+from settingsdialog import SettingsDialog
+from autokey.configmanager import *
+from autokey.iomediator import Recorder
+from autokey import model, common
+
+CONFIG_WINDOW_TITLE = _(common.CONFIG_WINDOW_TITLE + " - AutoKey")
+
+
+WEBSITE = "http://code.google.com/p/autokey"
+
+UI_DESCRIPTION_FILE = os.path.join(os.path.dirname(__file__), "data/menus.xml")
+
+def get_ui(fileName):
+    builder = gtk.Builder()
+    uiFile = os.path.join(os.path.dirname(os.path.abspath(__file__)), "data/" + fileName)
+    builder.add_from_file(uiFile)
+    return builder
+
+class SettingsWidget:
+	
+    KEY_MAP = HotkeySettingsDialog.KEY_MAP
+    REVERSE_KEY_MAP = HotkeySettingsDialog.REVERSE_KEY_MAP
+	
+    def __init__(self, parentWindow):
+        self.parentWindow = parentWindow
+        builder = get_ui("settingswidget.xml")
+        self.ui = builder.get_object("settingswidget")
+        builder.connect_signals(self)
+        
+        self.abbrDialog = AbbrSettingsDialog(parentWindow.ui, parentWindow.app.configManager, self.on_abbr_response)
+        self.hotkeyDialog = HotkeySettingsDialog(parentWindow.ui, parentWindow.app.configManager, self.on_hotkey_response)
+        self.filterDialog = WindowFilterSettingsDialog(parentWindow.ui)
+        
+        self.abbrLabel = builder.get_object("abbrLabel")
+        self.clearAbbrButton = builder.get_object("clearAbbrButton")
+        self.hotkeyLabel = builder.get_object("hotkeyLabel")
+        self.clearHotkeyButton = builder.get_object("clearHotkeyButton")
+        self.windowFilterLabel = builder.get_object("windowFilterLabel")
+        self.clearFilterButton = builder.get_object("clearFilterButton")
+        
+    def load(self, item):
+        self.currentItem = item
+        
+        self.abbrDialog.load(self.currentItem)
+        if model.TriggerMode.ABBREVIATION in item.modes:
+            self.abbrLabel.set_text(item.abbreviation)
+            self.clearAbbrButton.set_sensitive(True)
+            self.abbrEnabled = True
+        else:
+            self.abbrLabel.set_text(_("(None configured)"))
+            self.clearAbbrButton.set_sensitive(False)
+            self.abbrEnabled = False
+        
+        self.hotkeyDialog.load(self.currentItem)
+        if model.TriggerMode.HOTKEY in item.modes:
+            key = item.hotKey
+            self.hotkeyLabel.set_text(self.build_hotkey_string(key, item.modifiers))
+            self.clearHotkeyButton.set_sensitive(True)
+            self.hotkeyEnabled = True
+        else:
+            self.hotkeyLabel.set_text(_("(None configured)"))
+            self.clearHotkeyButton.set_sensitive(False)
+            self.hotkeyEnabled = False
+        
+        self.filterDialog.load(self.currentItem)
+        if item.uses_default_filter():
+            self.windowFilterLabel.set_text(_("(None configured)"))
+            self.clearFilterButton.set_sensitive(False)
+            self.filterEnabled = False
+        else:
+            self.windowFilterLabel.set_text(item.get_filter_regex())
+            self.clearFilterButton.set_sensitive(True)
+            self.filterEnabled = True
+            
+    def save(self):
+        self.currentItem.set_modes([])
+        if self.abbrEnabled:
+            self.abbrDialog.save(self.currentItem)
+        if self.hotkeyEnabled:
+            self.hotkeyDialog.save(self.currentItem)
+        if self.filterEnabled:
+            self.filterDialog.save(self.currentItem)
+        else:
+            self.currentItem.set_window_titles(None)
+            
+    def set_dirty(self):
+        self.parentWindow.set_dirty(True)
+        
+    # ---- Signal handlers
+        
+    def on_setAbbrButton_clicked(self, widget, data=None):
+        self.abbrDialog.run()
+         
+    def on_abbr_response(self, res):
+        if res == gtk.RESPONSE_OK:
+            self.set_dirty()
+            self.abbrEnabled = True
+            self.abbrLabel.set_text(self.abbrDialog.get_abbr())
+            self.clearAbbrButton.set_sensitive(True)
+            
+    def on_clearAbbrButton_clicked(self, widget, data=None):
+        self.set_dirty()
+        self.abbrEnabled = False
+        self.clearAbbrButton.set_sensitive(False)
+        self.abbrLabel.set_text(_("(None configured)"))
+        self.abbrDialog.reset()
+        
+    def on_setHotkeyButton_clicked(self, widget, data=None):
+        self.hotkeyDialog.run()
+        
+    def on_hotkey_response(self, res):
+        if res == gtk.RESPONSE_OK:
+            self.set_dirty()
+            self.hotkeyEnabled = True
+            key = self.hotkeyDialog.key
+            modifiers = self.hotkeyDialog.build_modifiers()
+            self.hotkeyLabel.set_text(self.build_hotkey_string(key, modifiers))
+            self.clearHotkeyButton.set_sensitive(True)
+            
+    def on_clearHotkeyButton_clicked(self, widget, data=None):
+        self.set_dirty()
+        self.hotkeyEnabled = False
+        self.clearHotkeyButton.set_sensitive(False)
+        self.hotkeyLabel.set_text(_("(None configured)"))
+        self.hotkeyDialog.reset()
+
+    def on_setFilterButton_clicked(self, widget, data=None):
+        if self.filterDialog.run() == gtk.RESPONSE_OK:
+            self.set_dirty()
+            filterText = self.filterDialog.get_filter_text()
+            if filterText != "":
+                self.filterEnabled = True
+                self.clearFilterButton.set_sensitive(True)
+                self.windowFilterLabel.set_text(filterText)
+            else:
+                self.filterEnabled = False
+                self.clearFilterButton.set_sensitive(False)
+                self.windowFilterLabel.set_text(_("(None configured)"))
+
+    def on_clearFilterButton_clicked(self, widget, data=None):
+        self.set_dirty()
+        self.filterEnabled = False
+        self.clearFilterButton.set_sensitive(False)
+        self.windowFilterLabel.set_text(_("(None configured)"))
+        self.filterDialog.reset()
+
+    def build_hotkey_string(self, key, modifiers):
+        hotkey = ""
+
+        for modifier in modifiers:
+            hotkey += modifier
+            hotkey += "+"
+
+        if key in self.KEY_MAP:
+            keyText = self.KEY_MAP[key]
+        else:
+            keyText = key
+        hotkey += keyText
+        
+        return hotkey
+
+    def __getattr__(self, attr):
+        # Magic fudge to allow us to pretend to be the ui class we encapsulate
+        return getattr(self.ui, attr)
+
+
+class FolderPage:
+    
+    def __init__(self, parentWindow):
+        self.parentWindow = parentWindow
+        builder = get_ui("folderpage.xml")
+        self.ui = builder.get_object("folderpage")
+        builder.connect_signals(self)
+        
+        self.showInTrayCheckbox = builder.get_object("showInTrayCheckbox")
+        
+        vbox = builder.get_object("settingsVbox")
+        self.settingsWidget = SettingsWidget(parentWindow)
+        vbox.pack_start(self.settingsWidget.ui)
+        
+    def load(self, theFolder):
+        self.currentFolder = theFolder
+        self.showInTrayCheckbox.set_active(theFolder.showInTrayMenu)
+        self.settingsWidget.load(theFolder)
+    
+    def save(self):
+        self.currentFolder.showInTrayMenu = self.showInTrayCheckbox.get_active()
+        self.settingsWidget.save()
+        
+    def set_item_title(self, newTitle):
+        self.currentFolder.title = newTitle.decode("utf-8")
+        #self.titleEntry.set_text(newTitle) # TODO testing remove me later
+    
+    def reset(self):
+        self.load(self.currentFolder)
+        
+    def validate(self):
+        return True
+        
+    def on_modified(self, widget, data=None):
+        self.set_dirty()
+    
+    def set_dirty(self):
+        self.parentWindow.set_dirty(True)
+        
+        
+class OldPhrasePage:
+    
+    def __init__(self, parentWindow):
+        self.parentWindow = parentWindow
+        builder = get_ui("phrasepage.xml")
+        self.ui = builder.get_object("phrasepage")
+        builder.connect_signals(self)
+        
+        self.descriptionEntry = builder.get_object("descriptionEntry")
+        self.phraseText = builder.get_object("phraseText")
+        self.promptCheckbox = builder.get_object("promptCheckbox")
+        self.showInTrayCheckbox = builder.get_object("showInTrayCheckbox")
+
+        vbox = builder.get_object("settingsVbox")
+        self.settingsWidget = SettingsWidget(parentWindow)
+        vbox.pack_start(self.settingsWidget.ui)
+
+    def load(self, thePhrase):
+        self.currentPhrase = thePhrase
+        self.descriptionEntry.set_text(thePhrase.description.encode("utf-8"))
+        buffer = gtk.TextBuffer()
+        buffer.set_text(thePhrase.phrase.encode("utf-8"))
+        buffer.connect("changed", self.on_modified)
+        self.phraseText.set_buffer(buffer)
+        self.promptCheckbox.set_active(thePhrase.prompt)
+        self.showInTrayCheckbox.set_active(thePhrase.showInTrayMenu)
+        self.settingsWidget.load(thePhrase)
+    
+    def save(self):
+        self.currentPhrase.description = self.descriptionEntry.get_text().decode("utf-8")
+    
+        buffer = self.phraseText.get_buffer()
+        self.currentPhrase.phrase = buffer.get_text(buffer.get_start_iter(),
+                                                        buffer.get_end_iter()).decode("utf-8")
+    
+        self.currentPhrase.prompt = self.promptCheckbox.get_active()
+        self.currentPhrase.showInTrayMenu = self.showInTrayCheckbox.get_active()
+        
+        self.settingsWidget.save()
+    
+    def reset(self):
+        self.load(self.currentPhrase)
+        
+    def validate(self):
+        if not validate(not EMPTY_FIELD_REGEX.match(self.descriptionEntry.get_text()),
+                         _("The phrase description can't be empty"), self.descriptionEntry, self.parentWindow.ui):
+            return False
+        
+        buffer = self.phraseText.get_buffer()
+        text = buffer.get_text(buffer.get_start_iter(), buffer.get_end_iter())
+        if not validate(not EMPTY_FIELD_REGEX.match(text), _("The phrase content can't be empty"), self.phraseText,
+                         self.parentWindow.ui):
+            return False
+        
+        return True
+        
+    def on_modified(self, widget, data=None):
+        self.set_dirty()
+    
+    def set_dirty(self):
+        self.parentWindow.set_dirty(True)
+        
+
+class ScriptPage:
+    
+    def __init__(self, parentWindow):
+        self.parentWindow = parentWindow
+        builder = get_ui("scriptpage.xml")
+        self.ui = builder.get_object("scriptpage")
+        builder.connect_signals(self)
+        
+        self.buffer = gtksourceview2.Buffer()
+        self.buffer.connect("changed", self.on_modified)
+        self.editor = gtksourceview2.View(self.buffer)
+        scrolledWindow = builder.get_object("scrolledWindow")
+        scrolledWindow.add(self.editor)
+        self.promptCheckbox = builder.get_object("promptCheckbox")
+        self.showInTrayCheckbox = builder.get_object("showInTrayCheckbox")
+
+        vbox = builder.get_object("settingsVbox")
+        self.settingsWidget = SettingsWidget(parentWindow)
+        vbox.pack_start(self.settingsWidget.ui)
+        
+        # Configure script editor
+        self.__m = gtksourceview2.LanguageManager()
+        self.__sm = gtksourceview2.StyleSchemeManager()
+        self.buffer.set_language(self.__m.get_language("python"))
+        self.buffer.set_style_scheme(self.__sm.get_scheme("kate"))
+        self.editor.set_auto_indent(True)
+        self.editor.set_smart_home_end(True)
+        self.editor.set_insert_spaces_instead_of_tabs(True)
+        self.editor.set_tab_width(4)
+        
+        self.ui.show_all()
+
+    def load(self, theScript):
+        self.currentItem = theScript
+        
+        self.buffer.begin_not_undoable_action()
+        self.buffer.set_text(theScript.code.encode("utf-8"))
+        self.buffer.end_not_undoable_action()
+        self.buffer.place_cursor(self.buffer.get_start_iter())
+        
+        self.promptCheckbox.set_active(theScript.prompt)
+        self.showInTrayCheckbox.set_active(theScript.showInTrayMenu)
+        self.settingsWidget.load(theScript)
+    
+    def save(self):
+        self.currentItem.code = self.buffer.get_text(self.buffer.get_start_iter(),
+                                                        self.buffer.get_end_iter()).decode("utf-8")
+    
+        self.currentItem.prompt = self.promptCheckbox.get_active()
+        self.currentItem.showInTrayMenu = self.showInTrayCheckbox.get_active()
+        
+        self.settingsWidget.save()
+        
+    def set_item_title(self, newTitle):
+        self.currentItem.description = newTitle.decode("utf-8")
+
+    
+    def reset(self):
+        self.load(self.currentItem)
+        self.parentWindow.set_undo_available(False)
+        self.parentWindow.set_redo_available(False)
+        
+    def validate(self):
+        text = self.buffer.get_text(self.buffer.get_start_iter(), self.buffer.get_end_iter())
+        if not validate(not EMPTY_FIELD_REGEX.match(text), _("The script code can't be empty"), self.editor,
+                         self.parentWindow.ui):
+            return False
+        
+        return True
+        
+    def start_record(self):
+        self.buffer.insert(self.buffer.get_end_iter(), "\n")
+        
+    def start_key_sequence(self):
+        self.buffer.insert(self.buffer.get_end_iter(), "keyboard.send_keys(\"")
+        
+    def end_key_sequence(self):
+        self.buffer.insert(self.buffer.get_end_iter(), "\")\n")        
+    
+    def append_key(self, key):
+        #line, pos = self.buffer.getCursorPosition()
+        self.buffer.insert(self.buffer.get_end_iter(), key)
+        #self.scriptCodeEditor.setCursorPosition(line, pos + len(key))
+        
+    def append_hotkey(self, key, modifiers):
+        #line, pos = self.scriptCodeEditor.getCursorPosition()
+        keyString = self.settingsWidget.build_hotkey_string(key, modifiers)
+        self.buffer.insert(self.buffer.get_end_iter(), keyString)
+        #self.scriptCodeEditor.setCursorPosition(line, pos + len(keyString))
+        
+    def append_mouseclick(self, xCoord, yCoord, button, windowTitle):
+        self.buffer.insert(self.buffer.get_end_iter(), "mouse.click_relative(%d, %d, %d) # %s\n" % (xCoord, yCoord, int(button), windowTitle))
+        
+    def undo(self):
+        self.buffer.undo()
+        self.parentWindow.set_undo_available(self.buffer.can_undo())
+        self.parentWindow.set_redo_available(self.buffer.can_redo())
+                
+    def redo(self):
+        self.buffer.redo()
+        self.parentWindow.set_undo_available(self.buffer.can_undo())
+        self.parentWindow.set_redo_available(self.buffer.can_redo())
+        
+    def on_modified(self, widget, data=None):
+        self.set_dirty()
+        self.parentWindow.set_undo_available(self.buffer.can_undo())
+        self.parentWindow.set_redo_available(self.buffer.can_redo())
+    
+    def set_dirty(self):
+        self.parentWindow.set_dirty(True)
+
+
+class PhrasePage(ScriptPage):
+
+    def __init__(self, parentWindow):
+        self.parentWindow = parentWindow
+        builder = get_ui("phrasepage.xml")
+        self.ui = builder.get_object("phrasepage")
+        builder.connect_signals(self)
+        
+        self.buffer = gtksourceview2.Buffer()
+        self.buffer.connect("changed", self.on_modified)
+        self.editor = gtksourceview2.View(self.buffer)
+        scrolledWindow = builder.get_object("scrolledWindow")
+        scrolledWindow.add(self.editor)
+        self.promptCheckbox = builder.get_object("promptCheckbox")
+        self.showInTrayCheckbox = builder.get_object("showInTrayCheckbox")
+
+        vbox = builder.get_object("settingsVbox")
+        self.settingsWidget = SettingsWidget(parentWindow)
+        vbox.pack_start(self.settingsWidget.ui)
+        
+        # Configure script editor
+        #self.__m = gtksourceview2.LanguageManager()
+        self.__sm = gtksourceview2.StyleSchemeManager()
+        self.buffer.set_language(None)
+        self.buffer.set_style_scheme(self.__sm.get_scheme("kate"))
+        self.buffer.set_highlight_matching_brackets(False)
+        self.editor.set_auto_indent(False)
+        self.editor.set_smart_home_end(False)
+        self.editor.set_insert_spaces_instead_of_tabs(True)
+        self.editor.set_tab_width(4)
+        
+        self.ui.show_all()
+
+    def load(self, thePhrase):
+        self.currentItem = thePhrase
+        
+        self.buffer.begin_not_undoable_action()
+        self.buffer.set_text(thePhrase.phrase.encode("utf-8"))
+        self.buffer.end_not_undoable_action()
+        self.buffer.place_cursor(self.buffer.get_start_iter())
+        
+        self.promptCheckbox.set_active(thePhrase.prompt)
+        self.showInTrayCheckbox.set_active(thePhrase.showInTrayMenu)
+        self.settingsWidget.load(thePhrase)
+    
+    def save(self):
+        self.currentItem.phrase = self.buffer.get_text(self.buffer.get_start_iter(),
+                                                        self.buffer.get_end_iter()).decode("utf-8")
+    
+        self.currentItem.prompt = self.promptCheckbox.get_active()
+        self.currentItem.showInTrayMenu = self.showInTrayCheckbox.get_active()
+        
+        self.settingsWidget.save()
+
+class ConfigWindow:
+    
+    def __init__(self, app):
+        self.app = app
+        self.cutCopiedItems = []
+        
+        builder = get_ui("mainwindow.xml")
+        self.ui = builder.get_object("mainwindow")
+        builder.connect_signals(self)
+        
+        # Menus and Actions
+        self.uiManager = gtk.UIManager()
+        self.add_accel_group(self.uiManager.get_accel_group())
+        
+        # Menu Bar
+        actionGroup = gtk.ActionGroup("menu")
+        actions = [
+                   ("File", None, "_File"),
+                   ("create", None, "Create..."),
+                   ("new-top-folder", "folder-new", "New _Top-Level Folder", "", "Create a new top-level phrase folder", self.on_new_topfolder),
+                   ("new-folder", "folder-new", "New _Folder", "", "Create a new phrase folder in the current folder", self.on_new_folder),
+                   ("new-phrase", gtk.STOCK_NEW, "New _Phrase", "<control>n", "Create a new phrase in the current folder", self.on_new_phrase),
+                   ("new-script", gtk.STOCK_NEW, "New _Script", "<control><shift>n", "Create a new script in the current folder", self.on_new_script),
+                   ("save", gtk.STOCK_SAVE, "_Save", None, "Save changes to current item", self.on_save),
+                   ("close-window", gtk.STOCK_CLOSE, "_Close window", None, "Close the configuration window", self.on_close),
+                   ("quit", gtk.STOCK_QUIT, "_Quit", None, "Completely exit AutoKey", self.on_quit),
+                   ("Edit", None, "_Edit"),
+                   ("cut-item", gtk.STOCK_CUT, "Cu_t Item(s)", "<control><shift>x", "Cut the selected item", self.on_cut_item),
+                   ("copy-item", gtk.STOCK_COPY, "_Copy Item(s)", "<control><shift>c", "Copy the selected item", self.on_copy_item),
+                   ("paste-item", gtk.STOCK_PASTE, "_Paste Item(s)", "<control><shift>v", "Paste the last cut/copied item", self.on_paste_item),
+                   ("delete-item", gtk.STOCK_DELETE, "_Delete Item(s)", "<control>d", "Delete the selected item", self.on_delete_item),
+                   ("rename", None, "_Rename", "", "Rename the selected item", self.on_rename),
+                   ("undo", gtk.STOCK_UNDO, "_Undo", "<control>z", "Undo the last edit", self.on_undo),
+                   ("redo", gtk.STOCK_REDO, "_Redo", "<control><shift>z", "Redo the last undone edit", self.on_redo),
+                   ("preferences", gtk.STOCK_PREFERENCES, "_Preferences", "", "Additional options", self.on_advanced_settings),
+                   ("View", None, "_View"),
+                   ("script-error", gtk.STOCK_DIALOG_ERROR, "Vie_w script error", None, "View script error information", self.on_show_error),                   
+                   #("Settings", None, "_Settings", None, None, None),
+                   #("advanced", gtk.STOCK_PREFERENCES, "_Advanced Settings", "", "Advanced configuration options", self.on_advanced_settings),
+                   ("Help", None, "_Help"),
+                   ("faq", None, "_F.A.Q.", None, "Display Frequently Asked Questions", self.on_show_faq),
+                   ("help", gtk.STOCK_HELP, "Online _Help", None, "Display Online Help", self.on_show_help),
+                   ("donate", gtk.STOCK_YES, "Donate", "", "Make A Donation", self.on_donate),
+                   ("about", gtk.STOCK_ABOUT, "About AutoKey", None, "Show program information", self.on_show_about)
+                   ]
+        actionGroup.add_actions(actions)
+        
+        toggleActions = [
+                         #("enable-monitoring", None, "_Enable Monitoring", None, "Toggle monitoring on/off", self.on_enable_toggled),
+                         ("toolbar", None, "_Show Toolbar", None, "Show/hide the toolbar", self.on_toggle_toolbar),
+                         ("record", gtk.STOCK_MEDIA_RECORD, "R_ecord Macro", None, "Record a keyboard/mouse macro", self.on_record_keystrokes),
+                         ]
+        actionGroup.add_toggle_actions(toggleActions)
+                
+        self.uiManager.insert_action_group(actionGroup, 0)
+        self.uiManager.add_ui_from_file(UI_DESCRIPTION_FILE)
+        self.vbox = builder.get_object("vbox")
+        self.vbox.pack_end(self.uiManager.get_widget("/MenuBar"), False, False)
+        
+        # Toolbar 'create' button 
+        create = gtk.MenuToolButton(gtk.STOCK_NEW)
+        create.show()
+        menu = self.uiManager.get_widget('/MenuBar/File/create').get_submenu()
+        create.set_menu(menu)
+        toolbar = self.uiManager.get_widget('/Toolbar')
+        s = gtk.SeparatorToolItem()
+        s.show()
+        toolbar.insert(s, 0)
+        toolbar.insert(create, 0)
+        #if ConfigManager.SETTINGS[SHOW_TOOLBAR]:
+        #    self.__addToolbar()
+        self.uiManager.get_action("/MenuBar/View/toolbar").set_active(ConfigManager.SETTINGS[SHOW_TOOLBAR])
+        
+        self.treeView = builder.get_object("treeWidget")
+        self.__initTreeWidget()
+        
+        self.stack = builder.get_object("stack")
+        self.__initStack()
+        
+        self.saveButton = builder.get_object("saveButton")
+        self.revertButton = builder.get_object("revertButton")
+        self.hpaned = builder.get_object("hpaned")
+        
+        #self.uiManager.get_action("/MenuBar/Settings/enable-monitoring").set_active(app.service.is_running())
+        #self.uiManager.get_action("/MenuBar/Settings/enable-monitoring").set_sensitive(not app.serviceDisabled)
+        
+        rootIter = self.treeView.get_model().get_iter_root()
+        self.treeView.get_selection().select_iter(rootIter)
+        self.on_tree_selection_changed(self.treeView)
+        
+        width, height = ConfigManager.SETTINGS[WINDOW_DEFAULT_SIZE]
+        self.set_default_size(width, height)
+        self.hpaned.set_position(ConfigManager.SETTINGS[HPANE_POSITION])
+        
+        self.recorder = Recorder(self.scriptPage)
+        
+    def __addToolbar(self):
+        toolbar = self.uiManager.get_widget('/Toolbar')
+        self.vbox.pack_end(toolbar, False, False)
+        self.vbox.reorder_child(toolbar, 1)
+        
+    def cancel_record(self):
+        if self.uiManager.get_widget("/MenuBar/Edit/record").get_active():
+            self.uiManager.get_widget("/MenuBar/Edit/record").set_active(False)
+            self.recorder.stop()
+            
+    def save_completed(self):
+        self.saveButton.set_sensitive(False)
+        self.uiManager.get_action("/MenuBar/File/save").set_sensitive(False)        
+        self.app.config_altered()
+        
+    def set_dirty(self, dirty):
+        self.dirty = dirty
+        self.uiManager.get_action("/MenuBar/File/save").set_sensitive(dirty)
+        self.saveButton.set_sensitive(dirty)
+        self.revertButton.set_sensitive(dirty)
+        
+    def update_actions(self, items, changed):
+        canCreate = isinstance(items[0], model.Folder) and len(items) == 1
+        canCopy = True
+        for item in items:
+            if isinstance(item, model.Folder):
+                canCopy = False
+                break
+        
+        self.uiManager.get_action("/MenuBar/File/create").set_sensitive(True)
+        self.uiManager.get_action("/MenuBar/File/create/new-top-folder").set_sensitive(True)
+        self.uiManager.get_action("/MenuBar/File/create/new-folder").set_sensitive(canCreate)
+        self.uiManager.get_action("/MenuBar/File/create/new-phrase").set_sensitive(canCreate)
+        self.uiManager.get_action("/MenuBar/File/create/new-script").set_sensitive(canCreate)
+        
+        self.uiManager.get_action("/MenuBar/Edit/copy-item").set_sensitive(canCopy)
+        self.uiManager.get_action("/MenuBar/Edit/paste-item").set_sensitive(canCreate and len(self.cutCopiedItems) > 0)
+        self.uiManager.get_action("/MenuBar/Edit/record").set_sensitive(isinstance(items[0], model.Script) and len(items) == 1)
+        
+        if changed:
+            self.uiManager.get_action("/MenuBar/File/save").set_sensitive(False)
+            self.saveButton.set_sensitive(False)
+            self.uiManager.get_action("/MenuBar/Edit/undo").set_sensitive(False)
+            self.uiManager.get_action("/MenuBar/Edit/redo").set_sensitive(False)
+        
+    def set_undo_available(self, state):
+        self.uiManager.get_action("/MenuBar/Edit/undo").set_sensitive(state)
+        
+    def set_redo_available(self, state):
+        self.uiManager.get_action("/MenuBar/Edit/redo").set_sensitive(state)
+        
+    def refresh_tree(self):
+        model, selectedPaths = self.treeView.get_selection().get_selected_rows()
+        for path in selectedPaths:
+            model.update_item(model[path].iter, self.__getTreeSelection())
+        
+    # ---- Signal handlers ----
+    
+    def on_save(self, widget, data=None):
+        if self.__getCurrentPage().validate():
+            self.__getCurrentPage().save()
+            self.save_completed()
+            self.set_dirty(False)
+            
+            self.refresh_tree()
+    
+    def on_reset(self, widget, data=None):
+        self.__getCurrentPage().reset()
+        self.set_dirty(False)
+        self.cancel_record()
+    
+    def queryClose(self):
+        if self.dirty:
+            return self.promptToSave()
+
+        return False
+        
+    def on_close(self, widget, data=None):
+        ConfigManager.SETTINGS[WINDOW_DEFAULT_SIZE] = self.get_size()
+        ConfigManager.SETTINGS[HPANE_POSITION] = self.hpaned.get_position()
+        self.cancel_record()
+        if self.queryClose():
+            return True
+        else:
+            self.hide()
+            self.destroy()
+            self.app.configWindow = None
+            self.app.config_altered()
+            
+    def on_quit(self, widget, data=None):
+        #if not self.queryClose():
+        ConfigManager.SETTINGS[WINDOW_DEFAULT_SIZE] = self.get_size()
+        ConfigManager.SETTINGS[HPANE_POSITION] = self.hpaned.get_position()
+        self.app.shutdown()
+            
+    # File Menu
+    
+    def on_new_topfolder(self, widget, data=None):
+        self.__createFolder(None)
+        
+    def on_new_folder(self, widget, data=None):
+        theModel, selectedPaths = self.treeView.get_selection().get_selected_rows()
+        parentIter = theModel[selectedPaths[0]].iter
+        self.__createFolder(parentIter)
+        
+    def __createFolder(self, parentIter):
+        theModel = self.treeView.get_model()
+        newFolder = model.Folder("New Folder")   
+        newIter = theModel.append_item(newFolder, parentIter)
+        self.treeView.expand_to_path(theModel.get_path(newIter))
+        self.treeView.get_selection().unselect_all()
+        self.treeView.get_selection().select_iter(newIter)
+        self.on_tree_selection_changed(self.treeView)
+        self.on_rename(self.treeView)
+        
+    def on_new_phrase(self, widget, data=None):
+        theModel, selectedPaths = self.treeView.get_selection().get_selected_rows()
+        parentIter = theModel[selectedPaths[0]].iter
+        newPhrase = model.Phrase("New Phrase", "Enter phrase contents")
+        newIter = theModel.append_item(newPhrase, parentIter)
+        self.treeView.expand_to_path(theModel.get_path(newIter))
+        self.treeView.get_selection().unselect_all()
+        self.treeView.get_selection().select_iter(newIter)
+        self.on_tree_selection_changed(self.treeView)
+        self.on_rename(self.treeView)        
+    
+    def on_new_script(self, widget, data=None):
+        theModel, selectedPaths = self.treeView.get_selection().get_selected_rows()
+        parentIter = theModel[selectedPaths[0]].iter
+        newScript = model.Script("New Script", "# Enter script code")
+        newIter = theModel.append_item(newScript, parentIter)
+        self.treeView.expand_to_path(theModel.get_path(newIter))
+        self.treeView.get_selection().unselect_all()
+        self.treeView.get_selection().select_iter(newIter)
+        self.on_tree_selection_changed(self.treeView)
+        self.on_rename(self.treeView)        
+        
+    # Edit Menu
+
+    def on_cut_item(self, widget, data=None):
+        self.cutCopiedItems = self.__getTreeSelection()
+        selection = self.treeView.get_selection()
+        model, selectedPaths = selection.get_selected_rows()
+        refs = []
+        for path in selectedPaths:
+            refs.append(gtk.TreeRowReference(model, path))
+            
+        for ref in refs:
+            if ref.valid():
+                self.__removeItem(model, model[ref.get_path()].iter)
+                
+        if len(selectedPaths) > 1:
+            self.treeView.get_selection().unselect_all()        
+            self.treeView.get_selection().select_iter(model.get_iter_root())
+            self.on_tree_selection_changed(self.treeView)
+            
+        self.app.config_altered()    
+    
+    def on_copy_item(self, widget, data=None):
+        sourceObjects = self.__getTreeSelection()
+        
+        for source in sourceObjects:
+            if isinstance(source, model.Phrase):
+                newObj = model.Phrase('', '')
+            else:
+                newObj = model.Script('', '')
+            newObj.copy(source)
+            self.cutCopiedItems.append(newObj)
+    
+    def on_paste_item(self, widget, data=None):
+        theModel, selectedPaths = self.treeView.get_selection().get_selected_rows()
+        parentIter = theModel[selectedPaths[0]].iter
+        
+        newIters = []
+        for item in self.cutCopiedItems:
+            newIter = theModel.append_item(item, parentIter)
+            if isinstance(item, model.Folder):
+                theModel.populate_store(newIter, item)
+            newIters.append(newIter)
+                
+        self.treeView.expand_to_path(theModel.get_path(newIters[-1]))
+        self.treeView.get_selection().unselect_all()
+        self.treeView.get_selection().select_iter(newIters[0])
+        self.cutCopiedItems = []
+        self.on_tree_selection_changed(self.treeView)        
+        for iter in newIters:
+            self.treeView.get_selection().select_iter(iter)        
+        self.app.config_altered()
+        
+    def on_delete_item(self, widget, data=None):
+        selection = self.treeView.get_selection()
+        model, selectedPaths = selection.get_selected_rows()
+        refs = []
+        for path in selectedPaths:
+            refs.append(gtk.TreeRowReference(model, path))
+            
+        for ref in refs:
+            if ref.valid():
+                # Prompt for removal of a folder with phrases
+                item = model[ref.get_path()].iter
+                    
+                if model.iter_n_children(item) > 0:
+                    title = model.get_value(item, AkTreeModel.OBJECT_COLUMN).title
+                    dlg = gtk.MessageDialog(self.ui, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,
+                                            _("Are you sure you want to delete the %s folder and all the items in it?") % title)
+                    if dlg.run() == gtk.RESPONSE_YES:
+                        self.__removeItem(model, item)
+                    dlg.destroy()
+                    
+                else:
+                    self.__removeItem(model, item)
+        
+        if len(selectedPaths) > 1:
+            self.treeView.get_selection().unselect_all()        
+            self.treeView.get_selection().select_iter(model.get_iter_root())
+            self.on_tree_selection_changed(self.treeView)        
+            
+        self.app.config_altered()
+            
+    def __removeItem(self, model, item):
+        selection = self.treeView.get_selection()
+        model, selectedPaths = selection.get_selected_rows()
+        newSelectionIter = model.iter_parent(model[selectedPaths[0]].iter)
+        if newSelectionIter is None:
+            newSelectionIter = model.get_iter_root()
+        
+        model.remove_item(item)
+        self.treeView.get_selection().select_iter(newSelectionIter)
+        self.on_tree_selection_changed(self.treeView)
+        
+    def on_undo(self, widget, data=None):
+        self.__getCurrentPage().undo()
+
+    def on_redo(self, widget, data=None):
+        self.__getCurrentPage().redo()
+        
+    def on_record_keystrokes(self, widget, data=None):
+        if widget.get_active():
+            dlg = RecordDialog(self.ui, self.on_rec_response)
+            dlg.run()
+        else:
+            self.recorder.stop()
+            
+    def on_rec_response(self, response, recKb, recMouse, delay):
+        if response == gtk.RESPONSE_OK:
+            self.recorder.set_record_keyboard(recKb)
+            self.recorder.set_record_mouse(recMouse)
+            self.recorder.start(delay)
+        elif response == gtk.RESPONSE_CANCEL:
+            self.uiManager.get_widget("/MenuBar/Edit/record").set_active(False)
+        
+    # View Menu
+    
+    def on_toggle_toolbar(self, widget, data=None):
+        if widget.get_active():
+            self.__addToolbar()
+        else:
+            self.vbox.remove(self.uiManager.get_widget('/Toolbar'))
+            
+        ConfigManager.SETTINGS[SHOW_TOOLBAR] = widget.get_active()
+        
+    def on_show_error(self, widget, data=None):
+        self.app.show_script_error()
+    
+    # Settings Menu
+    
+    def on_enable_toggled(self, widget, data=None):
+        if widget.get_active():
+            self.app.unpause_service()
+        else:
+            self.app.pause_service()
+            
+    def on_advanced_settings(self, widget, data=None):
+        s = SettingsDialog(self.ui, self.app.configManager)
+        s.show()
+
+    # Help Menu
+            
+    def on_show_faq(self, widget, data=None):
+        webbrowser.open(common.FAQ_URL, False, True)
+        
+    def on_show_help(self, widget, data=None):
+        webbrowser.open(common.HELP_URL, False, True)
+        
+    def on_donate(self, widget, data=None):
+        webbrowser.open(common.DONATE_URL, False, True)
+        
+    def on_show_about(self, widget, data=None):
+        dlg = gtk.AboutDialog()
+        dlg.set_name("AutoKey (GTK UI)")
+        dlg.set_comments("A desktop automation utility for Linux and X11.")
+        dlg.set_version(common.VERSION)
+        p = gtk.gdk.pixbuf_new_from_file(common.ICON_FILE)
+        p = p.scale_simple(100, 100, gtk.gdk.INTERP_BILINEAR)
+        dlg.set_logo(p)
+        dlg.set_website(WEBSITE)
+        dlg.set_authors(["Chris Dekter (Developer) <[e-mail]>",
+                        "Sam Peterson (Original developer) <[e-mail]>"])
+        dlg.run()
+        dlg.destroy()
+        
+    # Tree widget
+    
+    def on_rename(self, widget, data=None):
+        selection = self.treeView.get_selection()
+        theModel, selectedPaths = selection.get_selected_rows()
+        self.treeView.set_cursor(selectedPaths[0], self.treeView.get_column(0), True)
+    
+    def on_treeWidget_row_activated(self, widget, path, viewColumn, data=None):
+        widget.expand_row(path, False)
+        
+    def on_treeview_buttonpress(self, widget, event, data=None):
+        return self.dirty
+        
+    def on_treeview_buttonrelease(self, widget, event, data=None):          
+        if self.promptToSave():
+            # True result indicates user selected Cancel. Stop event propagation
+            return True
+        else:
+            x = int(event.x)
+            y = int(event.y)
+            time = event.time
+            pthinfo = widget.get_path_at_pos(x, y)
+            if pthinfo is not None:
+                path, col, cellx, celly = pthinfo
+                currentPath, currentCol = widget.get_cursor()
+                if currentPath != path and currentCol != col:
+                    widget.set_cursor(path, col, 0)
+                if event.button == 3:
+                    self.__popupMenu(event)
+            return False
+        
+    def on_tree_selection_changed(self, widget, data=None):
+        selectedObjects = self.__getTreeSelection()
+        if len(selectedObjects) == 1:
+            selectedObject = selectedObjects[0]
+ 
+            if isinstance(selectedObject, model.Folder):
+                self.stack.set_current_page(0)
+                self.folderPage.load(selectedObject)
+            elif isinstance(selectedObject, model.Phrase):
+                self.stack.set_current_page(1)
+                self.phrasePage.load(selectedObject)
+            else:
+                self.stack.set_current_page(2)
+                self.scriptPage.load(selectedObject)
+
+            self.set_dirty(False)
+            self.cancel_record()
+            self.update_actions(selectedObjects, True)            
+            self.selectedObject = selectedObject
+
+        else:
+            self.update_actions(selectedObjects, False)
+                
+    def on_drag_data_received(self, treeview, context, x, y, selection, info, etime):
+        selection = self.treeView.get_selection()
+        theModel, sourcePaths = selection.get_selected_rows()
+        drop_info = treeview.get_dest_row_at_pos(x, y)
+        if drop_info:
+            path, position = drop_info
+            targetIter = theModel.get_iter(path)
+            
+        sourceModelItems = self.__getTreeSelection()
+        #sourceModelItem = theModel.get_value(sourceIter, AkTreeModel.OBJECT_COLUMN)
+        targetModelItem = theModel.get_value(targetIter, AkTreeModel.OBJECT_COLUMN)
+        
+        for path in sourcePaths:
+            self.__removeItem(theModel, theModel[path].iter)
+        
+        newIters = []
+        for item in sourceModelItems:
+            newIter = theModel.append_item(item, targetIter)    
+            if isinstance(item, model.Folder):
+                theModel.populate_store(newIter, item)
+            newIters.append(newIter)
+                
+        self.treeView.expand_to_path(theModel.get_path(newIters[-1]))
+        selection.unselect_all()
+        for iter in newIters:
+            selection.select_iter(iter)
+        self.on_tree_selection_changed(self.treeView)
+        self.app.config_altered()
+        
+    def on_drag_drop(self, widget, drag_context, x, y, timestamp):
+        drop_info = widget.get_dest_row_at_pos(x, y)
+        if drop_info:
+            selection = widget.get_selection()
+            theModel, sourcePaths = selection.get_selected_rows()
+            path, position = drop_info
+            
+            if position not in (gtk.TREE_VIEW_DROP_INTO_OR_BEFORE, gtk.TREE_VIEW_DROP_INTO_OR_AFTER):
+                return True
+            
+            targetIter = theModel.get_iter(path)
+            targetModelItem = theModel.get_value(targetIter, AkTreeModel.OBJECT_COLUMN)
+            if isinstance(targetModelItem, model.Folder) and path not in sourcePaths:
+                # checking path prevents dropping a folder onto itself
+                return False
+            else:
+                return True
+        
+        return True
+        
+    def on_cell_modified(self, renderer, path, newText, data=None):