Merge lp:~rperier/language-selector/kcm into lp:language-selector

[Jonathan Riddell]

[Jonathan Riddell (jr)]

Awesomeness

After install the dialogue says "Translations and support have now been installed for Gaelic; Scottish Gaelic. Select them from the Add Language button." "Translations and support" should be changed depending on what has been installed. "Add Language button" should be changed to "Region & Language" (also add a comment to this translation that it refers to the name of the kcontrol module).

How about making the naming of the package consistent? language-selector-kde and language-selector-gnome

I think the "Select" tab should be "System Default"

I think qapt-batch is not called with --attach <winid>

There shouldn't be tickboxes in the uninstall tab, they're just confusing, clicking "Uninstall" should just uninstall everything.

When I set system language I get an error on the command line "ERROR:dbus.proxies:Introspect error on :1.1052:/: dbus.exceptions.DBusException: org.freedesktop.DBus.Error.AccessDenied: Rejected send message, 1 matched rules; type="method_call", sender=":1.1051" (uid=1000 pid=22332 comm="systemsettings) interface="org.freedesktop.DBus.Introspectable" member="Introspect" error name="(unset)" requested_reply=0 destination=":1.1052" (uid=0 pid=23133 comm="/usr/bin/python))"
I also get the polkit dialogue twice, which is strange.

I'm not sure "Language Support" is the best name for this kcontrol module, maybe "System Languages" would be better.

The patch in kdebase-workspace for launching qt-language-selector needs to go (or be changed to a pointer to the new kcm).

review: Needs Fixing

[Jonathan Riddell (jr)]

Oh and best to replace the debugging output with kdebug()

[Romain Perier (rperier)]

All changes have been applied, except:
- I've seriously no ideas for dbus error (it's apparently caused by "ls-dbus-backend")
- I did not found any informations about kdebug in PyKDE4 (nor Kwarning), does it exist in python ? (I'm wrong probably...)

In my humble opinion, we should bump language-selector to 0.14 since packages have been renamed and a lot of changes will be merge in LanguageSelector.qt .
And by the way, a new name for this kcmodule is open to suggestions, "language-selector" sounds good, but Harald disagrees.

[Jonathan Riddell (jr)]

Looking good

If I have a language half installed (e.g. have language-pack-en-kde installed but not -gnome) it pops up a dialogue on startup asking if I want to install the rest, if I click yes then it crashes. Maybe this dialogue should become a warning button on the install tab.

This isn't using the main kcontrol buttons. For the install/uninstall that probably isn't appropriate with further changes to the UI but for the select I think Apply can be used instead of a button within the tab?

A changelog can be added, use dch -i to do so

in debian/control language-selector-kde should replace/conflict language-selector-qt

[lp:~rperier/language-selector/kcm]

417. By Jonathan Riddell on 2011-02-23

* LanguageSelector/qt/QtLanguageSelector.py:
  - KCModule and kcontrol migration
  - Add same features than gtk frontend
  - New GUI
  - Migrate to polkit (no longer runs as root)
* dbus_backend/com.ubuntu.languageselector.policy.in:
  - Change policy to auth_admin_keep (avoids multiple polkit authentifications)
* debian:
  - Rename language-selector => language-selector-gnome
  - Rename language-selector-qt => language-selector-kde
  - Drop language-selector-qt.1 (not required anymore)
* data/qt-language-selector.desktop.in:
  - Rename to kde-language-selector
  - Make changes to be a kcmodule

=== modified file 'LanguageSelector/qt/QtLanguageSelector.py'
--- LanguageSelector/qt/QtLanguageSelector.py	2010-08-07 02:56:46 +0000
+++ LanguageSelector/qt/QtLanguageSelector.py	2011-02-22 18:57:39 +0000
@@ -13,7 +13,7 @@
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 from PyKDE4.kdecore import ki18n, KAboutData, KCmdLineArgs, KCmdLineOptions
-from PyKDE4.kdeui import KApplication, KIcon,  KMessageBox, KGuiItem
+from PyKDE4.kdeui import KApplication, KIcon,  KMessageBox, KGuiItem, KCModule, KWindowSystem
 
 from LanguageSelector.LanguageSelector import *
 from LanguageSelector.ImSwitch import ImSwitch
@@ -28,51 +28,30 @@
 def _(string):
     return utf8(i18n(string))
 
-class QtLanguageSelector(QWidget,LanguageSelectorBase):
+class QtLanguageSelector(KCModule, LanguageSelectorBase):
     """ actual implementation of the qt GUI """
 
-    def __init__(self, app, datadir, mode):
+    def __init__(self, datadir, component_data=None, parent=None):
         LanguageSelectorBase.__init__(self, datadir)
-        QWidget.__init__(self)
-        Ui_QtLanguageSelectorGUI.__init__(self)
+        KCModule.__init__(self, component_data, parent)
+        
+        self.parentApp = KApplication.kApplication()
         self.ui = Ui_QtLanguageSelectorGUI()
         self.ui.setupUi(self)
-
-        self.parentApp = app
-
+        self.about = MakeAboutData()
+        self.setAboutData(self.about)
+        
         self.setWindowIcon(KIcon("preferences-desktop-locale"))
-        self.ui.pushButtonSetSystemLanguage.setIcon(KIcon("dialog-ok"))
-        self.ui.pushButtonOk.setIcon(KIcon("dialog-ok"))
-        self.ui.pushButtonCancel.setIcon(KIcon("dialog-cancel"))
-        self.ui.pushButtonCancel_2.setIcon(KIcon("dialog-cancel"))
-
+        
         self.imSwitch = ImSwitch()
-
         # remove dangling ImSwitch symlinks if present
         self.imSwitch.removeDanglingSymlinks()
-
-        self.mode = mode
         self.init()
-        if mode == "uninstall":
-            self.ui.pushButtonOk.setText(_("Uninstall"))
-            self.ui.selectLanguageLabel.setText(_("Select language to uninstall:"))
-            self.ui.systemLanguageFrame.hide()
-        elif mode == "install":
-            self.ui.systemLanguageFrame.hide()
-        elif mode == "select":
-            self.ui.installLanguageFrame.hide()
-            self.resize(self.sizeHint())
-            self.setWindowTitle(_("Language Selector"))
-            self.checkInputMethods()
-        else:
-            print "ERROR: unknown mode"
 
         # connect the signals
-        app.connect(self.ui.listBoxDefaultLanguage, SIGNAL("itemSelectionChanged()"), self.checkInputMethods)
-        app.connect(self.ui.pushButtonOk, SIGNAL("clicked()"), self.onPushButtonOk)
-        app.connect(self.ui.pushButtonSetSystemLanguage, SIGNAL("clicked()"), self.onSystemPushButtonOk)
-        app.connect(self.ui.pushButtonCancel, SIGNAL("clicked()"), self.close)
-        app.connect(self.ui.pushButtonCancel_2, SIGNAL("clicked()"), self.close)
+        self.connect(self.ui.listViewLanguagesInst, SIGNAL("itemSelectionChanged()"), self.checkInstallableComponents)
+        self.connect(self.ui.listViewLanguagesUninst, SIGNAL("itemSelectionChanged()"), self.onChanged)
+        self.connect(self.ui.listBoxDefaultLanguage, SIGNAL("itemSelectionChanged()"), self.checkInputMethods)
 
     def init(self):
         self.translateUI()
@@ -113,17 +92,28 @@
         if True: #options.verify_installed:
             self.verifyInstalledLangPacks()
 
+    def save(self):
+        idx = self.ui.ktabwidget.currentIndex()
+
+        if idx == 0:
+            self.pkgChanges("install")
+        elif idx == 1:
+            self.pkgChanges("uninstall")
+        else:
+            self.onSystemLanguageApply()
 
     def translateUI(self):
         """ translate the strings in the UI, needed because Qt designer doesn't use gettext """
         self.ui.defaultSystemLabel.setText(_("Default system language:"))
-        self.ui.pushButtonSetSystemLanguage.setText(_("Set System Language"))
         self.ui.labelInputMethod.setText(_("Keyboard input method:"))
-        self.ui.pushButtonCancel_2.setText(_("Cancel"))
         self.ui.selectLanguageLabel.setText(_("Select language to install:"))
-        self.ui.pushButtonOk.setText(_("Install"))
-        self.ui.pushButtonCancel.setText(_("Cancel"))
-
+        self.ui.selectLanguageLabel_2.setText(_("Select language to uninstall:"))
+        self.ui.checkBoxTr.setText(_("Translations"))
+        self.ui.checkBoxIm.setText(_("Input methods"))
+        self.ui.checkBoxSpell.setText(_("Spellchecking and writing aids"))
+        self.ui.checkBoxFonts.setText(_("Extra fonts"))
+        self.ui.ComponentsLabel.setText(_("Components:"))
+         
     def updateSystemDefaultListbox(self):
         self.ui.listBoxDefaultLanguage.clear()
         self._localeinfo.localeToCodeMap = {}
@@ -139,7 +129,7 @@
             self._localeinfo.localeToCodeMap[name] = locale
         locales.sort()
         for localeName in locales:
-            item = QListWidgetItem(localeName, self.ui.listBoxDefaultLanguage)
+            item = QListWidgetItem(utf8(localeName), self.ui.listBoxDefaultLanguage)
             if defaultLangName == localeName:
                 item.setSelected(True)
         if (not os.path.exists("/etc/alternatives/xinput-all_ALL") or
@@ -174,61 +164,70 @@
                 self.setEnabled(True)
 
     def update(self):
-        lock = thread.allocate_lock()
-        lock.acquire()
-        t = thread.start_new_thread(self.run_pkg_manager_update,(lock,))
-        while lock.locked():
-            self.parentApp.processEvents()
-            time.sleep(0.05)
+        self.run_pkg_manager_update()
 
     def commit(self, inst, rm):
         # unlock here to make sure that lock/unlock are always run
         # pair-wise (and don't explode on errors)
         if len(inst) == 0 and len(rm) == 0:
             return
-        lock = thread.allocate_lock()
-        lock.acquire()
-        t = thread.start_new_thread(self.run_pkg_manager,(lock,inst,rm))
-        while lock.locked():
-            self.parentApp.processEvents()
-            time.sleep(0.05)
+        self.run_pkg_manager(inst,rm)
 
     def updateLanguagesList(self):
-        self.ui.listViewLanguages.clear()
+        self.ui.listViewLanguagesInst.clear()
+        self.ui.listViewLanguagesUninst.clear()
         # get the language names and sort them alphabetically
         languageList = self._cache.getLanguageInformation()
         self._localeinfo.listviewStrToLangInfoMap = {}
         for lang in languageList:
-            self._localeinfo.listviewStrToLangInfoMap[utf8(lang.language)] = lang
+            self._localeinfo.listviewStrToLangInfoMap[utf8(self._localeinfo.translate(lang.languageCode))] = lang
         languages = self._localeinfo.listviewStrToLangInfoMap.keys()
         languages.sort()
 
         for langName in languages:
             lang = self._localeinfo.listviewStrToLangInfoMap[langName]
-            elm = QListWidgetItem(utf8(lang.language), self.ui.listViewLanguages)
-
+            elmIn = QListWidgetItem(utf8(self._localeinfo.translate(lang.languageCode)), self.ui.listViewLanguagesInst)
+            elmUn = QListWidgetItem(utf8(self._localeinfo.translate(lang.languageCode)), self.ui.listViewLanguagesUninst)
+            
             if lang.fullInstalled:
-                if self.mode == "install":
-                    elm.setFlags(Qt.ItemIsDropEnabled)  #not sure how to unset all flags, but this disables the item
-                    elm.setToolTip(_("Already installed"))
-                else:
-                    elm.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
+                elmIn.setFlags(Qt.ItemIsDropEnabled)  #not sure how to unset all flags, but this disables the item
+                elmIn.setToolTip(_("Already installed"))
+                elmUn.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
             elif lang.inconsistent:
-                elm.setToolTip(_("Partially Installed"))
+                elmIn.setToolTip(_("Partially Installed"))
             else:
-                if self.mode == "uninstall":
-                    elm.setFlags(Qt.ItemIsDropEnabled)  #not sure how to unset all flags, but this disables the item
-                    elm.setToolTip(_("Not installed"))
-                    elm.setHidden(True)
-                else:
-                    elm.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
-
+                elmUn.setFlags(Qt.ItemIsDropEnabled)  #not sure how to unset all flags, but this disables the item
+                elmUn.setToolTip(_("Not installed"))
+                elmUn.setHidden(True)
+                elmIn.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
+
+    def onChanged(self):
+        self.changed()
+
+    def checkInstallableComponents(self):
+        """ check available components for the selected language
+            and set/unset the corresponding checkbutton accordingly
+        """
+        items = self.ui.listViewLanguagesInst.selectedItems()
+
+        if len(items) == 1:
+            self.changed()
+            li = self._localeinfo.listviewStrToLangInfoMap[unicode(items[0].text())]
+            for (button, langPkg) in (
+              ("checkBoxTr", li.languagePkgList["languagePack"]),
+              ("checkBoxIm", li.languagePkgList["languageSupportInputMethods"]),
+              ("checkBoxSpell", li.languagePkgList["languageSupportWritingAids"]),
+              ("checkBoxFonts", li.languagePkgList["languageSupportFonts"]) ):
+                getattr(self.ui, button).setChecked(langPkg.installed)
+                getattr(self.ui, button).setEnabled(langPkg.available)
+        
     def checkInputMethods(self):
-        """ check if the selected langauge has input method support
+        """ check if the selected language has input method support
             and set checkbutton_enable_input_methods accordingly
         """
-        if not self.imSwitch.available():
+        if (not self.imSwitch.available()) or (not self.getSystemLanguage()):
             return
+        self.changed()
         (lang, code) = self.getSystemLanguage()
 
         combo = self.ui.comboBoxInputMethod
@@ -243,28 +242,26 @@
             if IM == currentIM:
                 combo.setCurrentIndex(i)
 
-    def run_pkg_manager_update(self, lock):
+    def run_pkg_manager_update(self):
         self.returncode = 0
-        self.returncode = subprocess.call(["qapt-batch","--update"])
-        lock.release()
+        self.returncode = subprocess.call(["qapt-batch", "--attach", str(self.winId()), "--update"])
 
-    def run_pkg_manager(self, lock, to_inst, to_rm):
+    def run_pkg_manager(self, to_inst, to_rm):
         self.returncode = 0
         if len(to_inst) > 0:
             print str(["qapt-batch","--install"]+to_inst)
-            self.returncode = subprocess.call(["qapt-batch","--install"]+to_inst)
+            self.returncode = subprocess.call(["qapt-batch", "--attach", str(self.winId()), "--install"]+to_inst)
         # then remove
         if len(to_rm) > 0:
-            self.returncode = subprocess.call(["qapt-batch","--uninstall"]+to_rm)
-        lock.release()
+            print str(["qapt-batch","--uninstall"]+to_rm)
+            self.returncode = subprocess.call(["qapt-batch", "--attach", str(self.winId()), "--uninstall"]+to_rm)
 
-    def onSystemPushButtonOk(self):
+    def onSystemLanguageApply(self):
         (lang, code) = self.getSystemLanguage()
         self.writeSysLanguageSetting(code)
         self.writeSysLangSetting(code)
         self.updateInputMethods(code)
         KMessageBox.information(self, _("Default system Language now set to %s.") % lang, _("Language Set"))
-        self.close()
 
     def updateInputMethods(self,code):
         IM_choice = self.ui.comboBoxInputMethod.currentText()
@@ -273,7 +270,7 @@
     def getSystemLanguage(self):
         """ returns tuple of (lang, code) strings """
         items = self.ui.listBoxDefaultLanguage.selectedItems()
-        if len(items) == 1 and self.mode == "select":
+        if len(items) == 1:
             item = items[0]
             lang = item.text()
             new_locale = ("%s"%lang)
@@ -282,30 +279,32 @@
                 return (lang, code)
             except KeyError:
                 print "ERROR: can not find new_locale: '%s'"%new_locale
+      
+    def pkgChanges(self, mode):
 
-    def onPushButtonOk(self):
-        items = self.ui.listViewLanguages.selectedItems()
+        if mode == "install":
+            items = self.ui.listViewLanguagesInst.selectedItems()
+        else:
+            items = self.ui.listViewLanguagesUninst.selectedItems()
+            
         if len(items) == 1:
             elm = items[0]
             li = self._localeinfo.listviewStrToLangInfoMap[unicode(elm.text())]
-            if self.mode == "uninstall":
-#                self._cache.tryRemoveLanguage(li.languageCode)
-                for pkg in li.languagePkgList.values():
-                    if pkg.available:
-                        if pkg.installed:
-                            pkg.doChange = True
-                        else:
-                            pkg.doChange = False
-            else:
 #                self._cache.tryInstallLanguage(li.languageCode)
-                for pkg in li.languagePkgList.values():
-                    if pkg.available:
-                        if not pkg.installed:
-                            pkg.doChange = True
-                        else:
-                            pkg.doChange = False
+            for (button, langPkg) in (
+              ("checkBoxTr", li.languagePkgList["languagePack"]),
+              ("checkBoxIm", li.languagePkgList["languageSupportInputMethods"]),
+              ("checkBoxSpell", li.languagePkgList["languageSupportWritingAids"]),
+              ("checkBoxFonts", li.languagePkgList["languageSupportFonts"]) ):
+              if langPkg.available:
+                if (mode == "install") and (not langPkg.installed):
+                  langPkg.doChange = getattr(self.ui, button).isChecked()
+                elif (mode == "uninstall") and langPkg.installed:
+                  langPkg.doChange = True
             try:
                 self._cache.tryChangeDetails(li)
+                for langPkg in li.languagePkgList.values():
+                  langPkg.doChange = False
             except ExceptionPkgCacheBroken:
                 s = _("Software database is broken")
                 t = _("It is impossible to install or remove any software. "
@@ -317,33 +316,51 @@
 
         (to_inst, to_rm) = self._cache.getChangesList()
         if len(to_inst) == len(to_rm) == 0:
-            self.close()
             return
-
         # first install
         self.setCursor(Qt.WaitCursor)
         self.setEnabled(False)
-        lock = thread.allocate_lock()
-        lock.acquire()
-        t = thread.start_new_thread(self.run_pkg_manager,(lock,to_inst,to_rm))
-        while lock.locked():
-            self.parentApp.processEvents()
-            time.sleep(0.05)
+        self.run_pkg_manager(to_inst,to_rm)
         self.setCursor(Qt.ArrowCursor)
         self.setEnabled(True)
-
-        kdmscript = "/etc/init.d/kdm"
-        if os.path.exists("/var/run/kdm.pid") and os.path.exists(kdmscript):
-            subprocess.call(["invoke-rc.d","kdm","reload"])
+        
+#        kdmscript = "/etc/init.d/kdm"
+#        if os.path.exists("/var/run/kdm.pid") and os.path.exists(kdmscript):
+#            subprocess.call(["invoke-rc.d","kdm","reload"])
 
         #self.run_pkg_manager(to_inst, to_rm)
-        if self.returncode == 0 and self.mode == "install":
-            KMessageBox.information( self, _("Translations and support have now been installed for %s.  Select them from the Add Language button.") % unicode(items[0].text()), _("Language Installed") )
-        elif self.returncode == 0 and self.mode == "uninstall":
-            KMessageBox.information( self, _("Translations and support have now been uninstalled for %s.") % unicode(items[0].text()), _("Language Uninstalled") )
+
+        if self.returncode == 0:
+            if (mode == "install"):
+                KMessageBox.information( self, _("All selected components have now been installed for %s.  Select them from Country/Region & Language.") % unicode(items[0].text()), _("Language Installed") )
+            elif (mode == "uninstall"):
+                KMessageBox.information( self, _("Translations and support have now been uninstalled for %s.") % unicode(items[0].text()), _("Language Uninstalled") )
+            # Resync the cache to match packageManager changes, then update views
+            self._cache.open(None)
+            self.updateLanguagesList()
+            self.updateSystemDefaultListbox()
         else:
             KMessageBox.sorry(self, _("Failed to set system language."), _("Language Not Set"))
-        self.close()
+            self._cache.clear() # undo all selections
+            
+def MakeAboutData():
+  appName     = "language-selector"
+  catalog     = ""
+  programName = ki18n ("Language Selector")
+  version     = "0.3.4"
+  description = ki18n ("Language Selector")
+  license     = KAboutData.License_GPL
+  copyright   = ki18n ("(c) 2008 Canonical Ltd")
+  text        = ki18n ("none")
+  homePage    = "https://launchpad.net/language-selector"
+  bugEmail    = ""
+
+  aboutData   = KAboutData (appName, catalog, programName, version, description, license, copyright, text, homePage, bugEmail)
+  aboutData.addAuthor(ki18n("Michael Vogt"), ki18n("Developer"))
+  aboutData.addAuthor(ki18n("Jonathan Riddell"), ki18n("Developer"))
+  aboutData.addAuthor(ki18n("Harald Sitter"), ki18n("Developer"))
+  
+  return aboutData
 
 if __name__ == "__main__":
 
@@ -394,7 +411,7 @@
         KMessageBox.sorry(None, _("Please run this software with administrative rights."),  _("Not Root User"))
         sys.exit(1)
 
-    lc = QtLanguageSelector(app, "/usr/share/language-selector/", whattodo)
+    lc = QtLanguageSelector("/usr/share/language-selector/")
 
     lc.show()
 

=== modified file 'LanguageSelector/qt/QtLanguageSelectorGUI.py'
--- LanguageSelector/qt/QtLanguageSelectorGUI.py	2009-09-10 09:31:29 +0000
+++ LanguageSelector/qt/QtLanguageSelectorGUI.py	2011-02-22 18:57:39 +0000
@@ -2,88 +2,114 @@
 
 # Form implementation generated from reading ui file 'QtLanguageSelectorGUI.ui'
 #
-# Created: Thu Sep 10 11:27:14 2009
-#      by: PyQt4 UI code generator 4.5.2
+# Created: Tue Feb 22 18:52:25 2011
+#      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
 
 from PyQt4 import QtCore, QtGui
 
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    _fromUtf8 = lambda s: s
+
 class Ui_QtLanguageSelectorGUI(object):
     def setupUi(self, QtLanguageSelectorGUI):
-        QtLanguageSelectorGUI.setObjectName("QtLanguageSelectorGUI")
-        QtLanguageSelectorGUI.resize(432, 468)
-        self.gridlayout = QtGui.QGridLayout(QtLanguageSelectorGUI)
-        self.gridlayout.setMargin(9)
-        self.gridlayout.setSpacing(6)
-        self.gridlayout.setObjectName("gridlayout")
-        self.installLanguageFrame = QtGui.QFrame(QtLanguageSelectorGUI)
-        self.installLanguageFrame.setFrameShape(QtGui.QFrame.NoFrame)
-        self.installLanguageFrame.setFrameShadow(QtGui.QFrame.Raised)
-        self.installLanguageFrame.setObjectName("installLanguageFrame")
-        self.gridlayout1 = QtGui.QGridLayout(self.installLanguageFrame)
-        self.gridlayout1.setMargin(9)
-        self.gridlayout1.setSpacing(6)
-        self.gridlayout1.setObjectName("gridlayout1")
-        self.listViewLanguages = QtGui.QListWidget(self.installLanguageFrame)
-        self.listViewLanguages.setObjectName("listViewLanguages")
-        self.gridlayout1.addWidget(self.listViewLanguages, 1, 0, 1, 3)
-        self.pushButtonOk = QtGui.QPushButton(self.installLanguageFrame)
-        self.pushButtonOk.setObjectName("pushButtonOk")
-        self.gridlayout1.addWidget(self.pushButtonOk, 2, 1, 1, 1)
-        self.pushButtonCancel = QtGui.QPushButton(self.installLanguageFrame)
-        self.pushButtonCancel.setObjectName("pushButtonCancel")
-        self.gridlayout1.addWidget(self.pushButtonCancel, 2, 2, 1, 1)
-        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridlayout1.addItem(spacerItem, 2, 0, 1, 1)
-        self.selectLanguageLabel = QtGui.QLabel(self.installLanguageFrame)
+        QtLanguageSelectorGUI.setObjectName(_fromUtf8("QtLanguageSelectorGUI"))
+        QtLanguageSelectorGUI.resize(557, 407)
+        self.verticalLayout = QtGui.QVBoxLayout(QtLanguageSelectorGUI)
+        self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+        self.ktabwidget = KTabWidget(QtLanguageSelectorGUI)
+        self.ktabwidget.setObjectName(_fromUtf8("ktabwidget"))
+        self.InstallTab = QtGui.QWidget()
+        self.InstallTab.setObjectName(_fromUtf8("InstallTab"))
+        self.verticalLayout_2 = QtGui.QVBoxLayout(self.InstallTab)
+        self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
+        self.selectLanguageLabel = QtGui.QLabel(self.InstallTab)
         self.selectLanguageLabel.setWordWrap(False)
-        self.selectLanguageLabel.setObjectName("selectLanguageLabel")
-        self.gridlayout1.addWidget(self.selectLanguageLabel, 0, 0, 1, 2)
-        self.gridlayout.addWidget(self.installLanguageFrame, 1, 0, 1, 1)
-        self.systemLanguageFrame = QtGui.QFrame(QtLanguageSelectorGUI)
-        self.systemLanguageFrame.setFrameShape(QtGui.QFrame.NoFrame)
-        self.systemLanguageFrame.setFrameShadow(QtGui.QFrame.Raised)
-        self.systemLanguageFrame.setObjectName("systemLanguageFrame")
-        self.gridlayout2 = QtGui.QGridLayout(self.systemLanguageFrame)
-        self.gridlayout2.setMargin(9)
-        self.gridlayout2.setSpacing(6)
-        self.gridlayout2.setObjectName("gridlayout2")
-        self.pushButtonCancel_2 = QtGui.QPushButton(self.systemLanguageFrame)
-        self.pushButtonCancel_2.setObjectName("pushButtonCancel_2")
-        self.gridlayout2.addWidget(self.pushButtonCancel_2, 3, 2, 1, 1)
-        self.listBoxDefaultLanguage = QtGui.QListWidget(self.systemLanguageFrame)
-        self.listBoxDefaultLanguage.setObjectName("listBoxDefaultLanguage")
-        self.gridlayout2.addWidget(self.listBoxDefaultLanguage, 1, 0, 1, 3)
-        self.pushButtonSetSystemLanguage = QtGui.QPushButton(self.systemLanguageFrame)
-        self.pushButtonSetSystemLanguage.setObjectName("pushButtonSetSystemLanguage")
-        self.gridlayout2.addWidget(self.pushButtonSetSystemLanguage, 3, 1, 1, 1)
-        self.defaultSystemLabel = QtGui.QLabel(self.systemLanguageFrame)
+        self.selectLanguageLabel.setObjectName(_fromUtf8("selectLanguageLabel"))
+        self.verticalLayout_2.addWidget(self.selectLanguageLabel)
+        self.listViewLanguagesInst = QtGui.QListWidget(self.InstallTab)
+        self.listViewLanguagesInst.setObjectName(_fromUtf8("listViewLanguagesInst"))
+        self.verticalLayout_2.addWidget(self.listViewLanguagesInst)
+        self.gridLayout = QtGui.QGridLayout()
+        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.checkBoxTr = QtGui.QCheckBox(self.InstallTab)
+        self.checkBoxTr.setEnabled(False)
+        self.checkBoxTr.setObjectName(_fromUtf8("checkBoxTr"))
+        self.gridLayout.addWidget(self.checkBoxTr, 1, 0, 1, 1)
+        self.checkBoxIm = QtGui.QCheckBox(self.InstallTab)
+        self.checkBoxIm.setEnabled(False)
+        self.checkBoxIm.setObjectName(_fromUtf8("checkBoxIm"))
+        self.gridLayout.addWidget(self.checkBoxIm, 2, 0, 1, 1)
+        self.checkBoxSpell = QtGui.QCheckBox(self.InstallTab)
+        self.checkBoxSpell.setEnabled(False)
+        self.checkBoxSpell.setObjectName(_fromUtf8("checkBoxSpell"))
+        self.gridLayout.addWidget(self.checkBoxSpell, 1, 1, 1, 1)
+        self.checkBoxFonts = QtGui.QCheckBox(self.InstallTab)
+        self.checkBoxFonts.setEnabled(False)
+        self.checkBoxFonts.setObjectName(_fromUtf8("checkBoxFonts"))
+        self.gridLayout.addWidget(self.checkBoxFonts, 2, 1, 1, 1)
+        self.ComponentsLabel = QtGui.QLabel(self.InstallTab)
+        self.ComponentsLabel.setObjectName(_fromUtf8("ComponentsLabel"))
+        self.gridLayout.addWidget(self.ComponentsLabel, 0, 0, 1, 1)
+        self.verticalLayout_2.addLayout(self.gridLayout)
+        self.ktabwidget.addTab(self.InstallTab, _fromUtf8(""))
+        self.UninstallTab = QtGui.QWidget()
+        self.UninstallTab.setObjectName(_fromUtf8("UninstallTab"))
+        self.verticalLayout_3 = QtGui.QVBoxLayout(self.UninstallTab)
+        self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
+        self.selectLanguageLabel_2 = QtGui.QLabel(self.UninstallTab)
+        self.selectLanguageLabel_2.setWordWrap(False)
+        self.selectLanguageLabel_2.setObjectName(_fromUtf8("selectLanguageLabel_2"))
+        self.verticalLayout_3.addWidget(self.selectLanguageLabel_2)
+        self.listViewLanguagesUninst = QtGui.QListWidget(self.UninstallTab)
+        self.listViewLanguagesUninst.setObjectName(_fromUtf8("listViewLanguagesUninst"))
+        self.verticalLayout_3.addWidget(self.listViewLanguagesUninst)
+        self.ktabwidget.addTab(self.UninstallTab, _fromUtf8(""))
+        self.SystemDefaultTab = QtGui.QWidget()
+        self.SystemDefaultTab.setObjectName(_fromUtf8("SystemDefaultTab"))
+        self.verticalLayout_4 = QtGui.QVBoxLayout(self.SystemDefaultTab)
+        self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4"))
+        self.defaultSystemLabel = QtGui.QLabel(self.SystemDefaultTab)
         self.defaultSystemLabel.setWordWrap(False)
-        self.defaultSystemLabel.setObjectName("defaultSystemLabel")
-        self.gridlayout2.addWidget(self.defaultSystemLabel, 0, 0, 1, 2)
-        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridlayout2.addItem(spacerItem1, 3, 0, 1, 1)
-        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridlayout2.addItem(spacerItem2, 2, 0, 1, 1)
-        self.comboBoxInputMethod = QtGui.QComboBox(self.systemLanguageFrame)
-        self.comboBoxInputMethod.setObjectName("comboBoxInputMethod")
-        self.gridlayout2.addWidget(self.comboBoxInputMethod, 2, 2, 1, 1)
-        self.labelInputMethod = QtGui.QLabel(self.systemLanguageFrame)
-        self.labelInputMethod.setObjectName("labelInputMethod")
-        self.gridlayout2.addWidget(self.labelInputMethod, 2, 1, 1, 1)
-        self.gridlayout.addWidget(self.systemLanguageFrame, 0, 0, 1, 1)
+        self.defaultSystemLabel.setObjectName(_fromUtf8("defaultSystemLabel"))
+        self.verticalLayout_4.addWidget(self.defaultSystemLabel)
+        self.listBoxDefaultLanguage = QtGui.QListWidget(self.SystemDefaultTab)
+        self.listBoxDefaultLanguage.setObjectName(_fromUtf8("listBoxDefaultLanguage"))
+        self.verticalLayout_4.addWidget(self.listBoxDefaultLanguage)
+        self.horizontalLayout_4 = QtGui.QHBoxLayout()
+        self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4"))
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_4.addItem(spacerItem)
+        self.labelInputMethod = QtGui.QLabel(self.SystemDefaultTab)
+        self.labelInputMethod.setObjectName(_fromUtf8("labelInputMethod"))
+        self.horizontalLayout_4.addWidget(self.labelInputMethod)
+        self.comboBoxInputMethod = QtGui.QComboBox(self.SystemDefaultTab)
+        self.comboBoxInputMethod.setObjectName(_fromUtf8("comboBoxInputMethod"))
+        self.horizontalLayout_4.addWidget(self.comboBoxInputMethod)
+        self.verticalLayout_4.addLayout(self.horizontalLayout_4)
+        self.ktabwidget.addTab(self.SystemDefaultTab, _fromUtf8(""))
+        self.verticalLayout.addWidget(self.ktabwidget)
 
         self.retranslateUi(QtLanguageSelectorGUI)
+        self.ktabwidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(QtLanguageSelectorGUI)
 
     def retranslateUi(self, QtLanguageSelectorGUI):
         QtLanguageSelectorGUI.setWindowTitle(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Language Installer", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonOk.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Install", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonCancel.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
         self.selectLanguageLabel.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Select language to install:", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonCancel_2.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonSetSystemLanguage.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Set System Language", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxTr.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Translations", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxIm.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Input methods", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxSpell.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Spellchecking and writing aids", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkBoxFonts.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Extra fonts", None, QtGui.QApplication.UnicodeUTF8))
+        self.ComponentsLabel.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Components:", None, QtGui.QApplication.UnicodeUTF8))
+        self.ktabwidget.setTabText(self.ktabwidget.indexOf(self.InstallTab), QtGui.QApplication.translate("QtLanguageSelectorGUI", "Install", None, QtGui.QApplication.UnicodeUTF8))
+        self.selectLanguageLabel_2.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Select language to uninstall:", None, QtGui.QApplication.UnicodeUTF8))
+        self.ktabwidget.setTabText(self.ktabwidget.indexOf(self.UninstallTab), QtGui.QApplication.translate("QtLanguageSelectorGUI", "Uninstall", None, QtGui.QApplication.UnicodeUTF8))
         self.defaultSystemLabel.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Default system language:", None, QtGui.QApplication.UnicodeUTF8))
         self.labelInputMethod.setText(QtGui.QApplication.translate("QtLanguageSelectorGUI", "Keyboard input method:", None, QtGui.QApplication.UnicodeUTF8))
+        self.ktabwidget.setTabText(self.ktabwidget.indexOf(self.SystemDefaultTab), QtGui.QApplication.translate("QtLanguageSelectorGUI", "System Default", None, QtGui.QApplication.UnicodeUTF8))
 
+from PyKDE4.kdeui import KTabWidget

=== modified file 'LanguageSelector/qt/QtLanguageSelectorGUI.ui'
--- LanguageSelector/qt/QtLanguageSelectorGUI.ui	2009-09-10 02:47:55 +0000
+++ LanguageSelector/qt/QtLanguageSelectorGUI.ui	2011-02-22 18:57:39 +0000
@@ -6,163 +6,169 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>432</width>
-    <height>468</height>
+    <width>557</width>
+    <height>407</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Language Installer</string>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>9</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="1" column="0">
-    <widget class="QFrame" name="installLanguageFrame">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="1" column="0" colspan="3">
-       <widget class="QListWidget" name="listViewLanguages"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="pushButtonOk">
-        <property name="text">
-         <string>Install</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QPushButton" name="pushButtonCancel">
-        <property name="text">
-         <string>Cancel</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="selectLanguageLabel">
-        <property name="text">
-         <string>Select language to install:</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QFrame" name="systemLanguageFrame">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="3" column="2">
-       <widget class="QPushButton" name="pushButtonCancel_2">
-        <property name="text">
-         <string>Cancel</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="3">
-       <widget class="QListWidget" name="listBoxDefaultLanguage"/>
-      </item>
-      <item row="3" column="1">
-       <widget class="QPushButton" name="pushButtonSetSystemLanguage">
-        <property name="text">
-         <string>Set System Language</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="defaultSystemLabel">
-        <property name="text">
-         <string>Default system language:</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="0">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="2">
-       <widget class="QComboBox" name="comboBoxInputMethod"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLabel" name="labelInputMethod">
-        <property name="text">
-         <string>Keyboard input method:</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="KTabWidget" name="ktabwidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="InstallTab">
+      <attribute name="title">
+       <string>Install</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="selectLanguageLabel">
+         <property name="text">
+          <string>Select language to install:</string>
+         </property>
+         <property name="wordWrap">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QListWidget" name="listViewLanguagesInst"/>
+       </item>
+       <item>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="checkBoxTr">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="text">
+            <string>Translations</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="checkBoxIm">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="text">
+            <string>Input methods</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QCheckBox" name="checkBoxSpell">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="text">
+            <string>Spellchecking and writing aids</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QCheckBox" name="checkBoxFonts">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="text">
+            <string>Extra fonts</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="ComponentsLabel">
+           <property name="text">
+            <string>Components:</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="UninstallTab">
+      <attribute name="title">
+       <string>Uninstall</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QLabel" name="selectLanguageLabel_2">
+         <property name="text">
+          <string>Select language to uninstall:</string>
+         </property>
+         <property name="wordWrap">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QListWidget" name="listViewLanguagesUninst"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="SystemDefaultTab">
+      <attribute name="title">
+       <string>System Default</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <widget class="QLabel" name="defaultSystemLabel">
+         <property name="text">
+          <string>Default system language:</string>
+         </property>
+         <property name="wordWrap">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QListWidget" name="listBoxDefaultLanguage"/>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="labelInputMethod">
+           <property name="text">
+            <string>Keyboard input method:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="comboBoxInputMethod"/>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>KTabWidget</class>
+   <extends>QTabWidget</extends>
+   <header>ktabwidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>

=== renamed file 'data/incomplete-language-support-qt.note.in' => 'data/incomplete-language-support-kde.note.in'
=== renamed file 'data/qt-language-selector.desktop.in' => 'data/kde-language-selector.desktop.in'
--- data/qt-language-selector.desktop.in	2009-09-08 15:33:56 +0000
+++ data/kde-language-selector.desktop.in	2011-02-22 18:57:39 +0000
@@ -1,13 +1,17 @@
 [Desktop Entry]
-_Name=Language Support
+_Name=System Languages
 _Comment=Configure multiple and native language support on your system
-Exec=/usr/bin/qt-language-selector
+
+Exec=kcmshell4 language-selector
 Icon=preferences-desktop-locale
-Terminal=false
-Type=Application
+Type=Service
 Encoding=UTF-8
-Categories=Application;System;
-X-KDE-SubstituteUID=true
+
+X-KDE-ServiceTypes=KCModule
+X-KDE-Library=kpythonpluginfactory
+X-KDE-ParentApp=kcontrol
+X-KDE-PluginKeyword=language-selector/language-selector.py
+X-KDE-System-Settings-Parent-Category=locale
+X-KDE-Weight=90
+X-DocPath=kcontrol/language/index.html
 X-Ubuntu-Gettext-Domain=language-selector
-NoDisplay=true
-OnlyShowIn=KDE

=== removed file 'data/qt-language-selector.1'
--- data/qt-language-selector.1	2009-09-10 21:21:13 +0000
+++ data/qt-language-selector.1	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH QT\-LANGUAGE\-SELECTOR 1 "Sep 2009" "K Desktop Environment" "Language Selector"
-.SH NAME
-qt\-language\-selector
-\- Language Selector
-.SH SYNOPSIS
-qt\-language\-selector [Qt\-options] [KDE\-options] [options] [install] [uninstall] [select] 
-.SH DESCRIPTION
-Language Selector
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B install
-install a language
-.TP
-.B uninstall
-uninstall a language
-.TP
-.B select
-select a language
-.SS Options:
-.TP
-.B  \-\-mode  
-REQUIRED: install, uninstall or select must follow [select]
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-kde  
-Show KDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS KDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.TP
-.B  \-\-stylesheet  
-<file.qss>   applies the Qt stylesheet to the application widgets
-.TP
-.B  \-\-graphicssystem  <system>
-use a different graphics system instead of the default one, options are raster and opengl (experimental)
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/qt\-language\-selector/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/qt\-language\-selector/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Rob Bean
-.br
-

=== modified file 'dbus_backend/com.ubuntu.languageselector.policy.in'
--- dbus_backend/com.ubuntu.languageselector.policy.in	2010-05-19 09:08:57 +0000
+++ dbus_backend/com.ubuntu.languageselector.policy.in	2011-02-22 18:57:39 +0000
@@ -20,7 +20,7 @@
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin</allow_active>
+      <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-14 16:17:48 +0000
+++ debian/changelog	2011-02-22 18:57:39 +0000
@@ -1,3 +1,22 @@
+language-selector (0.14) natty; urgency=low
+
+  * LanguageSelector/qt/QtLanguageSelector.py:
+    - KCModule and kcontrol migration
+    - Add same features than gtk frontend
+    - New GUI
+    - Migrate to polkit (no longer runs as root)
+  * dbus_backend/com.ubuntu.languageselector.policy.in:
+    - Change policy to auth_admin_keep (avoids multiple polkit authentifications)
+  * debian:
+    - Rename language-selector => language-selector-gnome
+    - Rename language-selector-qt => language-selector-kde
+    - Drop language-selector-qt.1 (not required anymore)
+  * data/qt-language-selector.desktop.in:
+    - Rename to kde-language-selector
+    - Make changes to be a kcmodule
+
+ -- Romain Perier <[e-mail]>  Tue, 22 Feb 2011 18:58:21 +0100
+
 language-selector (0.13) natty; urgency=low
 
   [ Gunnar Hjalmarsson ]

=== modified file 'debian/control'
--- debian/control	2011-01-11 04:57:31 +0000
+++ debian/control	2011-02-22 18:57:39 +0000
@@ -10,7 +10,7 @@
 Standards-Version: 3.9.1
 Vcs-Bzr: http://bazaar.launchpad.net/%7Eubuntu-core-dev/language-selector/ubuntu/
 
-Package: language-selector
+Package: language-selector-gnome
 Architecture: all
 Depends: language-selector-common (= ${binary:Version}),
  ${misc:Depends},
@@ -28,7 +28,7 @@
  .
  This package contains the GTK+ frontend.
 
-Package: language-selector-qt
+Package: language-selector-kde
 Architecture: all
 Depends: language-selector-common (= ${binary:Version}),
  ${misc:Depends},

=== renamed file 'debian/language-selector.install' => 'debian/language-selector-gnome.install'
=== renamed file 'debian/language-selector.manpages' => 'debian/language-selector-gnome.manpages'
=== renamed file 'debian/language-selector-qt.install' => 'debian/language-selector-kde.install'
--- debian/language-selector-qt.install	2009-03-02 16:34:21 +0000
+++ debian/language-selector-kde.install	2011-02-22 18:57:39 +0000
@@ -1,4 +1,4 @@
-usr/bin/qt-language-selector
+usr/share/kde4/apps/language-selector/language-selector.py
 usr/lib/python*/*-packages/LanguageSelector/qt
-usr/share/applications/qt-language-selector.desktop
-../../data/incomplete-language-support-qt.note usr/share/language-support
+usr/share/kde4/services/language-selector.desktop
+../../data/incomplete-language-support-kde.note usr/share/language-support

=== removed file 'debian/language-selector-qt.manpages'
--- debian/language-selector-qt.manpages	2009-09-10 21:21:13 +0000
+++ debian/language-selector-qt.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-data/qt-language-selector.1

=== renamed file 'qt-language-selector' => 'kde-language-selector'
--- qt-language-selector	2008-08-26 11:33:42 +0000
+++ kde-language-selector	2011-02-22 18:57:39 +0000
@@ -15,6 +15,11 @@
 def _(string):
     return unicode(i18n(string), "utf-8")
 
+def CreatePlugin(widget_parent, parent, component_data):
+    gettext.bindtextdomain("language-selector", "/usr/share/locale")
+    gettext.textdomain("language-selector")
+    return QtLanguageSelector("/usr/share/language-selector/", component_data, widget_parent)
+
 if __name__ == "__main__":
 
     appName	= "language-selector"

=== modified file 'po/Makefile'
--- po/Makefile	2010-11-29 14:44:34 +0000
+++ po/Makefile	2011-02-22 18:57:39 +0000
@@ -14,7 +14,7 @@
 
 language-selector.pot:
 	intltool-extract --type=gettext/rfc822deb  ../data/incomplete-language-support-gnome.note.in
-	intltool-extract --type=gettext/rfc822deb  ../data/incomplete-language-support-qt.note.in
+	intltool-extract --type=gettext/rfc822deb  ../data/incomplete-language-support-kde.note.in
 	intltool-extract --type=gettext/rfc822deb  ../data/restart_session_required.note.in
 	intltool-update -p -g language-selector
 	

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-11-29 14:27:43 +0000
+++ po/POTFILES.in	2011-02-22 18:57:39 +0000
@@ -8,9 +8,9 @@
 LanguageSelector/qt/QtLanguageSelectorGUI.py
 [type: gettext/glade]data/LanguageSelector.ui
 data/language-selector.desktop.in
-data/qt-language-selector.desktop.in
+data/kde-language-selector.desktop.in
 [type: gettext/rfc822deb]/data/incomplete-language-support-gnome.note.in
-[type: gettext/rfc822deb]/data/incomplete-language-support-qt.note.in
+[type: gettext/rfc822deb]/data/incomplete-language-support-kde.note.in
 [type: gettext/rfc822deb]data/restart_session_required.note.in
 gnome-language-selector
 fontconfig-voodoo

=== modified file 'setup.py'
--- setup.py	2011-01-13 15:48:50 +0000
+++ setup.py	2011-02-22 18:57:39 +0000
@@ -5,6 +5,7 @@
 import os
 import sys
 
+PREFIX=sys.prefix
 GETTEXT_NAME="language-selector"
 I18NFILES = []
 for filepath in glob.glob("po/mo/*/LC_MESSAGES/*.mo"):
@@ -18,14 +19,17 @@
     assert(os.system("cd LanguageSelector/qt; make") == 0)
     assert(os.system("make -C po") == 0)
     assert(os.system("cd dbus_backend; make") == 0)
-    
+elif sys.argv[1] == "install":
+    for arg in sys.argv[2:]:
+        if "--prefix" in arg:
+            PREFIX=arg.split("=")[1]
+
 setup(name='language-selector',
       version='0.1',
       packages=['LanguageSelector',
                 'LanguageSelector.gtk',
                 'LanguageSelector.qt'],
-      scripts=['qt-language-selector',
-               'gnome-language-selector',
+      scripts=['gnome-language-selector',
                'check-language-support',
                'fontconfig-voodoo'],
       data_files=[('share/language-selector/data',
@@ -40,7 +44,12 @@
                     "data/im-switch.blacklist",
                     "data/LanguageSelector.ui"]),
                   ('share/applications',
-                   glob.glob("data/*.desktop")),
+                   ['data/language-selector.desktop']),
+                  # kcm stuff
+                  ('share/kde4/services',
+                   ['data/kde-language-selector.desktop']),
+                  ('share/kde4/apps/language-selector',
+                   ['kde-language-selector']),
                   # dbus stuff
                   ('share/dbus-1/system-services',
                    ['dbus_backend/com.ubuntu.LanguageSelector.service']),
@@ -55,5 +64,6 @@
                    ["data/language-selector.png"]),
                   ]+I18NFILES,
       )
-
-
+if sys.argv[1] == "install":
+    os.rename(PREFIX+"/share/kde4/services/kde-language-selector.desktop", PREFIX+"/share/kde4/services/language-selector.desktop")
+    os.rename(PREFIX+"/share/kde4/apps/language-selector/kde-language-selector", PREFIX+"/share/kde4/apps/language-selector/language-selector.py")