Reset submodule main/applications/settings/tde-guidance/admin to latest HEAD

Signed-off-by: gregory guy <gregory-tde@laposte.net>
(cherry picked from commit 8f5d69e802)

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

grubconfig/grubconfig.desktop

@@ -25,7 +25,7 @@ Comment[sr]=Управљање опцијама бутовања
 Comment[sr@Latn]=Upravljanje opcijama butovanja
 Comment[sv]=Hantering av startalternativ
 Comment[xx]=xxBoot Options Managementxx
-Icon=grubconfig.png
+Icon=grubconfig
 Encoding=UTF-8
 X-TDE-ModuleType=Library
 X-TDE-Library=grubconfig

grubconfig/grubconfig.py

@@ -19,19 +19,7 @@
 import sys
 import os
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdefile import *

mountconfig/SMBShareSelectDialog.py

@@ -14,7 +14,7 @@
 #                                                                         #
 ###########################################################################
 
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdeio import *
@@ -36,7 +36,7 @@ class SMBShareSelectDialog(KDialogBase):
         
         vbox = self.makeVBoxMainWidget()
 
-        hbox = TTQHBox(vbox)
+        hbox = TQHBox(vbox)
         hbox.setSpacing(self.spacingHint())
         tmplabel = TQLabel(hbox)
         tmplabel.setPixmap(UserIcon("hi32-samba"))

mountconfig/SimpleCommandRunner.py

@@ -13,7 +13,7 @@
 #   (at your option) any later version.                                   #
 #                                                                         #
 ###########################################################################
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 import locale
 

mountconfig/fuser.py

@@ -22,7 +22,7 @@ TODO:
 
 import sys
 import os
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 #import kdedesigner
 from fuser_ui import *

mountconfig/fuser_ui.ui

@@ -339,14 +339,9 @@ Killing a process may cause data loss. Make sure all work is saved before killin
         </widget>
     </vbox>
 </widget>
-<pixmapfunction>QPixmap</pixmapfunction>
+<pixmapfunction>TQPixmap</pixmapfunction>
 <layoutdefaults spacing="6" margin="6"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+     <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>

mountconfig/mountconfig.desktop

@@ -27,7 +27,7 @@ Comment[sr]=Подешавање диска и фајл-система
 Comment[sr@Latn]=Podešavanje diska i fajl-sistema
 Comment[sv]=Disk och filsysteminitierníng
 Comment[xx]=xxDisk & Filesystem Configurationxx
-Icon=disksfilesystems.png
+Icon=disksfilesystems
 Encoding=UTF-8
 X-TDE-ModuleType=Library
 X-TDE-Library=mountconfig

mountconfig/mountconfig.py

@@ -19,19 +19,7 @@
 import sys
 import os
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdefile import *

mountconfig/sizeview.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 import sys, os
 

serviceconfig/serviceconfig.desktop

@@ -26,7 +26,7 @@ Comment[sr]=Подешавање системских сервиса
 Comment[sr@Latn]=Podešavanje sistemskih servisa
 Comment[sv]=Inställning av systemtjänster
 Comment[xx]=xxSystem Service Configurationxx
-Icon=daemons.png
+Icon=daemons
 Encoding=UTF-8
 X-TDE-ModuleType=Library
 X-TDE-Library=serviceconfig

serviceconfig/serviceconfig.py

@@ -19,19 +19,7 @@
 import sys
 import os
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 import posix

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/python
+
 ###########################################################################
 # setup - description                                                     #
 # ------------------------------                                          #
@@ -15,98 +16,96 @@
 #                                                                         #
 ###########################################################################
 
+
 from distutils.core import Extension
 import tdedistutils
 
-###########################################################################
+
 def doit():
-    tdedistutils.setup(name="guidance",
-        version="0.8.0",
-        author="Simon Edwards",
-        author_email="simon@simonzone.com",
-        url="http://www.simonzone.com/software/guidance/",
+    tdedistutils.setup(
+        name = "guidance",
+        version = "0.8.0",
+        author = "Simon Edwards",
+        author_email = "simon@simonzone.com",
+        url = "http://www.simonzone.com/software/guidance/",
         min_kde_version = "3.0.0",
         min_qt_version = "3.0.0",
         license = "GPL",
+        docbooks = [('doc/en','en')],
+        package_dir = {'':'modules'},
+        py_modules = ['xf86misc'],
+
+        ext_modules = [Extension('ixf86misc',\
+                       sources = ['modules/ixf86misc.c'],\
+                       library_dirs = ['/usr/X11R6/lib'],\
+                       libraries = ['X11','Xxf86vm','Xext','Xrandr','Xrender','Xss'])],
+
         executable_links = [('serviceconfig','serviceconfig.py'),
-            ('userconfig','userconfig.py'),
-            ('mountconfig','mountconfig.py'),
-	    ('wineconfig','wineconfig.py'),
-	    ('grubconfig','grubconfig.py')],
-            
-        data_files = [# Icons for in KControl
-                      ('share/icons/crystalsvg/16x16/apps',['kde/serviceconfig/pics/16x16/daemons.png',
-                        'kde/mountconfig/pics/16x16/disksfilesystems.png',
-                        'kde/userconfig/pics/16x16/userconfig.png',
-			'kde/wineconfig/pics/16x16/wineconfig.svg'])],
+                            ('userconfig','userconfig.py'),
+                            ('mountconfig','mountconfig.py'),
+                            ('wineconfig','wineconfig.py'),
+                            ('grubconfig','grubconfig.py')],
 
-        i18n = ('po',['mountconfig','userconfig','serviceconfig','wineconfig']),
+        kcontrol_modules = [('serviceconfig/serviceconfig.desktop','serviceconfig.py'),
+                            ('userconfig/userconfig.desktop','userconfig.py'),
+                            ('mountconfig/mountconfig.desktop','mountconfig.py'),
+                            ('wineconfig/wineconfig.desktop','wineconfig.py')],
 
-        application_data = [('pics',
-                                ['kde/serviceconfig/pics/laserwarn.png',
-                                'kde/serviceconfig/pics/hi32-app-daemons.png',
-                                'kde/userconfig/pics/hi16-encrypted.png',
-                                'kde/userconfig/pics/hi32-user.png',
-                                'kde/userconfig/pics/hi32-group.png',
-                                'kde/userconfig/pics/hi32-identity.png',
-                                'kde/userconfig/pics/hi32-password.png',
-                                'kde/mountconfig/pics/kcmpartitions.png',
-                                'kde/mountconfig/pics/trinity1.png',
-                                'kde/mountconfig/pics/trinity2.png',
-                                'kde/mountconfig/pics/trinity3.png',
-                                'kde/mountconfig/pics/trinity4.png',
-                                'kde/mountconfig/pics/trinity5.png',
-                                'kde/mountconfig/pics/trinity6.png',
-                                'kde/mountconfig/pics/hi32-samba.png',
-                                'kde/mountconfig/pics/hi16-hdd.png',
-                                'kde/mountconfig/pics/hi16-cdrom.png',
-                                'kde/mountconfig/pics/hi16-burner.png',
-                                'kde/mountconfig/pics/hi16-floppy.png',
-                                'kde/mountconfig/pics/hi16-blockdevice.png',
-                                'kde/mountconfig/pics/hi16-password.png',
-                                'kde/mountconfig/pics/hi16-memory.png',
-                                'kde/mountconfig/pics/hi16-network.png',
-                                'kde/mountconfig/pics/hi16-lock.png',
-                                'kde/mountconfig/pics/hi16-usbpen.png',
-                                'kde/mountconfig/pics/greenled.png',
-                                'kde/mountconfig/pics/greyled.png',
-                                'kde/mountconfig/pics/exec.png',
-                                'kde/mountconfig/pics/file.png',
-                                'kde/mountconfig/pics/important.png',
-                                'kde/mountconfig/pics/tux.png',
-                                'kde/mountconfig/pics/user.png',
-                                'kde/wineconfig/pics/32-wine.png',
-                                'kde/wineconfig/pics/kdewinewizard.png']),
-                            'serviceconfig/serviceconfig.py',
-                            'userconfig/userconfig.py',
-                            'userconfig/unixauthdb.py',
-                            'mountconfig/mountconfig.py',
-                            'mountconfig/MicroHAL.py',
-                            'mountconfig/SMBShareSelectDialog.py',
-                            'mountconfig/SimpleCommandRunner.py',
-                            'mountconfig/fuser.py',
-                            'mountconfig/fuser_ui.ui',
-                            'mountconfig/sizeview.py',
-			    'wineconfig/wineconfig.py',
-			    'wineconfig/wineread.py',
-			    'wineconfig/winewrite.py',
-                            'wineconfig/drivedetect.py',
-                            'grubconfig/grubconfig.py'],
-                  
-        kcontrol_modules = [ \
-            ('serviceconfig/serviceconfig.desktop','serviceconfig.py'),
-            ('userconfig/userconfig.desktop','userconfig.py'),
-            ('mountconfig/mountconfig.desktop','mountconfig.py'),
-	    ('wineconfig/wineconfig.desktop','wineconfig.py')],
+        data_files = [('share/icons/crystalsvg/16x16/apps',['kde/serviceconfig/pics/16x16/daemons.png',
+                      'kde/mountconfig/pics/16x16/disksfilesystems.png',
+                      'kde/userconfig/pics/16x16/userconfig.png',
+                      'kde/wineconfig/pics/16x16/wineconfig.png'])],
+
+        i18n = ('po',['mountconfig','userconfig','serviceconfig','wineconfig']),
 
-        docbooks = [ ('doc/en','en') ],
+        application_data = [('pics',['kde/serviceconfig/pics/laserwarn.png',
+                                     'kde/serviceconfig/pics/hi32-app-daemons.png',
+                                     'kde/userconfig/pics/hi16-encrypted.png',
+                                     'kde/userconfig/pics/hi32-user.png',
+                                     'kde/userconfig/pics/hi32-group.png',
+                                     'kde/userconfig/pics/hi32-identity.png',
+                                     'kde/userconfig/pics/hi32-password.png',
+                                     'kde/mountconfig/pics/kcmpartitions.png',
+                                     'kde/mountconfig/pics/trinity1.png',
+                                     'kde/mountconfig/pics/trinity2.png',
+                                     'kde/mountconfig/pics/trinity3.png',
+                                     'kde/mountconfig/pics/trinity4.png',
+                                     'kde/mountconfig/pics/trinity5.png',
+                                     'kde/mountconfig/pics/trinity6.png',
+                                     'kde/mountconfig/pics/hi32-samba.png',
+                                     'kde/mountconfig/pics/hi16-hdd.png',
+                                     'kde/mountconfig/pics/hi16-cdrom.png',
+                                     'kde/mountconfig/pics/hi16-burner.png',
+                                     'kde/mountconfig/pics/hi16-floppy.png',
+                                     'kde/mountconfig/pics/hi16-blockdevice.png',
+                                     'kde/mountconfig/pics/hi16-password.png',
+                                     'kde/mountconfig/pics/hi16-memory.png',
+                                     'kde/mountconfig/pics/hi16-network.png',
+                                     'kde/mountconfig/pics/hi16-lock.png',
+                                     'kde/mountconfig/pics/hi16-usbpen.png',
+                                     'kde/mountconfig/pics/greenled.png',
+                                     'kde/mountconfig/pics/greyled.png',
+                                     'kde/mountconfig/pics/exec.png',
+                                     'kde/mountconfig/pics/file.png',
+                                     'kde/mountconfig/pics/important.png',
+                                     'kde/mountconfig/pics/tux.png',
+                                     'kde/mountconfig/pics/user.png',
+                                     'kde/wineconfig/pics/32-wine.png',
+                                     'kde/wineconfig/pics/kdewinewizard.png']),
+                             'serviceconfig/serviceconfig.py',
+                             'userconfig/userconfig.py',
+                             'userconfig/unixauthdb.py',
+                             'mountconfig/mountconfig.py',
+                             'mountconfig/MicroHAL.py',
+                             'mountconfig/SMBShareSelectDialog.py',
+                             'mountconfig/SimpleCommandRunner.py',
+                             'mountconfig/fuser.py',
+                             'mountconfig/fuser_ui.ui',
+                             'mountconfig/sizeview.py',
+                             'wineconfig/wineconfig.py',
+                             'wineconfig/wineread.py',
+                             'wineconfig/winewrite.py',
+                             'wineconfig/drivedetect.py',
+                             'grubconfig/grubconfig.py'])
 
-        package_dir={'':'modules'},
-        py_modules=['xf86misc'],
-        ext_modules=[\
-            Extension('ixf86misc',\
-                sources=['modules/ixf86misc.c'],\
-                library_dirs=['/usr/X11R6/lib'],\
-                libraries=['X11','Xxf86vm','Xext','Xrandr','Xrender','Xss'])]
-        )
 doit()

userconfig/userconfig.desktop

@@ -25,7 +25,7 @@ Comment[sr]=Администрирање корисника и група
 Comment[sr@Latn]=Administriranje korisnika i grupa
 Comment[sv]=Administration av användare och grupper
 Comment[xx]=xxUsers & Groups Administrationxx
-Icon=userconfig.png
+Icon=userconfig
 Encoding=UTF-8
 X-TDE-ModuleType=Library
 X-TDE-Library=userconfig

userconfig/userconfig.py

@@ -18,19 +18,7 @@
 
 import sys
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdefile import *

wineconfig/firstrunwizard.py

@@ -16,7 +16,7 @@
 #                                                                         #
 ###########################################################################
 
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 from tdeui import *
 from tdefile import *

wineconfig/wineconfig.py

@@ -19,19 +19,7 @@
 import sys
 import os
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 from tdeui import *
 from tdefile import *