Added systray icon support, and blue version of beryl settings svg icon for it.

Fixed actions and action highlighting.

Removed pixmap/Makefile/*.  Need to make symlinks sometime soon.

Other fixes as well.

10 files changed, 394 insertions, 923 deletions

diff --git a/kberylsettings/contentframe.py b/kberylsettings/contentframe.py
index 4e43628..1ce0728 100644
--- a/kberylsettings/contentframe.py
+++ b/kberylsettings/contentframe.py
@@ -94,12 +94,13 @@ class ContentFrame(WidgetStack):
         @param plugin berylsettings Plugin instance
         @return None
         """
-        logofile = 'file://%s' % (abspath(App.basedir + '/html/beryl-manager.png'), )
+        logofile = 'file://%s' % (abspath(App.basedir + '/html/beryl-manager.png'), )        
         htmlsrc = open(abspath(App.basedir + '/html/plugin.html')).read()        
         if plugin is None:
             pluginname = 'Beryl Settings'
             plugindesc = 'Beryl Settings - Get Your Effects On!'
         else:
+            #logofile = 'file://%s' % (abspath(App.basedir + '/pixmaps/beryl-settings-section-%s.png' % plugin.Name), )
             pluginname = plugin.ShortDesc
             plugindesc = plugin.LongDesc
         self.infoHtml.begin()
diff --git a/kberylsettings/html/plugin.html b/kberylsettings/html/plugin.html
index e2f4f9f..93afbaf 100644
--- a/kberylsettings/html/plugin.html
+++ b/kberylsettings/html/plugin.html
@@ -13,12 +13,12 @@
                 <img src="%(logofile)s" style="margin: 10px" alt="">
             </div>
             <div style="position: absolute;
-                        top: 25px;
-                        right: 100px;
+                        top: 15px;
+                        left: 70px;
                         text-align: right;
                         font-size: xx-large;
                         font-weight: bold;
-                        text-shadow: #fff 0px 0px 5px;
+                        text-shadow: #fff 1px 1px 2px;
                         color: #444">
                 %(pluginname)s
             </div>
diff --git a/kberylsettings/lib.py b/kberylsettings/lib.py
index 33c0ca0..17b14d7 100644
--- a/kberylsettings/lib.py
+++ b/kberylsettings/lib.py
@@ -46,6 +46,9 @@ class Signals:
     okClicked = SIGNAL('okClicked()')
     activated = SIGNAL('activated()')
     textChanged = SIGNAL('textChanged(const QString&)')
+    quitSelected = SIGNAL("quitSelected()")
+    actionStatusText = SIGNAL('actionStatusText(const QString &)')
+    clearStatusText = SIGNAL('clearStatusText()')
     contextMenuRequest = \
         SIGNAL('contextMenuRequested(QListViewItem*,const QPoint&,int)')
 
@@ -54,7 +57,9 @@ class Slots:
     """ class with SLOT attributes
 
     """
+    clear = SLOT('clear()')
     close = SLOT('close()')
+    messageText = SLOT('message( const QString & )')
 
 
 def iconLoader():
@@ -98,44 +103,48 @@ def iconSet(name, group=KIcon.NoGroup, size=KIcon.SizeSmall):
     return iconLoader().loadIconSet(name, group, size)
 
 
-def action(text, label, icon, accel, tip, collection, pluggable):
+def action(text, iconset, cut, slot, collection, name,
+           tooltip='', pluggable=None):
     """ creates and configures a KAction instance
 
     @param text display value for action
-    @param label value associated with action
-    @param icon pixmap for action
-    @param accel constructor parameter for KAccel
-    @param tip tooltip text for actin
+    @param iconset name of icon set for action
+    @param cut
+    @param slot
     @param collection KActionCollection instance
-    @param pluggable any object with plug method
+    @param name internal action name
+    @keyparam tooltip='' value for tooltip
+    @keyparam pluggable=None any pluggable object
     @return KAction instance
     """
-    obj = KAction(text)
-    obj.setShortcut(KShortcut(accel))
-    obj.setIconSet(iconSet(icon))
-    obj.setIcon(icon)
-    obj.setText(i18n(label))
-    obj.setToolTip(i18n(tip))
-    collection.insert(obj)
-    collection.connectHighlight(pluggable, obj)
-    obj.plug(pluggable)
-    return obj
-
-
-def stdAction(parent, name, slot, collection, pluggable):
+    if not cut:
+        cut = KShortcut()
+    else:
+        cut = KShortcut(cut)
+    iconset = iconSet(iconset)
+    action = KAction(text, iconset, cut, slot, collection, name)
+    if tooltip:
+        action.setToolTip(tooltip)
+    if pluggable:
+        action.plug(pluggable)
+    return action
+
+
+def stdAction(attr, slot, collection, name, pluggable=None):
     """ creates a named KStdAction instance
 
-    @param parent receiver of action
-    @param name attribute of KStdAction class
+    @param attr attribute of KStdAction class
     @param slot slot for KStdAction instance
     @param collection KActionCollection instance
-    @param pluggable any object with plug method
+    @param name internal action name
+    @keyparam pluggable=None any pluggable object    
     @return KStdAction instance
     """
-    typ = getattr(KStdAction, name)
-    obj = typ(parent, slot, collection)
-    obj.plug(pluggable)
-    return obj
+    typ = getattr(KStdAction, attr)
+    action = typ(slot, collection, name)
+    if pluggable:
+        action.plug(pluggable)
+    return action
 
 
 def buildPart(parent, servicetype, constraint, writable=False):
diff --git a/kberylsettings/main.py b/kberylsettings/main.py
index a0161fd..118c001 100644
--- a/kberylsettings/main.py
+++ b/kberylsettings/main.py
@@ -5,15 +5,15 @@
 """
 from sys import argv
 
-from qt import Qt, QWidget, QHBoxLayout, QLabel
 from kdecore import KApplication, KCmdLineArgs, KIcon, KGlobal, KWin, i18n
-from kdeui import KMainWindow, KStdGuiItem, KLineEdit
+from kdeui import KMainWindow, KStdGuiItem, KLineEdit, KSystemTray
 from kfile import KFileDialog
+from qt import Qt, QWidget, QHBoxLayout, QLabel
 
 from kberylsettings.about import about
 from kberylsettings.beryl import Context
 from kberylsettings.contentframe import ContentFrame
-from kberylsettings.lib import Signals, Slots, action, stdAction, icon
+from kberylsettings.lib import App, Signals, Slots, action, stdAction, icon
 from kberylsettings.plugindialog import PluginDialog
 from kberylsettings.pluginframe import PluginFrame
 from kberylsettings.widget import Frame, Popup, SmallPushButton, Splitter
@@ -25,11 +25,13 @@ class KBerylSetttings(KMainWindow):
     """
     viewMode = 0
     iconSize = 16
-    
+    startDir = '::kberylsettings'
+
     def __init__(self):
         KMainWindow.__init__(self)
         self.buildWidgets()
         self.buildMenus()
+        self.buildSystray()
         self.buildConnections()
         self.buildFinal()
 
@@ -38,6 +40,8 @@ class KBerylSetttings(KMainWindow):
 
         @return None
         """
+        actions = self.actionCollection()
+        actions.setHighlightingEnabled(True)
         self.mainSplitter = Splitter(self, Qt.Horizontal)
         self.leftFrame = Frame(self.mainSplitter)
         self.rightFrame = Frame(self.mainSplitter)
@@ -64,6 +68,17 @@ class KBerylSetttings(KMainWindow):
         menu.insertItem(i18n('&Settings'), self.settingsMenu())        
         menu.insertItem(i18n('&Help'), self.helpMenu())       
 
+    def buildSystray(self):
+        """ builds the system tray icon for this instance
+
+        @return None
+        """
+        self.quitFlag = False
+        self.sysTray = KSystemTray(self)
+        path = App.basedir + '/pixmaps/kberylsettings.svg'
+        self.sysTray.setPixmap(icon(path, size=KIcon.SizeSmallMedium))
+        self.sysTray.show()    
+
     def buildConnections(self):
         """ builds the connections for this instance
 
@@ -76,16 +91,14 @@ class KBerylSetttings(KMainWindow):
         connect(self.pluginList, Signals.showSettings, self.contentFrame.showSettings)
         connect(self.inputSearch, Signals.textChanged, self.pluginList.showSearch)
         connect(self.clearSearch, Signals.clicked, self.onClearSearch)
-        connect(self.importAction, Signals.activated, self.onImport)
-        connect(self.exportAction, Signals.activated, self.onExport)
         statusBar = self.statusBar()
+        connect(self.sysTray, Signals.quitSelected, self.onQuitSelected)
+        connect(self.quitAction, Signals.activated, self.onQuitSelected)
         actions = self.actionCollection()
-        actions.setHighlightingEnabled(True)
-        ## broken!
-        #connect(actions, SIGNAL('actionStatusText(const QString &)'),
-        #        self.statusBar(), SLOT('message( const QString & )'))
-        #connect(actions, SIGNAL('clearStatusText()'),
-        #        self.statusBar(), SLOT('clear()'))
+        connect(actions, Signals.actionStatusText, self.statusBar(),
+                Slots.messageText)
+        connect(actions, Signals.clearStatusText, self.statusBar(),
+                Slots.clear)
 
     def buildFinal(self):
         """ do everything else needed to create the widget
@@ -129,12 +142,16 @@ class KBerylSetttings(KMainWindow):
         """
         pop = Popup(self)
         actions =  self.actionCollection()
-        self.importAction = action('import', 'Import...', '', 'Import settings', 
-                                   'Import profile', actions, pop)
-        self.exportAction = action('export', 'Export...', '', 'Export current settings', 
-                                   'Export profile', actions, pop)
+        self.importAction = action('Import settings...', 'fileopen', 'Ctrl+O',
+                                   self.onImport, actions, 'import_action',
+                                   'Import settings from a file.',
+                                   pop)
+        self.exportAction = action('Export settings...', 'filesave', 'Ctrl+S',
+                                   self.onExport, actions, 'export_action',
+                                   'Export settings to a file.',
+                                   pop)
         pop.insertSeparator()
-        self.quitAction = stdAction(self, 'quit', Slots.close, actions, pop)
+        self.quitAction = stdAction('quit', self.close, actions, '', pop)
         return pop
 
     def viewMenu(self):
@@ -153,10 +170,12 @@ class KBerylSetttings(KMainWindow):
         @return KPopupMenu instance
         """
         pop = Popup(self)
-        self.pluginsAction = action('plugins', 'Select Plugins...', '',
-                                    'Select plugins', 'Select plugins',
-                                    self.actionCollection(), pop)
-        self.connect(self.pluginsAction, Signals.activated, self.onSelectPlugins)
+        self.pluginsAction = action('Select Plugins...', 'configure', 'Ctrl+P',
+                                    self.onSelectPlugins,
+                                    self.actionCollection(),
+                                    'select_plugins',
+                                    'Select Beryl plugins.',
+                                    pop)
         return pop    
 
     def modeMenu(self):
@@ -194,12 +213,16 @@ class KBerylSetttings(KMainWindow):
         
         @return True
         """
-        self.saveMainWindowSettings(self.config())
-        self.saveWindowSize(self.config('mainwindow'))
-        config = self.config('mainview')
-        config.writeEntry('iconsize', self.iconSize)
-        config.writeEntry('viewmode', self.viewMode)
-        return True
+        flag = self.quitFlag
+        if flag:
+            self.saveMainWindowSettings(self.config())
+            self.saveWindowSize(self.config('mainwindow'))
+            config = self.config('mainview')
+            config.writeEntry('iconsize', self.iconSize)
+            config.writeEntry('viewmode', self.viewMode)
+        else:
+            self.hide()
+        return flag
 
     def onClearSearch(self):
         """ clears the search input, emits signal to set view mode
@@ -215,7 +238,7 @@ class KBerylSetttings(KMainWindow):
         @return None
         """
         self.context.write()
-        self.context.reload()        
+        self.context.reload()
 
     def onSettingChanged(self):
         """ writes the beryl context
@@ -223,6 +246,7 @@ class KBerylSetttings(KMainWindow):
         @return None
         """
         self.context.write()
+        self.context.reload()        
 
     def onIconSize(self, value):
         """ changes the View Icon Size menu
@@ -247,6 +271,14 @@ class KBerylSetttings(KMainWindow):
         context.active = active
         self.emit(Signals.berylContextChanged, (context, ))
 
+    def onQuitSelected(self):
+        """ sets quit flag and calls application to quit
+
+        @return None
+        """
+        self.quitFlag = True
+        KApplication.kApplication().quit()
+
     def onSelectPlugins(self):
         """ shows dialog to select/deselect active plugins
 
@@ -268,14 +300,24 @@ class KBerylSetttings(KMainWindow):
             self.iconSizePopup.setItemEnabled(menuid, not value)
         for mode, menuid in self.modePopupIds.items():
             self.modePopup.setItemChecked(menuid, mode==value)
-
+    
     def onImport(self):
-        filename = KFileDialog.getOpenFileName('::kberylsettings')
+        """ shows dialog to select profile for import
+
+        @return None
+        """
+        filename = KFileDialog.getOpenFileName(self.startDir, None, self,
+                                               'Select Profile to Import')
         if filename:
             print 'importing file...', filename
 
     def onExport(self):
-        filename = KFileDialog.getSaveFileName('::kberylsettings')
+        """ shows dialog to select filename for profile export
+
+        @return None
+        """
+        filename = KFileDialog.getSaveFileName(self.startDir, None, self,
+                                               'Select File to Export Profile')
         if filename:
             print 'exporting file...', filename
 
@@ -303,14 +345,15 @@ def main():
     """ runs the KBerylSettings window with a KApplication
 
     @return None
-    """
+p    """
     aboutdata = about()
     KCmdLineArgs.init(argv, aboutdata)
     app = KApplication()
     obj = KBerylSetttings()
     obj.show()
     app.exec_loop()
-
+        
+        
 
 if __name__ == '__main__':
     main()
diff --git a/kberylsettings/pixmaps/Makefile b/kberylsettings/pixmaps/Makefile
deleted file mode 100644
index 27ab93a..0000000
--- a/kberylsettings/pixmaps/Makefile
+++ /dev/null
@@ -1,399 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# pixmaps/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/beryl-settings
-pkglibdir = $(libdir)/beryl-settings
-pkgincludedir = $(includedir)/beryl-settings
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = pixmaps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pixmapsdir)"
-pixmapsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pixmaps_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/troy/tmp/beryl/beryl-settings/missing --run aclocal-1.9
-ALL_LINGUAS = 
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/troy/tmp/beryl/beryl-settings/missing --run tar
-AUTOCONF = ${SHELL} /home/troy/tmp/beryl/beryl-settings/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/troy/tmp/beryl/beryl-settings/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/troy/tmp/beryl/beryl-settings/missing --run automake-1.9
-AWK = gawk
-BERYL_SETTINGS_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/startup-notification-1.0 -I/usr/include/beryl  
-BERYL_SETTINGS_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lberylsettings -lpng12 -lXcomposite -lXdamage -lXrandr -lSM -lXinerama -lstartup-notification-1 -lXfixes -lICE  
-BERYL_SETTINGS_REQUIRES = 		    gtk+-2.0 >= 2.8.0             berylsettings             beryl
-CATALOGS = 
-CATOBJEXT = .gmo
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -O0 -ggdb3 -gstabs+ -Wall
-CPP = gcc -E
-CPPFLAGS = 
-CYGPATH_W = echo
-DATADIRNAME = share
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /bin/grep -E
-EXEEXT = 
-GETTEXT_PACKAGE = beryl-settings
-GMOFILES = 
-GMSGFMT = /usr/bin/gmsgfmt
-GREP = /bin/grep
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-INSTOBJEXT = .mo
-INTLLIBS = 
-INTLTOOL_CAVES_RULE = %.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_DESKTOP_RULE = %.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_DIRECTORY_RULE = %.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_EXTRACT = $(top_builddir)/intltool-extract
-INTLTOOL_ICONV = /usr/bin/iconv
-INTLTOOL_KBD_RULE = %.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_KEYS_RULE = %.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_MERGE = $(top_builddir)/intltool-merge
-INTLTOOL_MSGFMT = /usr/bin/msgfmt
-INTLTOOL_MSGMERGE = /usr/bin/msgmerge
-INTLTOOL_OAF_RULE = %.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@
-INTLTOOL_PERL = /usr/bin/perl
-INTLTOOL_PONG_RULE = %.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_PROP_RULE = %.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SCHEMAS_RULE = %.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SERVER_RULE = %.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SERVICE_RULE = %.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SHEET_RULE = %.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_SOUNDLIST_RULE = %.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_THEME_RULE = %.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_UI_RULE = %.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_UPDATE = $(top_builddir)/intltool-update
-INTLTOOL_XAM_RULE = %.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-INTLTOOL_XGETTEXT = /usr/bin/xgettext
-INTLTOOL_XML_NOMERGE_RULE = %.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
-INTLTOOL_XML_RULE = %.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /home/troy/tmp/beryl/beryl-settings/missing --run makeinfo
-MKINSTALLDIRS = ./mkinstalldirs
-MSGFMT = /usr/bin/msgfmt
-OBJEXT = o
-PACKAGE = beryl-settings
-PACKAGE_BUGREPORT = livinglatexkali@gmail.com
-PACKAGE_NAME = beryl-settings
-PACKAGE_STRING = beryl-settings 0.1.3
-PACKAGE_TARNAME = beryl-settings
-PACKAGE_VERSION = 0.1.3
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-PKG_CONFIG_PATH = /usr/lib/pkgconfig:/usr/qt/3/lib/pkgconfig
-POFILES = 
-POSUB = po
-PO_IN_DATADIR_FALSE = 
-PO_IN_DATADIR_TRUE = 
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = 
-USE_NLS = yes
-VERSION = 0.1.3
-XGETTEXT = /usr/bin/xgettext
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build_alias = 
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host_alias = 
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = /home/troy/tmp/beryl/beryl-settings/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-pixmapsdir = $(datadir)/pixmaps
-pixmaps_DATA = \
-                beryl-settings.svg                      \
-                beryl-settings-section-_.svg            \
-		beryl-settings-section-3d.svg		\
-                beryl-settings-section-animation.svg    \
-		beryl-settings-section-annotate.svg	\
-                beryl-settings-section-bench.svg        \
-                beryl-settings-section-blurfx.svg       \
-                beryl-settings-section-blur.svg         \
-                beryl-settings-section-bs.svg           \
-                beryl-settings-section-capture.svg      \
-                beryl-settings-section-crashhandler.svg \
-                beryl-settings-section-cube.svg         \
-                beryl-settings-section-dbus.svg         \
-                beryl-settings-section-decoration.svg   \
-                beryl-settings-section-fade.svg         \
-		beryl-settings-section-group.svg	\
-		beryl-settings-section-inputzoom.svg	\
-                beryl-settings-section-minimize.svg     \
-                beryl-settings-section-move.svg         \
-                beryl-settings-section-neg.svg          \
-                beryl-settings-section-place.svg        \
-                beryl-settings-section-plane.svg        \
-                beryl-settings-section-put.svg          \
-                beryl-settings-section-reflection.svg   \
-                beryl-settings-section-resize.svg       \
-                beryl-settings-section-rotate.svg       \
-                beryl-settings-section-scale.svg        \
-                beryl-settings-section-screenshot.svg   \
-                beryl-settings-section-showdesktop.svg  \
-                beryl-settings-section-splash.svg       \
-                beryl-settings-section-state.svg        \
-                beryl-settings-section-switcher.svg     \
-                beryl-settings-section-trailfocus.svg   \
-                beryl-settings-section-water.svg        \
-                beryl-settings-section-wobbly.svg       \
-                beryl-settings-section-zoom.svg
-
-EXTRA_DIST = $(pixmaps_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pixmaps/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  pixmaps/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-pixmapsDATA: $(pixmaps_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pixmapsdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapsdir)"
-	@list='$(pixmaps_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pixmapsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapsdir)/$$f'"; \
-	  $(pixmapsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapsdir)/$$f"; \
-	done
-
-uninstall-pixmapsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pixmaps_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pixmapsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pixmapsdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pixmapsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pixmapsDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-pixmapsDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pixmapsDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-pixmapsDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/kberylsettings/pixmaps/Makefile.am b/kberylsettings/pixmaps/Makefile.am
deleted file mode 100644
index b808034..0000000
--- a/kberylsettings/pixmaps/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-## Process this file with automake to produce Makefile.in
-pixmapsdir = $(datadir)/pixmaps
-pixmaps_DATA =                                          \
-                beryl-settings.svg                      \
-                beryl-settings-section-_.svg            \
-		beryl-settings-section-3d.svg		\
-                beryl-settings-section-animation.svg    \
-		beryl-settings-section-annotate.svg	\
-                beryl-settings-section-bench.svg        \
-                beryl-settings-section-blurfx.svg       \
-                beryl-settings-section-blur.svg         \
-                beryl-settings-section-bs.svg           \
-                beryl-settings-section-capture.svg      \
-                beryl-settings-section-crashhandler.svg \
-                beryl-settings-section-cube.svg         \
-                beryl-settings-section-dbus.svg         \
-                beryl-settings-section-decoration.svg   \
-                beryl-settings-section-fade.svg         \
-		beryl-settings-section-group.svg	\
-		beryl-settings-section-inputzoom.svg	\
-                beryl-settings-section-minimize.svg     \
-                beryl-settings-section-move.svg         \
-                beryl-settings-section-neg.svg          \
-                beryl-settings-section-place.svg        \
-                beryl-settings-section-plane.svg        \
-                beryl-settings-section-put.svg          \
-                beryl-settings-section-reflection.svg   \
-                beryl-settings-section-resize.svg       \
-                beryl-settings-section-rotate.svg       \
-                beryl-settings-section-scale.svg        \
-                beryl-settings-section-screenshot.svg   \
-                beryl-settings-section-showdesktop.svg  \
-                beryl-settings-section-splash.svg       \
-                beryl-settings-section-state.svg        \
-                beryl-settings-section-switcher.svg     \
-                beryl-settings-section-trailfocus.svg   \
-                beryl-settings-section-water.svg        \
-                beryl-settings-section-wobbly.svg       \
-                beryl-settings-section-zoom.svg
-
-EXTRA_DIST = $(pixmaps_DATA)
diff --git a/kberylsettings/pixmaps/Makefile.in b/kberylsettings/pixmaps/Makefile.in
deleted file mode 100644
index 673a3ec..0000000
--- a/kberylsettings/pixmaps/Makefile.in
+++ /dev/null
@@ -1,399 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = pixmaps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pixmapsdir)"
-pixmapsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pixmaps_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BERYL_SETTINGS_CFLAGS = @BERYL_SETTINGS_CFLAGS@
-BERYL_SETTINGS_LIBS = @BERYL_SETTINGS_LIBS@
-BERYL_SETTINGS_REQUIRES = @BERYL_SETTINGS_REQUIRES@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-pixmapsdir = $(datadir)/pixmaps
-pixmaps_DATA = \
-                beryl-settings.svg                      \
-                beryl-settings-section-_.svg            \
-		beryl-settings-section-3d.svg		\
-                beryl-settings-section-animation.svg    \
-		beryl-settings-section-annotate.svg	\
-                beryl-settings-section-bench.svg        \
-                beryl-settings-section-blurfx.svg       \
-                beryl-settings-section-blur.svg         \
-                beryl-settings-section-bs.svg           \
-                beryl-settings-section-capture.svg      \
-                beryl-settings-section-crashhandler.svg \
-                beryl-settings-section-cube.svg         \
-                beryl-settings-section-dbus.svg         \
-                beryl-settings-section-decoration.svg   \
-                beryl-settings-section-fade.svg         \
-		beryl-settings-section-group.svg	\
-		beryl-settings-section-inputzoom.svg	\
-                beryl-settings-section-minimize.svg     \
-                beryl-settings-section-move.svg         \
-                beryl-settings-section-neg.svg          \
-                beryl-settings-section-place.svg        \
-                beryl-settings-section-plane.svg        \
-                beryl-settings-section-put.svg          \
-                beryl-settings-section-reflection.svg   \
-                beryl-settings-section-resize.svg       \
-                beryl-settings-section-rotate.svg       \
-                beryl-settings-section-scale.svg        \
-                beryl-settings-section-screenshot.svg   \
-                beryl-settings-section-showdesktop.svg  \
-                beryl-settings-section-splash.svg       \
-                beryl-settings-section-state.svg        \
-                beryl-settings-section-switcher.svg     \
-                beryl-settings-section-trailfocus.svg   \
-                beryl-settings-section-water.svg        \
-                beryl-settings-section-wobbly.svg       \
-                beryl-settings-section-zoom.svg
-
-EXTRA_DIST = $(pixmaps_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pixmaps/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  pixmaps/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-pixmapsDATA: $(pixmaps_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pixmapsdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapsdir)"
-	@list='$(pixmaps_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pixmapsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapsdir)/$$f'"; \
-	  $(pixmapsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapsdir)/$$f"; \
-	done
-
-uninstall-pixmapsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pixmaps_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pixmapsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pixmapsdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pixmapsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pixmapsDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-pixmapsDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pixmapsDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-pixmapsDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/kberylsettings/pixmaps/kberylsettings.svg b/kberylsettings/pixmaps/kberylsettings.svg
new file mode 100644
index 0000000..a9460dd
--- /dev/null
+++ b/kberylsettings/pixmaps/kberylsettings.svg
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/troy/tmp/beryl/branches/kberylsettings/kberylsettings/pixmaps"
+   sodipodi:docname="kberylsettings.svg"
+   version="1.0"
+   inkscape:export-filename="/home/andrew/Desktop/beryl_final/beryl_icon_final.png"
+   inkscape:export-xdpi="480"
+   inkscape:export-ydpi="480">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5316">
+      <stop
+         style="stop-color: rgb(239, 41, 41); stop-opacity: 0;"
+         offset="0"
+         id="stop5318" />
+      <stop
+         style="stop-color: rgb(164, 0, 0); stop-opacity: 1;"
+         offset="1"
+         id="stop5320" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5308">
+      <stop
+         style="stop-color: rgb(138, 226, 52); stop-opacity: 1;"
+         offset="0"
+         id="stop5310" />
+      <stop
+         style="stop-color: rgb(138, 226, 52); stop-opacity: 0;"
+         offset="1"
+         id="stop5312" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5268">
+      <stop
+         style="stop-color:#c00;stop-opacity:0.94117647;"
+         offset="0"
+         id="stop5270" />
+      <stop
+         style="stop-color: rgb(164, 0, 60); stop-opacity: 0;"
+         offset="1"
+         id="stop5272" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5252">
+      <stop
+         style="stop-color: rgb(138, 226, 52); stop-opacity: 1;"
+         offset="0"
+         id="stop5254" />
+      <stop
+         style="stop-color: rgb(138, 226, 52); stop-opacity: 0;"
+         offset="1"
+         id="stop5256" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5244">
+      <stop
+         style="stop-color: rgb(138, 226, 52); stop-opacity: 1;"
+         offset="0"
+         id="stop5246" />
+      <stop
+         style="stop-color: rgb(138, 226, 52); stop-opacity: 0;"
+         offset="1"
+         id="stop5248" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4743">
+      <stop
+         style="stop-color: rgb(78, 154, 6); stop-opacity: 1;"
+         offset="0"
+         id="stop4745" />
+      <stop
+         id="stop4751"
+         offset="0.5"
+         style="stop-color: rgb(115, 210, 22); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(78, 154, 6); stop-opacity: 1;"
+         offset="1"
+         id="stop4747" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5308"
+       id="linearGradient15047"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9448, -1.87839)"
+       x1="-46.42857"
+       y1="28.357143"
+       x2="-42.67857"
+       y2="46.392857" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5252"
+       id="linearGradient15068"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.9448, -1.87839)"
+       x1="-37.142857"
+       y1="27.107143"
+       x2="-36.546818"
+       y2="20.142857" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5244"
+       id="linearGradient15071"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.953602, 0.0211153, -0.0211153, 0.953602, 63.8732, -1.95327)"
+       x1="-47.013756"
+       y1="28.04245"
+       x2="-47.013756"
+       y2="20.321428" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4743"
+       id="linearGradient15077"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.16034, 0.0256928, -0.0256928, 1.16034, -3.33514, 0.090572)"
+       x1="12.184965"
+       y1="8.4777822"
+       x2="23.65625"
+       y2="8.2883787" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="27.579395"
+     inkscape:cy="18.506962"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1272"
+     inkscape:window-height="966"
+     inkscape:window-x="4"
+     inkscape:window-y="54"
+     width="48px"
+     height="48px"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="horizontal"
+       position="28.75"
+       id="guide2648" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 16.598434,1.1656986 L 4.7948944,6.8544945 L 2.6229628,14.41115 L 2.5254475,14.504446 L 22.207236,46.759276 L 22.268028,46.887898 L 22.299831,46.888599 L 22.330227,46.952913 L 22.458845,46.892122 L 22.610113,47.24548 L 23.34511,47.102658 L 23.725348,47.174716 L 23.893515,46.764796 L 45.108124,15.542793 L 43.148412,7.7673766 L 31.642161,1.4669854 L 16.598434,1.1656986 z "
+       id="path3816"
+       sodipodi:nodetypes="ccccccccccccccccc" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.974923;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       d="M 17.495286,11.323542 L 13.820229,23.28658 L 23.830558,23.399396 L 23.828151,23.50818 L 33.688616,23.83535 L 30.69173,11.724579 L 24.414637,11.76698 L 24.417044,11.658199 L 17.495286,11.323542 z "
+       id="path3818" />
+    <path
+       style="fill: rgb(204, 0, 0); fill-opacity: 1; stroke: url(#linearGradient15077); stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-opacity: 0;"
+       d="M 30.915135,3.2070595 L 17.207832,2.9398239 L 12.763428,7.0497022 L 17.162589,11.536791 L 30.721631,11.945859 L 35.063681,7.5434866 L 30.915135,3.2070595 z M 30.721631,11.945859 L 30.647506,12.016774 L 33.53722,24.052613 L 41.340752,17.332519 L 33.57107,24.162202 L 25.895567,39.845885 L 33.430044,23.977684 L 23.855646,23.838243 L 23.858856,23.693198 L 14.215954,23.370847 L 23.28118,44.866967 L 23.26994,45.374615 L 23.384341,45.123197 L 23.419,45.196523 L 23.42221,45.051478 L 23.574476,44.728348 L 42.524375,16.306657 L 43.041657,15.882768 L 35.239363,7.8013253 L 30.721631,11.945859 z M 16.80736,3.0035128 L 6.3913319,8.1057933 L 4.7850153,13.4757 L 16.80736,3.0035128 z M 31.309985,3.3971946 L 42.89247,14.428331 L 41.489961,8.9555231 L 31.309985,3.3971946 z M 12.687694,7.1931386 L 4.5353359,14.921306 L 4.9970856,15.366871 L 13.66803,23.540105 L 17.12472,11.60851 L 12.687694,7.1931386 z M 4.9970856,15.366871 L 22.804975,45.074094 L 13.519773,23.681935 L 4.9970856,15.366871 z "
+       id="path3820" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.953836;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.864407"
+       d="M 12.627219,7.202412 L 17.039189,11.604571 L 13.598262,23.519384 L 4.4624802,14.913141 L 12.627219,7.202412 z "
+       id="path3822"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill: url(#linearGradient15071); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;"
+       d="M 17.042814,11.244243 L 23.660562,11.567458 L 17.357592,11.314248 L 13.520506,23.209205 L 17.042814,11.244243 z "
+       id="path3824"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill: url(#linearGradient15068); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;"
+       d="M 30.459189,11.724054 L 23.70786,11.641303 L 30.434658,11.786542 L 33.44844,23.833202 L 30.459189,11.724054 z "
+       id="path3826"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.953836;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.864407"
+       d="M 35.161103,7.8038576 L 30.558609,12.006413 L 33.468773,24.061856 L 42.976541,15.86843 L 35.161103,7.8038576 z "
+       id="path3828"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.953836;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.864407"
+       d="M 6.3046555,8.0872908 L 17.158702,2.9249911 L 4.6982014,13.494844 L 6.3046555,8.0872908 z "
+       id="path3830"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.953836;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.864407"
+       d="M 41.413251,8.9415489 L 30.801599,3.1573605 L 42.862044,14.501939 L 41.413251,8.9415489 z "
+       id="path3832"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.953836;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.864407"
+       d="M 17.136269,2.9205755 L 30.826706,3.1954219 L 34.980746,7.5531627 L 30.627999,11.927521 L 17.07035,11.528748 L 12.70022,7.0503037 L 17.136269,2.9205755 z "
+       id="path3834"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.953836;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.864407"
+       d="M 13.429872,23.677639 L 22.727098,45.063548 L 4.8570132,15.307806 L 13.429872,23.677639 z "
+       id="path3836"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.953836;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.864407"
+       d="M 33.478026,24.147177 L 23.243315,45.100601 L 42.497162,16.209468 L 33.478026,24.147177 z "
+       id="path3838"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill: url(#linearGradient15047); fill-opacity: 1; stroke: white; stroke-width: 0.953836; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 0.864407;"
+       d="M 13.827571,23.481014 L 23.022577,45.119715 L 13.825439,23.293136 L 13.827571,23.481014 z "
+       id="path3840"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#418ade;fill-opacity:1;stroke:white;stroke-width:0.953836;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.864407"
+       d="M 13.782211,23.370912 L 23.179936,45.64859 L 33.340666,23.957471 L 13.782211,23.370912 z "
+       id="path3842"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/kberylsettings/plugindialog.py b/kberylsettings/plugindialog.py
index 3b981fe..ddd150d 100644
--- a/kberylsettings/plugindialog.py
+++ b/kberylsettings/plugindialog.py
@@ -2,13 +2,15 @@
 # -*- coding: utf-8 -*-
 """ kberylsettings.plugindialog -> defines a dialog box for selecting plugins.
 
+Tried to use KActionSelector instead of KListView, but it didn't make
+much sense.
 """
-from qt import QCheckListItem, QLabel
 from kdecore import i18n
 from kdeui import KDialogBase, KListView, KMessageBox
+from qt import QCheckListItem, QLabel
 
 from kberylsettings.lib import Signals, iconLoader
-### try to use KActionSelector
+
 
 class PluginList(KListView):
     """ PluginList -> list view for the select plugins dialog
diff --git a/kberylsettings/settingwidget.py b/kberylsettings/settingwidget.py
index f6de843..975775f 100644
--- a/kberylsettings/settingwidget.py
+++ b/kberylsettings/settingwidget.py
@@ -125,12 +125,11 @@ class NamedSettingWidget(BaseSettingWidget):
         layout.addWidget(view)
         for index, text in self.iconCorners:
             view.insertItem(text, index)
+        self.value = self.viewValue
+        
+    def viewValue(self):
+        return self.view.currentItem()
 
-    def value(self):
-        try:
-            return self.view.currentItem()
-        except (AttributeError, ):
-            raise
 
 class MatchNamedSettingWidget(BaseSettingWidget):
     """ Setting widget for settings with matching names.
@@ -166,7 +165,8 @@ class MatchNamedSettingWidget(BaseSettingWidget):
         layout = self.commonSetup(setting)
         self.view = KURLRequester(setting.Value, self)
         layout.addWidget(self.view)
-
+        self.value = self.urlValue
+        
     def filesSelector(self, parent, plugin, setting):
         layout = self.commonSetup(setting)
         #self.files = KURLComboBox(KURLComboBox.Files, self)
@@ -187,15 +187,15 @@ class MatchNamedSettingWidget(BaseSettingWidget):
                 grid.addWidget(cb, row, col)
         layout = self.commonSetup(setting)
         layout.addLayout(grid)
+        self.value = self.checkboxValues
 
-    def value(self):
-        try:
-            return str(self.view.url())
-        except (AttributeError, ):
-            def fix(o):
-                return str(o.text()).replace('&', '')
-            return [fix(check) for check in self.queryList('QCheckBox')
-                        if check.isChecked()]
+    def urlValue(self):
+        return str(self.view.url())
+
+    def checkboxValues(self):
+        def fix(o):
+            return str(o.text()).replace('&', '')
+        return [fix(cb) for cb in self.queryList('QCheckBox') if cb.isChecked()]
 
 
 class ColorSettingWidget(BaseSettingWidget):
@@ -274,19 +274,23 @@ class StringSettingWidget(BaseSettingWidget):
             s = ''
         if setting.Restrictions:
             other = self.combo = KComboBox(False, self)
+            self.value = self.comboValue
             for r in setting.Restrictions:
                 other.insertItem(r)
                 if s == r:
                     other.setCurrentItem(other.count()-1)
         else:
             other = self.line = KLineEdit(s, self)
+            self.value = self.lineValue
+            
         layout.addWidget(other)
 
-    def value(self):
-        try:
-            return str(self.line.text())
-        except (AttributeError, ):
-            return str(self.combo.currentText())
+    def lineValue(self):
+        return str(self.line.text())
+
+    def comboValue(self):
+        return str(self.combo.currentText())
+            
 
 class BindingSettingWidget(BaseSettingWidget):
     """ Setting widget for keyboard/mouse/edge bindings.