TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Part 1 of 2 of kdm rename

Browse Source
pull/2/head
Timothy Pearson 13 years ago
parent 0a2a54a022
commit 7021f40c13
154 changed files with 1632 additions and 1632 deletions
Show Stats Download Patch File Download Diff File

12
CMakeLists.txt
Unescape View File

@ -70,9 +70,9 @@ option( WITH_XTEST "Enable xext support" ${WITH_ALL_OPTIONS} )
option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} ) option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} )
option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" ${WITH_ALL_OPTIONS} ) option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" ${WITH_ALL_OPTIONS} )
option( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" ${WITH_ALL_OPTIONS} ) option( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" ${WITH_ALL_OPTIONS} )
option( WITH_PAM "kdm should use PAM" ${WITH_ALL_OPTIONS} ) option( WITH_PAM "tdm should use PAM" ${WITH_ALL_OPTIONS} )
option( WITH_SHADOW "kdm should use shadow passwords" ${WITH_ALL_OPTIONS} ) option( WITH_SHADOW "tdm should use shadow passwords" ${WITH_ALL_OPTIONS} )
option( WITH_XDMCP "xdmcp support for kdm" ${WITH_ALL_OPTIONS} ) option( WITH_XDMCP "xdmcp support for tdm" ${WITH_ALL_OPTIONS} )
option( WITH_XINERAMA "Enable xinerama extension support" ${WITH_ALL_OPTIONS} ) option( WITH_XINERAMA "Enable xinerama extension support" ${WITH_ALL_OPTIONS} )
option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} ) option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} )
option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} ) option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} )
@ -107,7 +107,7 @@ option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} )
option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} ) option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} )
option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} ) option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} )
option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} ) option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} )
option( BUILD_KDM "Build kdm" ${BUILD_ALL} ) option( BUILD_TDM "Build tdm" ${BUILD_ALL} )
option( BUILD_KSMSERVER "Build ksmserver" ${BUILD_ALL} ) option( BUILD_KSMSERVER "Build ksmserver" ${BUILD_ALL} )
option( BUILD_KSPLASHML "Build ksplashml" ${BUILD_ALL} ) option( BUILD_KSPLASHML "Build ksplashml" ${BUILD_ALL} )
option( BUILD_STARTKDE "Build starttde" ${BUILD_ALL} ) option( BUILD_STARTKDE "Build starttde" ${BUILD_ALL} )
@ -156,7 +156,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
##### tdebase directories ####################### ##### tdebase directories #######################
add_subdirectory( kdmlib ) add_subdirectory( tdmlib )
tde_conditional_add_subdirectory( BUILD_L10N l10n ) tde_conditional_add_subdirectory( BUILD_L10N l10n )
tde_conditional_add_subdirectory( BUILD_PICS pics ) tde_conditional_add_subdirectory( BUILD_PICS pics )
@ -182,7 +182,7 @@ tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject )
tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog ) tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog )
tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig ) tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig )
tde_conditional_add_subdirectory( BUILD_TDESU tdesu ) tde_conditional_add_subdirectory( BUILD_TDESU tdesu )
tde_conditional_add_subdirectory( BUILD_KDM kdm ) tde_conditional_add_subdirectory( BUILD_TDM tdm )
tde_conditional_add_subdirectory( BUILD_KSMSERVER ksmserver ) tde_conditional_add_subdirectory( BUILD_KSMSERVER ksmserver )
tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml ) tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml )
tde_conditional_add_subdirectory( BUILD_KFIND kfind ) tde_conditional_add_subdirectory( BUILD_KFIND kfind )

24
ConfigureChecks.cmake
Unescape View File

@ -9,8 +9,8 @@
# #
################################################# #################################################
# termios.h (kdm, kioslave) # termios.h (tdm, kioslave)
if( BUILD_KDM OR BUILD_KIOSLAVES ) if( BUILD_TDM OR BUILD_KIOSLAVES )
check_include_file( termios.h HAVE_TERMIOS_H ) check_include_file( termios.h HAVE_TERMIOS_H )
endif( ) endif( )
@ -22,7 +22,7 @@ endif( )
# pam # pam
if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_KDM) ) if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
check_library_exists( pam pam_start "" HAVE_PAM ) check_library_exists( pam pam_start "" HAVE_PAM )
if( HAVE_PAM ) if( HAVE_PAM )
check_include_file( "security/pam_appl.h" SECURITY_PAM_APPL_H ) check_include_file( "security/pam_appl.h" SECURITY_PAM_APPL_H )
@ -166,26 +166,26 @@ if( BUILD_KIOSLAVES OR BUILD_KSYSGUARD )
endif( ) endif( )
# getifaddrs (kcontrol, kdm) # getifaddrs (kcontrol, tdm)
if( BUILD_KCONTROL OR BUILD_KDM ) if( BUILD_KCONTROL OR BUILD_TDM )
check_function_exists( getifaddrs HAVE_GETIFADDRS ) check_function_exists( getifaddrs HAVE_GETIFADDRS )
endif( ) endif( )
# xkb (konsole, kdm, kxkb) # xkb (konsole, tdm, kxkb)
if( BUILD_KONSOLE OR BUILD_KDM OR BUILD_KXKB ) if( BUILD_KONSOLE OR BUILD_TDM OR BUILD_KXKB )
check_include_file( X11/XKBlib.h HAVE_X11_XKBLIB_H ) check_include_file( X11/XKBlib.h HAVE_X11_XKBLIB_H )
if( HAVE_X11_XKBLIB_H ) if( HAVE_X11_XKBLIB_H )
check_library_exists( X11 XkbLockModifiers "" HAVE_XKB ) check_library_exists( X11 XkbLockModifiers "" HAVE_XKB )
if( BUILD_KDM ) if( BUILD_TDM )
check_library_exists( X11 XkbSetPerClientControls "" HAVE_XKBSETPERCLIENTCONTROLS ) check_library_exists( X11 XkbSetPerClientControls "" HAVE_XKBSETPERCLIENTCONTROLS )
endif( ) endif( )
endif( ) endif( )
endif( ) endif( )
# XBINDIR, XLIBDIR (kdm, kxkb) # XBINDIR, XLIBDIR (tdm, kxkb)
if( BUILD_KDM OR BUILD_KXKB ) if( BUILD_TDM OR BUILD_KXKB )
find_program( some_x_program NAMES iceauth xrdb xterm ) find_program( some_x_program NAMES iceauth xrdb xterm )
if( NOT some_x_program ) if( NOT some_x_program )
set( some_x_program /usr/bin/xrdb ) set( some_x_program /usr/bin/xrdb )
@ -216,8 +216,8 @@ find_package( TDE )
# dbus-tqt need Qt flags # dbus-tqt need Qt flags
# dbus (kdm, ksmserver) # dbus (tdm, ksmserver)
if( BUILD_KDM OR BUILD_KSMSERVER ) if( BUILD_TDM OR BUILD_KSMSERVER )
pkg_search_module( DBUS dbus-1 ) pkg_search_module( DBUS dbus-1 )
if( NOT DBUS_FOUND ) if( NOT DBUS_FOUND )

4
Makefile.am.in
Unescape View File

@ -2,10 +2,10 @@
## (C) 1997 Stephan Kulow ## (C) 1997 Stephan Kulow
COMPILE_FIRST = libkonq COMPILE_FIRST = libkonq
COMPILE_AFTER_kdmlib = kdesktop kicker ksmserver COMPILE_AFTER_tdmlib = kdesktop kicker ksmserver
COMPILE_BEFORE_konqueror = kate COMPILE_BEFORE_konqueror = kate
COMPILE_BEFORE_kcontrol = kicker COMPILE_BEFORE_kcontrol = kicker
COMPILE_AFTER_kcontrol = kdm kdesktop COMPILE_AFTER_kcontrol = tdm kdesktop
AUTOMAKE_OPTIONS = foreign 1.6.1 AUTOMAKE_OPTIONS = foreign 1.6.1

2
README
Unescape View File

@ -62,7 +62,7 @@ libraries. Here is an overview of the directories:
* kdialog * kdialog
Allows to display menu boxes from shell scripts. Allows to display menu boxes from shell scripts.
* kdm * tdm
Replacement for XDM, for those people that like graphical logins. Replacement for XDM, for those people that like graphical logins.
* kfind * kfind

14
README.pam
Unescape View File

@ -1,5 +1,5 @@
KDE can be configured to support the PAM ("Pluggable Authentication KDE can be configured to support the PAM ("Pluggable Authentication
Modules") system for password checking by the display manager kdm and Modules") system for password checking by the display manager tdm and
by the screen saver kscreensaver (for unlocking the display). by the screen saver kscreensaver (for unlocking the display).
PAM is a flexible application-transparent configurable user-authentication PAM is a flexible application-transparent configurable user-authentication
@ -27,7 +27,7 @@ By default, PAM is automatically used, if it is found. Use
If PAM is found, KDE usually uses the PAM service "kde". You may If PAM is found, KDE usually uses the PAM service "kde". You may
override it for all KDE programs by using --with-pam=<service> and/or override it for all KDE programs by using --with-pam=<service> and/or
individually by using --with-<prog>-pam=<service>, where <prog> is individually by using --with-<prog>-pam=<service>, where <prog> is
one of kdm, kcp and kss (for kdm, kcheckpass and kscreensaver). one of tdm, kcp and kss (for tdm, kcheckpass and kscreensaver).
"make install" will attempt to create suitable service definitions; either "make install" will attempt to create suitable service definitions; either
by putting files into /etc/pam.d/ or by adding text to /etc/pam.conf. The by putting files into /etc/pam.d/ or by adding text to /etc/pam.conf. The
@ -35,18 +35,18 @@ services are just copies of the "login" service.
You may want to edit these definitions to meet your needs. You may want to edit these definitions to meet your needs.
There are also two example service definitions in this directory - There are also two example service definitions in this directory -
kde.pamd and kscreensaver.pamd - but don't just copy them! kde.pamd and kscreensaver.pamd - but don't just copy them!
If the services are misconfigured, you will NOT be able to login via KDM If the services are misconfigured, you will NOT be able to login via TDM
and/or unlock a locked screen! and/or unlock a locked screen!
If there is ever any doubt about which PAM service a program was If there is ever any doubt about which PAM service a program was
compiled with, it can be determined by examining the PAM-generated compiled with, it can be determined by examining the PAM-generated
entries in the system log associated with kdm logins or kscreensaver entries in the system log associated with tdm logins or kscreensaver
authentication failures. authentication failures.
PAM configuration files have four types of entries for each service: PAM configuration files have four types of entries for each service:
type used by kdm used by kscreensaver type used by tdm used by kscreensaver
---- ----------- -------------------- ---- ----------- --------------------
auth x x auth x x
account x account x
@ -58,10 +58,10 @@ configuration files and PAM documentation on your system for guidance as
to what entries to make. If you call a PAM service that is not to what entries to make. If you call a PAM service that is not
configured, the default action of PAM is likely to be denial of service. configured, the default action of PAM is likely to be denial of service.
Note: kdm implements PAM "session" support, which is not implemented in Note: tdm implements PAM "session" support, which is not implemented in
certain PAM-aware xdm's that it may be replacing (e.g., the Red Hat certain PAM-aware xdm's that it may be replacing (e.g., the Red Hat
Linux 5.x xdm did not implement it). This may be configured to carry out Linux 5.x xdm did not implement it). This may be configured to carry out
actions when a user opens or closes an kdm session, if a suitable PAM actions when a user opens or closes an tdm session, if a suitable PAM
module is available (e.g., mount and unmount user-specific filesystems). module is available (e.g., mount and unmount user-specific filesystems).
Note 2: Screensavers typically only authenticate a user to allow her to Note 2: Screensavers typically only authenticate a user to allow her to

124
applnk/compat/userinfo.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
Exec=kcmshell kcm_useraccount Exec=kcmshell kcm_useraccount
Icon=kdmconfig Icon=tdmconfig
DocPath=kcontrol/userinfo/index.html DocPath=kcontrol/userinfo/index.html
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
@ -160,68 +160,68 @@ Comment[vi]=Thay đổi thông tin tài khoản
Comment[wa]=Candjî l' informåcion do conte uzeu da vosse Comment[wa]=Candjî l' informåcion do conte uzeu da vosse
Comment[zh_CN]=更改您的账户信息 Comment[zh_CN]=更改您的账户信息
Comment[zh_TW]=更改帳號資訊 Comment[zh_TW]=更改帳號資訊
Keywords=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account Keywords=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account
Keywords[ar]=كلمات المرور,كلمة المرور,غيير كلمة المرور,أيقونة,وجه,kdm,إسم المستخدم,الإسم,الحساب Keywords[ar]=كلمات المرور,كلمة المرور,غيير كلمة المرور,أيقونة,وجه,tdm,إسم المستخدم,الإسم,الحساب
Keywords[az]=şifrələr,şifrə,dəyişdir,dəyişdirmək,timsal,şəkil,sifət,kdm,istifadəçi,ad,hesab Keywords[az]=şifrələr,şifrə,dəyişdir,dəyişdirmək,timsal,şəkil,sifət,tdm,istifadəçi,ad,hesab
Keywords[be]=Паролі,Пароль,Змена паролю,Значка,твар,Імя карыстальніка,Уліковы рахунак,Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account Keywords[be]=Паролі,Пароль,Змена паролю,Значка,твар,Імя карыстальніка,Уліковы рахунак,Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account
Keywords[bg]=парола, сметка, промяна на парола, име, потребител, Passwords, Password, Change Password, Icon, face, kdm, User Name, Name, Account Keywords[bg]=парола, сметка, промяна на парола, име, потребител, Passwords, Password, Change Password, Icon, face, tdm, User Name, Name, Account
Keywords[bs]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Šifre,Šifra,Promijenite šifru,Ikona,lice,Korisničko ime,Ime,login,Račun Keywords[bs]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,Šifre,Šifra,Promijenite šifru,Ikona,lice,Korisničko ime,Ime,login,Račun
Keywords[ca]=Contrasenyes,Contrasenya,Canvia contrasenya,Icona,aspecte,kdm,Nom d'usuari,Nom,Compte Keywords[ca]=Contrasenyes,Contrasenya,Canvia contrasenya,Icona,aspecte,tdm,Nom d'usuari,Nom,Compte
Keywords[cs]=hesla,heslo,změnit heslo,ikona,obličej,kdm,jméno, uživatelské jméno,účet Keywords[cs]=hesla,heslo,změnit heslo,ikona,obličej,tdm,jméno, uživatelské jméno,účet
Keywords[csb]=parola,parole,zmieni parolã,ikòna,kdm,brëkòwnik,miono,nôzwëskò,kònto Keywords[csb]=parola,parole,zmieni parolã,ikòna,tdm,brëkòwnik,miono,nôzwëskò,kònto
Keywords[cy]=Cyfrinair,Cyfrineiriau,Newid Cyfrinair,Eicon,wyneb,kdm,Defnydd-enw, Enw Defnyddiwr,Enw,Cyfrif Keywords[cy]=Cyfrinair,Cyfrineiriau,Newid Cyfrinair,Eicon,wyneb,tdm,Defnydd-enw, Enw Defnyddiwr,Enw,Cyfrif
Keywords[da]=Kodeord,Adgangskode,Ændr kodeord,Ikon,ansigt,kdm,Brugernavn,Navn,Konto Keywords[da]=Kodeord,Adgangskode,Ændr kodeord,Ikon,ansigt,tdm,Brugernavn,Navn,Konto
Keywords[de]=Passwörter,Passwort,Passwort ändern,Symbol,Schriftart,kdm,User,Benutzername,Name,Account,Zugang,Konto Keywords[de]=Passwörter,Passwort,Passwort ändern,Symbol,Schriftart,tdm,User,Benutzername,Name,Account,Zugang,Konto
Keywords[el]=Κωδικοί πρόσβασης,Κωδικός πρόσβασης,Αλλαγή κωδικού πρόσβασης,Εικονίδιο,πρόσωπο,kdm,Όνομα χρήστη,Όνομα,Λογαριασμός Keywords[el]=Κωδικοί πρόσβασης,Κωδικός πρόσβασης,Αλλαγή κωδικού πρόσβασης,Εικονίδιο,πρόσωπο,tdm,Όνομα χρήστη,Όνομα,Λογαριασμός
Keywords[eo]=Pasvortoj,Pasvorto,Ŝanĝu la pasvorton,Piktogramo,vizaĝo,kdm,Uzantnomo,Nomo,Konto Keywords[eo]=Pasvortoj,Pasvorto,Ŝanĝu la pasvorton,Piktogramo,vizaĝo,tdm,Uzantnomo,Nomo,Konto
Keywords[es]=Contraseñas,Contraseña,Cambiar contraseña,Icono,cara,kdm,Nombre de usuario,Nombre,Cuenta Keywords[es]=Contraseñas,Contraseña,Cambiar contraseña,Icono,cara,tdm,Nombre de usuario,Nombre,Cuenta
Keywords[et]=Paroolid,Parool,Parooli muutmine,Ikoon,nägu,kdm,Kasutajanimi,Nimi,Konto Keywords[et]=Paroolid,Parool,Parooli muutmine,Ikoon,nägu,tdm,Kasutajanimi,Nimi,Konto
Keywords[eu]=Pasahitzak,Pasahitza,Aldatu pasahitza,Ikonoa,aurpegia,kdm,Erabiltzaile izena,Izena,Kontua Keywords[eu]=Pasahitzak,Pasahitza,Aldatu pasahitza,Ikonoa,aurpegia,tdm,Erabiltzaile izena,Izena,Kontua
Keywords[fa]=اسم رمزها، اسم رمز، تغییر اسم رمز، شمایل، سطح، kdm ، نام کاربر، نام، حساب Keywords[fa]=اسم رمزها، اسم رمز، تغییر اسم رمز، شمایل، سطح، tdm ، نام کاربر، نام، حساب
Keywords[fi]=salasanat,salasana,muuta salasanaa,vaihda salasana,kuvake,kasvot,käyttäjän nimi,käyttäjätili,käyttäjätunnus Keywords[fi]=salasanat,salasana,muuta salasanaa,vaihda salasana,kuvake,kasvot,käyttäjän nimi,käyttäjätili,käyttäjätunnus
Keywords[fr]=mots de passe,mot de passe,changer le mot de passe,modifier le mot de passe,icône,visage,kdm,nom d'utilisateur,nom,compte Keywords[fr]=mots de passe,mot de passe,changer le mot de passe,modifier le mot de passe,icône,visage,tdm,nom d'utilisateur,nom,compte
Keywords[fy]=Wachtwurden,Wachtwurd,Wachtwurd feroarje,ikoan,face,kdm,Brûkersnamme,Namme,Akkount Keywords[fy]=Wachtwurden,Wachtwurd,Wachtwurd feroarje,ikoan,face,tdm,Brûkersnamme,Namme,Akkount
Keywords[ga]=Focail Fhaire,Focal Faire,Athraigh focal faire,Deilbhín,aghaidh, kdm,Ainm Úsáideora,Ainm Keywords[ga]=Focail Fhaire,Focal Faire,Athraigh focal faire,Deilbhín,aghaidh, tdm,Ainm Úsáideora,Ainm
Keywords[gl]=Contrasinais,Contrasinal,Trocar contrasinal,icona,aspeito,kdm,Nome de Usuario,Nome,Conta Keywords[gl]=Contrasinais,Contrasinal,Trocar contrasinal,icona,aspeito,tdm,Nome de Usuario,Nome,Conta
Keywords[he]=ססמאות, ססמה, שנה ססמה, סמל, פרצות, KDM,שם משתמש, שם,חשבון,Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account Keywords[he]=ססמאות, ססמה, שנה ססמה, סמל, פרצות, TDM,שם משתמש, שם,חשבון,Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account
Keywords[hi]=पासवर्ड,पासवर्ड्स,पासवर्ड बदलें,प्रतीक,चेहरा,केडीएम,उपयोक्ता नाम,नाम,खाता Keywords[hi]=पासवर्ड,पासवर्ड्स,पासवर्ड बदलें,प्रतीक,चेहरा,केडीएम,उपयोक्ता नाम,नाम,खाता
Keywords[hr]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Lozinke,Lozinka,Promjena lozinke,Ikona,lice,Korisničko ime,Naziv,Ime,Nalog Keywords[hr]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,Lozinke,Lozinka,Promjena lozinke,Ikona,lice,Korisničko ime,Naziv,Ime,Nalog
Keywords[is]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,lykilorð,Breyta lykilorði,andlit,mynd,nafn Keywords[is]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,lykilorð,Breyta lykilorði,andlit,mynd,nafn
Keywords[it]=Password,CambiaPassword,Icona,faccia,kdm,Utente,Nome utente,Nome,Account Keywords[it]=Password,CambiaPassword,Icona,faccia,tdm,Utente,Nome utente,Nome,Account
Keywords[ja]=パスワード,パスワード変更,アイコン,顔,kdm,ユーザ名,名前,アカウント Keywords[ja]=パスワード,パスワード変更,アイコン,顔,tdm,ユーザ名,名前,アカウント
Keywords[ka]=პაროლები, პაროლი, პაროლის შეცვლა, ხატულა, სახე, kdm, მომხმარებლის სახელი, სახელი,ანგარიში Keywords[ka]=პაროლები, პაროლი, პაროლის შეცვლა, ხატულა, სახე, tdm, მომხმარებლის სახელი, სახელი,ანგარიში
Keywords[km]=ពាក្យ​សម្ងាត់,ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់,រូបតំណាង,មុខ,kdm,ឈ្មោះ​អ្នក​ប្រើ,ឈ្មោះ,គណនី Keywords[km]=ពាក្យ​សម្ងាត់,ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់,រូបតំណាង,មុខ,tdm,ឈ្មោះ​អ្នក​ប្រើ,ឈ្មោះ,គណនី
Keywords[ko]=암호,비밀번호,아이콘,얼굴,사용자 이름,계정,kdm Keywords[ko]=암호,비밀번호,아이콘,얼굴,사용자 이름,계정,tdm
Keywords[lt]=Slaptažodžiai,Slaptažodis,pakeisti slaptažodį, ženklelis,veidas,kdm,naudotojo vardas,Vardas,Paskyra,Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account Keywords[lt]=Slaptažodžiai,Slaptažodis,pakeisti slaptažodį, ženklelis,veidas,tdm,naudotojo vardas,Vardas,Paskyra,Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account
Keywords[lv]=Paroles,Parole,Mainīt paroli,Ikona,seja,kdm,Lietotāja vārds,Vārds,Konts Keywords[lv]=Paroles,Parole,Mainīt paroli,Ikona,seja,tdm,Lietotāja vārds,Vārds,Konts
Keywords[mk]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Лозинки,Лозинка,Смени лозинка,Икона,лице,Корисничко Име,Име,Сметка Keywords[mk]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,Лозинки,Лозинка,Смени лозинка,Икона,лице,Корисничко Име,Име,Сметка
Keywords[ms]=Kata laluan, Kata laluan, Tukar kata laluan,Ikon,face,kdm,Nama Pengguna,Nama,Akaun Keywords[ms]=Kata laluan, Kata laluan, Tukar kata laluan,Ikon,face,tdm,Nama Pengguna,Nama,Akaun
Keywords[mt]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Kont,Ibdel Password,Ikona,Isem Keywords[mt]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,Kont,Ibdel Password,Ikona,Isem
Keywords[nb]=Passord,Passord,Endre passord,Ikon,utseende,kdm,brukernavn,navn,konto Keywords[nb]=Passord,Passord,Endre passord,Ikon,utseende,tdm,brukernavn,navn,konto
Keywords[nds]=Passwöör,Passwoort,Passwoort ännern,Lüttbild,icon,Gesicht,kdm,User Name,Brukernaam,Naam,Konto Keywords[nds]=Passwöör,Passwoort,Passwoort ännern,Lüttbild,icon,Gesicht,tdm,User Name,Brukernaam,Naam,Konto
Keywords[ne]=पासवर्डहरू, पासवर्ड, पासवर्ड परिवर्तन, प्रतिमा, मोहडा, के डी एम, प्रयोगकर्ता नाम, नाम, खाता Keywords[ne]=पासवर्डहरू, पासवर्ड, पासवर्ड परिवर्तन, प्रतिमा, मोहडा, के डी एम, प्रयोगकर्ता नाम, नाम, खाता
Keywords[nl]=wachtwoorden,passwords,wachtwoord,password,password wijzigen,wachtwoord wijzigen,pictogram,face,kdm,gebruikersnaam,naam,account Keywords[nl]=wachtwoorden,passwords,wachtwoord,password,password wijzigen,wachtwoord wijzigen,pictogram,face,tdm,gebruikersnaam,naam,account
Keywords[nn]=passord,endra passord,ikon,fjes,bilete,kdm,brukarnamn,namn,konto Keywords[nn]=passord,endra passord,ikon,fjes,bilete,tdm,brukarnamn,namn,konto
Keywords[pa]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,ਖਾਤਾ,ਗੁਪਤ-ਕੋਡ,ਆਈਕਾਨ,ਉਪਭੋਗੀ ਨਾਂ,ਨਾਂ Keywords[pa]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,ਖਾਤਾ,ਗੁਪਤ-ਕੋਡ,ਆਈਕਾਨ,ਉਪਭੋਗੀ ਨਾਂ,ਨਾਂ
Keywords[pl]=hasło,hasła,zmień hasło,ikona,kdm,użytkownik,imię,nazwisko,konto Keywords[pl]=hasło,hasła,zmień hasło,ikona,tdm,użytkownik,imię,nazwisko,konto
Keywords[pt]=senhas,senha,mudar a senha,ícone,face,kdm,nome de utilizador,nome,conta Keywords[pt]=senhas,senha,mudar a senha,ícone,face,tdm,nome de utilizador,nome,conta
Keywords[pt_BR]=senhas,senhas,mudar senha,ícone,cara,kdm,nome do usuário, nome,conta Keywords[pt_BR]=senhas,senhas,mudar senha,ícone,cara,tdm,nome do usuário, nome,conta
Keywords[ro]=parole,parolă,schimbă parolă,iconiță,față,kdm,nume utilizator,nume,cont Keywords[ro]=parole,parolă,schimbă parolă,iconiță,față,tdm,nume utilizator,nume,cont
Keywords[ru]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,пользователь,пароль Keywords[ru]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,пользователь,пароль
Keywords[rw]=Amagambobanga,Ijambobanga,Guhindura Ijambobanga, Agashushondanga,isura,kdm,Izina ry'Ukoresha,Izina, Konti Keywords[rw]=Amagambobanga,Ijambobanga,Guhindura Ijambobanga, Agashushondanga,isura,tdm,Izina ry'Ukoresha,Izina, Konti
Keywords[se]=beassanasánit,beassansátni,rievdat beassansáni,govaš,amadádju,kdm,geavaheaddjenamma,namma,kontu Keywords[se]=beassanasánit,beassansátni,rievdat beassansáni,govaš,amadádju,tdm,geavaheaddjenamma,namma,kontu
Keywords[sk]=heslá,heslo,zmena hesla,ikona,obrázok,foto,kdm,používateľ,meno,účet Keywords[sk]=heslá,heslo,zmena hesla,ikona,obrázok,foto,tdm,používateľ,meno,účet
Keywords[sl]=gesla,geslo,spremeni geslo,ikona,obraz,kdm,uporabniško ime, ime,račun Keywords[sl]=gesla,geslo,spremeni geslo,ikona,obraz,tdm,uporabniško ime, ime,račun
Keywords[sr]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Лозинке,Лозинка,Икона,лице,Име,Налог,Кориснички налог Keywords[sr]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,Лозинке,Лозинка,Икона,лице,Име,Налог,Кориснички налог
Keywords[sr@Latn]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Lozinke,Lozinka,Ikona,lice,Ime,Nalog,Korisnički nalog Keywords[sr@Latn]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,Lozinke,Lozinka,Ikona,lice,Ime,Nalog,Korisnički nalog
Keywords[sv]=lösenord,ändra lösenord,ikon,bild,KDM,användarnamn,namn,konto Keywords[sv]=lösenord,ändra lösenord,ikon,bild,TDM,användarnamn,namn,konto
Keywords[ta]=கடவுச்சொற்கள்,கடவுச்சொல்,கடவுச்சொலை மாற்று,சின்னம்,முகம்,kdm,பயனர் பெயர்,பெயர்,கணக்கு Keywords[ta]=கடவுச்சொற்கள்,கடவுச்சொல்,கடவுச்சொலை மாற்று,சின்னம்,முகம்,tdm,பயனர் பெயர்,பெயர்,கணக்கு
Keywords[te]=పాస్ వర్డులు, పాస్ వర్డ్, పాస్ వర్డ్ ను మార్చు, ప్రతిమ, ముఖము, కెడిఎం, యూజర్ పేరు, పేరు, ఖాతా Keywords[te]=పాస్ వర్డులు, పాస్ వర్డ్, పాస్ వర్డ్ ను మార్చు, ప్రతిమ, ముఖము, కెడిఎం, యూజర్ పేరు, పేరు, ఖాతా
Keywords[tr]=Parolalar,Parola,Parola Değişimi,Simge,yüz,kdm,Kullanıcı Adı,İsim,Ad,Hesap Keywords[tr]=Parolalar,Parola,Parola Değişimi,Simge,yüz,tdm,Kullanıcı Adı,İsim,Ad,Hesap
Keywords[uk]=паролі,пароль,зміна пароля,піктограма,обличчя,kdm,ім'я користувача,ім'я,рахунок Keywords[uk]=паролі,пароль,зміна пароля,піктограма,обличчя,tdm,ім'я користувача,ім'я,рахунок
Keywords[uz]=Foydalanuvchining ismi,Maxfiy soʻzlar,Maxfiy soʻz,Maxfiy soʻzni oʻzgartirish,Nishoncha,Foydalanuvchi,Hisob,kdm Keywords[uz]=Foydalanuvchining ismi,Maxfiy soʻzlar,Maxfiy soʻz,Maxfiy soʻzni oʻzgartirish,Nishoncha,Foydalanuvchi,Hisob,tdm
Keywords[uz@cyrillic]=Фойдаланувчининг исми,Махфий сўзлар,Махфий сўз,Махфий сўзни ўзгартириш,Нишонча,Фойдаланувчи,Ҳисоб,kdm Keywords[uz@cyrillic]=Фойдаланувчининг исми,Махфий сўзлар,Махфий сўз,Махфий сўзни ўзгартириш,Нишонча,Фойдаланувчи,Ҳисоб,tdm
Keywords[vi]=Các mật khẩu,Mật khẩu,Đổi mật khẩu,Biểu tượng,mặt,kdm,Tên Người dùng,Tên,Tài khoản Keywords[vi]=Các mật khẩu,Mật khẩu,Đổi mật khẩu,Biểu tượng,mặt,tdm,Tên Người dùng,Tên,Tài khoản
Keywords[wa]=Sicrets,Sicret,Candjî l' sicret,imådjete,kdm,No d' uzeu,No d' elodjaedje,No,Conte Keywords[wa]=Sicrets,Sicret,Candjî l' sicret,imådjete,tdm,No d' uzeu,No d' elodjaedje,No,Conte
Keywords[zh_CN]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,密码,更改密码,图标,头像,用户名,姓名,账户 Keywords[zh_CN]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,密码,更改密码,图标,头像,用户名,姓名,账户
Keywords[zh_TW]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,密碼,改變密碼,圖示,外觀,使用者名稱,名稱,帳號 Keywords[zh_TW]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,密碼,改變密碼,圖示,外觀,使用者名稱,名稱,帳號

16
config.h.cmake
Unescape View File

@ -15,13 +15,13 @@
// kdesktop, kcontrol, ksplashml // kdesktop, kcontrol, ksplashml
#cmakedefine HAVE_XCURSOR 1 #cmakedefine HAVE_XCURSOR 1
// konsole, kdm, kxkb // konsole, tdm, kxkb
#cmakedefine HAVE_XKB 1 #cmakedefine HAVE_XKB 1
// kxkb // kxkb
#cmakedefine HAVE_XTEST 1 #cmakedefine HAVE_XTEST 1
// kdm, kioslave // tdm, kioslave
#cmakedefine HAVE_TERMIOS_H 1 #cmakedefine HAVE_TERMIOS_H 1
// kioslave/media // kioslave/media
@ -37,7 +37,7 @@
// kioslave/smtp, kioslave/pop3 // kioslave/smtp, kioslave/pop3
#cmakedefine HAVE_LIBSASL2 1 #cmakedefine HAVE_LIBSASL2 1
// kdm, kcontrol // tdm, kcontrol
#cmakedefine HAVE_GETIFADDRS 1 #cmakedefine HAVE_GETIFADDRS 1
// kio_fish // kio_fish
@ -96,7 +96,7 @@
#cmakedefine HAVE_SYS_WAIT_H 1 #cmakedefine HAVE_SYS_WAIT_H 1
#cmakedefine DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@" #cmakedefine DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@"
// kdm, kcheckpass, kdesktop // tdm, kcheckpass, kdesktop
#cmakedefine HAVE_PAM 1 #cmakedefine HAVE_PAM 1
// kcheckpass // kcheckpass
@ -105,7 +105,7 @@
// kdesktop // kdesktop
#cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@" #cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
// kdm // tdm
#cmakedefine XBINDIR "@XBINDIR@" #cmakedefine XBINDIR "@XBINDIR@"
#define KDE_BINDIR "@TDE_BIN_DIR@" #define KDE_BINDIR "@TDE_BIN_DIR@"
#define KDE_DATADIR "@TDE_DATA_DIR@" #define KDE_DATADIR "@TDE_DATA_DIR@"
@ -145,7 +145,7 @@
#cmakedefine DEV_RANDOM "@DEV_RANDOM@" #cmakedefine DEV_RANDOM "@DEV_RANDOM@"
#cmakedefine USE_PAM 1 #cmakedefine USE_PAM 1
#cmakedefine KDM_PAM_SERVICE "@KDM_PAM_SERVICE@" #cmakedefine TDM_PAM_SERVICE "@TDM_PAM_SERVICE@"
#define USESHADOW 1 #define USESHADOW 1
#define HAVE_SHADOW 1 #define HAVE_SHADOW 1
@ -163,8 +163,8 @@
#cmakedefine HAVE_ARTS 1 #cmakedefine HAVE_ARTS 1
#cmakedefine COVARIANT_RETURN_BROKEN 1 #cmakedefine COVARIANT_RETURN_BROKEN 1
// kdm, kxkb // tdm, kxkb
#cmakedefine XLIBDIR "@XLIBDIR@" #cmakedefine XLIBDIR "@XLIBDIR@"
// kdm, kcontrol // tdm, kcontrol
#cmakedefine WITH_XRANDR "@WITH_XRANDR@" #cmakedefine WITH_XRANDR "@WITH_XRANDR@"

6
configure.in.in
Unescape View File

@ -5,7 +5,7 @@ KDE_ENABLE_HIDDEN_VISIBILITY
dnl PAM, shadow passwords, libcrypt dnl PAM, shadow passwords, libcrypt
KDE_PASSWDLIBS KDE_PASSWDLIBS
DEF_PAM_SERVICE(kdm, kdm, KDM) DEF_PAM_SERVICE(tdm, tdm, TDM)
DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS) DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)
DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER) DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER)
@ -230,7 +230,7 @@ AH_VERBATIM(_broken_xkb, [
#endif #endif
]) ])
dnl this is for kdm and kcontrol dnl this is for tdm and kcontrol
KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir) KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory]) AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir) KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
@ -239,7 +239,7 @@ KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory]) AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
AC_SUBST(KDE_BINDIR) AC_SUBST(KDE_BINDIR)
dnl libart is used by kdm, kcontrol and thumbnails code in kioslaves dnl libart is used by tdm, kcontrol and thumbnails code in kioslaves
KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/]) AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
]) ])

24
doc/faq/configkde.docbook
Unescape View File

@ -71,9 +71,9 @@ a line saying <userinput>id:3:initdefault:</userinput>. Change it to
comment out the following line: comment out the following line:
<literal>x:5:respawn:/usr/bin/X11/xdm -nodaemon</literal> and <literal>x:5:respawn:/usr/bin/X11/xdm -nodaemon</literal> and
replace it with replace it with
<userinput>x:5:respawn:<replaceable>/opt/kde/</replaceable>bin/kdm <userinput>x:5:respawn:<replaceable>/opt/kde/</replaceable>bin/tdm
-nodaemon</userinput>. -nodaemon</userinput>.
<note><para>The location of &kdm; may differ on your <note><para>The location of &tdm; may differ on your
system.</para></note></para> system.</para></note></para>
<para>For changes to take effect immediately, type <command>init <para>For changes to take effect immediately, type <command>init
5</command> (for &RedHat; systems) at the shell prompt. 5</command> (for &RedHat; systems) at the shell prompt.
@ -86,7 +86,7 @@ be in for a hard time getting back....</para></caution></para>
For FreeBSD, you should edit the file <filename>/etc/ttys</filename> For FreeBSD, you should edit the file <filename>/etc/ttys</filename>
and change one of the lines that look like and change one of the lines that look like
<programlisting>ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure</programlisting> <programlisting>ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure</programlisting>
to instead say <userinput>ttyv8 "/usr/local/bin/kdm -nodaemon" xterm to instead say <userinput>ttyv8 "/usr/local/bin/tdm -nodaemon" xterm
off secure</userinput>.</para> off secure</userinput>.</para>
</answer> </answer>
</qandaentry> </qandaentry>
@ -136,11 +136,11 @@ to whatever you want.</para>
<qandaentry> <qandaentry>
<question> <question>
<para>&kde; (&kdm;) does not read my <para>&kde; (&tdm;) does not read my
<filename>.bash_profile</filename>!</para> <filename>.bash_profile</filename>!</para>
</question> </question>
<answer> <answer>
<para>The login managers<application>xdm</application> and &kdm; do <para>The login managers<application>xdm</application> and &tdm; do
not run a login shell, so <filename>.profile</filename>, not run a login shell, so <filename>.profile</filename>,
<filename>.bash_profile</filename>, &etc; are not <filename>.bash_profile</filename>, &etc; are not
sourced. When the user logs in, <application>xdm</application> runs sourced. When the user logs in, <application>xdm</application> runs
@ -233,17 +233,17 @@ computer (sometimes referred to as <quote>fast user switching</quote>) you
need to tell the program that logs you in that it can use more than one need to tell the program that logs you in that it can use more than one
session (or, in &X-Window; terms, <quote>display</quote>) at a time.</para> session (or, in &X-Window; terms, <quote>display</quote>) at a time.</para>
<para>In &kde;, this program is called &kdm; which stands for <quote>&kde; <para>In &kde;, this program is called &tdm; which stands for <quote>&kde;
Display Manager</quote>. If you are not using &kdm; as your login screen Display Manager</quote>. If you are not using &tdm; as your login screen
then you will need to consult the documentation for the software you are using on how to then you will need to consult the documentation for the software you are using on how to
accomplish multiple sessions.</para> accomplish multiple sessions.</para>
<para>By default, this will be configured at installation time automatically <para>By default, this will be configured at installation time automatically
if &kdm; supports virtual terminals on your system (currently Linux only). if &tdm; supports virtual terminals on your system (currently Linux only).
If it was not configured automatically, consult the &kdm; manual, section If it was not configured automatically, consult the &tdm; manual, section
<ulink url="help:/kdm/kdmrc-xservers">Specifying permanent &X-Server;s</ulink>. <ulink url="help:/tdm/tdmrc-xservers">Specifying permanent &X-Server;s</ulink>.
After modifying kdmrc, you will have to let &kdm; know about it; just After modifying tdmrc, you will have to let &tdm; know about it; just
invoke <command>killall -HUP kdm</command>.</para> invoke <command>killall -HUP tdm</command>.</para>
</answer> </answer>
</qandaentry> </qandaentry>
</qandaset> </qandaset>

4
doc/faq/install.docbook
Unescape View File

@ -383,7 +383,7 @@ path.</para>
<para>Edit the file <filename>.xinitrc</filename> in your home folder (make a backup <para>Edit the file <filename>.xinitrc</filename> in your home folder (make a backup
copy first!), remove everything that looks like calling a window copy first!), remove everything that looks like calling a window
manager, and insert <command>starttde</command> instead. Restart the &X-Server;. If you use manager, and insert <command>starttde</command> instead. Restart the &X-Server;. If you use
&kdm;/<application>xdm</application>, you will have to edit the file <filename>.xsession</filename> instead of &tdm;/<application>xdm</application>, you will have to edit the file <filename>.xsession</filename> instead of
<filename>.xinitrc</filename>. And if there is no <filename>.xinitrc</filename> or <filename>.xsession</filename> in your home <filename>.xinitrc</filename>. And if there is no <filename>.xinitrc</filename> or <filename>.xsession</filename> in your home
folder, simply create a new one with just one line containing folder, simply create a new one with just one line containing
<command>starttde</command>. <command>starttde</command>.
@ -428,7 +428,7 @@ can lead to problems if you are not careful. </para>
<filename>starttde</filename> script. Simply put the line <filename>starttde</filename> script. Simply put the line
<command>starttde</command> at the end of your <filename>.xsession</filename> <command>starttde</command> at the end of your <filename>.xsession</filename>
file (or your <filename>.xinitrc</filename> or <filename>.Xclients</filename> file (or your <filename>.xinitrc</filename> or <filename>.Xclients</filename>
file if you are not using &kdm; or <application>xdm</application>). Please file if you are not using &tdm; or <application>xdm</application>). Please
also remove the lines that start your previous window manager. If there is no also remove the lines that start your previous window manager. If there is no
<filename>.xsession</filename>, <filename>.xinitrc</filename>, or <filename>.xsession</filename>, <filename>.xinitrc</filename>, or
<filename>.Xclients</filename> in your home folder, simply create a new one <filename>.Xclients</filename> in your home folder, simply create a new one

2
doc/faq/notrelated.docbook
Unescape View File

@ -44,7 +44,7 @@ start &X-Window; using <command>startx <option> -bpp
<replaceable>number</replaceable></option></command> where <replaceable>number</replaceable></option></command> where
<replaceable>number</replaceable> can be 8, 16, 24 or 32, depending on <replaceable>number</replaceable> can be 8, 16, 24 or 32, depending on
the depth you want. Alternatively, if you are using the depth you want. Alternatively, if you are using
<application>xdm</application>/&kdm;, you <application>xdm</application>/&tdm;, you
need to edit need to edit
<filename>/etc/X11/xdm/Xservers</filename> (may vary) and enter <filename>/etc/X11/xdm/Xservers</filename> (may vary) and enter
<userinput>:0 local /usr/X11R6/bin/X -bpp 16</userinput> for 16 bit color <userinput>:0 local /usr/X11R6/bin/X -bpp 16</userinput> for 16 bit color

2
doc/kcontrol/kcmsmserver/index.docbook
Unescape View File

@ -86,7 +86,7 @@ first place? --></para></listitem>
<para>You can configure what should happen by default when you log out of <para>You can configure what should happen by default when you log out of
&kde;. These options are not possible on all operating systems, and some of &kde;. These options are not possible on all operating systems, and some of
them may not appear unless you are using &kdm; as your login manager.</para> them may not appear unless you are using &tdm; as your login manager.</para>
<para>The options available are self explanatory, if you are in doubt, <para>The options available are self explanatory, if you are in doubt,
leave the default settings. They are:</para> leave the default settings. They are:</para>

2
doc/kcontrol/kdm/CMakeLists.txt
Unescape View File

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION kcontrol/kdm ) tde_create_handbook( DESTINATION kcontrol/tdm )

2
doc/kcontrol/kdm/Makefile.am
Unescape View File

@ -1,2 +1,2 @@
KDE_LANG = en KDE_LANG = en
KDE_DOCS = kcontrol/kdm KDE_DOCS = kcontrol/tdm

64
doc/kcontrol/kdm/index.docbook
Unescape View File

@ -21,7 +21,7 @@
<keywordset> <keywordset>
<keyword>KDE</keyword> <keyword>KDE</keyword>
<keyword>KControl</keyword> <keyword>KControl</keyword>
<keyword>KDM configuration</keyword> <keyword>TDM configuration</keyword>
<keyword>login manager</keyword> <keyword>login manager</keyword>
<keyword>login</keyword> <keyword>login</keyword>
</keywordset> </keywordset>
@ -31,20 +31,20 @@
<title>Login Manager</title> <title>Login Manager</title>
<para>Using this module, you can configure the &kde; graphical login <para>Using this module, you can configure the &kde; graphical login
manager, &kdm;. You can change how the login screen looks, who has manager, &tdm;. You can change how the login screen looks, who has
access using the login manager and who can shutdown the access using the login manager and who can shutdown the
computer.</para> computer.</para>
<para>In order to organize all of these options, this module is <para>In order to organize all of these options, this module is
divided into six sections: <link divided into six sections: <link
linkend="kdmconfig-appearance"><guilabel>Appearance</guilabel></link>, linkend="tdmconfig-appearance"><guilabel>Appearance</guilabel></link>,
<link linkend="kdmconfig-font"><guilabel>Font</guilabel></link>, <link <link linkend="tdmconfig-font"><guilabel>Font</guilabel></link>, <link
linkend="kdmconfig-background"><guilabel>Background</guilabel></link>, linkend="tdmconfig-background"><guilabel>Background</guilabel></link>,
<link <link
linkend="kdmconfig-sessions"><guilabel>Sessions</guilabel></link>, linkend="tdmconfig-sessions"><guilabel>Sessions</guilabel></link>,
<link linkend="kdmconfig-users"><guilabel>Users</guilabel></link> and <link linkend="tdmconfig-users"><guilabel>Users</guilabel></link> and
<link <link
linkend="kdmconfig-convenience"><guilabel>Convenience</guilabel></link>.</para> linkend="tdmconfig-convenience"><guilabel>Convenience</guilabel></link>.</para>
<para>You can switch between the sections using the tabs at the top of <para>You can switch between the sections using the tabs at the top of
the window.</para> the window.</para>
@ -55,15 +55,15 @@ Button. You will then be asked for a superuser password. Entering a
correct password will allow you to modify the settings of this correct password will allow you to modify the settings of this
module.</para></note> module.</para></note>
<sect2 id="kdmconfig-appearance"> <sect2 id="tdmconfig-appearance">
<title>Appearance</title> <title>Appearance</title>
<para>From this page you can change the visual appearance of &kdm;, <para>From this page you can change the visual appearance of &tdm;,
&kde;'s graphical login manager.</para> &kde;'s graphical login manager.</para>
<para>The greeting string is the title of the login screen. If the <para>The greeting string is the title of the login screen. If the
string contains the word <computeroutput>HOSTNAME</computeroutput> it string contains the word <computeroutput>HOSTNAME</computeroutput> it
will be translated to the domainless name of the machine &kdm; is will be translated to the domainless name of the machine &tdm; is
installed on.</para> installed on.</para>
<para>You can then choose to show either the current system time, a logo <para>You can then choose to show either the current system time, a logo
@ -87,11 +87,11 @@ dialog.</para>
</itemizedlist> </itemizedlist>
<para>If you do not specify a logo the default <para>If you do not specify a logo the default
<filename>$<envar>TDEDIR</envar>/share/apps/kdm/pics/kdelogo.png</filename> <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/kdelogo.png</filename>
will be displayed.</para> will be displayed.</para>
<para>While &kde;'s style depends on the settings of the user logged in, <para>While &kde;'s style depends on the settings of the user logged in,
the style used by &kdm; can be configured using the <guilabel>GUI the style used by &tdm; can be configured using the <guilabel>GUI
Style</guilabel> option.</para> Style</guilabel> option.</para>
<para>Below that, you have two dropdown boxes to choose the language and the <para>Below that, you have two dropdown boxes to choose the language and the
@ -99,7 +99,7 @@ country for your login box.</para>
</sect2> </sect2>
<sect2 id="kdmconfig-font"> <sect2 id="tdmconfig-font">
<title>Font</title> <title>Font</title>
<para>From this section of the module you can change the fonts used in <para>From this section of the module you can change the fonts used in
@ -130,7 +130,7 @@ login window.</para>
</sect2> </sect2>
<sect2 id="kdmconfig-background"> <sect2 id="tdmconfig-background">
<title>Background</title> <title>Background</title>
<para>Here you can change the desktop background which will be displayed <para>Here you can change the desktop background which will be displayed
@ -269,21 +269,21 @@ stretched to fit all four corners.</para> </listitem>
</sect2> </sect2>
<sect2 id="kdmconfig-sessions"> <sect2 id="tdmconfig-sessions">
<title>Sessions</title> <title>Sessions</title>
<para><guilabel>Allow to shutdown</guilabel></para> <para><guilabel>Allow to shutdown</guilabel></para>
<para>Use this dropdown box to choose who is allowed to shut down:</para> <para>Use this dropdown box to choose who is allowed to shut down:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><guilabel>None</guilabel>: No one can shutdown the computer using &kdm;. <para><guilabel>None</guilabel>: No one can shutdown the computer using &tdm;.
You must be logged in, and execute a command.</para> You must be logged in, and execute a command.</para>
</listitem> </listitem>
<listitem> <listitem>
<para><guilabel>All</guilabel>: Everyone can shutdown the computer using <para><guilabel>All</guilabel>: Everyone can shutdown the computer using
&kdm;.</para> &tdm;.</para>
</listitem> </listitem>
<listitem><para><guilabel>Root only</guilabel>: &kdm; requires that the <listitem><para><guilabel>Root only</guilabel>: &tdm; requires that the
<systemitem>root</systemitem> password be entered before shutting down the <systemitem>root</systemitem> password be entered before shutting down the
computer.</para></listitem> computer.</para></listitem>
<listitem><para><guilabel>Console only</guilabel>: The user must be at this <listitem><para><guilabel>Console only</guilabel>: The user must be at this
@ -305,13 +305,13 @@ defaults to:</para>
<para><command>/sbin/init <option>3</option></command></para> <para><command>/sbin/init <option>3</option></command></para>
<para>When <guilabel>Show boot options</guilabel> is enabled, &kdm; will on reboot <para>When <guilabel>Show boot options</guilabel> is enabled, &tdm; will on reboot
offer you options for the lilo boot manager. For this feature to work, you will offer you options for the lilo boot manager. For this feature to work, you will
need to supply the correct paths to your <command>lilo</command> command and to need to supply the correct paths to your <command>lilo</command> command and to
lilo's map file.</para> lilo's map file.</para>
<sect3 id="kdmconfig-sess"> <sect3 id="tdmconfig-sess">
<title>Session types</title> <title>Session types</title>
<para>Define which session types should be accessible from the login <para>Define which session types should be accessible from the login
@ -335,7 +335,7 @@ blank entitled <guilabel>New types</guilabel>, and click
</sect2> </sect2>
<sect2 id="kdmconfig-users"> <sect2 id="tdmconfig-users">
<title>Users</title> <title>Users</title>
<para>From here you can change the way users are represented in the <para>From here you can change the way users are represented in the
@ -359,7 +359,7 @@ more traditional. Users will need to type their username, and password
to gain entrance. This is the preferred way if you have many users on to gain entrance. This is the preferred way if you have many users on
this terminal.</para> this terminal.</para>
<sect3 id="kdmconfig-showusers"> <sect3 id="tdmconfig-showusers">
<title>To show (and sort) or not to show users</title> <title>To show (and sort) or not to show users</title>
<para>Along the right edge of the window are two check boxes:</para> <para>Along the right edge of the window are two check boxes:</para>
@ -376,7 +376,7 @@ effect.</para>
</sect3> </sect3>
<sect3 id="kdmconfig-whichusers"> <sect3 id="tdmconfig-whichusers">
<title>How to determine which users to show and which users to hide</title> <title>How to determine which users to show and which users to hide</title>
<para>Below the user image box, and above the <guilabel>Show <para>Below the user image box, and above the <guilabel>Show
@ -395,7 +395,7 @@ users</guilabel> is not checked, this has no effect. </para></listitem>
</sect3> </sect3>
<sect3 id="kdmconfig-select"> <sect3 id="tdmconfig-select">
<title>Select users</title> <title>Select users</title>
<para>This page contains three listboxes. The large listbox on the left <para>This page contains three listboxes. The large listbox on the left
@ -413,7 +413,7 @@ to the leftmost box.</para>
</sect3> </sect3>
<sect3 id="kdmconfig-image"> <sect3 id="tdmconfig-image">
<title>Images</title> <title>Images</title>
<note><para>This section of the manual only applies if <guilabel>Show <note><para>This section of the manual only applies if <guilabel>Show
@ -422,9 +422,9 @@ effect.</para></note>
<para>Every user on the system can be represented by a image. The image <para>Every user on the system can be represented by a image. The image
for the user is kept in a file called for the user is kept in a file called
<filename>$<envar>TDEDIR</envar>/share/apps/kdm/pics/users/$<envar>USER</envar>.xpm.</filename> <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/users/$<envar>USER</envar>.xpm.</filename>
If the user doesn't have such a file the file If the user doesn't have such a file the file
<filename>$<envar>TDEDIR</envar>/share/apps/kdm/pics/users/default.xpm</filename> <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/users/default.xpm</filename>
will be used instead.</para> will be used instead.</para>
<para>To assign a new image to a user just select the user in one of the <para>To assign a new image to a user just select the user in one of the
@ -445,7 +445,7 @@ button.</para>
</sect2> </sect2>
<sect2 id="kdmconfig-convenience"> <sect2 id="tdmconfig-convenience">
<title>Convenience</title> <title>Convenience</title>
<para>In the <guilabel>convenience</guilabel> tab you can configure some <para>In the <guilabel>convenience</guilabel> tab you can configure some
@ -467,9 +467,9 @@ the option <guilabel>Enable auto-login</guilabel>.</para>
<para>Automatic login comes in two flavors: <guilabel>truly automatic <para>Automatic login comes in two flavors: <guilabel>truly automatic
login</guilabel> acts like you would expect automatic login to, &ie; login</guilabel> acts like you would expect automatic login to, &ie;
&kdm; will automatically login without expecting any input from the &tdm; will automatically login without expecting any input from the
user. Enable this using the <guilabel>Truly automatic login</guilabel> user. Enable this using the <guilabel>Truly automatic login</guilabel>
option. If this option is not enabled, &kdm; will start normally, option. If this option is not enabled, &tdm; will start normally,
enabling you to login as any user, and will only perform automatic login enabling you to login as any user, and will only perform automatic login
if you kill the X server, &eg; by pressing <keycombo if you kill the X server, &eg; by pressing <keycombo
action="simul">&Ctrl;&Alt;<keycap>Backspace</keycap></keycombo>.</para> action="simul">&Ctrl;&Alt;<keycap>Backspace</keycap></keycombo>.</para>
@ -504,7 +504,7 @@ password-less login, &eg;
option allows you to skip the authentication procedure when your X option allows you to skip the authentication procedure when your X
server accidentally crashed. <guilabel>Show previous user</guilabel> server accidentally crashed. <guilabel>Show previous user</guilabel>
will show the name of the last login already entered into the login will show the name of the last login already entered into the login
field in &kdm;. Some site administrators would consider even this a field in &tdm;. Some site administrators would consider even this a
possible security weakness, because potential attackers then know at possible security weakness, because potential attackers then know at
least one valid login.</para> least one valid login.</para>

2
doc/kcontrol/mouse/index.docbook
Unescape View File

@ -408,7 +408,7 @@ and permissions, as shown below:
if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ]
then then
# New code, using lock files instead of copying /dev/console permissions # New code, using lock files instead of copying /dev/console permissions
# This also works with non-kdm logins (e.g. on a virtual terminal) # This also works with non-tdm logins (e.g. on a virtual terminal)
# Idea and code from Nalin Dahyabhai <nalin@redhat.com> # Idea and code from Nalin Dahyabhai <nalin@redhat.com>
if [ -f /var/run/console.lock ] if [ -f /var/run/console.lock ]
then then

2
doc/kdm/CMakeLists.txt
Unescape View File

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION kdm ) tde_create_handbook( DESTINATION tdm )

6
doc/kdm/Makefile.am
Unescape View File

@ -1,6 +1,6 @@
conf_def = $(top_srcdir)/kdm/config.def conf_def = $(top_srcdir)/tdm/config.def
ref: $(conf_def) $(top_srcdir)/kdm/confproc.pl ref: $(conf_def) $(top_srcdir)/tdm/confproc.pl
$(PERL) -w $(top_srcdir)/kdm/confproc.pl --doc $(conf_def) kdmrc-ref.docbook $(PERL) -w $(top_srcdir)/tdm/confproc.pl --doc $(conf_def) tdmrc-ref.docbook
KDE_LANG = en KDE_LANG = en
KDE_DOCS = AUTO KDE_DOCS = AUTO

258
doc/kdm/index.docbook
Unescape View File

@ -1,21 +1,21 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
"dtd/kdex.dtd" [ "dtd/kdex.dtd" [
<!ENTITY kappname "&kdm;"> <!ENTITY kappname "&tdm;">
<!ENTITY package "tdebase"> <!ENTITY package "tdebase">
<!ENTITY kdmrc "<filename>kdmrc</filename>"> <!ENTITY tdmrc "<filename>tdmrc</filename>">
<!ENTITY ksmserver "<application>ksmserver</application>"> <!ENTITY ksmserver "<application>ksmserver</application>">
<!ENTITY kdesktop "<application>kdesktop</application>"> <!ENTITY kdesktop "<application>kdesktop</application>">
<!ENTITY XDMCP "<acronym>XDMCP</acronym>"> <!ENTITY XDMCP "<acronym>XDMCP</acronym>">
<!ENTITY xdm "<application>xdm</application>"> <!ENTITY xdm "<application>xdm</application>">
<!ENTITY kdmrc-ref SYSTEM "kdmrc-ref.docbook"> <!ENTITY tdmrc-ref SYSTEM "tdmrc-ref.docbook">
<!ENTITY % addindex "INCLUDE"> <!ENTITY % addindex "INCLUDE">
<!ENTITY % English "INCLUDE" > <!-- change language only here --> <!ENTITY % English "INCLUDE" > <!-- change language only here -->
]> ]>
<book lang="&language;"> <book lang="&language;">
<bookinfo> <bookinfo>
<title>The &kdm; Handbook</title> <title>The &tdm; Handbook</title>
<authorgroup> <authorgroup>
<author> <author>
@ -53,13 +53,13 @@
<releaseinfo>0.05.02</releaseinfo> <releaseinfo>0.05.02</releaseinfo>
<abstract> <abstract>
<para>This document describes &kdm; the &kde; Display Manager. &kdm; <para>This document describes &tdm; the &kde; Display Manager. &tdm;
is also known as the <quote>Login Manager</quote>.</para> is also known as the <quote>Login Manager</quote>.</para>
</abstract> </abstract>
<keywordset> <keywordset>
<keyword>KDE</keyword> <keyword>KDE</keyword>
<keyword>kdm</keyword> <keyword>tdm</keyword>
<keyword>xdm</keyword> <keyword>xdm</keyword>
<keyword>display manager</keyword> <keyword>display manager</keyword>
<keyword>login manager</keyword> <keyword>login manager</keyword>
@ -70,9 +70,9 @@ is also known as the <quote>Login Manager</quote>.</para>
<chapter id="introduction"> <chapter id="introduction">
<title>Introduction</title> <title>Introduction</title>
<para>&kdm; provides a graphical interface that allows you to log in to a <para>&tdm; provides a graphical interface that allows you to log in to a
system. It prompts for login (username) and password, authenticates the user system. It prompts for login (username) and password, authenticates the user
and starts a <quote>session</quote>. &kdm; is superior to &xdm;, the X and starts a <quote>session</quote>. &tdm; is superior to &xdm;, the X
Display Manager, in a number of ways.</para> Display Manager, in a number of ways.</para>
</chapter> </chapter>
@ -81,7 +81,7 @@ Display Manager, in a number of ways.</para>
<!-- * Just enough config to get it to run and login to KDE <!-- * Just enough config to get it to run and login to KDE
* Adding more session types (GNOME, etc) * Adding more session types (GNOME, etc)
* Adding other customizations to XSession (ssh/gpg-agent, etc) * Adding other customizations to XSession (ssh/gpg-agent, etc)
* Further customization to KDM (via the kcontrol module, and by * Further customization to TDM (via the kcontrol module, and by
hand) hand)
* XDMCP by query * XDMCP by query
* XDMCP by broadcast * XDMCP by broadcast
@ -137,10 +137,10 @@ look in their documentation for the correct command.</para>
<para>At this point, typing <userinput><command>startx</command></userinput> <para>At this point, typing <userinput><command>startx</command></userinput>
on the commandline should start X, with a &kde; session. The next task is on the commandline should start X, with a &kde; session. The next task is
to try &kdm;.</para> to try &tdm;.</para>
<para>As <systemitem class="username">root</systemitem>, type <para>As <systemitem class="username">root</systemitem>, type
<userinput><command>kdm</command></userinput> at the prompt.</para> <userinput><command>tdm</command></userinput> at the prompt.</para>
<para>You should see a login window, which is described more fully in <xref <para>You should see a login window, which is described more fully in <xref
linkend="login" />.</para> linkend="login" />.</para>
@ -154,7 +154,7 @@ above for each of them.</para>
<note> <note>
<para>This is a quick guide to getting up and running only. You probably <para>This is a quick guide to getting up and running only. You probably
will want to customize &kdm; further, for example, to hide the names of the will want to customize &tdm; further, for example, to hide the names of the
system accounts, to allow further sessions, and much more. Please read system accounts, to allow further sessions, and much more. Please read
through the rest of this manual to find out how to do these things.</para> through the rest of this manual to find out how to do these things.</para>
</note> </note>
@ -164,7 +164,7 @@ through the rest of this manual to find out how to do these things.</para>
<chapter id="login"> <chapter id="login">
<title>The Login Window</title> <title>The Login Window</title>
<para> The user interface to &kdm; consists of two dialog boxes. The main <para> The user interface to &tdm; consists of two dialog boxes. The main
dialog box has these controls:</para> dialog box has these controls:</para>
<itemizedlist> <itemizedlist>
@ -186,7 +186,7 @@ imitation of the login box on &IRIX;).</para>
</listitem> </listitem>
<listitem> <listitem>
<para>A <guilabel>Menu</guilabel> drop down box that allows &kdm; to be used <para>A <guilabel>Menu</guilabel> drop down box that allows &tdm; to be used
to start sessions with various different window managers or desktop to start sessions with various different window managers or desktop
environments installed on the system.</para> environments installed on the system.</para>
</listitem> </listitem>
@ -233,7 +233,7 @@ and bring up the login dialog again.</para>
<listitem> <listitem>
<para>(Optionally on local displays) A <guimenuitem>Console <para>(Optionally on local displays) A <guimenuitem>Console
Mode</guimenuitem> item that terminates the currently running &X-Server; and Mode</guimenuitem> item that terminates the currently running &X-Server; and
leaves you alone with a console login. &kdm; will resume the graphical login leaves you alone with a console login. &tdm; will resume the graphical login
if nobody is logged in at the console for some time.</para> if nobody is logged in at the console for some time.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@ -285,56 +285,56 @@ software.</para>
<para>Pressing the <guibutton>OK</guibutton> button initiates the selected <para>Pressing the <guibutton>OK</guibutton> button initiates the selected
action; pressing the <guibutton>Cancel</guibutton> button returns to the action; pressing the <guibutton>Cancel</guibutton> button returns to the
main &kdm; dialog box. </para> main &tdm; dialog box. </para>
</chapter> </chapter>
<!-- *********************************************************************** --> <!-- *********************************************************************** -->
<chapter id="configuring-kdm"> <chapter id="configuring-tdm">
<title>Configuring &kdm;</title> <title>Configuring &tdm;</title>
<para>This chapter assumes that &kdm; is already up and running on your <para>This chapter assumes that &tdm; is already up and running on your
system, and that you simply want to change its behavior in some way.</para> system, and that you simply want to change its behavior in some way.</para>
<para>When &kdm; starts up, it reads its configuration from the folder <para>When &tdm; starts up, it reads its configuration from the folder
<filename class="directory">$TDEDIR/share/config/kdm/</filename> (this may <filename class="directory">$TDEDIR/share/config/tdm/</filename> (this may
be <filename class="directory">/etc/trinity/kdm/</filename> or something else be <filename class="directory">/etc/trinity/tdm/</filename> or something else
on your system).</para> on your system).</para>
<para>The main configuration file is &kdmrc;; all other files are <para>The main configuration file is &tdmrc;; all other files are
referenced from there and could be stored under any name anywhere on referenced from there and could be stored under any name anywhere on
the system - but usually that would not make much sense for obvious the system - but usually that would not make much sense for obvious
reasons (one particular exception is referencing configuration files reasons (one particular exception is referencing configuration files
of an already installed &xdm; - however when a new &kdm; is installed, of an already installed &xdm; - however when a new &tdm; is installed,
it will import settings from those files if it finds an already installed it will import settings from those files if it finds an already installed
&xdm;).</para> &xdm;).</para>
<para>Since &kdm; must run before any user is logged in, it is not <para>Since &tdm; must run before any user is logged in, it is not
associated with any particular user. Therefore, it is not possible to have associated with any particular user. Therefore, it is not possible to have
user-specific configuration files; all users share the common &kdmrc;. It user-specific configuration files; all users share the common &tdmrc;. It
follows from this that the configuration of &kdm; can only be altered by follows from this that the configuration of &tdm; can only be altered by
those users that have write access to those users that have write access to
<filename>$<envar>TDEDIR</envar>/share/config/kdm/kdmrc</filename> (normally <filename>$<envar>TDEDIR</envar>/share/config/tdm/tdmrc</filename> (normally
restricted to system administrators logged in as <systemitem restricted to system administrators logged in as <systemitem
class="username">root</systemitem>).</para> class="username">root</systemitem>).</para>
<para>You can view the &kdmrc; file currently in use on your system, and you <para>You can view the &tdmrc; file currently in use on your system, and you
can configure &kdm; by editing this file. Alternatively, you can use the can configure &tdm; by editing this file. Alternatively, you can use the
graphical configuration tool provided by the &kcontrolcenter; (under graphical configuration tool provided by the &kcontrolcenter; (under
<menuchoice><guisubmenu>System Administration</guisubmenu><guimenuitem>Login <menuchoice><guisubmenu>System Administration</guisubmenu><guimenuitem>Login
Manager</guimenuitem></menuchoice>), which is described in <ulink Manager</guimenuitem></menuchoice>), which is described in <ulink
url="help:/kcontrol/login-manager.html">the &kcontrolcenter; help files</ulink>. url="help:/kcontrol/login-manager.html">the &kcontrolcenter; help files</ulink>.
</para> </para>
<para>The remainder of this chapter describes configuration of &kdm; <para>The remainder of this chapter describes configuration of &tdm;
via the &kcontrolcenter; module, and the <link linkend="kdm-files">next via the &kcontrolcenter; module, and the <link linkend="tdm-files">next
chapter</link> describes the options available in &kdmrc; itself. If chapter</link> describes the options available in &tdmrc; itself. If
you only need to configure for local users, the &kcontrolcenter; module you only need to configure for local users, the &kcontrolcenter; module
should be sufficient for your needs. If you need to configure remote should be sufficient for your needs. If you need to configure remote
logins, or have multiple &kdm; sessions running, you will need to read logins, or have multiple &tdm; sessions running, you will need to read
on.</para> on.</para>
<sect1 id="kdm-kcontrol-module"> <sect1 id="tdm-kcontrol-module">
<sect1info> <sect1info>
<authorgroup> <authorgroup>
<author>&Thomas.Tanghus; &Thomas.Tanghus.mail;</author> <author>&Thomas.Tanghus; &Thomas.Tanghus.mail;</author>
@ -346,31 +346,31 @@ on.</para>
<title>The Login Manager &kcontrolcenter; Module</title> <title>The Login Manager &kcontrolcenter; Module</title>
<para>Using this module, you can configure the &kde; graphical login <para>Using this module, you can configure the &kde; graphical login
manager, &kdm;. You can change how the login screen looks, who has manager, &tdm;. You can change how the login screen looks, who has
access using the login manager and who can shutdown the access using the login manager and who can shutdown the
computer.</para> computer.</para>
<note><para>All settings will be written to the configuration file <note><para>All settings will be written to the configuration file
&kdmrc;, which in its original state has many comments to help you &tdmrc;, which in its original state has many comments to help you
configure &kdm;. Using this &kcontrolcenter; module will strip these configure &tdm;. Using this &kcontrolcenter; module will strip these
comments from the file. All available options in &kdmrc; are covered comments from the file. All available options in &tdmrc; are covered
in <xref linkend="kdm-files"/>.</para> in <xref linkend="tdm-files"/>.</para>
<para>The options listed in this chapter are cross referenced with <para>The options listed in this chapter are cross referenced with
their equivalents in &kdmrc;. All options available in the &kcontrol; their equivalents in &tdmrc;. All options available in the &kcontrol;
module are also available directly in &kdmrc; but the reverse is not module are also available directly in &tdmrc; but the reverse is not
true.</para></note> true.</para></note>
<para>In order to organize all of these options, this module is <para>In order to organize all of these options, this module is
divided into several sections: <link divided into several sections: <link
linkend="kdmconfig-appearance"><guilabel>Appearance</guilabel></link>, linkend="tdmconfig-appearance"><guilabel>Appearance</guilabel></link>,
<link linkend="kdmconfig-font"><guilabel>Font</guilabel></link>, <link <link linkend="tdmconfig-font"><guilabel>Font</guilabel></link>, <link
linkend="kdmconfig-background"><guilabel>Background</guilabel></link>, linkend="tdmconfig-background"><guilabel>Background</guilabel></link>,
<link <link
linkend="kdmconfig-shutdown"><guilabel>Shutdown</guilabel></link>, linkend="tdmconfig-shutdown"><guilabel>Shutdown</guilabel></link>,
<link linkend="kdmconfig-users"><guilabel>Users</guilabel></link> and <link linkend="tdmconfig-users"><guilabel>Users</guilabel></link> and
<link <link
linkend="kdmconfig-convenience"><guilabel>Convenience</guilabel></link>.</para> linkend="tdmconfig-convenience"><guilabel>Convenience</guilabel></link>.</para>
<para>You can switch between the sections using the tabs at the top of <para>You can switch between the sections using the tabs at the top of
the window.</para> the window.</para>
@ -381,10 +381,10 @@ Button. You will then be asked for a superuser password. Entering a
correct password will allow you to modify the settings of this correct password will allow you to modify the settings of this
module.</para></note> module.</para></note>
<sect2 id="kdmconfig-appearance"> <sect2 id="tdmconfig-appearance">
<title>Appearance</title> <title>Appearance</title>
<para>From this page you can change the visual appearance of &kdm;, <para>From this page you can change the visual appearance of &tdm;,
&kde;'s graphical login manager.</para> &kde;'s graphical login manager.</para>
<para>The <guilabel>Greeting:</guilabel> is the title of the login <para>The <guilabel>Greeting:</guilabel> is the title of the login
@ -392,13 +392,13 @@ module.</para></note>
may log in to. You may use various placeholders, which are described may log in to. You may use various placeholders, which are described
along with the corresponding key along with the corresponding key
<link linkend="option-greetstring"><option>GreetString</option></link> <link linkend="option-greetstring"><option>GreetString</option></link>
in &kdmrc;. in &tdmrc;.
</para> </para>
<para>You can then choose to show either the current system time, a logo or <para>You can then choose to show either the current system time, a logo or
nothing special in the login box. Make your choice in the radio buttons nothing special in the login box. Make your choice in the radio buttons
labeled <guilabel>Logo area:</guilabel>. This corresponds to <link labeled <guilabel>Logo area:</guilabel>. This corresponds to <link
linkend="option-logoarea"><option>LogoArea</option></link> in &kdmrc;</para> linkend="option-logoarea"><option>LogoArea</option></link> in &tdmrc;</para>
<para>If you chose <guilabel>Show logo</guilabel> you can now choose a <para>If you chose <guilabel>Show logo</guilabel> you can now choose a
logo:</para> logo:</para>
@ -414,7 +414,7 @@ dialog.</para>
</itemizedlist> </itemizedlist>
<para>If you do not specify a logo the default <para>If you do not specify a logo the default
<filename>$<envar>TDEDIR</envar>/share/apps/kdm/pics/kdelogo.xpm</filename> <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/kdelogo.xpm</filename>
will be displayed.</para> will be displayed.</para>
<para>Normally the login box is centered on the screen. Use the <para>Normally the login box is centered on the screen. Use the
@ -425,23 +425,23 @@ relative to the top left of the display, in the fields labeled
<guilabel>X:</guilabel> and <guilabel>Y:</guilabel> respectively. <guilabel>X:</guilabel> and <guilabel>Y:</guilabel> respectively.
These correspond to the key These correspond to the key
<link linkend="option-greeterpos"><option>GreeterPos</option></link> <link linkend="option-greeterpos"><option>GreeterPos</option></link>
in &kdmrc;.</para> in &tdmrc;.</para>
<para>While &kde;'s style depends on the settings of the user logged <para>While &kde;'s style depends on the settings of the user logged
in, the style used by &kdm; can be configured using the <guilabel>GUI in, the style used by &tdm; can be configured using the <guilabel>GUI
Style:</guilabel> and <guilabel>Color Scheme:</guilabel> options. Style:</guilabel> and <guilabel>Color Scheme:</guilabel> options.
These correspond to the keys <link These correspond to the keys <link
linkend="option-guistyle"><option>GUIStyle</option></link> and <link linkend="option-guistyle"><option>GUIStyle</option></link> and <link
linkend="option-colorscheme"><option>ColorScheme</option></link> in linkend="option-colorscheme"><option>ColorScheme</option></link> in
&kdmrc; respectively.</para> &tdmrc; respectively.</para>
<para>Below that, you have a drop down box to choose the language for <para>Below that, you have a drop down box to choose the language for
your login box, corresponding to setting <option>Language</option> in your login box, corresponding to setting <option>Language</option> in
&kdmrc;.</para> &tdmrc;.</para>
</sect2> </sect2>
<sect2 id="kdmconfig-font"> <sect2 id="tdmconfig-font">
<title>Font</title> <title>Font</title>
<para>From this section of the module you can change the fonts used in the <para>From this section of the module you can change the fonts used in the
@ -474,7 +474,7 @@ fonts</guilabel> if you want smoothed fonts in the login dialog.</para>
</sect2> </sect2>
<sect2 id="kdmconfig-background"> <sect2 id="tdmconfig-background">
<title>Background</title> <title>Background</title>
<para>Here you can change the desktop background which will be displayed <para>Here you can change the desktop background which will be displayed
@ -612,7 +612,7 @@ stretched to fit all four corners.</para> </listitem>
</sect2> </sect2>
<sect2 id="kdmconfig-shutdown"> <sect2 id="tdmconfig-shutdown">
<title><guilabel>Shutdown</guilabel></title> <title><guilabel>Shutdown</guilabel></title>
<para><guilabel>Allow Shutdown</guilabel></para> <para><guilabel>Allow Shutdown</guilabel></para>
@ -620,13 +620,13 @@ stretched to fit all four corners.</para> </listitem>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><guilabel>Nobody</guilabel>: No one can shutdown the computer using <para><guilabel>Nobody</guilabel>: No one can shutdown the computer using
&kdm;. You must be logged in, and execute a command.</para> &tdm;. You must be logged in, and execute a command.</para>
</listitem> </listitem>
<listitem> <listitem>
<para><guilabel>Everybody</guilabel>: Everyone can shutdown the computer using <para><guilabel>Everybody</guilabel>: Everyone can shutdown the computer using
&kdm;.</para> &tdm;.</para>
</listitem> </listitem>
<listitem><para><guilabel>Only Root</guilabel>: &kdm; requires that the <listitem><para><guilabel>Only Root</guilabel>: &tdm; requires that the
<systemitem>root</systemitem> password be entered before shutting down the <systemitem>root</systemitem> password be entered before shutting down the
computer.</para></listitem> computer.</para></listitem>
</itemizedlist> </itemizedlist>
@ -638,12 +638,12 @@ shutdown command for the <guilabel>Local:</guilabel> and
<para><emphasis>Commands</emphasis></para> <para>Use these text fields to <para><emphasis>Commands</emphasis></para> <para>Use these text fields to
define the exact shutdown command.</para> <para>The define the exact shutdown command.</para> <para>The
<guilabel>Halt:</guilabel> command defaults to <!-- Are these defaults still <guilabel>Halt:</guilabel> command defaults to <!-- Are these defaults still
correct? they disagree with what's in --> <!-- kdmrc --> correct? they disagree with what's in --> <!-- tdmrc -->
<command>/sbin/halt</command>. The <guilabel>Restart:</guilabel> command <command>/sbin/halt</command>. The <guilabel>Restart:</guilabel> command
defaults to defaults to
<command>/sbin/reboot</command>.</para> <command>/sbin/reboot</command>.</para>
<para>When <guilabel>Show boot options</guilabel> is enabled, &kdm; <para>When <guilabel>Show boot options</guilabel> is enabled, &tdm;
will on reboot offer you options for the lilo boot manager. For this will on reboot offer you options for the lilo boot manager. For this
feature to work, you will need to supply the correct paths to your feature to work, you will need to supply the correct paths to your
<command>lilo</command> command and to lilo's map file. Note that this <command>lilo</command> command and to lilo's map file. Note that this
@ -651,13 +651,13 @@ option is not available on all operating systems.</para>
</sect2> </sect2>
<sect2 id="kdmconfig-users"> <sect2 id="tdmconfig-users">
<title>Users</title> <title>Users</title>
<para>From here you can change the way users are represented in the <para>From here you can change the way users are represented in the
login window.</para> login window.</para>
<para>You may disable the user list in &kdm; entirely in the <para>You may disable the user list in &tdm; entirely in the
<guilabel>Show Users</guilabel> section. You can choose from:</para> <guilabel>Show Users</guilabel> section. You can choose from:</para>
<variablelist> <variablelist>
@ -692,7 +692,7 @@ over 65000, are not shown.</para>
<para>You can also enable the <guilabel>Sort users</guilabel> <para>You can also enable the <guilabel>Sort users</guilabel>
checkbox, to have the user list sorted alphabetically. If this is checkbox, to have the user list sorted alphabetically. If this is
disabled, users will appear in the order they are listed in the disabled, users will appear in the order they are listed in the
password file. &kdm; will also autocomplete user names if you enable the password file. &tdm; will also autocomplete user names if you enable the
<guilabel>Autocompletion</guilabel> option.</para> <guilabel>Autocompletion</guilabel> option.</para>
<para>If you choose to show users, then the login window will show <para>If you choose to show users, then the login window will show
@ -714,7 +714,7 @@ this terminal.</para>
</sect2> </sect2>
<sect2 id="kdmconfig-convenience"> <sect2 id="tdmconfig-convenience">
<title>Convenience</title> <title>Convenience</title>
<para>In the <guilabel>convenience</guilabel> tab you can configure <para>In the <guilabel>convenience</guilabel> tab you can configure
@ -758,12 +758,12 @@ password-less login, &eg;
<systemitem>guest</systemitem>.</para></important> <systemitem>guest</systemitem>.</para></important>
<para>You can also choose which user is <quote>preselected</quote> <para>You can also choose which user is <quote>preselected</quote>
when &kdm; starts. The default is <guilabel>None</guilabel>, but you when &tdm; starts. The default is <guilabel>None</guilabel>, but you
can choose <guilabel>Previous</guilabel> to have &kdm; default to the can choose <guilabel>Previous</guilabel> to have &tdm; default to the
last successfully logged in user, or you can last successfully logged in user, or you can
<guilabel>Specify</guilabel> a particular user to always be selected <guilabel>Specify</guilabel> a particular user to always be selected
from the list. You can also have &kdm; set the focus to the password from the list. You can also have &tdm; set the focus to the password
field, so that when you reach the &kdm; login screen, you can type the field, so that when you reach the &tdm; login screen, you can type the
password immediately.</para> password immediately.</para>
<para>The <guilabel>Automatically login after X server crash</guilabel> <para>The <guilabel>Automatically login after X server crash</guilabel>
@ -778,18 +778,18 @@ server accidentally crashed.</para>
</chapter> </chapter>
&kdmrc-ref; &tdmrc-ref;
<!-- ************************************************************ --> <!-- ************************************************************ -->
<chapter id="configuring-your-system-for-kdm"> <chapter id="configuring-your-system-for-tdm">
<title>Configuring your system to use &kdm;</title> <title>Configuring your system to use &tdm;</title>
<para>This chapter assumes that your system is already configured to <para>This chapter assumes that your system is already configured to
run the &X-Window;, and that you only need to reconfigure it to run the &X-Window;, and that you only need to reconfigure it to
allow graphical login.</para> allow graphical login.</para>
<sect1 id="setting-up-kdm"> <sect1 id="setting-up-tdm">
<title>Setting up &kdm;</title> <title>Setting up &tdm;</title>
<para>The fundamental thing that controls whether your computer boots to a <para>The fundamental thing that controls whether your computer boots to a
terminal prompt (console mode) or a graphical login prompt is the default terminal prompt (console mode) or a graphical login prompt is the default
@ -829,11 +829,11 @@ distributions is:</para>
</itemizedlist> </itemizedlist>
<para>The first step in configuring your system is to ensure that you <para>The first step in configuring your system is to ensure that you
can start &kdm; from the command line. Once this is working, you can can start &tdm; from the command line. Once this is working, you can
change your system configuration so that &kdm; starts automatically change your system configuration so that &tdm; starts automatically
each time you reboot your system.</para> each time you reboot your system.</para>
<para>To test &kdm;, you must first bring your system to a runlevel <para>To test &tdm;, you must first bring your system to a runlevel
that does not run &xdm;. To do so, issue a command like this:</para> that does not run &xdm;. To do so, issue a command like this:</para>
<screen><command>/sbin/init <option>3</option></command></screen> <screen><command>/sbin/init <option>3</option></command></screen>
@ -847,23 +847,23 @@ systems, you should check that your <abbrev>PAM</abbrev> configuration permits
login through the service named <literal>kde</literal>. If you previously used login through the service named <literal>kde</literal>. If you previously used
&xdm; successfully, you should not need to make any &xdm; successfully, you should not need to make any
changes to your <abbrev>PAM</abbrev> configuration in order to use changes to your <abbrev>PAM</abbrev> configuration in order to use
&kdm;. <filename>/etc/pam.conf</filename> or &tdm;. <filename>/etc/pam.conf</filename> or
<filename>/etc/pam.d/kde</filename>. Information on configuring <filename>/etc/pam.d/kde</filename>. Information on configuring
<abbrev>PAM</abbrev> is beyond the scope of this handbook, but <abbrev>PAM</abbrev> is beyond the scope of this handbook, but
<abbrev>PAM</abbrev> comes with comprehensive documentation (try looking in <abbrev>PAM</abbrev> comes with comprehensive documentation (try looking in
<filename>/usr/share/doc/*pam*/html/</filename>).</para> <filename>/usr/share/doc/*pam*/html/</filename>).</para>
<para>Now it's time for you to test &kdm; by issuing the following <para>Now it's time for you to test &tdm; by issuing the following
command:</para> command:</para>
<screen><command>kdm <option>-nodaemon</option></command> <screen><command>tdm <option>-nodaemon</option></command>
</screen> </screen>
<para>If you get a &kdm; login dialog and you are able to log in, <para>If you get a &tdm; login dialog and you are able to log in,
things are going well. The main thing that can go wrong here is that things are going well. The main thing that can go wrong here is that
the run-time linker might not find the shared &Qt; or &kde; libraries. the run-time linker might not find the shared &Qt; or &kde; libraries.
If you have a binary distribution of the &kde; libraries, make sure If you have a binary distribution of the &kde; libraries, make sure
&kdm; is installed where the libraries believe &kde; is installed and &tdm; is installed where the libraries believe &kde; is installed and
try setting some environment variables to point to your &kde; and &Qt; try setting some environment variables to point to your &kde; and &Qt;
libraries.</para> libraries.</para>
@ -883,8 +883,8 @@ libraries.</para>
make sure that you are not suffering from a more serious X make sure that you are not suffering from a more serious X
configuration problem.</para> configuration problem.</para>
<para>When you are able to start &kdm; successfully, you can start to <para>When you are able to start &tdm; successfully, you can start to
replace &xdm; by &kdm;. Again, this is distribution-dependent.</para> replace &xdm; by &tdm;. Again, this is distribution-dependent.</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
@ -892,16 +892,16 @@ replace &xdm; by &kdm;. Again, this is distribution-dependent.</para>
line:</para> line:</para>
<screen>x:5:respawn:/usr/X11/bin/xdm -nodaemon</screen> <screen>x:5:respawn:/usr/X11/bin/xdm -nodaemon</screen>
<para>and replace with:</para> <para>and replace with:</para>
<screen>x:5:respawn:/opt/kde/bin/kdm</screen> <screen>x:5:respawn:/opt/kde/bin/tdm</screen>
<para>This tells <command>init</command>(8) to respawn &kdm; when the <para>This tells <command>init</command>(8) to respawn &tdm; when the
system is in run level 5. Note that &kdm; does not need the system is in run level 5. Note that &tdm; does not need the
<option>-nodaemon</option> option.</para> <option>-nodaemon</option> option.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>For &Mandrake;, the X11 runlevel in <para>For &Mandrake;, the X11 runlevel in
<filename>/etc/inittab</filename> invokes the shell script <filename>/etc/inittab</filename> invokes the shell script
<filename>/etc/X11/prefdm</filename>, which is set up to select from <filename>/etc/X11/prefdm</filename>, which is set up to select from
amongst several display managers, including &kdm;. Make sure that all amongst several display managers, including &tdm;. Make sure that all
the paths are correct for your installation.</para> the paths are correct for your installation.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -909,22 +909,22 @@ the paths are correct for your installation.</para>
first line:</para> first line:</para>
<screen>. /etc/rc.config <screen>. /etc/rc.config
DISPLAYMANAGER=kdm DISPLAYMANAGER=tdm
export DISPLAYMANAGER</screen> export DISPLAYMANAGER</screen>
</listitem> </listitem>
<listitem><para>For FreeBSD, edit <filename>/etc/ttys</filename> and find <listitem><para>For FreeBSD, edit <filename>/etc/ttys</filename> and find
the line like this:</para> the line like this:</para>
<screen>ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure</screen> <screen>ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure</screen>
<para>and edit it to this:</para> <para>and edit it to this:</para>
<screen>ttyv8 "/usr/local/bin/kdm" xterm on secure</screen> <screen>ttyv8 "/usr/local/bin/tdm" xterm on secure</screen>
</listitem> </listitem>
<listitem><para>Most other distributions are a variation of one of <listitem><para>Most other distributions are a variation of one of
these.</para></listitem> these.</para></listitem>
</itemizedlist> </itemizedlist>
<para>At this stage, you can test &kdm; again by bringing your system <para>At this stage, you can test &tdm; again by bringing your system
to the runlevel that should now run &kdm;. To do so, issue a command to the runlevel that should now run &tdm;. To do so, issue a command
like this:</para> like this:</para>
<screen><command>/sbin/init <option>5</option></command> <screen><command>/sbin/init <option>5</option></command>
@ -950,7 +950,7 @@ at your peril.</para></warning>
<screen>id:5:initdefault:</screen> <screen>id:5:initdefault:</screen>
<para>When you reboot your system, you should end up with the <para>When you reboot your system, you should end up with the
graphical &kdm; login dialog.</para> graphical &tdm; login dialog.</para>
<para>If this step is unsuccessful the most likely problem is that the <para>If this step is unsuccessful the most likely problem is that the
environment used at boot time differs from the environment that you used for environment used at boot time differs from the environment that you used for
@ -964,24 +964,24 @@ some way.</para>
</chapter> </chapter>
<chapter id="different-window-managers-with-kdm"> <chapter id="different-window-managers-with-tdm">
<title>Supporting multiple window managers</title> <title>Supporting multiple window managers</title>
<para>&kdm; detects most available window manager and desktop environments when <para>&tdm; detects most available window manager and desktop environments when
it is run. Installing a new one should make it automatically available in it is run. Installing a new one should make it automatically available in
the &kdm; main dialog <guilabel>Session Type:</guilabel>.</para> the &tdm; main dialog <guilabel>Session Type:</guilabel>.</para>
<para>If you have a very new window manager, or something that &kdm; does <para>If you have a very new window manager, or something that &tdm; does
not support, the first thing you should check is that the application to be not support, the first thing you should check is that the application to be
run is in the <envar>PATH</envar> and has not been renamed during the run is in the <envar>PATH</envar> and has not been renamed during the
install into something unexpected.</para> install into something unexpected.</para>
<para>If the case is that the application is too new and not yet supported <para>If the case is that the application is too new and not yet supported
by &kdm;, you can quite simply add a new session.</para> by &tdm;, you can quite simply add a new session.</para>
<para>The sessions are defined in <firstterm>.desktop</firstterm> files in <para>The sessions are defined in <firstterm>.desktop</firstterm> files in
<filename <filename
class="directory">$<envar>TDEDIR</envar>/share/apps/kdm/sessions</filename>. class="directory">$<envar>TDEDIR</envar>/share/apps/tdm/sessions</filename>.
You can simply add an appropriately named <literal You can simply add an appropriately named <literal
role="extension">.desktop</literal> file in this directory. The fields role="extension">.desktop</literal> file in this directory. The fields
are:</para> are:</para>
@ -995,7 +995,7 @@ Exec=<replaceable>executable name</replaceable> <lineannotation>Passed to
<command>eval exec</command> in a Bourne shell</lineannotation> <command>eval exec</command> in a Bourne shell</lineannotation>
TryExec=<replaceable>executable name</replaceable> <lineannotation>Supported TryExec=<replaceable>executable name</replaceable> <lineannotation>Supported
but not required</lineannotation> but not required</lineannotation>
Name=<replaceable>name to show in the &kdm; session list</replaceable></programlisting> Name=<replaceable>name to show in the &tdm; session list</replaceable></programlisting>
<para>There are also three <quote>magic</quote>:</para> <para>There are also three <quote>magic</quote>:</para>
@ -1004,7 +1004,7 @@ Name=<replaceable>name to show in the &kdm; session list</replaceable></programl
<term>default</term> <term>default</term>
<listitem> <listitem>
<para> <para>
The default session for &kdm; is normally &kde; but can be configured by the The default session for &tdm; is normally &kde; but can be configured by the
system administrator. system administrator.
</para> </para>
</listitem> </listitem>
@ -1032,14 +1032,14 @@ purposes.
to the config dir and edit it at will. Removing the shipped session types to the config dir and edit it at will. Removing the shipped session types
can be accomplished by <quote>shadowing</quote> them with .desktop files can be accomplished by <quote>shadowing</quote> them with .desktop files
containing Hidden=true. For the magic session types no .desktop files exist containing Hidden=true. For the magic session types no .desktop files exist
by default, but &kdm; pretends they would, so you can override them like any by default, but &tdm; pretends they would, so you can override them like any
other type. I guess you already know how to add a new session type by other type. I guess you already know how to add a new session type by
now. ;-)</para> now. ;-)</para>
</chapter> </chapter>
<chapter id="xdmcp-with-kdm"> <chapter id="xdmcp-with-tdm">
<title>Using &kdm; for Remote Logins (&XDMCP;)</title> <title>Using &tdm; for Remote Logins (&XDMCP;)</title>
<para>&XDMCP; is the Open Group standard, the <quote>X Display Manager <para>&XDMCP; is the Open Group standard, the <quote>X Display Manager
Control Protocol</quote>. This is used to set up connections between Control Protocol</quote>. This is used to set up connections between
@ -1068,7 +1068,7 @@ this.</para>
<sect1 id="command-sockets"> <sect1 id="command-sockets">
<title>Command Sockets</title> <title>Command Sockets</title>
<para>This is a feature you can use to remote-control &kdm;. It's mostly <para>This is a feature you can use to remote-control &tdm;. It's mostly
intended for use by &ksmserver; and &kdesktop; from a running session, but intended for use by &ksmserver; and &kdesktop; from a running session, but
other applications are possible as well.</para> other applications are possible as well.</para>
@ -1149,9 +1149,9 @@ is attempted, but a scheduled "login" command will be executed.</para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term><returnvalue>&kdm;</returnvalue></term> <term><returnvalue>&tdm;</returnvalue></term>
<listitem> <listitem>
<para>identifies &kdm;, in case some other DM implements this protocol, <para>identifies &tdm;, in case some other DM implements this protocol,
too</para> too</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1280,7 +1280,7 @@ means immediately.</para>
<para><parameter>end</parameter> is the latest time at which the shutdown <para><parameter>end</parameter> is the latest time at which the shutdown
should be performed if active sessions are still running. If it starts with should be performed if active sessions are still running. If it starts with
a plus-sign, the start time is added. -1 means wait infinitely. If end is a plus-sign, the start time is added. -1 means wait infinitely. If end is
through and active sessions are still running, &kdm; can do one of the through and active sessions are still running, &tdm; can do one of the
following:</para> following:</para>
<itemizedlist> <itemizedlist>
<listitem><para><parameter>cancel</parameter> - give up the <listitem><para><parameter>cancel</parameter> - give up the
@ -1346,21 +1346,21 @@ $<envar>DM_CONTROL</envar>; the name of per-display sockets can be derived
from $<envar>DISPLAY</envar>.</para> from $<envar>DISPLAY</envar>.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>By using the <command>kdmctl</command> command (&eg; from within a <para>By using the <command>tdmctl</command> command (&eg; from within a
shell script). Try <command>kdmctl</command> <option>-h</option> to find out shell script). Try <command>tdmctl</command> <option>-h</option> to find out
more.</para> more.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>Here is an example bash script <quote>reboot into FreeBSD</quote>:</para> <para>Here is an example bash script <quote>reboot into FreeBSD</quote>:</para>
<programlisting>if kdmctl | grep -q shutdown; then <programlisting>if tdmctl | grep -q shutdown; then
IFS=$'\t' IFS=$'\t'
set -- `kdmctl listbootoptions` set -- `tdmctl listbootoptions`
if [ "$1" = ok ]; then if [ "$1" = ok ]; then
fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}') fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}')
if [ -n "$fbsd" ]; then if [ -n "$fbsd" ]; then
kdmctl shutdown reboot "=$fbsd" ask &gt; /dev/null tdmctl shutdown reboot "=$fbsd" ask &gt; /dev/null
else else
echo "FreeBSD boot unavailable." echo "FreeBSD boot unavailable."
fi fi
@ -1372,14 +1372,14 @@ else
fi</programlisting> fi</programlisting>
</sect1> </sect1>
<!-- Riddell: so there's no GUI you need to edit kdmrc to say UseTheme=true and Theme=/path/to/theme.xml <!-- Riddell: so there's no GUI you need to edit tdmrc to say UseTheme=true and Theme=/path/to/theme.xml
[13:31] <Riddell> jriddell.org/programs has an example theme [13:31] <Riddell> jriddell.org/programs has an example theme
<sect1 id="dm-themes"> <sect1 id="dm-themes">
<title>Themes</title> <title>Themes</title>
&kdm; has limited support for desktop manager themes. You may enable them &tdm; has limited support for desktop manager themes. You may enable them
by adding <userinput>UseTheme=true</userinput> to <filename>kdmrc</filename> by adding <userinput>UseTheme=true</userinput> to <filename>tdmrc</filename>
and <userinput>Theme=/path/to/theme.xml</userinput>. and <userinput>Theme=/path/to/theme.xml</userinput>.
</sect1> </sect1>
--> -->
@ -1388,12 +1388,12 @@ and <userinput>Theme=/path/to/theme.xml</userinput>.
<chapter id="Other-Information"> <chapter id="Other-Information">
<title>Other sources of information</title> <title>Other sources of information</title>
<para>Since &kdm; is descended from &xdm;, the <ulink <para>Since &tdm; is descended from &xdm;, the <ulink
url="man:xdm">&xdm; man page</ulink> may provide useful background url="man:xdm">&xdm; man page</ulink> may provide useful background
information. For X-related problems try the man pages <ulink information. For X-related problems try the man pages <ulink
url="man:X">X</ulink> and <ulink url="man:startx">startx</ulink>. If you have url="man:X">X</ulink> and <ulink url="man:startx">startx</ulink>. If you have
questions about &kdm; that are not answered by this handbook, take advantage of questions about &tdm; that are not answered by this handbook, take advantage of
the fact the &kdm; is provided under the terms of the <abbrev>&GNU;</abbrev> the fact the &tdm; is provided under the terms of the <abbrev>&GNU;</abbrev>
General Public License: look at the source code. General Public License: look at the source code.
</para> </para>
@ -1402,19 +1402,19 @@ General Public License: look at the source code.
<chapter id="credits"><title>Credits and License</title> <chapter id="credits"><title>Credits and License</title>
<para>&kdm; is derived from, and includes code from, <para>&tdm; is derived from, and includes code from,
&xdm; (C) Keith Packard, MIT X Consortium.</para> &xdm; (C) Keith Packard, MIT X Consortium.</para>
<para>&kdm; 0.1 was written by &Matthias.Ettrich;. Later versions till &kde; <para>&tdm; 0.1 was written by &Matthias.Ettrich;. Later versions till &kde;
2.0.x were written by &Steffen.Hansen;. Some new features for &kde; 2.1.x and 2.0.x were written by &Steffen.Hansen;. Some new features for &kde; 2.1.x and
a major rewrite for &kde; 2.2.x made by &Oswald.Buddenhagen;.</para> a major rewrite for &kde; 2.2.x made by &Oswald.Buddenhagen;.</para>
<para>Other parts of the &kdm; code are copyright by the authors, and <para>Other parts of the &tdm; code are copyright by the authors, and
licensed under the terms of the <ulink url="common/gpl-license.html">&GNU; licensed under the terms of the <ulink url="common/gpl-license.html">&GNU;
GPL</ulink>. Anyone is allowed to change &kdm; and redistribute the result GPL</ulink>. Anyone is allowed to change &tdm; and redistribute the result
as long as the names of the authors are mentioned.</para> as long as the names of the authors are mentioned.</para>
<para>&kdm; requires the &Qt; library, which is copyright Troll Tech AS.</para> <para>&tdm; requires the &Qt; library, which is copyright Troll Tech AS.</para>
<para>Documentation contributors: <para>Documentation contributors:
<itemizedlist> <itemizedlist>
@ -1449,7 +1449,7 @@ man page, which is &copy; Keith Packard.</para>
<glossentry id="gloss-greeter"> <glossentry id="gloss-greeter">
<glossterm>greeter</glossterm> <glossterm>greeter</glossterm>
<glossdef><para>The greeter is the login dialog, &ie; the part of &kdm; <glossdef><para>The greeter is the login dialog, &ie; the part of &tdm;
which the user sees.</para> which the user sees.</para>
</glossdef> </glossdef>
</glossentry> </glossentry>

230
doc/kdm/kdmrc-ref.docbook
Unescape View File

@ -1,19 +1,19 @@
<!-- generated from ../../kdm/config.def - DO NOT EDIT! --> <!-- generated from ../../tdm/config.def - DO NOT EDIT! -->
<chapter id="kdm-files"> <chapter id="tdm-files">
<title>The Files &kdm; Uses for Configuration</title> <title>The Files &tdm; Uses for Configuration</title>
<para>This chapter documents the files that control &kdm;'s behavior. <para>This chapter documents the files that control &tdm;'s behavior.
Some of this can be also controlled from the &kcontrol; module, but Some of this can be also controlled from the &kcontrol; module, but
not all.</para> not all.</para>
<sect1 id="kdmrc"> <sect1 id="tdmrc">
<title>&kdmrc; - The &kdm; master configuration file</title> <title>&tdmrc; - The &tdm; master configuration file</title>
<para>The basic format of the file is <quote>INI-like</quote>. <para>The basic format of the file is <quote>INI-like</quote>.
Options are key/value pairs, placed in sections. Options are key/value pairs, placed in sections.
Everything in the file is case sensitive. Everything in the file is case sensitive.
Syntactic errors and unrecognized key/section identifiers cause &kdm; to Syntactic errors and unrecognized key/section identifiers cause &tdm; to
issue non-fatal error messages.</para> issue non-fatal error messages.</para>
<para>Lines beginning with <literal>#</literal> are comments; empty lines <para>Lines beginning with <literal>#</literal> are comments; empty lines
@ -124,13 +124,13 @@ have the usual meaning; the backslash quotes everything (not only special
characters). Note that the backslashes need to be doubled because of the characters). Note that the backslashes need to be doubled because of the
two levels of quoting.</para> two levels of quoting.</para>
<note><para>A pristine &kdmrc; is very thoroughly commented. <note><para>A pristine &tdmrc; is very thoroughly commented.
All comments will be lost if you change this file with the All comments will be lost if you change this file with the
kcontrol frontend.</para></note> kcontrol frontend.</para></note>
<sect2 id="kdmrc-general"> <sect2 id="tdmrc-general">
<title>The [General] section of &kdmrc;</title> <title>The [General] section of &tdmrc;</title>
<para> <para>
This section contains global options that do not fit into any specific section. This section contains global options that do not fit into any specific section.
@ -144,7 +144,7 @@ This section contains global options that do not fit into any specific section.
<para> <para>
This option exists solely for the purpose of clean automatic upgrades. This option exists solely for the purpose of clean automatic upgrades.
<emphasis>Do not</emphasis> change it, you may interfere with future <emphasis>Do not</emphasis> change it, you may interfere with future
upgrades and this could result in &kdm; failing to run. upgrades and this could result in &tdm; failing to run.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -153,12 +153,12 @@ upgrades and this could result in &kdm; failing to run.
<term id="option-staticservers"><option>StaticServers</option></term> <term id="option-staticservers"><option>StaticServers</option></term>
<listitem> <listitem>
<para> <para>
List of displays (&X-Server;s) permanently managed by &kdm;. Displays with a List of displays (&X-Server;s) permanently managed by &tdm;. Displays with a
hostname are foreign displays which are expected to be already running, hostname are foreign displays which are expected to be already running,
the others are local displays for which &kdm; starts an own &X-Server;; the others are local displays for which &tdm; starts an own &X-Server;;
see <option>ServerCmd</option>. Each display may belong to a display class; see <option>ServerCmd</option>. Each display may belong to a display class;
append it to the display name separated by an underscore. append it to the display name separated by an underscore.
See <xref linkend="kdmrc-xservers"/> for the details. See <xref linkend="tdmrc-xservers"/> for the details.
</para> </para>
<para>The default is <quote>:0</quote>.</para> <para>The default is <quote>:0</quote>.</para>
</listitem> </listitem>
@ -180,7 +180,7 @@ List of on-demand displays. See <option>StaticServers</option> for syntax.
<para> <para>
List of Virtual Terminals to allocate to &X-Server;s. For negative numbers the List of Virtual Terminals to allocate to &X-Server;s. For negative numbers the
absolute value is used, and the <acronym>VT</acronym> will be allocated only absolute value is used, and the <acronym>VT</acronym> will be allocated only
if the kernel says it is free. If &kdm; exhausts this list, it will allocate if the kernel says it is free. If &tdm; exhausts this list, it will allocate
free <acronym>VT</acronym>s greater than the absolute value of the last entry free <acronym>VT</acronym>s greater than the absolute value of the last entry
in this list. in this list.
Currently Linux only. Currently Linux only.
@ -194,14 +194,14 @@ Currently Linux only.
<listitem> <listitem>
<para> <para>
This option is for operating systems (<acronym>OS</acronym>s) with support This option is for operating systems (<acronym>OS</acronym>s) with support
for virtual terminals (<acronym>VT</acronym>s), by both &kdm; and the for virtual terminals (<acronym>VT</acronym>s), by both &tdm; and the
<acronym>OS</acronym>s itself. <acronym>OS</acronym>s itself.
Currently this applies only to Linux. Currently this applies only to Linux.
</para><para> </para><para>
When &kdm; switches to console mode, it starts monitoring all When &tdm; switches to console mode, it starts monitoring all
<acronym>TTY</acronym> lines listed here (without the leading <acronym>TTY</acronym> lines listed here (without the leading
<literal>/dev/</literal>). <literal>/dev/</literal>).
If none of them is active for some time, &kdm; switches back to the X login. If none of them is active for some time, &tdm; switches back to the X login.
</para> </para>
<para>Empty by default.</para> <para>Empty by default.</para>
</listitem> </listitem>
@ -212,7 +212,7 @@ If none of them is active for some time, &kdm; switches back to the X login.
<listitem> <listitem>
<para> <para>
The filename specified will be created to contain an ASCII representation The filename specified will be created to contain an ASCII representation
of the process ID of the main &kdm; process; the PID will not be stored of the process ID of the main &tdm; process; the PID will not be stored
if the filename is empty. if the filename is empty.
</para> </para>
<para>Empty by default.</para> <para>Empty by default.</para>
@ -223,7 +223,7 @@ if the filename is empty.
<term id="option-lockpidfile"><option>LockPidFile</option></term> <term id="option-lockpidfile"><option>LockPidFile</option></term>
<listitem> <listitem>
<para> <para>
This option controls whether &kdm; uses file locking to keep multiple This option controls whether &tdm; uses file locking to keep multiple
display managers from running onto each other. display managers from running onto each other.
</para> </para>
<para>The default is <quote>true</quote>.</para> <para>The default is <quote>true</quote>.</para>
@ -234,8 +234,8 @@ display managers from running onto each other.
<term id="option-authdir"><option>AuthDir</option></term> <term id="option-authdir"><option>AuthDir</option></term>
<listitem> <listitem>
<para> <para>
This names a directory under which &kdm; stores &X-Server; authorization This names a directory under which &tdm; stores &X-Server; authorization
files while initializing the session. &kdm; expects the system to clean up files while initializing the session. &tdm; expects the system to clean up
this directory from stale files on reboot. this directory from stale files on reboot.
</para><para> </para><para>
The authorization file to be used for a particular display can be The authorization file to be used for a particular display can be
@ -249,7 +249,7 @@ specified with the <option>AuthFile</option> option in [X-*-Core].
<term id="option-autorescan"><option>AutoRescan</option></term> <term id="option-autorescan"><option>AutoRescan</option></term>
<listitem> <listitem>
<para> <para>
This boolean controls whether &kdm; automatically re-reads its This boolean controls whether &tdm; automatically re-reads its
configuration files if it finds them to have changed. configuration files if it finds them to have changed.
</para> </para>
<para>The default is <quote>true</quote>.</para> <para>The default is <quote>true</quote>.</para>
@ -260,7 +260,7 @@ configuration files if it finds them to have changed.
<term id="option-exportlist"><option>ExportList</option></term> <term id="option-exportlist"><option>ExportList</option></term>
<listitem> <listitem>
<para> <para>
Additional environment variables &kdm; should pass on to all programs it runs. Additional environment variables &tdm; should pass on to all programs it runs.
<envar>LD_LIBRARY_PATH</envar> and <envar>XCURSOR_THEME</envar> are good candidates; <envar>LD_LIBRARY_PATH</envar> and <envar>XCURSOR_THEME</envar> are good candidates;
otherwise, it should not be necessary very often. otherwise, it should not be necessary very often.
</para> </para>
@ -275,7 +275,7 @@ otherwise, it should not be necessary very often.
If the system has no native entropy source like /dev/urandom (see If the system has no native entropy source like /dev/urandom (see
<option>RandomDevice</option>) and no entropy daemon like EGD (see <option>RandomDevice</option>) and no entropy daemon like EGD (see
<option>PrngdSocket</option> and <option>PrngdPort</option>) is running, <option>PrngdSocket</option> and <option>PrngdPort</option>) is running,
&kdm; will fall back to its own pseudo-random number generator &tdm; will fall back to its own pseudo-random number generator
that will, among other things, successively checksum parts of this file that will, among other things, successively checksum parts of this file
(which, obviously, should change frequently). (which, obviously, should change frequently).
</para><para> </para><para>
@ -313,7 +313,7 @@ Same as <option>PrngdSocket</option>, only use a TCP socket on localhost.
<term id="option-randomdevice"><option>RandomDevice</option></term> <term id="option-randomdevice"><option>RandomDevice</option></term>
<listitem> <listitem>
<para> <para>
The path to a character device which &kdm; should read random data from. The path to a character device which &tdm; should read random data from.
Empty means to use the system's preferred entropy device if there is one. Empty means to use the system's preferred entropy device if there is one.
</para><para> </para><para>
This option does not exist on OpenBSD, as it uses the arc4_random This option does not exist on OpenBSD, as it uses the arc4_random
@ -348,10 +348,10 @@ can be either a name or a numerical ID.
<term id="option-datadir"><option>DataDir</option></term> <term id="option-datadir"><option>DataDir</option></term>
<listitem> <listitem>
<para> <para>
The directory in which &kdm; should store persistent working data; such data The directory in which &tdm; should store persistent working data; such data
is, for example, the previous user that logged in on a particular display. is, for example, the previous user that logged in on a particular display.
</para> </para>
<para>The default is <quote>/var/lib/kdm</quote>.</para> <para>The default is <quote>/var/lib/tdm</quote>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -359,7 +359,7 @@ is, for example, the previous user that logged in on a particular display.
<term id="option-dmrcdir"><option>DmrcDir</option></term> <term id="option-dmrcdir"><option>DmrcDir</option></term>
<listitem> <listitem>
<para> <para>
The directory in which &kdm; should store users' <filename>.dmrc</filename> files. This is only The directory in which &tdm; should store users' <filename>.dmrc</filename> files. This is only
needed if the home directories are not readable before actually logging in needed if the home directories are not readable before actually logging in
(like with AFS). (like with AFS).
</para> </para>
@ -371,11 +371,11 @@ needed if the home directories are not readable before actually logging in
</sect2> </sect2>
<sect2 id="kdmrc-xdmcp"> <sect2 id="tdmrc-xdmcp">
<title>The [Xdmcp] section of &kdmrc;</title> <title>The [Xdmcp] section of &tdmrc;</title>
<para> <para>
This section contains options that control &kdm;'s handling of This section contains options that control &tdm;'s handling of
&XDMCP; requests. &XDMCP; requests.
</para> </para>
@ -385,7 +385,7 @@ This section contains options that control &kdm;'s handling of
<term id="option-enable"><option>Enable</option></term> <term id="option-enable"><option>Enable</option></term>
<listitem> <listitem>
<para> <para>
Whether &kdm; should listen to incoming &XDMCP; requests. Whether &tdm; should listen to incoming &XDMCP; requests.
</para> </para>
<para>The default is <quote>true</quote>.</para> <para>The default is <quote>true</quote>.</para>
</listitem> </listitem>
@ -395,7 +395,7 @@ Whether &kdm; should listen to incoming &XDMCP; requests.
<term id="option-port"><option>Port</option></term> <term id="option-port"><option>Port</option></term>
<listitem> <listitem>
<para> <para>
This indicates the UDP port number which &kdm; uses to listen for incoming This indicates the UDP port number which &tdm; uses to listen for incoming
&XDMCP; requests. Unless you need to debug the system, leave this with its &XDMCP; requests. Unless you need to debug the system, leave this with its
default value. default value.
</para> </para>
@ -408,7 +408,7 @@ default value.
<listitem> <listitem>
<para> <para>
XDM-AUTHENTICATION-1 style &XDMCP; authentication requires a private XDM-AUTHENTICATION-1 style &XDMCP; authentication requires a private
key to be shared between &kdm; and the terminal. This option specifies key to be shared between &tdm; and the terminal. This option specifies
the file containing those values. Each entry in the file consists of a the file containing those values. Each entry in the file consists of a
display name and the shared key. display name and the shared key.
</para> </para>
@ -424,9 +424,9 @@ To prevent unauthorized &XDMCP; service and to allow forwarding of &XDMCP;
IndirectQuery requests, this file contains a database of hostnames which IndirectQuery requests, this file contains a database of hostnames which
are either allowed direct access to this machine, or have a list of hosts are either allowed direct access to this machine, or have a list of hosts
to which queries should be forwarded to. The format of this file is to which queries should be forwarded to. The format of this file is
described in <xref linkend="kdmrc-xaccess"/>. described in <xref linkend="tdmrc-xaccess"/>.
</para> </para>
<para>The default is <quote>${<envar>kde_confdir</envar>}/kdm/Xaccess</quote>.</para> <para>The default is <quote>${<envar>kde_confdir</envar>}/tdm/Xaccess</quote>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -450,7 +450,7 @@ is offered again.
<para> <para>
When computing the display name for &XDMCP; clients, the name resolver will When computing the display name for &XDMCP; clients, the name resolver will
typically create a fully qualified host name for the terminal. As this is typically create a fully qualified host name for the terminal. As this is
sometimes confusing, &kdm; will remove the domain name portion of the host sometimes confusing, &tdm; will remove the domain name portion of the host
name if it is the same as the domain name of the local host when this option name if it is the same as the domain name of the local host when this option
is enabled. is enabled.
</para> </para>
@ -489,8 +489,8 @@ displayed in a chooser window. If no program is specified, the string
</sect2> </sect2>
<sect2 id="kdmrc-shutdown"> <sect2 id="tdmrc-shutdown">
<title>The [Shutdown] section of &kdmrc;</title> <title>The [Shutdown] section of &tdmrc;</title>
<para> <para>
This section contains global options concerning system shutdown. This section contains global options concerning system shutdown.
@ -504,7 +504,7 @@ This section contains global options concerning system shutdown.
<para> <para>
The command (subject to word splitting) to run to halt/poweroff the system. The command (subject to word splitting) to run to halt/poweroff the system.
</para><para> </para><para>
The default is something reasonable for the system on which &kdm; was built, like The default is something reasonable for the system on which &tdm; was built, like
<command>/sbin/shutdown&nbsp;<option>-h</option>&nbsp;<parameter>now</parameter></command>. <command>/sbin/shutdown&nbsp;<option>-h</option>&nbsp;<parameter>now</parameter></command>.
</para> </para>
</listitem> </listitem>
@ -516,7 +516,7 @@ The default is something reasonable for the system on which &kdm; was built, lik
<para> <para>
The command (subject to word splitting) to run to reboot the system. The command (subject to word splitting) to run to reboot the system.
</para><para> </para><para>
The default is something reasonable for the system &kdm; on which was built, like The default is something reasonable for the system &tdm; on which was built, like
<command>/sbin/shutdown&nbsp;<option>-r</option>&nbsp;<parameter>now</parameter></command>. <command>/sbin/shutdown&nbsp;<option>-r</option>&nbsp;<parameter>now</parameter></command>.
</para> </para>
</listitem> </listitem>
@ -549,7 +549,7 @@ This will have no effect unless <option>AllowFifo</option> is enabled.
<term id="option-bootmanager"><option>BootManager</option></term> <term id="option-bootmanager"><option>BootManager</option></term>
<listitem> <listitem>
<para> <para>
The boot manager &kdm; should use for offering boot options in the The boot manager &tdm; should use for offering boot options in the
shutdown dialog. shutdown dialog.
</para> </para>
<variablelist> <variablelist>
@ -574,12 +574,12 @@ shutdown dialog.
</sect2> </sect2>
<sect2 id="kdmrc-core"> <sect2 id="tdmrc-core">
<title>The [X-*-Core] section class of &kdmrc;</title> <title>The [X-*-Core] section class of &tdmrc;</title>
<para> <para>
This section class contains options concerning the configuration This section class contains options concerning the configuration
of the &kdm; backend (core). of the &tdm; backend (core).
</para> </para>
<variablelist> <variablelist>
@ -608,7 +608,7 @@ See <option>OpenRepeat</option>.
<term id="option-openrepeat"><option>OpenRepeat</option></term> <term id="option-openrepeat"><option>OpenRepeat</option></term>
<listitem> <listitem>
<para> <para>
These options control the behavior of &kdm; when attempting to open a These options control the behavior of &tdm; when attempting to open a
connection to an &X-Server;. <option>OpenDelay</option> is the length connection to an &X-Server;. <option>OpenDelay</option> is the length
of the pause (in seconds) between successive attempts, of the pause (in seconds) between successive attempts,
<option>OpenRepeat</option> is the number of attempts to make and <option>OpenRepeat</option> is the number of attempts to make and
@ -625,7 +625,7 @@ connection attempt, the start attempt is considered failed.
<term id="option-startattempts"><option>StartAttempts</option></term> <term id="option-startattempts"><option>StartAttempts</option></term>
<listitem> <listitem>
<para> <para>
How many times &kdm; should attempt to start a <literal>foreign</literal> How many times &tdm; should attempt to start a <literal>foreign</literal>
display listed in <option>StaticServers</option> before giving up display listed in <option>StaticServers</option> before giving up
and disabling it. and disabling it.
Local displays are attempted only once, and &XDMCP; displays are retried Local displays are attempted only once, and &XDMCP; displays are retried
@ -640,7 +640,7 @@ was given to the &X-Server;).
<term id="option-serverattempts"><option>ServerAttempts</option></term> <term id="option-serverattempts"><option>ServerAttempts</option></term>
<listitem> <listitem>
<para> <para>
How many times &kdm; should attempt to start up a local &X-Server;. How many times &tdm; should attempt to start up a local &X-Server;.
Starting up includes executing it and waiting for it to come up. Starting up includes executing it and waiting for it to come up.
</para> </para>
<para>The default is <quote>1</quote>.</para> <para>The default is <quote>1</quote>.</para>
@ -651,7 +651,7 @@ Starting up includes executing it and waiting for it to come up.
<term id="option-servertimeout"><option>ServerTimeout</option></term> <term id="option-servertimeout"><option>ServerTimeout</option></term>
<listitem> <listitem>
<para> <para>
How many seconds &kdm; should wait for a local &X-Server; to come up. How many seconds &tdm; should wait for a local &X-Server; to come up.
</para> </para>
<para>The default is <quote>15</quote>.</para> <para>The default is <quote>15</quote>.</para>
</listitem> </listitem>
@ -664,7 +664,7 @@ How many seconds &kdm; should wait for a local &X-Server; to come up.
The command line to start the &X-Server;, without display number and VT spec. The command line to start the &X-Server;, without display number and VT spec.
This string is subject to word splitting. This string is subject to word splitting.
</para><para> </para><para>
The default is something reasonable for the system on which &kdm; was built, The default is something reasonable for the system on which &tdm; was built,
like <command>/usr/X11R6/bin/X</command>. like <command>/usr/X11R6/bin/X</command>.
</para> </para>
</listitem> </listitem>
@ -698,7 +698,7 @@ This string is subject to word splitting.
<para> <para>
The VT the &X-Server; should run on. The VT the &X-Server; should run on.
<option>ServerVTs</option> should be used instead of this option. <option>ServerVTs</option> should be used instead of this option.
Leave it zero to let &kdm; assign a <acronym>VT</acronym> automatically. Leave it zero to let &tdm; assign a <acronym>VT</acronym> automatically.
Set it to <literal>-1</literal> to avoid assigning a <acronym>VT</acronym> Set it to <literal>-1</literal> to avoid assigning a <acronym>VT</acronym>
alltogether - this is required for setups with multiple physical consoles. alltogether - this is required for setups with multiple physical consoles.
Currently Linux only. Currently Linux only.
@ -711,13 +711,13 @@ Currently Linux only.
<listitem> <listitem>
<para> <para>
This option is for <acronym>OS</acronym>s without support for This option is for <acronym>OS</acronym>s without support for
<acronym>VT</acronym>s, either by &kdm; or the <acronym>OS</acronym> itself. <acronym>VT</acronym>s, either by &tdm; or the <acronym>OS</acronym> itself.
Currently this applies to all <acronym>OS</acronym>s but Linux. Currently this applies to all <acronym>OS</acronym>s but Linux.
</para><para> </para><para>
When &kdm; switches to console mode, it starts monitoring this When &tdm; switches to console mode, it starts monitoring this
<acronym>TTY</acronym> line (specified without the leading <acronym>TTY</acronym> line (specified without the leading
<literal>/dev/</literal>) for activity. If the line is not used for some time, <literal>/dev/</literal>) for activity. If the line is not used for some time,
&kdm; switches back to the X login. &tdm; switches back to the X login.
</para> </para>
<para>Empty by default.</para> <para>Empty by default.</para>
</listitem> </listitem>
@ -737,7 +737,7 @@ See <option>PingTimeout</option>.
<term id="option-pingtimeout"><option>PingTimeout</option></term> <term id="option-pingtimeout"><option>PingTimeout</option></term>
<listitem> <listitem>
<para> <para>
To discover when <emphasis>remote</emphasis> displays disappear, &kdm; To discover when <emphasis>remote</emphasis> displays disappear, &tdm;
regularly pings them. regularly pings them.
<option>PingInterval</option> specifies the time (in minutes) between the <option>PingInterval</option> specifies the time (in minutes) between the
pings and <option>PingTimeout</option> specifies the maximum amount of pings and <option>PingTimeout</option> specifies the maximum amount of
@ -757,7 +757,7 @@ accidentally disabled.
<term id="option-terminateserver"><option>TerminateServer</option></term> <term id="option-terminateserver"><option>TerminateServer</option></term>
<listitem> <listitem>
<para> <para>
Whether &kdm; should restart the local &X-Server; after session exit instead Whether &tdm; should restart the local &X-Server; after session exit instead
of resetting it. Use this if the &X-Server; leaks memory or crashes the system of resetting it. Use this if the &X-Server; leaks memory or crashes the system
on reset attempts. on reset attempts.
</para> </para>
@ -789,7 +789,7 @@ The signal number to use to terminate the local &X-Server;.
<term id="option-authorize"><option>Authorize</option></term> <term id="option-authorize"><option>Authorize</option></term>
<listitem> <listitem>
<para> <para>
Controls whether &kdm; generates and uses authorization for Controls whether &tdm; generates and uses authorization for
<emphasis>local</emphasis> &X-Server; connections. <emphasis>local</emphasis> &X-Server; connections.
For &XDMCP; displays the authorization requested by the display is used; For &XDMCP; displays the authorization requested by the display is used;
foreign non-&XDMCP; displays do not support authorization at all. foreign non-&XDMCP; displays do not support authorization at all.
@ -817,9 +817,9 @@ depending on the build configuration.
<para> <para>
Some <emphasis>old</emphasis> &X-Server;s re-read the authorization file Some <emphasis>old</emphasis> &X-Server;s re-read the authorization file
at &X-Server; reset time, instead of when checking the initial connection. at &X-Server; reset time, instead of when checking the initial connection.
As &kdm; generates the authorization information just before connecting to As &tdm; generates the authorization information just before connecting to
the display, an old &X-Server; would not get up-to-date authorization the display, an old &X-Server; would not get up-to-date authorization
information. This option causes &kdm; to send SIGHUP to the &X-Server; information. This option causes &tdm; to send SIGHUP to the &X-Server;
after setting up the file, causing an additional &X-Server; reset to occur, after setting up the file, causing an additional &X-Server; reset to occur,
during which time the new authorization information will be read. during which time the new authorization information will be read.
</para> </para>
@ -831,7 +831,7 @@ during which time the new authorization information will be read.
<term id="option-authfile"><option>AuthFile</option></term> <term id="option-authfile"><option>AuthFile</option></term>
<listitem> <listitem>
<para> <para>
This file is used to communicate the authorization data from &kdm; to This file is used to communicate the authorization data from &tdm; to
the &X-Server;, using the <option>-auth</option> &X-Server; command line the &X-Server;, using the <option>-auth</option> &X-Server; command line
option. It should be kept in a directory which is not world-writable option. It should be kept in a directory which is not world-writable
as it could easily be removed, disabling the authorization mechanism in as it could easily be removed, disabling the authorization mechanism in
@ -879,7 +879,7 @@ greeter window. This may be used to change the appearance of the screen
around the greeter window or to put up other windows (e.g., you may want around the greeter window or to put up other windows (e.g., you may want
to run <command>xconsole</command> here). to run <command>xconsole</command> here).
The conventional name for a program used here is <command>Xsetup</command>. The conventional name for a program used here is <command>Xsetup</command>.
See <xref linkend="kdmrc-xsetup"/>. See <xref linkend="tdmrc-xsetup"/>.
</para> </para>
<para>Empty by default.</para> <para>Empty by default.</para>
</listitem> </listitem>
@ -894,7 +894,7 @@ It specifies a program which is run (as
<systemitem class="username">root</systemitem>) after the user <systemitem class="username">root</systemitem>) after the user
authentication process succeeds. authentication process succeeds.
The conventional name for a program used here is <command>Xstartup</command>. The conventional name for a program used here is <command>Xstartup</command>.
See <xref linkend="kdmrc-xstartup"/>. See <xref linkend="tdmrc-xstartup"/>.
</para> </para>
<para>Empty by default.</para> <para>Empty by default.</para>
</listitem> </listitem>
@ -909,7 +909,7 @@ It specifies a program which is run (as
<systemitem class="username">root</systemitem>) after the session <systemitem class="username">root</systemitem>) after the session
terminates. terminates.
The conventional name for a program used here is <command>Xreset</command>. The conventional name for a program used here is <command>Xreset</command>.
See <xref linkend="kdmrc-xreset"/>. See <xref linkend="tdmrc-xreset"/>.
</para> </para>
<para>Empty by default.</para> <para>Empty by default.</para>
</listitem> </listitem>
@ -923,7 +923,7 @@ This string is subject to word splitting.
It specifies the session program to be executed (as the user owning It specifies the session program to be executed (as the user owning
the session). the session).
The conventional name for a program used here is <command>Xsession</command>. The conventional name for a program used here is <command>Xsession</command>.
See <xref linkend="kdmrc-xsession"/>. See <xref linkend="tdmrc-xsession"/>.
</para> </para>
<para>The default is <quote>${<envar>x_bindir</envar>}/xterm -ls -T</quote>.</para> <para>The default is <quote>${<envar>x_bindir</envar>}/xterm -ls -T</quote>.</para>
</listitem> </listitem>
@ -933,10 +933,10 @@ See <xref linkend="kdmrc-xsession"/>.
<term id="option-failsafeclient"><option>FailsafeClient</option></term> <term id="option-failsafeclient"><option>FailsafeClient</option></term>
<listitem> <listitem>
<para> <para>
If the <option>Session</option> program fails to execute, &kdm; will If the <option>Session</option> program fails to execute, &tdm; will
fall back to this program. This program is executed with no arguments, fall back to this program. This program is executed with no arguments,
but executes using the same environment variables as the session would but executes using the same environment variables as the session would
have had (see <xref linkend="kdmrc-xsession"/>). have had (see <xref linkend="tdmrc-xsession"/>).
</para> </para>
<para>The default is <quote>${<envar>x_bindir</envar>}/xterm</quote>.</para> <para>The default is <quote>${<envar>x_bindir</envar>}/xterm</quote>.</para>
</listitem> </listitem>
@ -949,7 +949,7 @@ have had (see <xref linkend="kdmrc-xsession"/>).
The <envar>PATH</envar> environment variable for The <envar>PATH</envar> environment variable for
non-<systemitem class="username">root</systemitem> <option>Session</option>s. non-<systemitem class="username">root</systemitem> <option>Session</option>s.
</para><para> </para><para>
The default depends on the system &kdm; was built on. The default depends on the system &tdm; was built on.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -963,7 +963,7 @@ non-<systemitem class="username">root</systemitem>
<option>Session</option>s. Note that it is good practice not to include <option>Session</option>s. Note that it is good practice not to include
<literal>.</literal> (the current directory) into this entry. <literal>.</literal> (the current directory) into this entry.
</para><para> </para><para>
The default depends on the system &kdm; was built on. The default depends on the system &tdm; was built on.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -983,7 +983,7 @@ The <envar>SHELL</envar> environment variable for all programs but the
<term id="option-userauthdir"><option>UserAuthDir</option></term> <term id="option-userauthdir"><option>UserAuthDir</option></term>
<listitem> <listitem>
<para> <para>
When &kdm; is unable to write to the usual user authorization file When &tdm; is unable to write to the usual user authorization file
($<envar>HOME</envar>/.Xauthority), it creates a unique file name in this ($<envar>HOME</envar>/.Xauthority), it creates a unique file name in this
directory and points the environment variable <envar>XAUTHORITY</envar> directory and points the environment variable <envar>XAUTHORITY</envar>
at the created file. at the created file.
@ -996,7 +996,7 @@ at the created file.
<term id="option-autorelogin"><option>AutoReLogin</option></term> <term id="option-autorelogin"><option>AutoReLogin</option></term>
<listitem> <listitem>
<para> <para>
If enabled, &kdm; will automatically restart a session after an &X-Server; If enabled, &tdm; will automatically restart a session after an &X-Server;
crash (or if it is killed by Alt-Ctrl-BackSpace). Note that enabling this crash (or if it is killed by Alt-Ctrl-BackSpace). Note that enabling this
feature opens a security hole: a secured display lock can be circumvented feature opens a security hole: a secured display lock can be circumvented
(unless &kde;'s built-in screen locker is used). (unless &kde;'s built-in screen locker is used).
@ -1196,7 +1196,7 @@ The user to log in automatically. <emphasis>Never</emphasis> specify <systemitem
<para> <para>
The password for the user to log in automatically. This is <emphasis>not</emphasis> required The password for the user to log in automatically. This is <emphasis>not</emphasis> required
unless the user is logged into a <acronym>NIS</acronym> or Kerberos domain. If you use this unless the user is logged into a <acronym>NIS</acronym> or Kerberos domain. If you use this
option, you should <command>chmod&nbsp;<option>600</option>&nbsp;<filename>kdmrc</filename></command> for obvious reasons. option, you should <command>chmod&nbsp;<option>600</option>&nbsp;<filename>tdmrc</filename></command> for obvious reasons.
</para> </para>
<para>Empty by default.</para> <para>Empty by default.</para>
</listitem> </listitem>
@ -1219,7 +1219,7 @@ KDE sessions.
<para> <para>
A list of directories containing session type definitions. A list of directories containing session type definitions.
</para> </para>
<para>The default is <quote>${<envar>kde_datadir</envar>}/kdm/sessions</quote>.</para> <para>The default is <quote>${<envar>kde_datadir</envar>}/tdm/sessions</quote>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1240,7 +1240,7 @@ literal <literal>%</literal>.
<term id="option-usesessreg"><option>UseSessReg</option></term> <term id="option-usesessreg"><option>UseSessReg</option></term>
<listitem> <listitem>
<para> <para>
Specify whether &kdm;'s built-in utmp/wtmp/lastlog registration should Specify whether &tdm;'s built-in utmp/wtmp/lastlog registration should
be used. If it is not, the tool <command>sessreg</command> should be used be used. If it is not, the tool <command>sessreg</command> should be used
in the <option>Startup</option> and <option>Reset</option> scripts, or, in the <option>Startup</option> and <option>Reset</option> scripts, or,
alternatively, the pam_lastlog module should be used on alternatively, the pam_lastlog module should be used on
@ -1254,12 +1254,12 @@ alternatively, the pam_lastlog module should be used on
</sect2> </sect2>
<sect2 id="kdmrc-greeter"> <sect2 id="tdmrc-greeter">
<title>The [X-*-Greeter] section class of &kdmrc;</title> <title>The [X-*-Greeter] section class of &tdmrc;</title>
<para> <para>
This section class contains options concerning the configuration This section class contains options concerning the configuration
of the &kdm; frontend (greeter). of the &tdm; frontend (greeter).
</para> </para>
<variablelist> <variablelist>
@ -1329,7 +1329,7 @@ The image to show in the greeter if <option>LogoArea</option> is
<listitem> <listitem>
<para> <para>
The relative coordinates (percentages of the screen size; X,Y) at which The relative coordinates (percentages of the screen size; X,Y) at which
the center of the greeter is put. &kdm; aligns the greeter to the edges the center of the greeter is put. &tdm; aligns the greeter to the edges
of the screen it would cross otherwise. of the screen it would cross otherwise.
</para> </para>
<para>The default is <quote>50,50</quote>.</para> <para>The default is <quote>50,50</quote>.</para>
@ -1563,7 +1563,7 @@ See <option>ShowUsers</option>.
<term id="option-facesource"><option>FaceSource</option></term> <term id="option-facesource"><option>FaceSource</option></term>
<listitem> <listitem>
<para> <para>
If <option>UserList</option> is enabled, this specifies where &kdm; gets the If <option>UserList</option> is enabled, this specifies where &tdm; gets the
images from: images from:
</para> </para>
<variablelist> <variablelist>
@ -1587,7 +1587,7 @@ images from:
<para> <para>
The images can be in any format Qt recognizes, but the filename The images can be in any format Qt recognizes, but the filename
must match &kdm;'s expectations: <literal>.face.icon</literal> should be a must match &tdm;'s expectations: <literal>.face.icon</literal> should be a
48x48 icon, while <literal>.face</literal> should be a 300x300 image. 48x48 icon, while <literal>.face</literal> should be a 300x300 image.
Currently the big image is used only as a fallback and is scaled down, Currently the big image is used only as a fallback and is scaled down,
but in the future it might be displayed full-size in the logo area or a but in the future it might be displayed full-size in the logo area or a
@ -1603,7 +1603,7 @@ tooltip.
<para> <para>
See <option>FaceSource</option>. See <option>FaceSource</option>.
</para> </para>
<para>The default is <quote>${<envar>kde_datadir</envar>}/kdm/faces</quote>.</para> <para>The default is <quote>${<envar>kde_datadir</envar>}/tdm/faces</quote>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1692,7 +1692,7 @@ character</para></listitem>
<term id="option-usebackground"><option>UseBackground</option></term> <term id="option-usebackground"><option>UseBackground</option></term>
<listitem> <listitem>
<para> <para>
If enabled, &kdm; will automatically start the <command>krootimage</command> If enabled, &tdm; will automatically start the <command>krootimage</command>
program to set up the background; otherwise, the <option>Setup</option> program to set up the background; otherwise, the <option>Setup</option>
program is responsible for the background. program is responsible for the background.
</para> </para>
@ -1709,7 +1709,7 @@ It contains a section named <literal>[Desktop0]</literal> like
<filename>kdesktoprc</filename> does. Its options are not described <filename>kdesktoprc</filename> does. Its options are not described
herein; guess their meanings or use the control center. herein; guess their meanings or use the control center.
</para> </para>
<para>The default is <quote>${<envar>kde_confdir</envar>}/kdm/backgroundrc</quote>.</para> <para>The default is <quote>${<envar>kde_confdir</envar>}/tdm/backgroundrc</quote>.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1735,11 +1735,11 @@ grabbed until just before the session begins.
<term id="option-grabtimeout"><option>GrabTimeout</option></term> <term id="option-grabtimeout"><option>GrabTimeout</option></term>
<listitem> <listitem>
<para> <para>
This option specifies the maximum time &kdm; will wait for the grabs to This option specifies the maximum time &tdm; will wait for the grabs to
succeed. A grab may fail if some other X-client has the &X-Server; or the succeed. A grab may fail if some other X-client has the &X-Server; or the
keyboard grabbed, or possibly if the network latencies are very high. You keyboard grabbed, or possibly if the network latencies are very high. You
should be cautious when raising the timeout, as a user can be spoofed by should be cautious when raising the timeout, as a user can be spoofed by
a look-alike window on the display. If a grab fails, &kdm; kills and a look-alike window on the display. If a grab fails, &tdm; kills and
restarts the &X-Server; (if possible) and the session. restarts the &X-Server; (if possible) and the session.
</para> </para>
<para>The default is <quote>3</quote>.</para> <para>The default is <quote>3</quote>.</para>
@ -1826,10 +1826,10 @@ login domain.
<term id="option-showlog"><option>ShowLog</option></term> <term id="option-showlog"><option>ShowLog</option></term>
<listitem> <listitem>
<para> <para>
Enable &kdm;'s built-in <command>xconsole</command>. Enable &tdm;'s built-in <command>xconsole</command>.
Note that this can be enabled for only one display at a time. Note that this can be enabled for only one display at a time.
This option is available only if &kdm; was <command>configure</command>d This option is available only if &tdm; was <command>configure</command>d
with <option>--enable-kdm-xconsole</option>. with <option>--enable-tdm-xconsole</option>.
</para> </para>
<para>The default is <quote>false</quote>.</para> <para>The default is <quote>false</quote>.</para>
</listitem> </listitem>
@ -1839,7 +1839,7 @@ with <option>--enable-kdm-xconsole</option>.
<term id="option-logsource"><option>LogSource</option></term> <term id="option-logsource"><option>LogSource</option></term>
<listitem> <listitem>
<para> <para>
The data source for &kdm;'s built-in <command>xconsole</command>. The data source for &tdm;'s built-in <command>xconsole</command>.
If empty, a console log redirection is requested from If empty, a console log redirection is requested from
<filename>/dev/console</filename>. <filename>/dev/console</filename>.
Has no effect if <option>ShowLog</option> is disabled. Has no effect if <option>ShowLog</option> is disabled.
@ -1950,13 +1950,13 @@ file.
</sect1> </sect1>
<sect1 id="kdmrc-xservers"> <sect1 id="tdmrc-xservers">
<title>Specifying permanent &X-Server;s</title> <title>Specifying permanent &X-Server;s</title>
<para>Each entry in the <option>StaticServers</option> list indicates a <para>Each entry in the <option>StaticServers</option> list indicates a
display which should constantly be display which should constantly be
managed and which is not using &XDMCP;. This method is typically used only for managed and which is not using &XDMCP;. This method is typically used only for
local &X-Server;s that are started by &kdm;, but &kdm; can manage externally local &X-Server;s that are started by &tdm;, but &tdm; can manage externally
started (<quote>foreign</quote>) &X-Server;s as well, may they run on the started (<quote>foreign</quote>) &X-Server;s as well, may they run on the
local machine or rather remotely.</para> local machine or rather remotely.</para>
@ -1975,7 +1975,7 @@ The display name of &XDMCP; displays is derived from the display's address by
reverse host name resolution. For configuration purposes, the reverse host name resolution. For configuration purposes, the
<literal>localhost</literal> prefix from locally running &XDMCP; displays is <literal>localhost</literal> prefix from locally running &XDMCP; displays is
<emphasis>not</emphasis> stripped to make them distinguishable from local <emphasis>not</emphasis> stripped to make them distinguishable from local
&X-Server;s started by &kdm;.</para> &X-Server;s started by &tdm;.</para>
<para>The <replaceable>display class</replaceable> portion is also used in the <para>The <replaceable>display class</replaceable> portion is also used in the
display-specific sections. This is useful if you have a large collection of display-specific sections. This is useful if you have a large collection of
@ -1983,11 +1983,11 @@ similar displays (such as a corral of X terminals) and would like to set
options for groups of them. options for groups of them.
When using &XDMCP;, the display is required to specify the display class, When using &XDMCP;, the display is required to specify the display class,
so the manual for your particular X terminal should document the display so the manual for your particular X terminal should document the display
class string for your device. If it does not, you can run &kdm; in debug class string for your device. If it does not, you can run &tdm; in debug
mode and <command>grep</command> the log for <quote>class</quote>.</para> mode and <command>grep</command> the log for <quote>class</quote>.</para>
<para>The displays specified in <option>ReserveServers</option> will not be <para>The displays specified in <option>ReserveServers</option> will not be
started when &kdm; starts up, but when it is explicitly requested via started when &tdm; starts up, but when it is explicitly requested via
the command socket (or <acronym>FiFo</acronym>). the command socket (or <acronym>FiFo</acronym>).
If reserve displays are specified, the &kde; menu will have a If reserve displays are specified, the &kde; menu will have a
<guilabel>Start New Session</guilabel> item near the bottom; use that to <guilabel>Start New Session</guilabel> item near the bottom; use that to
@ -1995,26 +1995,26 @@ activate a reserve display with a new login session. The monitor will switch
to the new display, and you will have a minute to login. If there are no more to the new display, and you will have a minute to login. If there are no more
reserve displays available, the menu item will be disabled.</para> reserve displays available, the menu item will be disabled.</para>
<para>When &kdm; starts a session, it sets up authorization data for the <para>When &tdm; starts a session, it sets up authorization data for the
&X-Server;. For local servers, &kdm; passes &X-Server;. For local servers, &tdm; passes
<command><option>-auth</option>&nbsp;<filename><replaceable>filename</replaceable></filename></command> <command><option>-auth</option>&nbsp;<filename><replaceable>filename</replaceable></filename></command>
on the &X-Server;'s command line to point it at its authorization data. on the &X-Server;'s command line to point it at its authorization data.
For &XDMCP; displays, &kdm; passes the authorization data to the &X-Server; For &XDMCP; displays, &tdm; passes the authorization data to the &X-Server;
via the <quote>Accept</quote> &XDMCP; message.</para> via the <quote>Accept</quote> &XDMCP; message.</para>
</sect1> </sect1>
<sect1 id="kdmrc-xaccess"> <sect1 id="tdmrc-xaccess">
<title>&XDMCP; access control</title> <title>&XDMCP; access control</title>
<para>The file specified by the <option>AccessFile</option> option provides <para>The file specified by the <option>AccessFile</option> option provides
information which &kdm; uses to control access from displays requesting service information which &tdm; uses to control access from displays requesting service
via &XDMCP;. via &XDMCP;.
The file contains four types of entries: entries which control the response The file contains four types of entries: entries which control the response
to <quote>Direct</quote> and <quote>Broadcast</quote> queries, entries which to <quote>Direct</quote> and <quote>Broadcast</quote> queries, entries which
control the response to <quote>Indirect</quote> queries, macro definitions for control the response to <quote>Indirect</quote> queries, macro definitions for
<quote>Indirect</quote> entries, and entries which control on which network <quote>Indirect</quote> entries, and entries which control on which network
interfaces &kdm; listens for &XDMCP; queries. interfaces &tdm; listens for &XDMCP; queries.
Blank lines are ignored, <literal>#</literal> is treated as a comment Blank lines are ignored, <literal>#</literal> is treated as a comment
delimiter causing the rest of that line to be ignored, and <literal>\</literal> delimiter causing the rest of that line to be ignored, and <literal>\</literal>
causes an immediately following newline to be ignored, allowing indirect host causes an immediately following newline to be ignored, allowing indirect host
@ -2039,7 +2039,7 @@ Preceding the entry with a <literal>!</literal> character causes hosts which
match that entry to be excluded. match that entry to be excluded.
To only respond to <quote>Direct</quote> queries for a host or pattern, To only respond to <quote>Direct</quote> queries for a host or pattern,
it can be followed by the optional <literal>NOBROADCAST</literal> keyword. it can be followed by the optional <literal>NOBROADCAST</literal> keyword.
This can be used to prevent a &kdm; server from appearing on menus based on This can be used to prevent a &tdm; server from appearing on menus based on
<quote>Broadcast</quote> queries.</para> <quote>Broadcast</quote> queries.</para>
<para>An <quote>Indirect</quote> entry also contains a host name or pattern, <para>An <quote>Indirect</quote> entry also contains a host name or pattern,
@ -2057,7 +2057,7 @@ the hop count is used as the TTL.
--> -->
If the indirect host list contains the keyword <literal>CHOOSER</literal>, If the indirect host list contains the keyword <literal>CHOOSER</literal>,
<quote>Indirect</quote> queries are not forwarded, but instead a host chooser <quote>Indirect</quote> queries are not forwarded, but instead a host chooser
dialog is displayed by &kdm;. The chooser will send a <quote>Direct</quote> dialog is displayed by &tdm;. The chooser will send a <quote>Direct</quote>
query to each of the remaining host names in the list and offer a menu of query to each of the remaining host names in the list and offer a menu of
all the hosts that respond. The host list may contain the keyword all the hosts that respond. The host list may contain the keyword
<literal>BROADCAST</literal>, to make the chooser send a <literal>BROADCAST</literal>, to make the chooser send a
@ -2079,21 +2079,21 @@ The formal syntax is
<screen> <screen>
<userinput>&nbsp;<literal>LISTEN</literal>&nbsp;[<replaceable>interface</replaceable>&nbsp;[<replaceable>multicast&nbsp;list</replaceable>]]</userinput> <userinput>&nbsp;<literal>LISTEN</literal>&nbsp;[<replaceable>interface</replaceable>&nbsp;[<replaceable>multicast&nbsp;list</replaceable>]]</userinput>
</screen> </screen>
If one or more <literal>LISTEN</literal> lines are specified, &kdm; listens If one or more <literal>LISTEN</literal> lines are specified, &tdm; listens
for &XDMCP; requests only on the specified interfaces. for &XDMCP; requests only on the specified interfaces.
<replaceable>interface</replaceable> may be a hostname or IP address <replaceable>interface</replaceable> may be a hostname or IP address
representing a network interface on this machine, or the wildcard representing a network interface on this machine, or the wildcard
<literal>*</literal> to represent all available network interfaces. <literal>*</literal> to represent all available network interfaces.
If multicast group addresses are listed on a <literal>LISTEN</literal> line, If multicast group addresses are listed on a <literal>LISTEN</literal> line,
&kdm; joins the multicast groups on the given interface. For IPv6 multicasts, &tdm; joins the multicast groups on the given interface. For IPv6 multicasts,
the IANA has assigned ff0<replaceable>X</replaceable>:0:0:0:0:0:0:12b as the the IANA has assigned ff0<replaceable>X</replaceable>:0:0:0:0:0:0:12b as the
permanently assigned range of multicast addresses for &XDMCP;. The permanently assigned range of multicast addresses for &XDMCP;. The
<replaceable>X</replaceable> in the prefix may be replaced by any valid scope <replaceable>X</replaceable> in the prefix may be replaced by any valid scope
identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and
so on (see IETF RFC 2373 or its replacement for further details and scope so on (see IETF RFC 2373 or its replacement for further details and scope
definitions). &kdm; defaults to listening on the Link-Local scope address definitions). &tdm; defaults to listening on the Link-Local scope address
ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior.
If no <literal>LISTEN</literal> lines are given, &kdm; listens on all If no <literal>LISTEN</literal> lines are given, &tdm; listens on all
interfaces and joins the default &XDMCP; IPv6 multicast group (when interfaces and joins the default &XDMCP; IPv6 multicast group (when
compiled with IPv6 support). compiled with IPv6 support).
To disable listening for &XDMCP; requests altogether, a To disable listening for &XDMCP; requests altogether, a
@ -2103,11 +2103,11 @@ the <literal>[Xdmcp]</literal> <option>Enable</option> option is preferred.
</sect1> </sect1>
<sect1 id="kdm-scripts"> <sect1 id="tdm-scripts">
<title>Supplementary programs</title> <title>Supplementary programs</title>
<para> <para>
The following programs are run by &kdm; at various stages of a session. The following programs are run by &tdm; at various stages of a session.
They typically are shell scripts. They typically are shell scripts.
</para> </para>
@ -2119,7 +2119,7 @@ Their first argument is <literal>auto</literal> if the session results
from an automatic login; otherwise, no arguments are passed to them. from an automatic login; otherwise, no arguments are passed to them.
</para> </para>
<sect2 id="kdmrc-xsetup"> <sect2 id="tdmrc-xsetup">
<title>Setup program</title> <title>Setup program</title>
<para> <para>
@ -2156,7 +2156,7 @@ the following environment variables are passed:</para>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<para> Note that since &kdm; grabs the keyboard, any other windows will not be <para> Note that since &tdm; grabs the keyboard, any other windows will not be
able to receive keyboard input. They will be able to interact with the mouse, able to receive keyboard input. They will be able to interact with the mouse,
however; beware of potential security holes here. If <option>GrabServer</option> however; beware of potential security holes here. If <option>GrabServer</option>
is set, <filename>Xsetup</filename> will not be able to connect to the display is set, <filename>Xsetup</filename> will not be able to connect to the display
@ -2166,7 +2166,7 @@ at all. Resources for this program can be put into the file named by
</sect2> </sect2>
<sect2 id="kdmrc-xstartup"> <sect2 id="tdmrc-xstartup">
<title>Startup program</title> <title>Startup program</title>
<para>The <filename>Xstartup</filename> program is run as <para>The <filename>Xstartup</filename> program is run as
@ -2215,13 +2215,13 @@ the following environment variables are passed:</para>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<para>&kdm; waits until this program exits before starting the user session. <para>&tdm; waits until this program exits before starting the user session.
If the exit value of this program is non-zero, &kdm; discontinues the session If the exit value of this program is non-zero, &tdm; discontinues the session
and starts another authentication cycle.</para> and starts another authentication cycle.</para>
</sect2> </sect2>
<sect2 id="kdmrc-xsession"> <sect2 id="tdmrc-xsession">
<title>Session program</title> <title>Session program</title>
<para>The <filename>Xsession</filename> program is the command which is run <para>The <filename>Xsession</filename> program is the command which is run
@ -2295,7 +2295,7 @@ the following environment variables are passed:</para>
</sect2> </sect2>
<sect2 id="kdmrc-xreset"> <sect2 id="tdmrc-xreset">
<title>Reset program</title> <title>Reset program</title>
<para>Symmetrical with <filename>Xstartup</filename>, the <para>Symmetrical with <filename>Xstartup</filename>, the

2
doc/ksplashml/index.docbook
Unescape View File

@ -418,7 +418,7 @@ true.</entry>
<entry>Indicates whether icon should be shown. Default is true</entry> <entry>Indicates whether icon should be shown. Default is true</entry>
</row> </row>
<row> <row>
<entry>Use KDM User Icon</entry> <entry>Use TDM User Icon</entry>
<entry>[true/false]</entry> <entry>[true/false]</entry>
<entry>Show user's login icon. Default is true.</entry> <entry>Show user's login icon. Default is true.</entry>
</row> </row>

6
doc/tdesu/index.docbook
Unescape View File

@ -120,9 +120,9 @@ current user. If it is not writable, the command is executed as user
<parameter>FILE</parameter> starts with a <literal>/</literal>, it is <parameter>FILE</parameter> starts with a <literal>/</literal>, it is
taken as an absolute filename. Otherwise, it is taken as the name of a taken as an absolute filename. Otherwise, it is taken as the name of a
global &kde; configuration file. For example: to configure the K display global &kde; configuration file. For example: to configure the K display
manager, <application>kdm</application>, you could issue manager, <application>tdm</application>, you could issue
<command>tdesu <option>-c kdmconfig -f <command>tdesu <option>-c tdmconfig -f
kdmrc</option></command></para></listitem> tdmrc</option></command></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-i</option> <replaceable>icon name</replaceable></term> <term><option>-i</option> <replaceable>icon name</replaceable></term>

6
doc/tdesu/man-tdesu.1.docbook
Unescape View File

@ -92,9 +92,9 @@ current user. If it is not writable, the command is executed as user
<parameter>file</parameter> starts with a <literal>/</literal>, it is <parameter>file</parameter> starts with a <literal>/</literal>, it is
taken as an absolute filename. Otherwise, it is taken as the name of a taken as an absolute filename. Otherwise, it is taken as the name of a
global &kde; configuration file. For example: to configure the K display global &kde; configuration file. For example: to configure the K display
manager, <application>kdm</application>, you could issue manager, <application>tdm</application>, you could issue
<command>tdesu <option>-c kdmconfig -f <command>tdesu <option>-c tdmconfig -f
kdmrc</option></command></para></listitem> tdmrc</option></command></para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-i</option> <replaceable>icon name</replaceable></term> <term><option>-i</option> <replaceable>icon name</replaceable></term>

4
doc/userguide/control-center.docbook
Unescape View File

@ -878,8 +878,8 @@ configuration files for a &Linux; kernel. This configurator is compatible with k
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><guilabel>Login Manager</guilabel></term> <term><guilabel>Login Manager</guilabel></term>
<listitem><para>This module allows you to configure the &kde; login manager, &kdm;. &kdm; is <listitem><para>This module allows you to configure the &kde; login manager, &tdm;. &tdm; is
a powerful login manager with a large range of options. It supports user switching, remote graphical logins and has a fully customizable appearance. For more information, see the &kdm; handbook. </para></listitem> a powerful login manager with a large range of options. It supports user switching, remote graphical logins and has a fully customizable appearance. For more information, see the &tdm; handbook. </para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><guilabel>Paths</guilabel></term> <term><guilabel>Paths</guilabel></term>

8
doc/userguide/index.docbook
Unescape View File

@ -357,7 +357,7 @@ programs here (and not links to removable media, like CDs).</para>
</sect1info> </sect1info>
<title>Logging In and Logging Out</title> <title>Logging In and Logging Out</title>
<para>Basic KDM &amp; starttde stuff.</para> <para>Basic TDM &amp; starttde stuff.</para>
<!-- Not sure what exactly to say about starttde and where to say it --> <!-- Not sure what exactly to say about starttde and where to say it -->
<!-- (Phil) --> <!-- (Phil) -->
<para>There are two ways to log into &kde;: graphically and via the <para>There are two ways to log into &kde;: graphically and via the
@ -366,7 +366,7 @@ command line. We'll look at them both briefly:</para>
<sect2 id="logging-in-graphically"> <sect2 id="logging-in-graphically">
<title>Logging in Graphically</title> <title>Logging in Graphically</title>
<indexterm><primary>login</primary></indexterm> <indexterm><primary>login</primary></indexterm>
<indexterm><primary>&kdm;</primary></indexterm> <indexterm><primary>&tdm;</primary></indexterm>
<para>If you see a screen a little bit like the one below when you <para>If you see a screen a little bit like the one below when you
start up your computer, then you are all set for logging in start up your computer, then you are all set for logging in
@ -410,9 +410,9 @@ for now, hit <guibutton>Cancel</guibutton>.</para>
<itemizedlist> <itemizedlist>
<title>Related Information</title> <title>Related Information</title>
<listitem><para>The &kdm; Handbook has information about using and setting up <listitem><para>The &tdm; Handbook has information about using and setting up
the &kde; graphical login manager. You can read it in &khelpcenter; or the &kde; graphical login manager. You can read it in &khelpcenter; or
by entering <userinput>help:/kdm</userinput> in &konqueror;'s by entering <userinput>help:/tdm</userinput> in &konqueror;'s
<guilabel>Location</guilabel> bar.</para> <guilabel>Location</guilabel> bar.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

12
doc/userguide/kde-for-admins.docbook
Unescape View File

@ -781,11 +781,11 @@ Auto Save Interval=25
<sect1 id="kde-startup-sequence"> <sect1 id="kde-startup-sequence">
<title>&kde; Startup Sequence</title> <title>&kde; Startup Sequence</title>
<sect2 id="kdm"> <sect2 id="tdm">
<title>&kdm;</title> <title>&tdm;</title>
<para>Always runs as <systemitem class="username">root</systemitem>! Uses <para>Always runs as <systemitem class="username">root</systemitem>! Uses
<filename>$<envar>TDEDIR</envar>/share/config/kdmrc</filename> and <filename>$<envar>TDEDIR</envar>/share/config/tdmrc</filename> and
<filename>/etc/X11/xdm/Xservers</filename>. The latter contains entries <filename>/etc/X11/xdm/Xservers</filename>. The latter contains entries
like:</para> like:</para>
@ -796,7 +796,7 @@ like:</para>
<para>Relevant startup files are also: </para> <para>Relevant startup files are also: </para>
<simplelist> <simplelist>
<member> <member>
[X-*-Core] section in <filename>kdmrc</filename> [X-*-Core] section in <filename>tdmrc</filename>
</member> </member>
<member> <member>
Setup - <filename>/etc/X11/xdm/Xsetup</filename> Setup - <filename>/etc/X11/xdm/Xsetup</filename>
@ -828,7 +828,7 @@ Reset - <filename>/etc/X11/xdm/Xreset</filename> - after session finished
<para>The &kde; startup sequence starts with the <para>The &kde; startup sequence starts with the
<filename>starttde</filename> script. In most cases this script gets called <filename>starttde</filename> script. In most cases this script gets called
from the display manager (&kdm;) once the user has been authenticated. Their from the display manager (&tdm;) once the user has been authenticated. Their
are two very important lines in the <filename>starttde</filename> are two very important lines in the <filename>starttde</filename>
script:</para> script:</para>
@ -2107,7 +2107,7 @@ screen</para></listitem>
<varlistentry> <varlistentry>
<term><option>start_new_session</option></term> <term><option>start_new_session</option></term>
<listitem><para>Whether the user may start a second X session (see also <listitem><para>Whether the user may start a second X session (see also
&kdm;)</para></listitem> &tdm;)</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>opengl_screensavers</option></term> <term><option>opengl_screensavers</option></term>

6
doc/userguide/switching-sessions.docbook
Unescape View File

@ -32,7 +32,7 @@ save documents) and let her or him log in.</para>
you will find a <guisubmenu>Switch User</guisubmenu> submenu. It contains you will find a <guisubmenu>Switch User</guisubmenu> submenu. It contains
the command to lock the current and start a new session which means that the command to lock the current and start a new session which means that
your desktop will start the screensaver and after a few seconds can log in your desktop will start the screensaver and after a few seconds can log in
with KDM as always. The <guimenuitem>Start New Session</guimenuitem> entry with TDM as always. The <guimenuitem>Start New Session</guimenuitem> entry
skips the activation of your screensaver.</para> skips the activation of your screensaver.</para>
<para>Once you have running more than one session you can either choose to <para>Once you have running more than one session you can either choose to
@ -53,8 +53,8 @@ User...</guibutton> button and log into another session.</para>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>Switch Session in &kdm;</term> <term>Switch Session in &tdm;</term>
<listitem><para>If you are in &kdm; and want to switch to another active <listitem><para>If you are in &tdm; and want to switch to another active
session you can press the <guibutton>Menu</guibutton> button and choose session you can press the <guibutton>Menu</guibutton> button and choose
<guisubmenu>Switch User</guisubmenu> which is mainly the same as described <guisubmenu>Switch User</guisubmenu> which is mainly the same as described
above.</para> above.</para>

4
kcontrol/CMakeLists.txt
Unescape View File

@ -11,7 +11,7 @@
# FIXME smartcard is not ported # FIXME smartcard is not ported
if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_KDM ) if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_TDM )
add_subdirectory( background ) add_subdirectory( background )
@ -37,7 +37,7 @@ if( BUILD_KCONTROL )
add_subdirectory( kded ) add_subdirectory( kded )
add_subdirectory( launch ) add_subdirectory( launch )
add_subdirectory( keys ) add_subdirectory( keys )
add_subdirectory( kdm ) add_subdirectory( tdm )
add_subdirectory( kio ) add_subdirectory( kio )
add_subdirectory( konq ) add_subdirectory( konq )
add_subdirectory( style ) add_subdirectory( style )

2
kcontrol/Makefile.am
Unescape View File

@ -32,7 +32,7 @@ JOYSTICK_SUBDIR=joystick
endif endif
# 'colors' and 'fonts' should come after 'krdb' # 'colors' and 'fonts' should come after 'krdb'
SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo kdm\ SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo tdm\
kicker locale launch keys kio konq style kded \ kicker locale launch keys kio konq style kded \
konqhtml ebrowsing arts kcontrol knotify\ konqhtml ebrowsing arts kcontrol knotify\
clock pics $(ACCESS_SUBDIR) colors energy fonts css \ clock pics $(ACCESS_SUBDIR) colors energy fonts css \

2
kcontrol/background/CMakeLists.txt
Unescape View File

@ -9,7 +9,7 @@
# #
################################################# #################################################
if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_KDM ) if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_TDM )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

4
kcontrol/background/bgrender.cpp
Unescape View File

@ -312,7 +312,7 @@ wp_load:
} }
// _Don't_ use KMimeType, as it relies on ksycoca which we really // _Don't_ use KMimeType, as it relies on ksycoca which we really
// don't want in krootimage (kdm context). // don't want in krootimage (tdm context).
//if ( KMimeType::findByPath( file )->is( "image/svg+xml" ) ) { //if ( KMimeType::findByPath( file )->is( "image/svg+xml" ) ) {
if (file.endsWith(".svg") || file.endsWith(".svgz")) { if (file.endsWith(".svg") || file.endsWith(".svgz")) {
#ifdef HAVE_LIBART #ifdef HAVE_LIBART
@ -400,7 +400,7 @@ wp_load:
// HACK: Use KFileMetaInfo only when we're attached to DCOP. // HACK: Use KFileMetaInfo only when we're attached to DCOP.
// KFileMetaInfo needs ksycoca and so on, but this code is // KFileMetaInfo needs ksycoca and so on, but this code is
// used also in krootimage (which in turn is used by kdm). // used also in krootimage (which in turn is used by tdm).
if( kapp->dcopClient()->isAttached()) { if( kapp->dcopClient()->isAttached()) {
KFileMetaInfo metaInfo(file); KFileMetaInfo metaInfo(file);
if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) { if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) {

2
kcontrol/fonts/fonts.cpp
Unescape View File

@ -648,7 +648,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
"<p>The use of this option is generally discouraged. For selecting proper DPI" "<p>The use of this option is generally discouraged. For selecting proper DPI"
" value a better option is explicitly configuring it for the whole X server if" " value a better option is explicitly configuring it for the whole X server if"
" possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> to" " possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> to"
" ServerLocalArgs= in $TDEDIR/share/config/kdm/kdmrc). When fonts do not render" " ServerLocalArgs= in $TDEDIR/share/config/tdm/tdmrc). When fonts do not render"
" properly with real DPI value better fonts should be used or configuration" " properly with real DPI value better fonts should be used or configuration"
" of font hinting should be checked.</p>" ); " of font hinting should be checked.</p>" );
TQWhatsThis::add(comboForceDpi, whatsthis); TQWhatsThis::add(comboForceDpi, whatsthis);

2
kcontrol/kdm/AUTHORS
Unescape View File

@ -1,4 +1,4 @@
KDM - The KDE Display Manager - written by Steffen Hansen <hansen@kde.org> TDM - The KDE Display Manager - written by Steffen Hansen <hansen@kde.org>
The KDE Display Manager Configuration module - The KDE Display Manager Configuration module -
written by Thomas Tanghus <tanghus@earthling.net> written by Thomas Tanghus <tanghus@earthling.net>

10
kcontrol/kdm/CMakeLists.txt
Unescape View File

@ -23,18 +23,18 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kdm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES tdm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
##### kcm_kdm (module) ########################## ##### kcm_tdm (module) ##########################
set_source_files_properties( background.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" ) set_source_files_properties( background.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
set_source_files_properties( main.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" ) set_source_files_properties( main.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
tde_add_kpart( kcm_kdm AUTOMOC tde_add_kpart( kcm_tdm AUTOMOC
SOURCES SOURCES
background.cpp kdm-appear.cpp kdm-font.cpp kdm-shut.cpp background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp
kdm-users.cpp kdm-conv.cpp main.cpp kbackedcombobox.cpp tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp
LINK kcmbgnd-static bgnd-static knewstuff-shared LINK kcmbgnd-static bgnd-static knewstuff-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

14
kcontrol/kdm/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
kde_module_LTLIBRARIES = kcm_kdm.la kde_module_LTLIBRARIES = kcm_tdm.la
# _don't_ add a theme configurator!! # _don't_ add a theme configurator!!
kcm_kdm_la_SOURCES = background.cpp kdm-appear.cpp kdm-font.cpp kdm-shut.cpp \ kcm_tdm_la_SOURCES = background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp \
kdm-users.cpp kdm-conv.cpp main.cpp kbackedcombobox.cpp tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp
kcm_kdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined kcm_tdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined
kcm_kdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) $(LIB_KNEWSTUFF) kcm_tdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) $(LIB_KNEWSTUFF)
AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \ AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \
-I$(top_srcdir)/kcontrol/background \ -I$(top_srcdir)/kcontrol/background \
@ -14,6 +14,6 @@ AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \
METASOURCES = AUTO METASOURCES = AUTO
messages: messages:
$(XGETTEXT) $(kcm_kdm_la_SOURCES) -o $(podir)/kdmconfig.pot $(XGETTEXT) $(kcm_tdm_la_SOURCES) -o $(podir)/tdmconfig.pot
xdg_apps_DATA = kdm.desktop xdg_apps_DATA = tdm.desktop

6
kcontrol/kdm/background.cpp
Unescape View File

@ -46,12 +46,12 @@ KBackground::KBackground(TQWidget *parent, const char *name)
// Enabling checkbox // Enabling checkbox
m_pCBEnable = new TQCheckBox( i18n("E&nable background"), this ); m_pCBEnable = new TQCheckBox( i18n("E&nable background"), this );
TQWhatsThis::add( m_pCBEnable, TQWhatsThis::add( m_pCBEnable,
i18n("If this is checked, KDM will use the settings below for the background." i18n("If this is checked, TDM will use the settings below for the background."
" If it is disabled, you have to look after the background yourself." " If it is disabled, you have to look after the background yourself."
" This is done by running some program (possibly xsetroot) in the script" " This is done by running some program (possibly xsetroot) in the script"
" specified in the Setup= option in kdmrc (usually Xsetup).") ); " specified in the Setup= option in tdmrc (usually Xsetup).") );
config->setGroup( "X-*-Greeter" ); config->setGroup( "X-*-Greeter" );
m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/kdm/backgroundrc" ) ); m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) );
m_background = new BGDialog( this, m_simpleConf, false ); m_background = new BGDialog( this, m_simpleConf, false );
connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));

64
kcontrol/kdm/kdm-appear.cpp
Unescape View File

@ -44,13 +44,13 @@
#include <kurldrag.h> #include <kurldrag.h>
#include <kimagefilepreview.h> #include <kimagefilepreview.h>
#include "kdm-appear.h" #include "tdm-appear.h"
#include "kbackedcombobox.h" #include "kbackedcombobox.h"
extern KSimpleConfig *config; extern KSimpleConfig *config;
KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name) : TQWidget(parent, name)
{ {
TQString wtstr; TQString wtstr;
@ -74,9 +74,9 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)), connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(changed())); TQT_SLOT(changed()));
hlay->addWidget(greetstr_lined); hlay->addWidget(greetstr_lined);
wtstr = i18n("This is the \"headline\" for KDM's login window. You may want to " wtstr = i18n("This is the \"headline\" for TDM's login window. You may want to "
"put some nice greeting or information about the operating system here.<p>" "put some nice greeting or information about the operating system here.<p>"
"KDM will substitute the following character pairs with the " "TDM will substitute the following character pairs with the "
"respective contents:<br><ul>" "respective contents:<br><ul>"
"<li>%d -> current display</li>" "<li>%d -> current display</li>"
"<li>%h -> host name, possibly with domain name</li>" "<li>%h -> host name, possibly with domain name</li>"
@ -127,7 +127,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
hglay->addWidget(logoLabel, 1, 0); hglay->addWidget(logoLabel, 1, 0);
hglay->addWidget(logobutton, 1, 1, Qt::AlignCenter); hglay->addWidget(logobutton, 1, 1, Qt::AlignCenter);
hglay->addRowSpacing(1, 110); hglay->addRowSpacing(1, 110);
wtstr = i18n("Click here to choose an image that KDM will display. " wtstr = i18n("Click here to choose an image that TDM will display. "
"You can also drag and drop an image onto this button " "You can also drag and drop an image onto this button "
"(e.g. from Konqueror)."); "(e.g. from Konqueror).");
TQWhatsThis::add( logoLabel, wtstr ); TQWhatsThis::add( logoLabel, wtstr );
@ -177,7 +177,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
connect(compositorcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); connect(compositorcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hglay->addWidget(label, 0, 0); hglay->addWidget(label, 0, 0);
hglay->addWidget(compositorcombo, 0, 1); hglay->addWidget(compositorcombo, 0, 1);
wtstr = i18n("Choose a compositor to be used in KDM. Note that the chosen compositor will continue to run after login."); wtstr = i18n("Choose a compositor to be used in TDM. Note that the chosen compositor will continue to run after login.");
TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( label, wtstr );
TQWhatsThis::add( compositorcombo, wtstr ); TQWhatsThis::add( compositorcombo, wtstr );
@ -190,7 +190,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
hglay->addWidget(label, 1, 0); hglay->addWidget(label, 1, 0);
hglay->addWidget(guicombo, 1, 1); hglay->addWidget(guicombo, 1, 1);
wtstr = i18n("You can choose a basic GUI style here that will be " wtstr = i18n("You can choose a basic GUI style here that will be "
"used by KDM only."); "used by TDM only.");
TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( label, wtstr );
TQWhatsThis::add( guicombo, wtstr ); TQWhatsThis::add( guicombo, wtstr );
@ -203,7 +203,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
hglay->addWidget(label, 2, 0); hglay->addWidget(label, 2, 0);
hglay->addWidget(colcombo, 2, 1); hglay->addWidget(colcombo, 2, 1);
wtstr = i18n("You can choose a basic Color Scheme here that will be " wtstr = i18n("You can choose a basic Color Scheme here that will be "
"used by KDM only."); "used by TDM only.");
TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( label, wtstr );
TQWhatsThis::add( colcombo, wtstr ); TQWhatsThis::add( colcombo, wtstr );
@ -215,7 +215,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
hglay->addWidget(label, 3, 0); hglay->addWidget(label, 3, 0);
hglay->addWidget(echocombo, 3, 1); hglay->addWidget(echocombo, 3, 1);
wtstr = i18n("You can choose whether and how KDM shows your password when you type it."); wtstr = i18n("You can choose whether and how TDM shows your password when you type it.");
TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( label, wtstr );
TQWhatsThis::add( echocombo, wtstr ); TQWhatsThis::add( echocombo, wtstr );
@ -232,7 +232,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
hbox->setColStretch(1, 1); hbox->setColStretch(1, 1);
hbox->addWidget(label, 1, 0); hbox->addWidget(label, 1, 0);
hbox->addWidget(langcombo, 1, 1); hbox->addWidget(langcombo, 1, 1);
wtstr = i18n("Here you can choose the language used by KDM. This setting does not affect" wtstr = i18n("Here you can choose the language used by TDM. This setting does not affect"
" a user's personal settings; that will take effect after login."); " a user's personal settings; that will take effect after login.");
TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( label, wtstr );
TQWhatsThis::add( langcombo, wtstr ); TQWhatsThis::add( langcombo, wtstr );
@ -255,7 +255,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
} }
void KDMAppearanceWidget::makeReadOnly() void TDMAppearanceWidget::makeReadOnly()
{ {
disconnect( logobutton, TQT_SIGNAL(clicked()), disconnect( logobutton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotLogoButtonClicked()) ); this, TQT_SLOT(slotLogoButtonClicked()) );
@ -274,7 +274,7 @@ void KDMAppearanceWidget::makeReadOnly()
sakbox->setEnabled(false); sakbox->setEnabled(false);
} }
void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
{ {
TQStringList langlist = KGlobal::dirs()->findAllResources("locale", TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop")); TQString::fromLatin1("*/entry.desktop"));
@ -293,7 +293,7 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
} }
} }
void KDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo) void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
{ {
// XXX: Global + local schemes // XXX: Global + local schemes
TQStringList list = KGlobal::dirs()-> TQStringList list = KGlobal::dirs()->
@ -314,7 +314,7 @@ void KDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
} }
} }
void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
{ {
// XXX: Global + local schemes // XXX: Global + local schemes
TQStringList list = KGlobal::dirs()-> TQStringList list = KGlobal::dirs()->
@ -340,10 +340,10 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
} }
} }
bool KDMAppearanceWidget::setLogo(TQString logo) bool TDMAppearanceWidget::setLogo(TQString logo)
{ {
TQString flogo = logo.isEmpty() ? TQString flogo = logo.isEmpty() ?
locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) : locate("data", TQString::fromLatin1("tdm/pics/kdelogo.png") ) :
logo; logo;
TQImage p(flogo); TQImage p(flogo);
if (p.isNull()) if (p.isNull())
@ -358,10 +358,10 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
} }
void KDMAppearanceWidget::slotLogoButtonClicked() void TDMAppearanceWidget::slotLogoButtonClicked()
{ {
KImageIO::registerFormats(); KImageIO::registerFormats();
KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")), KFileDialog dialogue(locate("data", TQString::fromLatin1("tdm/pics/")),
KImageIO::pattern( KImageIO::Reading ), KImageIO::pattern( KImageIO::Reading ),
this, 0, true); this, 0, true);
dialogue.setOperationMode( KFileDialog::Opening ); dialogue.setOperationMode( KFileDialog::Opening );
@ -377,14 +377,14 @@ void KDMAppearanceWidget::slotLogoButtonClicked()
} }
void KDMAppearanceWidget::slotAreaRadioClicked(int id) void TDMAppearanceWidget::slotAreaRadioClicked(int id)
{ {
logobutton->setEnabled( id == KdmLogo ); logobutton->setEnabled( id == KdmLogo );
logoLabel->setEnabled( id == KdmLogo ); logoLabel->setEnabled( id == KdmLogo );
} }
bool KDMAppearanceWidget::eventFilter(TQObject *, TQEvent *e) bool TDMAppearanceWidget::eventFilter(TQObject *, TQEvent *e)
{ {
if (e->type() == TQEvent::DragEnter) { if (e->type() == TQEvent::DragEnter) {
iconLoaderDragEnterEvent((TQDragEnterEvent *) e); iconLoaderDragEnterEvent((TQDragEnterEvent *) e);
@ -399,7 +399,7 @@ bool KDMAppearanceWidget::eventFilter(TQObject *, TQEvent *e)
return false; return false;
} }
void KDMAppearanceWidget::iconLoaderDragEnterEvent(TQDragEnterEvent *e) void TDMAppearanceWidget::iconLoaderDragEnterEvent(TQDragEnterEvent *e)
{ {
e->accept(KURLDrag::canDecode(e)); e->accept(KURLDrag::canDecode(e));
} }
@ -407,7 +407,7 @@ void KDMAppearanceWidget::iconLoaderDragEnterEvent(TQDragEnterEvent *e)
KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg); KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg);
void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
{ {
KURL pixurl; KURL pixurl;
bool istmp; bool istmp;
@ -418,7 +418,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
// we gotta check if it is a non-local file and make a tmp copy at the hd. // we gotta check if it is a non-local file and make a tmp copy at the hd.
if(!url->isLocalFile()) { if(!url->isLocalFile()) {
pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() + pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() +
"kdm/pics/" + url->fileName()); "tdm/pics/" + url->fileName());
KIO::NetAccess::copy(*url, pixurl, parentWidget()); KIO::NetAccess::copy(*url, pixurl, parentWidget());
istmp = true; istmp = true;
} else { } else {
@ -441,7 +441,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
} }
void KDMAppearanceWidget::save() void TDMAppearanceWidget::save()
{ {
config->setGroup("X-*-Greeter"); config->setGroup("X-*-Greeter");
@ -468,7 +468,7 @@ void KDMAppearanceWidget::save()
} }
void KDMAppearanceWidget::load() void TDMAppearanceWidget::load()
{ {
config->setGroup("X-*-Greeter"); config->setGroup("X-*-Greeter");
@ -520,7 +520,7 @@ void KDMAppearanceWidget::load()
} }
void KDMAppearanceWidget::defaults() void TDMAppearanceWidget::defaults()
{ {
greetstr_lined->setText( i18n("Welcome to %n") ); greetstr_lined->setText( i18n("Welcome to %n") );
logoRadio->setChecked( true ); logoRadio->setChecked( true );
@ -537,18 +537,18 @@ void KDMAppearanceWidget::defaults()
langcombo->setCurrentItem( "en_US" ); langcombo->setCurrentItem( "en_US" );
} }
TQString KDMAppearanceWidget::quickHelp() const TQString TDMAppearanceWidget::quickHelp() const
{ {
return i18n("<h1>KDM - Appearance</h1> Here you can configure the basic appearance" return i18n("<h1>TDM - Appearance</h1> Here you can configure the basic appearance"
" of the KDM login manager, i.e. a greeting string, an icon etc.<p>" " of the TDM login manager, i.e. a greeting string, an icon etc.<p>"
" For further refinement of KDM's appearance, see the \"Font\" and \"Background\" " " For further refinement of TDM's appearance, see the \"Font\" and \"Background\" "
" tabs."); " tabs.");
} }
void KDMAppearanceWidget::changed() void TDMAppearanceWidget::changed()
{ {
emit changed(true); emit changed(true);
} }
#include "kdm-appear.moc" #include "tdm-appear.moc"

8
kcontrol/kdm/kdm-appear.h
Unescape View File

@ -18,8 +18,8 @@
*/ */
#ifndef __KDMAPPEAR_H__ #ifndef __TDMAPPEAR_H__
#define __KDMAPPEAR_H__ #define __TDMAPPEAR_H__
#include <tqdir.h> #include <tqdir.h>
@ -42,12 +42,12 @@ class TQLineEdit;
class KLineEdit; class KLineEdit;
class KDMAppearanceWidget : public TQWidget class TDMAppearanceWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
KDMAppearanceWidget(TQWidget *parent, const char *name=0); TDMAppearanceWidget(TQWidget *parent, const char *name=0);
void load(); void load();
void save(); void save();

38
kcontrol/kdm/kdm-conv.cpp
Unescape View File

@ -35,11 +35,11 @@
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <klocale.h> #include <klocale.h>
#include "kdm-conv.h" #include "tdm-conv.h"
extern KSimpleConfig *config; extern KSimpleConfig *config;
KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name) : TQWidget(parent, name)
{ {
TQString wtstr; TQString wtstr;
@ -53,7 +53,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
alGroup->setSizePolicy( vpref ); alGroup->setSizePolicy( vpref );
TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
" This applies only to KDM's graphical login." " This applies only to TDM's graphical login."
" Think twice before enabling this!") ); " Think twice before enabling this!") );
connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
@ -82,7 +82,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
againcb = new TQCheckBox( i18n("P&ersistent"), alGroup ); againcb = new TQCheckBox( i18n("P&ersistent"), alGroup );
connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) );
TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only " TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only "
"when KDM starts up. If this is checked, automatic login will kick in " "when TDM starts up. If this is checked, automatic login will kick in "
"after finishing a session as well.") ); "after finishing a session as well.") );
autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup ); autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup );
connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) );
@ -117,7 +117,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
hlpl->addWidget(puserlb); hlpl->addWidget(puserlb);
hlpl->addStretch( 1 ); hlpl->addStretch( 1 );
cbjumppw = new TQCheckBox(i18n("Focus pass&word"), puGroup); cbjumppw = new TQCheckBox(i18n("Focus pass&word"), puGroup);
TQWhatsThis::add( cbjumppw, i18n("When this option is on, KDM will place the cursor " TQWhatsThis::add( cbjumppw, i18n("When this option is on, TDM will place the cursor "
"in the password field instead of the user field after preselecting a user. " "in the password field instead of the user field after preselecting a user. "
"Use this to save one key press per login, if the preselection usually does not need to " "Use this to save one key press per login, if the preselection usually does not need to "
"be changed.") ); "be changed.") );
@ -128,7 +128,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
TQWhatsThis::add( npGroup, i18n("When this option is checked, the checked users from" TQWhatsThis::add( npGroup, i18n("When this option is checked, the checked users from"
" the list below will be allowed to log in without entering their" " the list below will be allowed to log in without entering their"
" password. This applies only to KDM's graphical login." " password. This applies only to TDM's graphical login."
" Think twice before enabling this!") ); " Think twice before enabling this!") );
connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
@ -173,7 +173,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
} }
void KDMConvenienceWidget::makeReadOnly() void TDMConvenienceWidget::makeReadOnly()
{ {
((TQWidget*)alGroup->child("qt_groupbox_checkbox"))->setEnabled(false); ((TQWidget*)alGroup->child("qt_groupbox_checkbox"))->setEnabled(false);
userlb->setEnabled(false); userlb->setEnabled(false);
@ -190,7 +190,7 @@ void KDMConvenienceWidget::makeReadOnly()
cbjumppw->setEnabled(false); cbjumppw->setEnabled(false);
} }
void KDMConvenienceWidget::slotPresChanged() void TDMConvenienceWidget::slotPresChanged()
{ {
bool en = spRadio->isChecked(); bool en = spRadio->isChecked();
pu_label->setEnabled(en); pu_label->setEnabled(en);
@ -198,7 +198,7 @@ void KDMConvenienceWidget::slotPresChanged()
cbjumppw->setEnabled(!npRadio->isChecked()); cbjumppw->setEnabled(!npRadio->isChecked());
} }
void KDMConvenienceWidget::save() void TDMConvenienceWidget::save()
{ {
config->setGroup("X-:0-Core"); config->setGroup("X-:0-Core");
config->writeEntry( "AutoLoginEnable", alGroup->isChecked() ); config->writeEntry( "AutoLoginEnable", alGroup->isChecked() );
@ -223,7 +223,7 @@ void KDMConvenienceWidget::save()
} }
void KDMConvenienceWidget::load() void TDMConvenienceWidget::load()
{ {
config->setGroup("X-:0-Core"); config->setGroup("X-:0-Core");
bool alenable = config->readBoolEntry( "AutoLoginEnable", false); bool alenable = config->readBoolEntry( "AutoLoginEnable", false);
@ -257,7 +257,7 @@ void KDMConvenienceWidget::load()
} }
void KDMConvenienceWidget::defaults() void TDMConvenienceWidget::defaults()
{ {
alGroup->setChecked(false); alGroup->setChecked(false);
delaysb->setValue(0); delaysb->setValue(0);
@ -275,22 +275,22 @@ void KDMConvenienceWidget::defaults()
} }
void KDMConvenienceWidget::slotChanged() void TDMConvenienceWidget::slotChanged()
{ {
emit changed(true); emit changed(true);
} }
void KDMConvenienceWidget::slotSetAutoUser( const TQString &user ) void TDMConvenienceWidget::slotSetAutoUser( const TQString &user )
{ {
autoUser = user; autoUser = user;
} }
void KDMConvenienceWidget::slotSetPreselUser( const TQString &user ) void TDMConvenienceWidget::slotSetPreselUser( const TQString &user )
{ {
preselUser = user; preselUser = user;
} }
void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item ) void TDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item )
{ {
if ( !item ) if ( !item )
return; return;
@ -305,7 +305,7 @@ void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item )
} }
} }
void KDMConvenienceWidget::slotClearUsers() void TDMConvenienceWidget::slotClearUsers()
{ {
userlb->clear(); userlb->clear();
puserlb->clear(); puserlb->clear();
@ -316,7 +316,7 @@ void KDMConvenienceWidget::slotClearUsers()
puserlb->insertItem(preselUser); puserlb->insertItem(preselUser);
} }
void KDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users) void TDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users)
{ {
TQMapConstIterator<TQString,int> it; TQMapConstIterator<TQString,int> it;
for (it = users.begin(); it != users.end(); ++it) { for (it = users.begin(); it != users.end(); ++it) {
@ -342,7 +342,7 @@ void KDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users)
puserlb->setCurrentItem(preselUser); puserlb->setCurrentItem(preselUser);
} }
void KDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users) void TDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users)
{ {
TQMapConstIterator<TQString,int> it; TQMapConstIterator<TQString,int> it;
for (it = users.begin(); it != users.end(); ++it) { for (it = users.begin(); it != users.end(); ++it) {
@ -359,4 +359,4 @@ void KDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users)
} }
} }
#include "kdm-conv.moc" #include "tdm-conv.moc"

8
kcontrol/kdm/kdm-conv.h
Unescape View File

@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __KDMCONV_H__ #ifndef __TDMCONV_H__
#define __KDMCONV_H__ #define __TDMCONV_H__
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqstring.h> #include <tqstring.h>
@ -39,12 +39,12 @@
#include <pwd.h> #include <pwd.h>
class KDMConvenienceWidget : public TQWidget class TDMConvenienceWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
KDMConvenienceWidget(TQWidget *parent=0, const char *name=0); TDMConvenienceWidget(TQWidget *parent=0, const char *name=0);
void load(); void load();
void save(); void save();

18
kcontrol/kdm/kdm-font.cpp
Unescape View File

@ -34,12 +34,12 @@
#include <kfontrequester.h> #include <kfontrequester.h>
#include <klocale.h> #include <klocale.h>
#include "kdm-font.h" #include "tdm-font.h"
extern KSimpleConfig *config; extern KSimpleConfig *config;
KDMFontWidget::KDMFontWidget(TQWidget *parent, const char *name) TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name) : TQWidget(parent, name)
{ {
TQGridLayout *ml = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint()); TQGridLayout *ml = new TQGridLayout(this, 5, 2, KDialog::marginHint(), KDialog::spacingHint());
@ -75,7 +75,7 @@ KDMFontWidget::KDMFontWidget(TQWidget *parent, const char *name)
ml->setRowStretch(5, 10); ml->setRowStretch(5, 10);
} }
void KDMFontWidget::makeReadOnly() void TDMFontWidget::makeReadOnly()
{ {
stdFontChooser->button()->setEnabled(false); stdFontChooser->button()->setEnabled(false);
failFontChooser->button()->setEnabled(false); failFontChooser->button()->setEnabled(false);
@ -83,19 +83,19 @@ void KDMFontWidget::makeReadOnly()
aacb->setEnabled(false); aacb->setEnabled(false);
} }
void KDMFontWidget::configChanged() void TDMFontWidget::configChanged()
{ {
emit changed(true); emit changed(true);
} }
void KDMFontWidget::set_def() void TDMFontWidget::set_def()
{ {
stdFontChooser->setFont(TQFont("Sans Serif", 10)); stdFontChooser->setFont(TQFont("Sans Serif", 10));
failFontChooser->setFont(TQFont("Sans Serif", 10, TQFont::Bold)); failFontChooser->setFont(TQFont("Sans Serif", 10, TQFont::Bold));
greetingFontChooser->setFont(TQFont("Sans Serif", 22)); greetingFontChooser->setFont(TQFont("Sans Serif", 22));
} }
void KDMFontWidget::save() void TDMFontWidget::save()
{ {
config->setGroup("X-*-Greeter"); config->setGroup("X-*-Greeter");
@ -107,7 +107,7 @@ void KDMFontWidget::save()
} }
void KDMFontWidget::load() void TDMFontWidget::load()
{ {
set_def(); set_def();
@ -125,10 +125,10 @@ void KDMFontWidget::load()
} }
void KDMFontWidget::defaults() void TDMFontWidget::defaults()
{ {
set_def(); set_def();
aacb->setChecked(true); aacb->setChecked(true);
} }
#include "kdm-font.moc" #include "tdm-font.moc"

8
kcontrol/kdm/kdm-font.h
Unescape View File

@ -17,20 +17,20 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __KDMFONT_H__ #ifndef __TDMFONT_H__
#define __KDMFONT_H__ #define __TDMFONT_H__
#include <tqwidget.h> #include <tqwidget.h>
class KFontRequester; class KFontRequester;
class TQCheckBox; class TQCheckBox;
class KDMFontWidget : public TQWidget class TDMFontWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
KDMFontWidget(TQWidget *parent=0, const char *name=0); TDMFontWidget(TQWidget *parent=0, const char *name=0);
void load(); void load();
void save(); void save();

28
kcontrol/kdm/kdm-shut.cpp
Unescape View File

@ -34,13 +34,13 @@
#include <kdialog.h> #include <kdialog.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include "kdm-shut.h" #include "tdm-shut.h"
#include "kbackedcombobox.h" #include "kbackedcombobox.h"
extern KSimpleConfig *config; extern KSimpleConfig *config;
KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name) TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name) : TQWidget(parent, name)
{ {
TQString wtstr; TQString wtstr;
@ -61,11 +61,11 @@ KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name)
sdrcombo->insertItem(i18n("Nobody"), SdNone); sdrcombo->insertItem(i18n("Nobody"), SdNone);
connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown" TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown"
" the computer using KDM. You can specify different values for local (console) and remote displays. " " the computer using TDM. You can specify different values for local (console) and remote displays. "
"Possible values are:<ul>" "Possible values are:<ul>"
" <li><em>Everybody:</em> everybody can shutdown the computer using KDM</li>" " <li><em>Everybody:</em> everybody can shutdown the computer using TDM</li>"
" <li><em>Only root:</em> KDM will only allow shutdown after the user has entered the root password</li>" " <li><em>Only root:</em> TDM will only allow shutdown after the user has entered the root password</li>"
" <li><em>Nobody:</em> nobody can shutdown the computer using KDM</li></ul>") ); " <li><em>Nobody:</em> nobody can shutdown the computer using TDM</li></ul>") );
TQGroupBox *group1 = new TQGroupBox( i18n("Commands"), this ); TQGroupBox *group1 = new TQGroupBox( i18n("Commands"), this );
@ -138,7 +138,7 @@ KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name)
} }
void KDMSessionsWidget::makeReadOnly() void TDMSessionsWidget::makeReadOnly()
{ {
sdlcombo->setEnabled(false); sdlcombo->setEnabled(false);
sdrcombo->setEnabled(false); sdrcombo->setEnabled(false);
@ -151,7 +151,7 @@ void KDMSessionsWidget::makeReadOnly()
bm_combo->setEnabled(false); bm_combo->setEnabled(false);
} }
void KDMSessionsWidget::writeSD(TQComboBox *combo) void TDMSessionsWidget::writeSD(TQComboBox *combo)
{ {
TQString what; TQString what;
switch (combo->currentItem()) { switch (combo->currentItem()) {
@ -162,7 +162,7 @@ void KDMSessionsWidget::writeSD(TQComboBox *combo)
config->writeEntry( "AllowShutdown", what); config->writeEntry( "AllowShutdown", what);
} }
void KDMSessionsWidget::save() void TDMSessionsWidget::save()
{ {
config->setGroup("X-:*-Core"); config->setGroup("X-:*-Core");
writeSD(sdlcombo); writeSD(sdlcombo);
@ -177,7 +177,7 @@ void KDMSessionsWidget::save()
config->writeEntry("BootManager", bm_combo->currentId()); config->writeEntry("BootManager", bm_combo->currentId());
} }
void KDMSessionsWidget::readSD(TQComboBox *combo, TQString def) void TDMSessionsWidget::readSD(TQComboBox *combo, TQString def)
{ {
TQString str = config->readEntry("AllowShutdown", def); TQString str = config->readEntry("AllowShutdown", def);
SdModes sdMode; SdModes sdMode;
@ -190,7 +190,7 @@ void KDMSessionsWidget::readSD(TQComboBox *combo, TQString def)
combo->setCurrentItem(sdMode); combo->setCurrentItem(sdMode);
} }
void KDMSessionsWidget::load() void TDMSessionsWidget::load()
{ {
config->setGroup("X-:*-Core"); config->setGroup("X-:*-Core");
readSD(sdlcombo, "All"); readSD(sdlcombo, "All");
@ -207,7 +207,7 @@ void KDMSessionsWidget::load()
void KDMSessionsWidget::defaults() void TDMSessionsWidget::defaults()
{ {
restart_lined->setURL("/sbin/reboot"); restart_lined->setURL("/sbin/reboot");
shutdown_lined->setURL("/sbin/poweroff"); shutdown_lined->setURL("/sbin/poweroff");
@ -219,9 +219,9 @@ void KDMSessionsWidget::defaults()
} }
void KDMSessionsWidget::changed() void TDMSessionsWidget::changed()
{ {
emit changed(true); emit changed(true);
} }
#include "kdm-shut.moc" #include "tdm-shut.moc"

8
kcontrol/kdm/kdm-shut.h
Unescape View File

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __KDMSESS_H__ #ifndef __TDMSESS_H__
#define __KDMSESS_H__ #define __TDMSESS_H__
#include <tqstring.h> #include <tqstring.h>
@ -28,12 +28,12 @@ class TQCheckBox;
class KURLRequester; class KURLRequester;
class KBackedComboBox; class KBackedComboBox;
class KDMSessionsWidget : public TQWidget class TDMSessionsWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
KDMSessionsWidget(TQWidget *parent=0, const char *name=0); TDMSessionsWidget(TQWidget *parent=0, const char *name=0);
void load(); void load();
void save(); void save();

70
kcontrol/kdm/kdm-users.cpp
Unescape View File

@ -38,14 +38,14 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kurldrag.h> #include <kurldrag.h>
#include "kdm-users.h" #include "tdm-users.h"
#include <sys/stat.h> #include <sys/stat.h>
extern KSimpleConfig *config; extern KSimpleConfig *config;
KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name) : TQWidget(parent, name)
{ {
#ifdef __linux__ #ifdef __linux__
@ -71,10 +71,10 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
defmaxuid = "65000"; defmaxuid = "65000";
#endif #endif
// We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users, // We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users,
// and create them if necessary. // and create them if necessary.
config->setGroup( "X-*-Greeter" ); config->setGroup( "X-*-Greeter" );
m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
m_notFirst = false; m_notFirst = false;
TQDir testDir( m_userPixDir ); TQDir testDir( m_userPixDir );
if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() ) if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
@ -86,7 +86,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
TQString wtstr; TQString wtstr;
minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this ); minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this );
TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by KDM and this setup dialog." TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by TDM and this setup dialog."
" Note that users with the UID 0 (typically root) are not affected by this and must be" " Note that users with the UID 0 (typically root) are not affected by this and must be"
" explicitly hidden in \"Not hidden\" mode.")); " explicitly hidden in \"Not hidden\" mode."));
TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed ); TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed );
@ -110,10 +110,10 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) ); connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) );
connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup ); cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup );
TQWhatsThis::add( cbshowlist, i18n("If this option is checked, KDM will show a list of users," TQWhatsThis::add( cbshowlist, i18n("If this option is checked, TDM will show a list of users,"
" so users can click on their name or image rather than typing in their login.") ); " so users can click on their name or image rather than typing in their login.") );
cbcomplete = new TQCheckBox( i18n("Autocompletion"), usrGroup ); cbcomplete = new TQCheckBox( i18n("Autocompletion"), usrGroup );
TQWhatsThis::add( cbcomplete, i18n("If this option is checked, KDM will automatically complete" TQWhatsThis::add( cbcomplete, i18n("If this option is checked, TDM will automatically complete"
" user names while they are typed in the line edit.") ); " user names while they are typed in the line edit.") );
cbinverted = new TQCheckBox( i18n("Inverse selection"), usrGroup ); cbinverted = new TQCheckBox( i18n("Inverse selection"), usrGroup );
TQWhatsThis::add( cbinverted, i18n("This option specifies how the users for \"Show list\" and \"Autocompletion\"" TQWhatsThis::add( cbinverted, i18n("This option specifies how the users for \"Show list\" and \"Autocompletion\""
@ -122,7 +122,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
"If checked, select all non-system users, except the checked ones.")); "If checked, select all non-system users, except the checked ones."));
cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup ); cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup );
connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) ); connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) );
TQWhatsThis::add( cbusrsrt, i18n("If this is checked, KDM will alphabetically sort the user list." TQWhatsThis::add( cbusrsrt, i18n("If this is checked, TDM will alphabetically sort the user list."
" Otherwise users are listed in the order they appear in the password file.") ); " Otherwise users are listed in the order they appear in the password file.") );
wstack = new TQWidgetStack( this ); wstack = new TQWidgetStack( this );
@ -130,7 +130,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
optinlv = new KListView( this ); optinlv = new KListView( this );
optinlv->addColumn( i18n("Selected Users") ); optinlv->addColumn( i18n("Selected Users") );
optinlv->setResizeMode( TQListView::LastColumn ); optinlv->setResizeMode( TQListView::LastColumn );
TQWhatsThis::add( optinlv, i18n("KDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
wstack->addWidget( optinlv ); wstack->addWidget( optinlv );
connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )),
TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) ); TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) );
@ -139,7 +139,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
optoutlv = new KListView( this ); optoutlv = new KListView( this );
optoutlv->addColumn( i18n("Hidden Users") ); optoutlv->addColumn( i18n("Hidden Users") );
optoutlv->setResizeMode( TQListView::LastColumn ); optoutlv->setResizeMode( TQListView::LastColumn );
TQWhatsThis::add( optoutlv, i18n("KDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") );
wstack->addWidget( optoutlv ); wstack->addWidget( optoutlv );
connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) ); TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) );
@ -147,9 +147,9 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
TQT_SLOT(slotChanged()) ); TQT_SLOT(slotChanged()) );
faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this ); faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this );
TQWhatsThis::add( faceGroup, i18n("Here you can specify where KDM will obtain the images that represent users." TQWhatsThis::add( faceGroup, i18n("Here you can specify where TDM will obtain the images that represent users."
" \"Admin\" represents the global folder; these are the pictures you can set below." " \"Admin\" represents the global folder; these are the pictures you can set below."
" \"User\" means that KDM should read the user's $HOME/.face.icon file." " \"User\" means that TDM should read the user's $HOME/.face.icon file."
" The two selections in the middle define the order of preference if both sources are available.") ); " The two selections in the middle define the order of preference if both sources are available.") );
connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) ); connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) );
connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
@ -176,7 +176,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list" TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list"
" of images or drag and drop your own image on to the button (e.g. from Konqueror).") ); " of images or drag and drop your own image on to the button (e.g. from Konqueror).") );
rstuserbutton = new TQPushButton( i18n("Unset"), hlpw ); rstuserbutton = new TQPushButton( i18n("Unset"), hlpw );
TQWhatsThis::add( rstuserbutton, i18n("Click this button to make KDM use the default image for the selected user.") ); TQWhatsThis::add( rstuserbutton, i18n("Click this button to make TDM use the default image for the selected user.") );
connect( rstuserbutton, TQT_SIGNAL(clicked()), connect( rstuserbutton, TQT_SIGNAL(clicked()),
TQT_SLOT(slotUnsetUserPix()) ); TQT_SLOT(slotUnsetUserPix()) );
TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() ); TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() );
@ -206,7 +206,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
} }
void KDMUsersWidget::makeReadOnly() void TDMUsersWidget::makeReadOnly()
{ {
leminuid->setReadOnly(true); leminuid->setReadOnly(true);
lemaxuid->setReadOnly(true); lemaxuid->setReadOnly(true);
@ -224,7 +224,7 @@ void KDMUsersWidget::makeReadOnly()
rstuserbutton->setEnabled(false); rstuserbutton->setEnabled(false);
} }
void KDMUsersWidget::slotShowOpts() void TDMUsersWidget::slotShowOpts()
{ {
bool en = cbshowlist->isChecked() || cbcomplete->isChecked(); bool en = cbshowlist->isChecked() || cbcomplete->isChecked();
cbinverted->setEnabled( en ); cbinverted->setEnabled( en );
@ -241,7 +241,7 @@ void KDMUsersWidget::slotShowOpts()
slotFaceOpts(); slotFaceOpts();
} }
void KDMUsersWidget::slotFaceOpts() void TDMUsersWidget::slotFaceOpts()
{ {
bool en = !rbusronly->isChecked(); bool en = !rbusronly->isChecked();
usercombo->setEnabled( en ); usercombo->setEnabled( en );
@ -252,7 +252,7 @@ void KDMUsersWidget::slotFaceOpts()
rstuserbutton->setEnabled( false ); rstuserbutton->setEnabled( false );
} }
void KDMUsersWidget::slotUserSelected() void TDMUsersWidget::slotUserSelected()
{ {
TQString user = usercombo->currentText(); TQString user = usercombo->currentText();
TQImage p; TQImage p;
@ -267,7 +267,7 @@ void KDMUsersWidget::slotUserSelected()
} }
void KDMUsersWidget::changeUserPix(const TQString &pix) void TDMUsersWidget::changeUserPix(const TQString &pix)
{ {
TQString user( usercombo->currentText() ); TQString user( usercombo->currentText() );
if (user == m_defaultText) if (user == m_defaultText)
@ -298,10 +298,10 @@ void KDMUsersWidget::changeUserPix(const TQString &pix)
slotUserSelected(); slotUserSelected();
} }
void KDMUsersWidget::slotUserButtonClicked() void TDMUsersWidget::slotUserButtonClicked()
{ {
KFileDialog dlg(m_notFirst ? TQString::null : KFileDialog dlg(m_notFirst ? TQString::null :
KGlobal::dirs()->resourceDirs("data").last() + "kdm/pics/users", KGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/users",
KImageIO::pattern( KImageIO::Reading ), KImageIO::pattern( KImageIO::Reading ),
this, 0, true); this, 0, true);
dlg.setOperationMode( KFileDialog::Opening ); dlg.setOperationMode( KFileDialog::Opening );
@ -317,13 +317,13 @@ void KDMUsersWidget::slotUserButtonClicked()
changeUserPix( dlg.selectedFile() ); changeUserPix( dlg.selectedFile() );
} }
void KDMUsersWidget::slotUnsetUserPix() void TDMUsersWidget::slotUnsetUserPix()
{ {
TQFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" ); TQFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" );
slotUserSelected(); slotUserSelected();
} }
bool KDMUsersWidget::eventFilter(TQObject *, TQEvent *e) bool TDMUsersWidget::eventFilter(TQObject *, TQEvent *e)
{ {
if (e->type() == TQEvent::DragEnter) { if (e->type() == TQEvent::DragEnter) {
TQDragEnterEvent *ee = (TQDragEnterEvent *) e; TQDragEnterEvent *ee = (TQDragEnterEvent *) e;
@ -341,7 +341,7 @@ bool KDMUsersWidget::eventFilter(TQObject *, TQEvent *e)
KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg); KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg);
void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e) void TDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
{ {
KURL *url = decodeImgDrop(e, this); KURL *url = decodeImgDrop(e, this);
if (url) { if (url) {
@ -353,7 +353,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
} }
} }
void KDMUsersWidget::save() void TDMUsersWidget::save()
{ {
config->setGroup( "X-*-Greeter" ); config->setGroup( "X-*-Greeter" );
@ -376,7 +376,7 @@ void KDMUsersWidget::save()
} }
void KDMUsersWidget::updateOptList( TQListViewItem *item, TQStringList &list ) void TDMUsersWidget::updateOptList( TQListViewItem *item, TQStringList &list )
{ {
if ( !item ) if ( !item )
return; return;
@ -391,17 +391,17 @@ void KDMUsersWidget::updateOptList( TQListViewItem *item, TQStringList &list )
} }
} }
void KDMUsersWidget::slotUpdateOptIn( TQListViewItem *item ) void TDMUsersWidget::slotUpdateOptIn( TQListViewItem *item )
{ {
updateOptList( item, selectedUsers ); updateOptList( item, selectedUsers );
} }
void KDMUsersWidget::slotUpdateOptOut( TQListViewItem *item ) void TDMUsersWidget::slotUpdateOptOut( TQListViewItem *item )
{ {
updateOptList( item, hiddenUsers ); updateOptList( item, hiddenUsers );
} }
void KDMUsersWidget::slotClearUsers() void TDMUsersWidget::slotClearUsers()
{ {
optinlv->clear(); optinlv->clear();
optoutlv->clear(); optoutlv->clear();
@ -409,7 +409,7 @@ void KDMUsersWidget::slotClearUsers()
usercombo->insertItem( m_defaultText ); usercombo->insertItem( m_defaultText );
} }
void KDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users) void TDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users)
{ {
TQMapConstIterator<TQString,int> it; TQMapConstIterator<TQString,int> it;
for (it = users.begin(); it != users.end(); ++it) { for (it = users.begin(); it != users.end(); ++it) {
@ -427,7 +427,7 @@ void KDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users)
usercombo->listBox()->sort(); usercombo->listBox()->sort();
} }
void KDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users) void TDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users)
{ {
TQMapConstIterator<TQString,int> it; TQMapConstIterator<TQString,int> it;
for (it = users.begin(); it != users.end(); ++it) { for (it = users.begin(); it != users.end(); ++it) {
@ -439,7 +439,7 @@ void KDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users)
} }
} }
void KDMUsersWidget::load() void TDMUsersWidget::load()
{ {
TQString str; TQString str;
@ -472,7 +472,7 @@ void KDMUsersWidget::load()
slotFaceOpts(); slotFaceOpts();
} }
void KDMUsersWidget::defaults() void TDMUsersWidget::defaults()
{ {
leminuid->setText( defminuid ); leminuid->setText( defminuid );
lemaxuid->setText( defmaxuid ); lemaxuid->setText( defmaxuid );
@ -487,14 +487,14 @@ void KDMUsersWidget::defaults()
slotFaceOpts(); slotFaceOpts();
} }
void KDMUsersWidget::slotMinMaxChanged() void TDMUsersWidget::slotMinMaxChanged()
{ {
emit setMinMaxUID( leminuid->text().toInt(), lemaxuid->text().toInt() ); emit setMinMaxUID( leminuid->text().toInt(), lemaxuid->text().toInt() );
} }
void KDMUsersWidget::slotChanged() void TDMUsersWidget::slotChanged()
{ {
emit changed(true); emit changed(true);
} }
#include "kdm-users.moc" #include "tdm-users.moc"

8
kcontrol/kdm/kdm-users.h
Unescape View File

@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef __KDMUSERS_H__ #ifndef __TDMUSERS_H__
#define __KDMUSERS_H__ #define __TDMUSERS_H__
#include <tqwidget.h> #include <tqwidget.h>
#include <tqptrlist.h> #include <tqptrlist.h>
@ -37,12 +37,12 @@
#include <pwd.h> #include <pwd.h>
class KDMUsersWidget : public TQWidget class TDMUsersWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
KDMUsersWidget( TQWidget *parent = 0, const char *name = 0 ); TDMUsersWidget( TQWidget *parent = 0, const char *name = 0 );
void load(); void load();
void save(); void save();

276
kcontrol/kdm/kdm.desktop
Unescape View File

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell kdm Exec=kcmshell tdm
Icon=kdmconfig Icon=tdmconfig
Type=Application Type=Application
DocPath=kdm/index.html#configuring-kdm DocPath=tdm/index.html#configuring-tdm
X-KDE-SubstituteUID=true X-KDE-SubstituteUID=true
X-KDE-Library=kdm X-KDE-Library=tdm
X-KDE-RootOnly=true X-KDE-RootOnly=true
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol
@ -40,7 +40,7 @@ Name[gl]=Xestor de Login
Name[he]=מנהל הכניסה למערכת Name[he]=מנהל הכניסה למערכת
Name[hi]=लॉगइन प्रबंधक Name[hi]=लॉगइन प्रबंधक
Name[hr]=Upravljanje prijavljivanjem Name[hr]=Upravljanje prijavljivanjem
Name[hu]=Bejelentkező felület (KDM) Name[hu]=Bejelentkező felület (TDM)
Name[id]=Manajer Login Name[id]=Manajer Login
Name[is]=Innstimplunarstjóri Name[is]=Innstimplunarstjóri
Name[it]=Gestione degli accessi Name[it]=Gestione degli accessi
@ -93,151 +93,151 @@ Name[zh_CN]=登录管理器
Name[zh_TW]=登錄管理程式 Name[zh_TW]=登錄管理程式
Name[zu]=Imenenja yokungena ngaphakathi Name[zu]=Imenenja yokungena ngaphakathi
Comment=Configure the login manager (KDM) Comment=Configure the login manager (TDM)
Comment[af]=Konfigureer die aanteken bestuurder (Kdm) Comment[af]=Konfigureer die aanteken bestuurder (Kdm)
Comment[ar]=إعداد مسيير الدخول (KDM) Comment[ar]=إعداد مسيير الدخول (TDM)
Comment[az]=Giriş İdarəçisi (KDM) Qurğuları Comment[az]=Giriş İdarəçisi (TDM) Qurğuları
Comment[be]=Настаўленні кіраўніка ўваходу (KDM) Comment[be]=Настаўленні кіраўніка ўваходу (TDM)
Comment[bg]=Настройване на графичната системата за вход Comment[bg]=Настройване на графичната системата за вход
Comment[bn]=লগ-ইন ম্যানেজার কনফিগার করুন Comment[bn]=লগ-ইন ম্যানেজার কনফিগার করুন
Comment[br]=Kefluniañ ar merour ereañ (KDM) Comment[br]=Kefluniañ ar merour ereañ (TDM)
Comment[bs]=Podesite menadžer prijavom (KDM) Comment[bs]=Podesite menadžer prijavom (TDM)
Comment[ca]=Configura el gestor d'accés (KDM) Comment[ca]=Configura el gestor d'accés (TDM)
Comment[cs]=Nastavení správce přihlášení (KDM) Comment[cs]=Nastavení správce přihlášení (TDM)
Comment[csb]=Kònfigùracëjô menedżera logòwaniô (KDM) Comment[csb]=Kònfigùracëjô menedżera logòwaniô (TDM)
Comment[cy]=Ffurfweddu y rheolydd mewngofnodi (KDM) Comment[cy]=Ffurfweddu y rheolydd mewngofnodi (TDM)
Comment[da]=Indstil indlogningshåndtering (KDM) Comment[da]=Indstil indlogningshåndtering (TDM)
Comment[de]=Anmeldungsmanager KDM einrichten Comment[de]=Anmeldungsmanager TDM einrichten
Comment[el]=Ρυθμίστε το διαχειριστή σύνδεσης (KDM) Comment[el]=Ρυθμίστε το διαχειριστή σύνδεσης (TDM)
Comment[eo]=Agordu la salutadminstrilon (KDM) Comment[eo]=Agordu la salutadminstrilon (TDM)
Comment[es]=Configura el gestor de acceso (KDM) Comment[es]=Configura el gestor de acceso (TDM)
Comment[et]=Sisselogimise halduri seadistamine (KDM) Comment[et]=Sisselogimise halduri seadistamine (TDM)
Comment[eu]=Konfiguratu saio-hasieraren kudeatzailea (KDM) Comment[eu]=Konfiguratu saio-hasieraren kudeatzailea (TDM)
Comment[fa]=پیکربندی مدیر ورود (KDM) Comment[fa]=پیکربندی مدیر ورود (TDM)
Comment[fi]=Sisäänkirjautumisasetukset Comment[fi]=Sisäänkirjautumisasetukset
Comment[fr]=Configuration du gestionnaire de connexion (KDM) Comment[fr]=Configuration du gestionnaire de connexion (TDM)
Comment[fy]=Hjir kinne jo it oanmeldskerm ynstelle (KDM) Comment[fy]=Hjir kinne jo it oanmeldskerm ynstelle (TDM)
Comment[ga]=Cumraigh an bainisteoir logála isteach (KDM) Comment[ga]=Cumraigh an bainisteoir logála isteach (TDM)
Comment[gl]=Configurar o xestor de início (KDM) Comment[gl]=Configurar o xestor de início (TDM)
Comment[he]=שינוי הגדרות מנהל הכניסה למערכת (KDM) Comment[he]=שינוי הגדרות מנהל הכניסה למערכת (TDM)
Comment[hi]=लॉगइन प्रबंधक कॉन्फ़िगर करें (केडीएम) Comment[hi]=लॉगइन प्रबंधक कॉन्फ़िगर करें (केडीएम)
Comment[hr]=Konfiguriranje upravljanja prijavljivanja (KDM) Comment[hr]=Konfiguriranje upravljanja prijavljivanja (TDM)
Comment[hu]=A KDE grafikus bejelentkező felületének beállításai Comment[hu]=A KDE grafikus bejelentkező felületének beállításai
Comment[is]=Stilla innstimplunarstjórann (KDM) Comment[is]=Stilla innstimplunarstjórann (TDM)
Comment[it]=Configurazione della gestione degli accessi (KDM) Comment[it]=Configurazione della gestione degli accessi (TDM)
Comment[ja]=ログインマネージャ (KDM) の設定 Comment[ja]=ログインマネージャ (TDM) の設定
Comment[ka]=შევლის მენეჯერის კონფიგურირება (KDM) Comment[ka]=შევლის მენეჯერის კონფიგურირება (TDM)
Comment[kk]=Жүйеге кіруді басқаруын (KDM) баптау Comment[kk]=Жүйеге кіруді басқаруын (TDM) баптау
Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​គ្រប់គ្រង​ការ​ចូល (KDM) Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​គ្រប់គ្រង​ការ​ចូល (TDM)
Comment[ko]=로그인 관리자 KDM 설정 Comment[ko]=로그인 관리자 TDM 설정
Comment[lo]=ປັບແຕ່ງປລັກອິນແລະການເຊື່ອມ ຕໍ່ສຳລັບລະບົບ KDB Comment[lo]=ປັບແຕ່ງປລັກອິນແລະການເຊື່ອມ ຕໍ່ສຳລັບລະບົບ KDB
Comment[lt]=Konfigūruoti registravimos tvarkyklę (KDM) Comment[lt]=Konfigūruoti registravimos tvarkyklę (TDM)
Comment[lv]=Konfigure pieteiksanās menedžeri KDM Comment[lv]=Konfigure pieteiksanās menedžeri TDM
Comment[mk]=Конфигурирајте го менаџерот на најави (KDM) Comment[mk]=Конфигурирајте го менаџерот на најави (TDM)
Comment[mn]=Нэвтрэлт удирдагч KDM тохируулах Comment[mn]=Нэвтрэлт удирдагч TDM тохируулах
Comment[ms]=Konfigur pengurus login (KDM) Comment[ms]=Konfigur pengurus login (TDM)
Comment[mt]=Ikkonfigura l-manager tal-logins (KDM) Comment[mt]=Ikkonfigura l-manager tal-logins (TDM)
Comment[nb]=Tilpass innlogin­gsbehandler (KDM) Comment[nb]=Tilpass innlogin­gsbehandler (TDM)
Comment[nds]=Den Anmellen-Schirm instellen (KDM) Comment[nds]=Den Anmellen-Schirm instellen (TDM)
Comment[ne]=लगइन प्रबन्धक (KDM) कन्फिगर गर्नुहोस् Comment[ne]=लगइन प्रबन्धक (TDM) कन्फिगर गर्नुहोस्
Comment[nl]=Hier kunt u het aanmeldscherm (KDM) instellen Comment[nl]=Hier kunt u het aanmeldscherm (TDM) instellen
Comment[nn]=Set opp innloggingshandsamaren (KDM) Comment[nn]=Set opp innloggingshandsamaren (TDM)
Comment[nso]=Beakanya molaodoi wa tseno (KDM) Comment[nso]=Beakanya molaodoi wa tseno (TDM)
Comment[pa]=ਲਾਗਆਨ ਮੈਨੇਜਰ ਸੰਰਚਨਾ(KDM) Comment[pa]=ਲਾਗਆਨ ਮੈਨੇਜਰ ਸੰਰਚਨਾ(TDM)
Comment[pl]=Konfiguracja menedżera logowania (KDM) Comment[pl]=Konfiguracja menedżera logowania (TDM)
Comment[pt]=Configuração do gestor de autenticação (KDM) Comment[pt]=Configuração do gestor de autenticação (TDM)
Comment[pt_BR]=Configura o gerenciador de login (KDM) Comment[pt_BR]=Configura o gerenciador de login (TDM)
Comment[ro]=Configurează managerul de logare grafică (KDM) Comment[ro]=Configurează managerul de logare grafică (TDM)
Comment[ru]=Настройка менеджера входа в систему (KDM) Comment[ru]=Настройка менеджера входа в систему (TDM)
Comment[rw]=Kuboneza mugenga w'ifashayinjira (KDM) Comment[rw]=Kuboneza mugenga w'ifashayinjira (TDM)
Comment[se]=Heivet sisačálihangieđahalli (KDM) Comment[se]=Heivet sisačálihangieđahalli (TDM)
Comment[sk]=Nastavenie správcu prihlásenia (KDM) Comment[sk]=Nastavenie správcu prihlásenia (TDM)
Comment[sl]=Nastavitve upravitelja prijav (KDM) Comment[sl]=Nastavitve upravitelja prijav (TDM)
Comment[sr]=Подешавање менаџера за пријављивање (KDM) Comment[sr]=Подешавање менаџера за пријављивање (TDM)
Comment[sr@Latn]=Podešavanje menadžera za prijavljivanje (KDM) Comment[sr@Latn]=Podešavanje menadžera za prijavljivanje (TDM)
Comment[sv]=Anpassa inloggningshanteraren (KDM) Comment[sv]=Anpassa inloggningshanteraren (TDM)
Comment[ta]=புகுபதிகை மேலாளரை அமை (KDM) Comment[ta]=புகுபதிகை மேலாளரை அமை (TDM)
Comment[tg]=Танзими мудири вуруд (KDM) Comment[tg]=Танзими мудири вуруд (TDM)
Comment[th]=ปรับแต่งเครื่องมือจัดการการล็อกอิน (KDM) Comment[th]=ปรับแต่งเครื่องมือจัดการการล็อกอิน (TDM)
Comment[tr]=Giriş yöneticisini yapılandır (KDM) Comment[tr]=Giriş yöneticisini yapılandır (TDM)
Comment[tt]=Kerü idäräçen caylaw urını (KDM) Comment[tt]=Kerü idäräçen caylaw urını (TDM)
Comment[uk]=Налаштування менеджера реєстрації (KDM) Comment[uk]=Налаштування менеджера реєстрації (TDM)
Comment[uz]=Tizimga kirish boshqaruvchisini (KDM) moslash Comment[uz]=Tizimga kirish boshqaruvchisini (TDM) moslash
Comment[uz@cyrillic]=Тизимга кириш бошқарувчисини (KDM) мослаш Comment[uz@cyrillic]=Тизимга кириш бошқарувчисини (TDM) мослаш
Comment[ven]=Ni nga dzudzanya mulanguli wau loga (KDM) Comment[ven]=Ni nga dzudzanya mulanguli wau loga (TDM)
Comment[vi]=Cấu hình trình đăng nhập (KDM) Comment[vi]=Cấu hình trình đăng nhập (TDM)
Comment[wa]=Apontyî l' manaedjeu d' elodjaedje (KDM) Comment[wa]=Apontyî l' manaedjeu d' elodjaedje (TDM)
Comment[xh]=Qwalasela umphathi wegama elithile (KDM) Comment[xh]=Qwalasela umphathi wegama elithile (TDM)
Comment[zh_CN]=配置登录管理器(KDM) Comment[zh_CN]=配置登录管理器(TDM)
Comment[zh_TW]=設定登入管理程式 (KDM) Comment[zh_TW]=設定登入管理程式 (TDM)
Comment[zu]=Hlanganisela imenenja yokungena ngaphakathi (KDM) Comment[zu]=Hlanganisela imenenja yokungena ngaphakathi (TDM)
Keywords=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart Keywords=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart
Keywords[ar]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,مدير العرض,المستخدمون مستخدمون,المستخدمين,مستخدمين,دخول,الدخول,تحية,التحية,اللغة,المظهر, البلد,الخطوط,الخط,خطوط,خط,خلفية,ورق حائط,جلسات,اغلاق,اعادة تشغيل Keywords[ar]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,مدير العرض,المستخدمون مستخدمون,المستخدمين,مستخدمين,دخول,الدخول,تحية,التحية,اللغة,المظهر, البلد,الخطوط,الخط,خطوط,خط,خلفية,ورق حائط,جلسات,اغلاق,اعادة تشغيل
Keywords[az]=kdm,görünüş idarəçi,xdm,istifadəçilər,iclas açma,qarşılama,loqo,tərzlər,dil,ölkə,yazı növləri,arxa plan,divar kağızları,iclaslar,qapat,təkrar başlat Keywords[az]=tdm,görünüş idarəçi,xdm,istifadəçilər,iclas açma,qarşılama,loqo,tərzlər,dil,ölkə,yazı növləri,arxa plan,divar kağızları,iclaslar,qapat,təkrar başlat
Keywords[be]=кіраўнік дысплея,кіраўнік уваходу,карыстальнікі,уваход,запрашэнне,лагатып,стылі,стыль,мова,краіна,шрыфты,фон,шпалеры,сесіі,сесія,выключэнне,перазагрузка,kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart Keywords[be]=кіраўнік дысплея,кіраўнік уваходу,карыстальнікі,уваход,запрашэнне,лагатып,стылі,стыль,мова,краіна,шрыфты,фон,шпалеры,сесіі,сесія,выключэнне,перазагрузка,tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart
Keywords[bg]=графична, система, вход, влизане, включване, потребител, kdm, display manager, xdm, users, login, greeting, Logo, styles, language, country, fonts, background, wallpapers, sessions, shutdown, restart Keywords[bg]=графична, система, вход, влизане, включване, потребител, tdm, display manager, xdm, users, login, greeting, Logo, styles, language, country, fonts, background, wallpapers, sessions, shutdown, restart
Keywords[ca]=kdm,administrador de la pantalla,xdm,usuaris,accés,salutació,Logo,estils,llengua,país,lletres,fons,tapissos,sessions,apagar,reiniciar Keywords[ca]=tdm,administrador de la pantalla,xdm,usuaris,accés,salutació,Logo,estils,llengua,país,lletres,fons,tapissos,sessions,apagar,reiniciar
Keywords[cs]=kdm,Správce obrazovky,xdm,Uživatelé,Přihlášení,Uvítání,Logo,Styly,Jazyk,Země,Písma,pozadí,Tapety,Relace,Sezení,Vypnutí,Restart Keywords[cs]=tdm,Správce obrazovky,xdm,Uživatelé,Přihlášení,Uvítání,Logo,Styly,Jazyk,Země,Písma,pozadí,Tapety,Relace,Sezení,Vypnutí,Restart
Keywords[csb]=kdm,menedżer ekranu,xdm,brëkòwnicë,logòwanié,przëwitanié,Logò,sztéle,jãzëk,kraj,fòntë,spódk,tapetë,spòdlë,sesëje,zamkniãce systemë,resztart,zôczãce robòtë Keywords[csb]=tdm,menedżer ekranu,xdm,brëkòwnicë,logòwanié,przëwitanié,Logò,sztéle,jãzëk,kraj,fòntë,spódk,tapetë,spòdlë,sesëje,zamkniãce systemë,resztart,zôczãce robòtë
Keywords[cy]=kdm,rheolydd y dangosydd,xdm,defnyddwyr,mewngofnodi,cyfarchiad,Logo,arddulliau,iaith,gwlad,ffontiau,cefndir,papurau wal,sesiynau,cau,ailgychwyn Keywords[cy]=tdm,rheolydd y dangosydd,xdm,defnyddwyr,mewngofnodi,cyfarchiad,Logo,arddulliau,iaith,gwlad,ffontiau,cefndir,papurau wal,sesiynau,cau,ailgychwyn
Keywords[da]=kdm,skærmhåndtering,xdm,brugere,login,hilsen,Logo,stil, sprog,land,skrifttyper,baggrund,tapeter,sessioner,luk ned,genstart Keywords[da]=tdm,skærmhåndtering,xdm,brugere,login,hilsen,Logo,stil, sprog,land,skrifttyper,baggrund,tapeter,sessioner,luk ned,genstart
Keywords[de]=Kdm,Display Manager,Xdm,Benutzer,Login,Logo,Stile,Sprachen,Länder,Schriften,Hintergründe,Hintergrundbilder,Beenden,Neustart Keywords[de]=Kdm,Display Manager,Xdm,Benutzer,Login,Logo,Stile,Sprachen,Länder,Schriften,Hintergründe,Hintergrundbilder,Beenden,Neustart
Keywords[el]=kdm,διαχειριστής οθόνης,xdm,χρήστες,σύνδεση,χαιρετισμός,Λογότυπο,στυλ,γλώσσα,χώρα,γραμματοσειρές,φόντο,ταπετσαρίες,συνεδρίες,τερματισμός,επανεκκίνηση Keywords[el]=tdm,διαχειριστής οθόνης,xdm,χρήστες,σύνδεση,χαιρετισμός,Λογότυπο,στυλ,γλώσσα,χώρα,γραμματοσειρές,φόντο,ταπετσαρίες,συνεδρίες,τερματισμός,επανεκκίνηση
Keywords[eo]=kdm,ekrano,,xdm,uzantoj,saluto,emblemo,stilo,lingvo,lando,tiparo,fono,tapeto,seanco,adaiaŭo,relanĉo Keywords[eo]=tdm,ekrano,,xdm,uzantoj,saluto,emblemo,stilo,lingvo,lando,tiparo,fono,tapeto,seanco,adaiaŭo,relanĉo
Keywords[es]=kdm,gestor de pantalla,xdm,usuarios,entrada,acceso,saludo,Logo,estilos,idioma,país,tipos de letra,fondo,tapices,sesiones,apagar,reiniciar Keywords[es]=tdm,gestor de pantalla,xdm,usuarios,entrada,acceso,saludo,Logo,estilos,idioma,país,tipos de letra,fondo,tapices,sesiones,apagar,reiniciar
Keywords[et]=kdm,ekraanihaldur,xdm,kasutajad,sisselogimine,tervitus,logo,stiil,keel,riik,fondid,taust,taustapilt,seansid,töö lõpetamine,taaskäivitamine Keywords[et]=tdm,ekraanihaldur,xdm,kasutajad,sisselogimine,tervitus,logo,stiil,keel,riik,fondid,taust,taustapilt,seansid,töö lõpetamine,taaskäivitamine
Keywords[eu]=kdm,pantaila kudeatzailea,xdm,erabiltzaileak,Saio hasiera,agurra,Logoa,estiloak,hizkuntza, herrialdea,letra-tipoak,atzeko planoa,horma-irudiak,saioak,itzali,berrabiarazi Keywords[eu]=tdm,pantaila kudeatzailea,xdm,erabiltzaileak,Saio hasiera,agurra,Logoa,estiloak,hizkuntza, herrialdea,letra-tipoak,atzeko planoa,horma-irudiak,saioak,itzali,berrabiarazi
Keywords[fa]=kdm، مدیر نمایش، xdm، کاربران، ورود، تبریک، آرمِ، سبک، زبان، کشور، قلمها، زمینه، کاغذهای دیواری، نشستها، تعطیل، بازآغازی Keywords[fa]=tdm، مدیر نمایش، xdm، کاربران، ورود، تبریک، آرمِ، سبک، زبان، کشور، قلمها، زمینه، کاغذهای دیواری، نشستها، تعطیل، بازآغازی
Keywords[fi]=kdm,näytönhallinta ,xdm,käyttäjät,sisäänkirjautuminen,tervehdys,Logo,tyylit,kieli,maa,kirjasimet,tausta,istunnot,sammutus,uudelleenkäynnistys Keywords[fi]=tdm,näytönhallinta ,xdm,käyttäjät,sisäänkirjautuminen,tervehdys,Logo,tyylit,kieli,maa,kirjasimet,tausta,istunnot,sammutus,uudelleenkäynnistys
Keywords[fr]=kdm,gestionnaire d'affichage,xdm,utilisateurs,login,connexion,bienvenue,message de bienvenue,Logo,styles,langue,pays,style,police,fond d'écran,papier peint,session,arrêt,logout,redémarrage,reboot Keywords[fr]=tdm,gestionnaire d'affichage,xdm,utilisateurs,login,connexion,bienvenue,message de bienvenue,Logo,styles,langue,pays,style,police,fond d'écran,papier peint,session,arrêt,logout,redémarrage,reboot
Keywords[fy]=kdm,display manager,xdm,users,login,begroeting,oanmelde,brûkers,Oanmeldbehearder,logo,stylen,taal,language,country,lân,fonts,lettertypen,eftergrûn,wallpapers,behang,sesjes,shutdown,restart,ôfslute,opnij begjinne,oanmelde Keywords[fy]=tdm,display manager,xdm,users,login,begroeting,oanmelde,brûkers,Oanmeldbehearder,logo,stylen,taal,language,country,lân,fonts,lettertypen,eftergrûn,wallpapers,behang,sesjes,shutdown,restart,ôfslute,opnij begjinne,oanmelde
Keywords[ga]=kdm,bainisteoir scáileáin,xdm,úsáideoirí,logáil isteach,fáilte,Lógó,stíleanna,teanga,tír,clónna,clófhoirne,cúlra,cúlbhrait,seisiúin,múchadh,atosú Keywords[ga]=tdm,bainisteoir scáileáin,xdm,úsáideoirí,logáil isteach,fáilte,Lógó,stíleanna,teanga,tír,clónna,clófhoirne,cúlra,cúlbhrait,seisiúin,múchadh,atosú
Keywords[gl]=kdm,xestor de entrada,xdm,usuarios,identificación,Logo,estilos,lingua,país,fontes,fondo,papeis tapiz,sesións,apagado,reinício Keywords[gl]=tdm,xestor de entrada,xdm,usuarios,identificación,Logo,estilos,lingua,país,fontes,fondo,papeis tapiz,sesións,apagado,reinício
Keywords[he]=משתמשים,כניסה למערכת,כניסה,לוגו,סגנונות,שפה,מדינה,גופנים,רקע,טפטים,הפעלות,כיבוי,הפעלה,מחדש,מנהל,תצוגה,display,manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart Keywords[he]=משתמשים,כניסה למערכת,כניסה,לוגו,סגנונות,שפה,מדינה,גופנים,רקע,טפטים,הפעלות,כיבוי,הפעלה,מחדש,מנהל,תצוגה,display,manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart
Keywords[hi]=केडीएम,प्रकटन प्रबंधक,एक्स-डीएम,उपयोक्ता,लॉगइन,शुभकामनाएँ,लोगो,पृष्ठभूमि,वालपेपर्स,सत्र,बन्द, फिर से चालू Keywords[hi]=केडीएम,प्रकटन प्रबंधक,एक्स-डीएम,उपयोक्ता,लॉगइन,शुभकामनाएँ,लोगो,पृष्ठभूमि,वालपेपर्स,सत्र,बन्द, फिर से चालू
Keywords[hr]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,upravljanje zaslona,korisnici,prijava,pozdrav,stilovi,jezik,država,zemlja,fontovi,pozadina,pozadina radne površine,sesije,gašenje,ponovno pokretanje Keywords[hr]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,upravljanje zaslona,korisnici,prijava,pozdrav,stilovi,jezik,država,zemlja,fontovi,pozadina,pozadina radne površine,sesije,gašenje,ponovno pokretanje
Keywords[hu]=kdm,képernyőkezelő,xdm,felhasználók,bejelentkezés,üdvözlés,embléma,stílusok,nyelv,ország,betűtípusok,háttér,tapéták,munkafolyamatok,leállítás,újraindítás Keywords[hu]=tdm,képernyőkezelő,xdm,felhasználók,bejelentkezés,üdvözlés,embléma,stílusok,nyelv,ország,betűtípusok,háttér,tapéták,munkafolyamatok,leállítás,újraindítás
Keywords[is]=kdm,skjár,gluggastjóri,innskráning,innstimplun,snið,tungumál,land,letur,bakgrunnur,bakgrunnar,veggfóður,setur,slökkva,endurræsa Keywords[is]=tdm,skjár,gluggastjóri,innskráning,innstimplun,snið,tungumál,land,letur,bakgrunnur,bakgrunnar,veggfóður,setur,slökkva,endurræsa
Keywords[it]=kdm,display manager,gestione degli utenti,xdm,utenti,login,accesso,benvenuto,logo,stile,lingua,stato,paese,tipi di carattere,sfondo,immagine di sfondo,sessioni,riavvio,spegnimento,gestione degli accessi Keywords[it]=tdm,display manager,gestione degli utenti,xdm,utenti,login,accesso,benvenuto,logo,stile,lingua,stato,paese,tipi di carattere,sfondo,immagine di sfondo,sessioni,riavvio,spegnimento,gestione degli accessi
Keywords[ja]=kdm,ディスプレイマネージャ,xdm,ユーザ,ログイン,あいさつ,ロゴ,スタイル,言語,国,フォント,背景,壁紙,セッション,シャットダウン,再起動 Keywords[ja]=tdm,ディスプレイマネージャ,xdm,ユーザ,ログイン,あいさつ,ロゴ,スタイル,言語,国,フォント,背景,壁紙,セッション,シャットダウン,再起動
Keywords[km]=kdm,កម្មវិធី​គ្រប់គ្រង​ការ​បង្ហាញ,xdm,អ្នក​ប្រើ,ចូល,ស្វាគមន៍,រូបសញ្ញា,រចនាប័ទ្ម,ភាសា,ប្រទេស,ពុម្ពអក្សរ,ផ្ទៃ​ខាង​ក្រោយ,ក្រដាស​បិទ​ជញ្ជាំង,សម័យ,បិទ,ចាប់ផ្ដើម​ឡើង​វិញ Keywords[km]=tdm,កម្មវិធី​គ្រប់គ្រង​ការ​បង្ហាញ,xdm,អ្នក​ប្រើ,ចូល,ស្វាគមន៍,រូបសញ្ញា,រចនាប័ទ្ម,ភាសា,ប្រទេស,ពុម្ពអក្សរ,ផ្ទៃ​ខាង​ក្រោយ,ក្រដាស​បិទ​ជញ្ជាំង,សម័យ,បិទ,ចាប់ផ្ដើម​ឡើង​វិញ
Keywords[lt]=kdm,display manager,ekrano tvarkyklė,xdm,users,naudotojai,login,registracija,greeting,pasveikinimas,Logo, styles,stiliai,language,country,fonts,background,wallpapers,sessions, shutdown,restart Keywords[lt]=tdm,display manager,ekrano tvarkyklė,xdm,users,naudotojai,login,registracija,greeting,pasveikinimas,Logo, styles,stiliai,language,country,fonts,background,wallpapers,sessions, shutdown,restart
Keywords[lv]=kdm,displeja menedžeris,xdm,lietotāji,pieteikšanās,apsveikums,Logo,stili,valoda,valsts,fonti,fons,tapetes,sesijas,nošaut,pārstartēt Keywords[lv]=tdm,displeja menedžeris,xdm,lietotāji,pieteikšanās,apsveikums,Logo,stili,valoda,valsts,fonti,fons,tapetes,sesijas,nošaut,pārstartēt
Keywords[mk]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,менаџер на екран,корисници,најава,поздрав,Лого,стилови,јазик,земја,фонтови,подлога,позадина,сесии,исклучување,рестартирање Keywords[mk]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,менаџер на екран,корисници,најава,поздрав,Лого,стилови,јазик,земја,фонтови,подлога,позадина,сесии,исклучување,рестартирање
Keywords[mn]=Kdm,Display Manager,Xdm,Хэрэглэгч,Login,Logo,Хэлбэр,Хэл,Улс,Бичиг,Дэвсгэр,Дэвсгэр зураг,Дуусгах,Шинээр эхлүүлэх Keywords[mn]=Kdm,Display Manager,Xdm,Хэрэглэгч,Login,Logo,Хэлбэр,Хэл,Улс,Бичиг,Дэвсгэр,Дэвсгэр зураг,Дуусгах,Шинээр эхлүүлэх
Keywords[mt]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,merħba,lingwa,pajjiż,sfond,itfi,irristartja Keywords[mt]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,merħba,lingwa,pajjiż,sfond,itfi,irristartja
Keywords[nb]=kdm,skjermbehandler,xdm,brukere,innlogging,velkomst,logo,stiler,språk,land,skrifttyper,bakgrunn,bakgrunnsbilde,økter,skru av,slå av,omstart Keywords[nb]=tdm,skjermbehandler,xdm,brukere,innlogging,velkomst,logo,stiler,språk,land,skrifttyper,bakgrunn,bakgrunnsbilde,økter,skru av,slå av,omstart
Keywords[nds]=kdm,Startschirm,xdm,Bruker,anmellen,greeting,Logo,Stilen,Spraak,Land,Schriftoorden,Achtergrund,Tapeten,Törns,Utmaken,Nieg starten Keywords[nds]=tdm,Startschirm,xdm,Bruker,anmellen,greeting,Logo,Stilen,Spraak,Land,Schriftoorden,Achtergrund,Tapeten,Törns,Utmaken,Nieg starten
Keywords[ne]=kdm, प्रदर्शन प्रबन्धक, xdm, प्रयोगकर्ताहरू, लगइन, अभिवादन, परिचायक चिन्ह, शैलीहरू, भाषा, देश, फन्टहरू, पृष्ठभूमि,वालपेपरहरू, सत्र, बन्द गर्नुहोस्, फेरि सुरु गर्नुहोस् Keywords[ne]=tdm, प्रदर्शन प्रबन्धक, xdm, प्रयोगकर्ताहरू, लगइन, अभिवादन, परिचायक चिन्ह, शैलीहरू, भाषा, देश, फन्टहरू, पृष्ठभूमि,वालपेपरहरू, सत्र, बन्द गर्नुहोस्, फेरि सुरु गर्नुहोस्
Keywords[nl]=kdm,display manager,xdm,users,login,begroeting,inloggen,gebruikers,loginbeheerder,logo,stijlen,taal,language,country,land,fonts,lettertypen,achtergrond,wallpapers,behang,sessies,shutdown,restart,afsluiten,herstarten,aanmelden,opstarten Keywords[nl]=tdm,display manager,xdm,users,login,begroeting,inloggen,gebruikers,loginbeheerder,logo,stijlen,taal,language,country,land,fonts,lettertypen,achtergrond,wallpapers,behang,sessies,shutdown,restart,afsluiten,herstarten,aanmelden,opstarten
Keywords[nn]=kdm,xdm,brukarar,innlogging,helsing,logo,stil,språk,land,skrifttypar,bakgrunn,bakgrunnsbilete,økt,avslutt,slå av,omstart Keywords[nn]=tdm,xdm,brukarar,innlogging,helsing,logo,stil,språk,land,skrifttypar,bakgrunn,bakgrunnsbilete,økt,avslutt,slå av,omstart
Keywords[nso]=kdm,molaodi wa pontsho,xdm,badirisi,tseno,madume,Logo,mekgwa,leleme,naga,difonto,bokamorago,di-wallpaper,ditiragalo,timo,thomaleswa Keywords[nso]=tdm,molaodi wa pontsho,xdm,badirisi,tseno,madume,Logo,mekgwa,leleme,naga,difonto,bokamorago,di-wallpaper,ditiragalo,timo,thomaleswa
Keywords[pa]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart, ਲੋਗੋ, ਭਾਸ਼ਾ, ਦੇਸ਼, ਫੋਂਟ, ਲਾਗਿੰਨ, ਉਪਭੋਗੀ,ਸ਼ੈਸ਼ਨ Keywords[pa]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart, ਲੋਗੋ, ਭਾਸ਼ਾ, ਦੇਸ਼, ਫੋਂਟ, ਲਾਗਿੰਨ, ਉਪਭੋਗੀ,ਸ਼ੈਸ਼ਨ
Keywords[pl]=kdm,menedżer ekranu,xdm,użytkownicy,logowanie,powitanie,Logo,style,jezyk,kraj,czcionki,tło,tapety,sesje,zamknięcie systemu,restart,rozpoczęcie pracy Keywords[pl]=tdm,menedżer ekranu,xdm,użytkownicy,logowanie,powitanie,Logo,style,jezyk,kraj,czcionki,tło,tapety,sesje,zamknięcie systemu,restart,rozpoczęcie pracy
Keywords[pt]=kdm,gestor de 'logins',xdm,utilizadores,saudação,logótipo,estilos,língua,país,tipos de letra,fundo,papéis de parede,sessões,terminar,reiniciar Keywords[pt]=tdm,gestor de 'logins',xdm,utilizadores,saudação,logótipo,estilos,língua,país,tipos de letra,fundo,papéis de parede,sessões,terminar,reiniciar
Keywords[pt_BR]=kdm,gerenciador de tela, xdm,usuários,login,saudação,Logo,estilos,linguagem,país,fontes, papéis de parede,sessões,desligar,reiniciar Keywords[pt_BR]=tdm,gerenciador de tela, xdm,usuários,login,saudação,Logo,estilos,linguagem,país,fontes, papéis de parede,sessões,desligar,reiniciar
Keywords[ro]=kdm,manager de ecran,xdm,utilizatori,logare,întîmpinare,logo,stiluri,limbaj,țară,fonturi,fundal,imagini de fundal,sesiuni,oprire,restartare Keywords[ro]=tdm,manager de ecran,xdm,utilizatori,logare,întîmpinare,logo,stiluri,limbaj,țară,fonturi,fundal,imagini de fundal,sesiuni,oprire,restartare
Keywords[ru]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,перезагрузка,сеанс,шрифты,страна,фон,стили,обои Keywords[ru]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,перезагрузка,сеанс,шрифты,страна,фон,стили,обои
Keywords[rw]=kdm,kwerekana umuyobozi,xdm,abakoresha,ifashayinjira,gusuhuza,ikirango,imisusire,ururimi,igihugu,imyandikire,mbuganyuma,impapurorukuta,imikoro,kuzimya,kongera gutangiza Keywords[rw]=tdm,kwerekana umuyobozi,xdm,abakoresha,ifashayinjira,gusuhuza,ikirango,imisusire,ururimi,igihugu,imyandikire,mbuganyuma,impapurorukuta,imikoro,kuzimya,kongera gutangiza
Keywords[se]=kdm,xdm,geavaheaddjit,sisačáliheapmi,dearvvuođat,logo,stiila,giella,riika, fonttat,duogáš,duogášgovva,bargovuorut,heaittihit,časkit eret,ođđasit álggahit Keywords[se]=tdm,xdm,geavaheaddjit,sisačáliheapmi,dearvvuođat,logo,stiila,giella,riika, fonttat,duogáš,duogášgovva,bargovuorut,heaittihit,časkit eret,ođđasit álggahit
Keywords[sk]=kdm,správca obrazovky,Login manažér,správca prihlásenia,xdm,používatelia,prihlásenie,login,privítanie,logo,štýly,jazyk,krajina,pozadie,tapety,sedenia,vypnutie,reset,reštart Keywords[sk]=tdm,správca obrazovky,Login manažér,správca prihlásenia,xdm,používatelia,prihlásenie,login,privítanie,logo,štýly,jazyk,krajina,pozadie,tapety,sedenia,vypnutie,reset,reštart
Keywords[sl]=kdm,upravitelj zaslona,upravljalnik,xdm,uporabniki,prijava,login,pozdrav,logo,slogi,jezik,država,pisave,ozadje,tapete,seje,ugasnitev,vnovičen zagon Keywords[sl]=tdm,upravitelj zaslona,upravljalnik,xdm,uporabniki,prijava,login,pozdrav,logo,slogi,jezik,država,pisave,ozadje,tapete,seje,ugasnitev,vnovičen zagon
Keywords[sr]=kdm,display manager,xdm,users,login,greeting,Лого,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,менаџер,пријављивање,стил,језик,земља,фонтови,позадина,сесије,гашење Keywords[sr]=tdm,display manager,xdm,users,login,greeting,Лого,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,менаџер,пријављивање,стил,језик,земља,фонтови,позадина,сесије,гашење
Keywords[sr@Latn]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,menadžer,prijavljivanje,stil,jezik,zemlja,fontovi,pozadina,sesije,gašenje Keywords[sr@Latn]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,menadžer,prijavljivanje,stil,jezik,zemlja,fontovi,pozadina,sesije,gašenje
Keywords[sv]=kdm,display manager,xdm,användare,inloggning,välkomsttext,Logo,stilar,språk,land,teckensnitt,bakgrund,skrivbordsunderlägg,sessioner,stäng av,starta om Keywords[sv]=tdm,display manager,xdm,användare,inloggning,välkomsttext,Logo,stilar,språk,land,teckensnitt,bakgrund,skrivbordsunderlägg,sessioner,stäng av,starta om
Keywords[ta]=கேடிஎம்,காட்சி மேலாளர்,xdm,பயன்படுத்துபவர்,உள்நுழை,வாழ்த்து,சின்னம்,பாணிகள்,மொழி,நாடு,எழுத்துருக்கள்,பின்னணி,வால்பேப்பர்கள்,பகுதிகள்,முடித்தல்,தொடங்குதல் Keywords[ta]=கேடிஎம்,காட்சி மேலாளர்,xdm,பயன்படுத்துபவர்,உள்நுழை,வாழ்த்து,சின்னம்,பாணிகள்,மொழி,நாடு,எழுத்துருக்கள்,பின்னணி,வால்பேப்பர்கள்,பகுதிகள்,முடித்தல்,தொடங்குதல்
Keywords[th]=kdm,ตัวจัดการจอแสดงผล,xdm,ผู้ใช้,ล็อกอิน, ทักทาย,โลโก้,รูปแบบ,ภาษา,ประเทศ,แบบอักษร,พื้นหลัง, วอลล์เปเปอร์,วาระ,ปิด,เริ่มการทำงานใหม่ Keywords[th]=tdm,ตัวจัดการจอแสดงผล,xdm,ผู้ใช้,ล็อกอิน, ทักทาย,โลโก้,รูปแบบ,ภาษา,ประเทศ,แบบอักษร,พื้นหลัง, วอลล์เปเปอร์,วาระ,ปิด,เริ่มการทำงานใหม่
Keywords[tr]=kdm,görüntü yönetici,xdm,kullanıcılar,oturum açma,karşılama,logo,stiller,dil,ülke,yazı tipleri,artalan,duvar kağıtları,oturumlar,kapat,tekrar başlat Keywords[tr]=tdm,görüntü yönetici,xdm,kullanıcılar,oturum açma,karşılama,logo,stiller,dil,ülke,yazı tipleri,artalan,duvar kağıtları,oturumlar,kapat,tekrar başlat
Keywords[uk]=kdm,менеджер дисплеїв,xdm,користувачі,реєстрація,привітання,логотип,стилі,мова,країна,шрифти,тло,шпалери,сеанси,вимикання,перезапуск Keywords[uk]=tdm,менеджер дисплеїв,xdm,користувачі,реєстрація,привітання,логотип,стилі,мова,країна,шрифти,тло,шпалери,сеанси,вимикання,перезапуск
Keywords[uz]=kdm,kirish boshqaruvchisi,xdm,foydalanuvchilar,kirish,salomlashish,Belgi,uslublar,til,davlat,shriftlar,orqa fon,seanslar,oʻchirish,oʻchirib-yoqish Keywords[uz]=tdm,kirish boshqaruvchisi,xdm,foydalanuvchilar,kirish,salomlashish,Belgi,uslublar,til,davlat,shriftlar,orqa fon,seanslar,oʻchirish,oʻchirib-yoqish
Keywords[uz@cyrillic]=kdm,кириш бошқарувчиси,xdm,фойдаланувчилар,кириш,саломлашиш,Белги,услублар,тил,давлат,шрифтлар,орқа фон,сеанслар,ўчириш,ўчириб-ёқиш Keywords[uz@cyrillic]=tdm,кириш бошқарувчиси,xdm,фойдаланувчилар,кириш,саломлашиш,Белги,услублар,тил,давлат,шрифтлар,орқа фон,сеанслар,ўчириш,ўчириб-ёқиш
Keywords[ven]=kdm,mulanguli wau vhonisa,xdm,vhashumisi,u loga,dzindumeliso,logo,zwitaela,luambo,shango,fontu,murahu,mabammbiri a luvhondoni,tshitenwa,thutha,thomolosa Keywords[ven]=tdm,mulanguli wau vhonisa,xdm,vhashumisi,u loga,dzindumeliso,logo,zwitaela,luambo,shango,fontu,murahu,mabammbiri a luvhondoni,tshitenwa,thutha,thomolosa
Keywords[vi]=kdm,quản lý hiển thị,xdm,người dùng,đăng nhập,chào hỏi,Biểu trưng,kiểu,ngôn ngữ,quốc gia,phông chữ,nền,ảnh nền,phiên đăng nhập,tắt máy,khởi động lại Keywords[vi]=tdm,quản lý hiển thị,xdm,người dùng,đăng nhập,chào hỏi,Biểu trưng,kiểu,ngôn ngữ,quốc gia,phông chữ,nền,ảnh nền,phiên đăng nhập,tắt máy,khởi động lại
Keywords[wa]=kdm,manaedjeu d' håynaedje,xdm,uzeus,login,wilikom,greeting,Logo,styles,stîles,lingaedje,payi,fontes,fond,fond del waitroûle,sessions,distinde,dislodjî,elodjî,s' elodjî,renonder Keywords[wa]=tdm,manaedjeu d' håynaedje,xdm,uzeus,login,wilikom,greeting,Logo,styles,stîles,lingaedje,payi,fontes,fond,fond del waitroûle,sessions,distinde,dislodjî,elodjî,s' elodjî,renonder
Keywords[xh]=kdm,umphathi womboniso,xdm,abasebenzisi,igama elithile,umbuliso,ilogo,iintlobo,ulwimi,ilizwe,ubungakanani bamagama, imvelaphi,amaphepha odonga,iintlanganiso,vala,qala kwakhona Keywords[xh]=tdm,umphathi womboniso,xdm,abasebenzisi,igama elithile,umbuliso,ilogo,iintlobo,ulwimi,ilizwe,ubungakanani bamagama, imvelaphi,amaphepha odonga,iintlanganiso,vala,qala kwakhona
Keywords[zh_CN]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,显示管理器,用户,登录,欢迎辞,标志,风格,语言,国家,字体,背景,墙纸,会话,关机,重启动 Keywords[zh_CN]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,显示管理器,用户,登录,欢迎辞,标志,风格,语言,国家,字体,背景,墙纸,会话,关机,重启动
Keywords[zh_TW]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,顯示管理程式,使用者,登入,歡迎,風格,語言,國家,字型,背景,底圖,工作階段,關機,重新啟動 Keywords[zh_TW]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,顯示管理程式,使用者,登入,歡迎,風格,語言,國家,字型,背景,底圖,工作階段,關機,重新啟動
Keywords[zu]=kdm,Imenenja yokuveza,xdm,abasebenzisi,ukungena ngaphakathi,isibingelelo,Isiqubulo,izitayela,ulimi,izwe,izinhlobo zamagama, inkundla yangemuva,emaphepha ezindonga,iziqendu,vala,phinda uqale Keywords[zu]=tdm,Imenenja yokuveza,xdm,abasebenzisi,ukungena ngaphakathi,isibingelelo,Isiqubulo,izitayela,ulimi,izwe,izinhlobo zamagama, inkundla yangemuva,emaphepha ezindonga,iziqendu,vala,phinda uqale
Categories=Qt;KDE;X-KDE-settings-system; Categories=Qt;KDE;X-KDE-settings-system;

50
kcontrol/kdm/main.cpp
Unescape View File

@ -31,11 +31,11 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kurldrag.h> #include <kurldrag.h>
#include "kdm-appear.h" #include "tdm-appear.h"
#include "kdm-font.h" #include "tdm-font.h"
#include "kdm-users.h" #include "tdm-users.h"
#include "kdm-shut.h" #include "tdm-shut.h"
#include "kdm-conv.h" #include "tdm-conv.h"
#include "main.h" #include "main.h"
#include "background.h" #include "background.h"
@ -47,8 +47,8 @@
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
typedef KGenericFactory<KDModule, TQWidget> KDMFactory; typedef KGenericFactory<TDModule, TQWidget> TDMFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kdm, KDMFactory("kdmconfig") ) K_EXPORT_COMPONENT_FACTORY( kcm_tdm, TDMFactory("tdmconfig") )
KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg) KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg)
{ {
@ -78,16 +78,16 @@ KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg)
KSimpleConfig *config; KSimpleConfig *config;
KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
: KCModule(KDMFactory::instance(), parent, name) : KCModule(TDMFactory::instance(), parent, name)
, minshowuid(0) , minshowuid(0)
, maxshowuid(0) , maxshowuid(0)
, updateOK(false) , updateOK(false)
{ {
KAboutData *about = KAboutData *about =
new KAboutData(I18N_NOOP("kcmkdm"), I18N_NOOP("KDE Login Manager Config Module"), new KAboutData(I18N_NOOP("kcmtdm"), I18N_NOOP("KDE Login Manager Config Module"),
0, 0, KAboutData::License_GPL, 0, 0, KAboutData::License_GPL,
I18N_NOOP("(c) 1996 - 2005 The KDM Authors")); I18N_NOOP("(c) 1996 - 2005 The TDM Authors"));
about->addAuthor("Thomas Tanghus", I18N_NOOP("Original author"), "tanghus@earthling.net"); about->addAuthor("Thomas Tanghus", I18N_NOOP("Original author"), "tanghus@earthling.net");
about->addAuthor("Steffen Hansen", 0, "hansen@kde.org"); about->addAuthor("Steffen Hansen", 0, "hansen@kde.org");
@ -174,11 +174,11 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
<< "' have unknown GID " << tgmapci.key() << endl; << "' have unknown GID " << tgmapci.key() << endl;
struct stat st; struct stat st;
if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) { if( stat( KDE_CONFDIR "/tdm/tdmdistrc" ,&st ) == 0) {
config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" )); config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
} }
else { else {
config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
} }
TQVBoxLayout *top = new TQVBoxLayout(this); TQVBoxLayout *top = new TQVBoxLayout(this);
@ -188,11 +188,11 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
// _don't_ add a theme configurator until the theming engine is _really_ done!! // _don't_ add a theme configurator until the theming engine is _really_ done!!
// ***** // *****
appearance = new KDMAppearanceWidget(this); appearance = new TDMAppearanceWidget(this);
tab->addTab(appearance, i18n("A&ppearance")); tab->addTab(appearance, i18n("A&ppearance"));
connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool))); connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool)));
font = new KDMFontWidget(this); font = new TDMFontWidget(this);
tab->addTab(font, i18n("&Font")); tab->addTab(font, i18n("&Font"));
connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
@ -200,11 +200,11 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
tab->addTab(background, i18n("&Background")); tab->addTab(background, i18n("&Background"));
connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
sessions = new KDMSessionsWidget(this); sessions = new TDMSessionsWidget(this);
tab->addTab(sessions, i18n("&Shutdown")); tab->addTab(sessions, i18n("&Shutdown"));
connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
users = new KDMUsersWidget(this, 0); users = new TDMUsersWidget(this, 0);
tab->addTab(users, i18n("&Users")); tab->addTab(users, i18n("&Users"));
connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int))); connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int)));
@ -212,7 +212,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &)));
connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers())); connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers()));
convenience = new KDMConvenienceWidget(this, 0); convenience = new TDMConvenienceWidget(this, 0);
tab->addTab(convenience, i18n("Con&venience")); tab->addTab(convenience, i18n("Con&venience"));
connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &)));
@ -231,12 +231,12 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
top->addWidget(tab); top->addWidget(tab);
} }
KDModule::~KDModule() TDModule::~TDModule()
{ {
delete config; delete config;
} }
void KDModule::load() void TDModule::load()
{ {
appearance->load(); appearance->load();
font->load(); font->load();
@ -248,7 +248,7 @@ void KDModule::load()
} }
void KDModule::save() void TDModule::save()
{ {
appearance->save(); appearance->save();
font->save(); font->save();
@ -260,7 +260,7 @@ void KDModule::save()
} }
void KDModule::defaults() void TDModule::defaults()
{ {
if ( getuid() == 0 ) if ( getuid() == 0 )
{ {
@ -274,7 +274,7 @@ void KDModule::defaults()
} }
} }
void KDModule::propagateUsers() void TDModule::propagateUsers()
{ {
groupmap.clear(); groupmap.clear();
emit clearUsers(); emit clearUsers();
@ -298,7 +298,7 @@ void KDModule::propagateUsers()
updateOK = true; updateOK = true;
} }
void KDModule::slotMinMaxUID(int min, int max) void TDModule::slotMinMaxUID(int min, int max)
{ {
if (updateOK) { if (updateOK) {
TQMap<TQString,int> alusers, dlusers; TQMap<TQString,int> alusers, dlusers;

30
kcontrol/kdm/main.h
Unescape View File

@ -21,29 +21,29 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef __kdm_main_h #ifndef __tdm_main_h
#define __kdm_main_h #define __tdm_main_h
#include <tqtabwidget.h> #include <tqtabwidget.h>
#include <tqmap.h> #include <tqmap.h>
#include <kcmodule.h> #include <kcmodule.h>
class KDMAppearanceWidget; class TDMAppearanceWidget;
class KDMFontWidget; class TDMFontWidget;
class KDMSessionsWidget; class TDMSessionsWidget;
class KDMUsersWidget; class TDMUsersWidget;
class KDMConvenienceWidget; class TDMConvenienceWidget;
class KBackground; class KBackground;
class KDModule : public KCModule class TDModule : public KCModule
{ {
Q_OBJECT Q_OBJECT
public: public:
KDModule(TQWidget *parent, const char *name, const TQStringList &); TDModule(TQWidget *parent, const char *name, const TQStringList &);
~KDModule(); ~TDModule();
void load(); void load();
void save(); void save();
@ -63,12 +63,12 @@ private:
TQTabWidget *tab; TQTabWidget *tab;
KDMAppearanceWidget *appearance; TDMAppearanceWidget *appearance;
KBackground *background; KBackground *background;
KDMFontWidget *font; TDMFontWidget *font;
KDMSessionsWidget *sessions; TDMSessionsWidget *sessions;
KDMUsersWidget *users; TDMUsersWidget *users;
KDMConvenienceWidget *convenience; TDMConvenienceWidget *convenience;
TQMap<TQString, QPair<int,TQStringList> > usermap; TQMap<TQString, QPair<int,TQStringList> > usermap;
TQMap<TQString,int> groupmap; TQMap<TQString,int> groupmap;

2
kcontrol/smserver/smserverconfigdlg.ui
Unescape View File

@ -116,7 +116,7 @@
<string>Default Shutdown Option</string> <string>Default Shutdown Option</string>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>Here you can choose what should happen by default when you log out. This only has meaning, if you logged in through KDM.</string> <string>Here you can choose what should happen by default when you log out. This only has meaning, if you logged in through TDM.</string>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

6
kdepasswd/kcm/kcm_useraccount.kcfg
Unescape View File

@ -5,11 +5,11 @@
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<include>kglobal.h</include> <include>kglobal.h</include>
<include>kstandarddirs.h</include> <include>kstandarddirs.h</include>
<kcfgfile name="kdm/kdmrc"/> <kcfgfile name="tdm/tdmrc"/>
<group name="X-*-Greeter"> <group name="X-*-Greeter">
<entry name="faceDir" type="Path"> <entry name="faceDir" type="Path">
<default code="true"> <default code="true">
KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" + '/' KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" + '/'
</default> </default>
</entry> </entry>
<entry name="UserFaceDir" type="Path"> <entry name="UserFaceDir" type="Path">
@ -18,7 +18,7 @@
<entry name="FaceSource" type="String"> <entry name="FaceSource" type="String">
<default>PreferAdmin</default> <default>PreferAdmin</default>
</entry> </entry>
<!-- These entries doesn't "exist" or is used in kdmrc <!-- These entries doesn't "exist" or is used in tdmrc
but this is a nifty way of handling default values ;-) --> but this is a nifty way of handling default values ;-) -->
<entry name = "FaceSize" type="Int"> <entry name = "FaceSize" type="Int">
<label>The size of login images</label> <label>The size of login images</label>

4
kdepasswd/kcm/main.cpp
Unescape View File

@ -147,7 +147,7 @@ void KCMUserAccount::load()
_mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer )); _mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer ));
TQString _userPicsDir = KCFGUserAccount::faceDir() + TQString _userPicsDir = KCFGUserAccount::faceDir() +
KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces/";
TQString fs = KCFGUserAccount::faceSource(); TQString fs = KCFGUserAccount::faceSource();
if (fs == TQString::fromLatin1("UserOnly")) if (fs == TQString::fromLatin1("UserOnly"))
@ -271,7 +271,7 @@ void KCMUserAccount::slotFaceButtonClicked()
} }
ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() + ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() +
"/kdm/pics/users/" ); "/tdm/pics/users/" );
if ( pDlg->exec() == TQDialog::Accepted && !pDlg->getFaceImage().isNull() ) if ( pDlg->exec() == TQDialog::Accepted && !pDlg->getFaceImage().isNull() )
changeFace( pDlg->getFaceImage() ); changeFace( pDlg->getFaceImage() );

2
kdepasswd/kcm/pics/CMakeLists.txt
Unescape View File

@ -16,4 +16,4 @@ install( FILES
Heart.png Konqui.png Lion.png Monkey.png Penguin.png Heart.png Konqui.png Lion.png Monkey.png Penguin.png
Pig.png Rabbit.png Ring.png Scream.png Shark.png Pig.png Rabbit.png Ring.png Scream.png Shark.png
Splash.png Star.png Teddybear.png Turtle.png Splash.png Star.png Teddybear.png Turtle.png
DESTINATION ${DATA_INSTALL_DIR}/kdm/pics/users ) DESTINATION ${DATA_INSTALL_DIR}/tdm/pics/users )

2
kdepasswd/kcm/pics/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
picsdir = $(kde_datadir)/kdm/pics/users picsdir = $(kde_datadir)/tdm/pics/users
pics_DATA = Apple.png BeachBall.png Blowfish.png Bug.png \ pics_DATA = Apple.png BeachBall.png Blowfish.png Bug.png \
Butterfly.png Car.png Cow.png Daemon.png Dog.png Elephant.png \ Butterfly.png Car.png Cow.png Daemon.png Dog.png Elephant.png \
Flower.png Frog.png Ghost.png Guitar.png Heart.png Konqui.png \ Flower.png Frog.png Ghost.png Guitar.png Heart.png Konqui.png \

2
kdesktop/CMakeLists.txt
Unescape View File

@ -27,7 +27,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kdmlib ${CMAKE_SOURCE_DIR}/tdmlib
${CMAKE_SOURCE_DIR}/kcontrol/background ${CMAKE_SOURCE_DIR}/kcontrol/background
${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/libkonq
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}

4
kdesktop/Makefile.am
Unescape View File

@ -1,8 +1,8 @@
## Makefile.am of tdebase/kdesktop ## Makefile.am of tdebase/kdesktop
INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes) INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq -I$(top_srcdir)/tdmlib $(all_includes)
kdesktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kdesktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/kdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR) kdesktop_la_LIBADD = libkdesktopsettings.la $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la $(top_builddir)/tdmlib/libdmctl.la $(LIB_XSS) $(LIB_KUTILS) $(LIB_XCURSOR)
SUBDIRS = . lock pics patterns programs init kwebdesktop SUBDIRS = . lock pics patterns programs init kwebdesktop

2
kdesktop/bgmanager.cc
Unescape View File

@ -525,7 +525,7 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
m_pDesktop->repaint(); m_pDesktop->repaint();
static bool root_cleared = false; static bool root_cleared = false;
if( !root_cleared ) if( !root_cleared )
{ // clear the root window pixmap set by kdm { // clear the root window pixmap set by tdm
root_cleared = true; root_cleared = true;
TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot())); TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
// but make the pixmap visible until m_pDesktop is visible // but make the pixmap visible until m_pDesktop is visible

2
kdesktop/lock/CMakeLists.txt
Unescape View File

@ -13,7 +13,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/kdesktop ${CMAKE_BINARY_DIR}/kdesktop
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kdmlib ${CMAKE_SOURCE_DIR}/tdmlib
${CMAKE_SOURCE_DIR}/kcheckpass ${CMAKE_SOURCE_DIR}/kcheckpass
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}

4
kdesktop/lock/Makefile.am
Unescape View File

@ -1,8 +1,8 @@
## Makefile.am of tdebase/kdesktop/lock ## Makefile.am of tdebase/kdesktop/lock
INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes) INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/tdmlib $(GLINC) $(all_includes)
kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB) kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
####### Files ####### Files

2
kdesktop/lock/main.cc
Unescape View File

@ -29,7 +29,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <dcopref.h> #include <dcopref.h>
#include <kdmtsak.h> #include <tdmtsak.h>
#include <stdlib.h> #include <stdlib.h>

2
kdesktop/lock/sakdlg.cc
Unescape View File

@ -104,7 +104,7 @@ SAKDlg::SAKDlg(LockProcess *parent)
installEventFilter(this); installEventFilter(this);
mSAKProcess = new KProcess; mSAKProcess = new KProcess;
*mSAKProcess << "kdmtsak"; *mSAKProcess << "tdmtsak";
connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited())); connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
mSAKProcess->start(); mSAKProcess->start();
} }

2
kdesktop/lockeng.cc
Unescape View File

@ -54,7 +54,7 @@ SaverEngine::SaverEngine()
TQT_SLOT(lockProcessExited())); TQT_SLOT(lockProcessExited()));
mSAKProcess = new KProcess; mSAKProcess = new KProcess;
*mSAKProcess << "kdmtsak"; *mSAKProcess << "tdmtsak";
connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited())); connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) ); TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );

4
kdm/CMakeLists.txt
Unescape View File

@ -13,8 +13,8 @@
# FIXME needs more checks (for kerberos, etc) # FIXME needs more checks (for kerberos, etc)
# FIXME Xsession need some improvements # FIXME Xsession need some improvements
if( NOT DEFINED KDM_PAM_SERVICE ) if( NOT DEFINED TDM_PAM_SERVICE )
set( KDM_PAM_SERVICE "kde" CACHE INTERNAL "" ) set( TDM_PAM_SERVICE "kde" CACHE INTERNAL "" )
endif( ) endif( )
include( ConfigureChecks.cmake ) include( ConfigureChecks.cmake )

94
kdm/ChangeLog
Unescape View File

@ -1,4 +1,4 @@
This change log contains only changes relevant to the KDM configuration, This change log contains only changes relevant to the TDM configuration,
startup and packaging. Bug fixes are not listed, and feature changes only startup and packaging. Bug fixes are not listed, and feature changes only
if they affect the configuration. if they affect the configuration.
@ -28,7 +28,7 @@ if they affect the configuration.
2005-01-09 Oswald Buddenhagen <ossi@kde.org> 2005-01-09 Oswald Buddenhagen <ossi@kde.org>
* Merged sessreg into kdm. Option UseSessReg. * Merged sessreg into tdm. Option UseSessReg.
2004-08-14 Oswald Buddenhagen <ossi@kde.org> 2004-08-14 Oswald Buddenhagen <ossi@kde.org>
@ -38,7 +38,7 @@ if they affect the configuration.
2004-07-28 Oswald Buddenhagen <ossi@kde.org> 2004-07-28 Oswald Buddenhagen <ossi@kde.org>
* Added control sockets. Control FiFos are now obsolete. * Added control sockets. Control FiFos are now obsolete.
Added control socket command line client 'kdmctl'. Added control socket command line client 'tdmctl'.
* The Setup program is now run even for automatic logins. * The Setup program is now run even for automatic logins.
Setup, Startup and Reset have the arg "auto" for automatic logins. Setup, Startup and Reset have the arg "auto" for automatic logins.
@ -80,7 +80,7 @@ if they affect the configuration.
2004-03-16 Oswald Buddenhagen <ossi@kde.org> 2004-03-16 Oswald Buddenhagen <ossi@kde.org>
* Changed AllowClose default to true; only the default kdmrc * Changed AllowClose default to true; only the default tdmrc
disables it for local display now. disables it for local display now.
2004-03-11 Chris Cheney <ccheney@cheney.cx> 2004-03-11 Chris Cheney <ccheney@cheney.cx>
@ -96,12 +96,12 @@ if they affect the configuration.
2004-02-28 Oswald Buddenhagen <ossi@kde.org> 2004-02-28 Oswald Buddenhagen <ossi@kde.org>
* The default Xsession no longer tries to merge kdm's PATH into the * The default Xsession no longer tries to merge tdm's PATH into the
one set up by the shell startup scripts. Instead, kde.desktop one set up by the shell startup scripts. Instead, kde.desktop
contains a full pathname and starttde fixes up PATH if necessary. contains a full pathname and starttde fixes up PATH if necessary.
* The default Xsession will emulate the startup behaviour of more * The default Xsession will emulate the startup behaviour of more
shells, in particular bash, zsh and csh/tcsh. shells, in particular bash, zsh and csh/tcsh.
* Setting up the session log is now done by kdm, not the Session * Setting up the session log is now done by tdm, not the Session
script; option ClientLogFile. script; option ClientLogFile.
2004-01-25 Oswald Buddenhagen <ossi@kde.org> 2004-01-25 Oswald Buddenhagen <ossi@kde.org>
@ -128,15 +128,15 @@ if they affect the configuration.
2003-10-27 Oswald Buddenhagen <ossi@kde.org> 2003-10-27 Oswald Buddenhagen <ossi@kde.org>
* KDM now complies with the input model of PAM. The greeter has an * TDM now complies with the input model of PAM. The greeter has an
interface for conversation plugins, so alternative authentication interface for conversation plugins, so alternative authentication
mechanisms can be handled; options PluginsLogin & PluginsShutdown. mechanisms can be handled; options PluginsLogin & PluginsShutdown.
* Password-less and automatic logins now use a separate PAM service * Password-less and automatic logins now use a separate PAM service
(${KDM_PAM_SERVICE}-np). (${TDM_PAM_SERVICE}-np).
2003-10-17 Oswald Buddenhagen <ossi@kde.org> 2003-10-17 Oswald Buddenhagen <ossi@kde.org>
* Add --with-kdm-xconsole configure switch. No need to patch * Add --with-tdm-xconsole configure switch. No need to patch
Makefile.am to enable the built-in xconsole anymore. Makefile.am to enable the built-in xconsole anymore.
2003-09-23 Oswald Buddenhagen <ossi@kde.org> 2003-09-23 Oswald Buddenhagen <ossi@kde.org>
@ -148,7 +148,7 @@ if they affect the configuration.
- "custom" to ~/.xsession - "custom" to ~/.xsession
* The previous session type choice is now saved in a different file * The previous session type choice is now saved in a different file
(~/.dmrc) in a different format (ini-file); the SessSaveFile option (~/.dmrc) in a different format (ini-file); the SessSaveFile option
is gone. Optionally KDM can be configured to store all .dmrc files is gone. Optionally TDM can be configured to store all .dmrc files
in a common directory (option DmrcDir); this can be useful for AFS in a common directory (option DmrcDir); this can be useful for AFS
based installations. based installations.
* The location of the administratively set user faces is now specified * The location of the administratively set user faces is now specified
@ -158,7 +158,7 @@ if they affect the configuration.
The spec for the above changes is shared with GDM, so packagers should The spec for the above changes is shared with GDM, so packagers should
choose common directories. choose common directories.
* The kdmsts file moved to /var/lib/kdm by default; option DataDir. * The tdmsts file moved to /var/lib/tdm by default; option DataDir.
* Nuked the AutoLoginSession option; i don't think it was useful at all * Nuked the AutoLoginSession option; i don't think it was useful at all
and it can be emulated anyway. and it can be emulated anyway.
@ -192,7 +192,7 @@ if they affect the configuration.
This code is not built by default; uncomment the first three lines This code is not built by default; uncomment the first three lines
in kfrontend/Makefile.am to enable it. in kfrontend/Makefile.am to enable it.
* The DaemonMode option is gone. The command line switches -daemon and * The DaemonMode option is gone. The command line switches -daemon and
-nodaemon still exist, but are mostly unnecessary, as KDM can decide -nodaemon still exist, but are mostly unnecessary, as TDM can decide
what to do based on the parent process ID. what to do based on the parent process ID.
* The AutoLogin option and the -autolog/-noautolog switches are gone. * The AutoLogin option and the -autolog/-noautolog switches are gone.
* The AutoLogin1st option is gone. * The AutoLogin1st option is gone.
@ -207,11 +207,11 @@ if they affect the configuration.
2002-08-10 Oswald Buddenhagen <ossi@kde.org> 2002-08-10 Oswald Buddenhagen <ossi@kde.org>
* Renamed kdmdesktop to krootimage, moved it back into the KDM source * Renamed tdmdesktop to krootimage, moved it back into the TDM source
tree, and changed its command line tree, and changed its command line
* krootimage will be automatically invoked by the greeter by default; * krootimage will be automatically invoked by the greeter by default;
option UseBackground option UseBackground
* Chucked out the [Desktop0] section from kdmrc. Instead, the * Chucked out the [Desktop0] section from tdmrc. Instead, the
location of the config file containing such a section is specified location of the config file containing such a section is specified
with the BackgroundRc option. with the BackgroundRc option.
* User images can now be optionally fetched from the users's home * User images can now be optionally fetched from the users's home
@ -231,7 +231,7 @@ if they affect the configuration.
2002-03-10 Oswald Buddenhagen <ossi@kde.org> 2002-03-10 Oswald Buddenhagen <ossi@kde.org>
* Added InteractiveSd option. This is not really implemented yet, * Added InteractiveSd option. This is not really implemented yet,
so enabling it just makes KDM deny the existence of the shutdown so enabling it just makes TDM deny the existence of the shutdown
condition/timing options. condition/timing options.
* The Setup script is now executed synchronously. Long-lasting * The Setup script is now executed synchronously. Long-lasting
commands should be put in the background explicitly. commands should be put in the background explicitly.
@ -259,7 +259,7 @@ if they affect the configuration.
* The defaults of the options Xservers, Session, Setup, Startup, * The defaults of the options Xservers, Session, Setup, Startup,
Reset and PidFile are now back to the saner XDM defaults, Reset and PidFile are now back to the saner XDM defaults,
so KDM works even without config files. so TDM works even without config files.
* Changed option ShowUsers: All -> NotHidden * Changed option ShowUsers: All -> NotHidden
* Renamed the option Users to SelectedUsers and NoUsers to HiddenUsers. * Renamed the option Users to SelectedUsers and NoUsers to HiddenUsers.
* The GUIStyle option now groks all installed widget styles. * The GUIStyle option now groks all installed widget styles.
@ -288,9 +288,9 @@ if they affect the configuration.
2001-07-10 Oswald Buddenhagen <ossi@kde.org> 2001-07-10 Oswald Buddenhagen <ossi@kde.org>
* Added the tool 'genkdmconf'. It's supposed to create a suitable * Added the tool 'gentdmconf'. It's supposed to create a suitable
configuration for KDM during 'make install' by merging new defaults configuration for TDM during 'make install' by merging new defaults
with a previous XDM/KDM config (if any is found). with a previous XDM/TDM config (if any is found).
2001-07-03 Oswald Buddenhagen <ossi@kde.org> 2001-07-03 Oswald Buddenhagen <ossi@kde.org>
@ -318,26 +318,26 @@ if they affect the configuration.
the DebugLevel resource is gone the DebugLevel resource is gone
* The ErrorLogFile resource is gone * The ErrorLogFile resource is gone
* The greeter module libKdmGreet.so has been converted to an * The greeter module libKdmGreet.so has been converted to an
executable named kdm_greet; the external config parser is now executable named tdm_greet; the external config parser is now
named kdm_config. The resource GreeterLib and the command line named tdm_config. The resource GreeterLib and the command line
option -getcfg (and -cfg2get) are gone, as the locations of the option -getcfg (and -cfg2get) are gone, as the locations of the
config parser and greeter are derived from the location of the config parser and greeter are derived from the location of the
kdm executable tdm executable
* The config files are all located in ${kde_confdir}/kdm now; the * The config files are all located in ${kde_confdir}/tdm now; the
defaults for Setup & Session were adapted to this. defaults for Setup & Session were adapted to this.
* The keys in kdmrc were reorganized: * The keys in tdmrc were reorganized:
- [KDM]/ShutdownButton -> [X-<dpy>-Greeter]/(ShutdownButton & - [TDM]/ShutdownButton -> [X-<dpy>-Greeter]/(ShutdownButton &
ShutdownNeedsRoot) ShutdownNeedsRoot)
- [KDM]/Shutdown -> [Shutdown]/HaltCmd - [TDM]/Shutdown -> [Shutdown]/HaltCmd
- [KDM]/Restart -> [Shutdown]/RebootCmd - [TDM]/Restart -> [Shutdown]/RebootCmd
- [KDM]/LogoArea -> [X-*-Greeter]/ {None,Logo,Clock} - [TDM]/LogoArea -> [X-*-Greeter]/ {None,Logo,Clock}
- remaining keys from [KDM] -> [X-*-Greeter]/ - remaining keys from [TDM] -> [X-*-Greeter]/
- [Lilo]/Lilo -> [Shutdown]/UseLilo - [Lilo]/Lilo -> [Shutdown]/UseLilo
- [Lilo]/LiloCommand -> [Shutdown]/LiloCmd - [Lilo]/LiloCommand -> [Shutdown]/LiloCmd
- [Lilo]/LiloMap -> [Shutdown]/ - [Lilo]/LiloMap -> [Shutdown]/
- [Locale]/Language -> [X-*-Greeter]/ (Country key dropped) - [Locale]/Language -> [X-*-Greeter]/ (Country key dropped)
* KDM will no longer use kdm-config; most of its resources were * TDM will no longer use tdm-config; most of its resources were
absorbed into kdmrc: absorbed into tdmrc:
- Servers -> [General]/Xservers - Servers -> [General]/Xservers
- RequestPort -> [Xdmcp]/(Port & Enable) - RequestPort -> [Xdmcp]/(Port & Enable)
- DaemonMode -> [General]/ - DaemonMode -> [General]/
@ -366,11 +366,11 @@ if they affect the configuration.
* In GreetString the HOSTNAME substitution was replaced with the * In GreetString the HOSTNAME substitution was replaced with the
%%, %d, %h, %n, %s, %r & %m expandos %%, %d, %h, %n, %s, %r & %m expandos
* EchoMode does not understand "NoStars" any more. Use "NoEcho". * EchoMode does not understand "NoStars" any more. Use "NoEcho".
* Defaults changed: AuthDir to /var/lib/kdm, KeyFile to * Defaults changed: AuthDir to /var/lib/tdm, KeyFile to
$kdm_confdir/kdmkeys, Xservers to $kdm_confdir/Xservers, Xaccess to $tdm_confdir/tdmkeys, Xservers to $tdm_confdir/Xservers, Xaccess to
$kdm_confdir/Xaccess, Startup to $kdm_confdir/Xstartup, Reset to $tdm_confdir/Xaccess, Startup to $tdm_confdir/Xstartup, Reset to
$kdm_confdir/Xreset, removed kde2 from SessionTypes $tdm_confdir/Xreset, removed kde2 from SessionTypes
* The previous user is now saved in $kdm_confdir/kdmsts, not kdmrc * The previous user is now saved in $tdm_confdir/tdmsts, not tdmrc
* Added option SessSaveFile, defaulting to .wmrc * Added option SessSaveFile, defaulting to .wmrc
* Command line option changes: * Command line option changes:
- -server, -udpPort, -resources, -session and -xrm are gone - -server, -udpPort, -resources, -session and -xrm are gone
@ -386,11 +386,11 @@ if they affect the configuration.
* %DMNAME% and %DMPATH% are expanded in string resources; * %DMNAME% and %DMPATH% are expanded in string resources;
changed the defaults for PidFile and ConfigFile accordingly - changed the defaults for PidFile and ConfigFile accordingly -
the latter resulting in KDM now using kdm-config, NOT xdm-config the latter resulting in TDM now using tdm-config, NOT xdm-config
* Use external config parser to merge platform-specific (that is, * Use external config parser to merge platform-specific (that is,
KDE-like) configuration data into the XDM resources; command line KDE-like) configuration data into the XDM resources; command line
options -getcfg (default %DMPATH%_getcfg) and -cfg2get (no default, options -getcfg (default %DMPATH%_getcfg) and -cfg2get (no default,
meaning kdm_getcfg will use $kde_confdir/kdmrc). meaning tdm_getcfg will use $kde_confdir/tdmrc).
* Changed "kde" to "kde2" in the default SessionTypes * Changed "kde" to "kde2" in the default SessionTypes
* Stolen idea for console mode handling from dtlogin; options * Stolen idea for console mode handling from dtlogin; options
ConsoleMode and AllowConsoleMode are gone; extension to Xservers ConsoleMode and AllowConsoleMode are gone; extension to Xservers
@ -427,13 +427,13 @@ if they affect the configuration.
resource NoPassUsers resource NoPassUsers
* Added auto-re-login on XServer crash; resource & option AutoReLogin * Added auto-re-login on XServer crash; resource & option AutoReLogin
The kdmrc options and xdm-config resources are "ORed", i.e., if The tdmrc options and xdm-config resources are "ORed", i.e., if
either is enabled, the function is enabled. either is enabled, the function is enabled.
The command line options -autolog/-noautolog and the resource AutoLogin The command line options -autolog/-noautolog and the resource AutoLogin
can be used to disable auto-login and password-less login at once. can be used to disable auto-login and password-less login at once.
* Added displaying the previously logged in user in the "Login" * Added displaying the previously logged in user in the "Login"
field; option ShowPrevious. The previous user is saved in kdmrc, field; option ShowPrevious. The previous user is saved in tdmrc,
section [Previous]. section [Previous].
2000-12-07 Oswald Buddenhagen <ossi@kde.org> 2000-12-07 Oswald Buddenhagen <ossi@kde.org>
@ -454,8 +454,8 @@ if they affect the configuration.
2000-10-10 Steffen Hansen <hansen@kde.org> 2000-10-10 Steffen Hansen <hansen@kde.org>
* Made kdmdesktop read the [Desktop0] section from kdmrc instead * Made tdmdesktop read the [Desktop0] section from tdmrc instead
of kdmdesktoprc. of tdmdesktoprc.
2000-09-07 Waldo Bastian <bastian@kde.org> 2000-09-07 Waldo Bastian <bastian@kde.org>
@ -483,8 +483,8 @@ if they affect the configuration.
1999-11-15 Matthias Hoelzer-Kluepfel <hoelzer@kde.org> 1999-11-15 Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
* kdmdesktop replaced with ../kdesktop/kdmdesktop. Uses new config * tdmdesktop replaced with ../kdesktop/tdmdesktop. Uses new config
file (kdmdesktoprc) with new options (all in section [Desktop0]): file (tdmdesktoprc) with new options (all in section [Desktop0]):
1999-07-01 Steffen Hansen <hansen@kde.org> 1999-07-01 Steffen Hansen <hansen@kde.org>
@ -494,7 +494,7 @@ if they affect the configuration.
* Added next boot OS selection via LiLo; options [Lilo] Lilo, * Added next boot OS selection via LiLo; options [Lilo] Lilo,
LiloCommand & LiloMap LiloCommand & LiloMap
* Added button to switch to console mode; option [KDM] ConsoleMode * Added button to switch to console mode; option [TDM] ConsoleMode
1999-03-01 Stephan Kulow <coolo@kde.org> 1999-03-01 Stephan Kulow <coolo@kde.org>
@ -502,7 +502,7 @@ if they affect the configuration.
1998-10-08 Thomas Tanghus <tanghus@earthling.net> 1998-10-08 Thomas Tanghus <tanghus@earthling.net>
* [KDMDESKTOP] option changes: * [TDMDESKTOP] option changes:
- BackgroundPictureTile, BackgroundPictureCenter, FancyBackground -> - BackgroundPictureTile, BackgroundPictureCenter, FancyBackground ->
BackgroundPictureMode {None,Tile,Center,Scale, BackgroundPictureMode {None,Tile,Center,Scale,
TopLeft,TopRight,BottomLeft,BottomRight,Fancy} TopLeft,TopRight,BottomLeft,BottomRight,Fancy}
@ -513,7 +513,7 @@ if they affect the configuration.
* Change defaults: * Change defaults:
- Setup: "" -> XDMDIR/Xsetup - Setup: "" -> XDMDIR/Xsetup
- PidFile: "" -> FreeBSD: /var/run/kdm.pid, others: XDMDIR/kdm-pid - PidFile: "" -> FreeBSD: /var/run/tdm.pid, others: XDMDIR/tdm-pid
- Session: "XBINDIR/xterm -ls" -> XDMDIR/Xsession - Session: "XBINDIR/xterm -ls" -> XDMDIR/Xsession
- UserPath & SystemPath: no /usr/ucb for Linux & FreeBSD - UserPath & SystemPath: no /usr/ucb for Linux & FreeBSD

10
kdm/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
SUBDIRS = . backend kfrontend SUBDIRS = . backend kfrontend
PAM = @KDM_PAM_SERVICE@ PAM = @TDM_PAM_SERVICE@
noinst_DATA=config.ci noinst_DATA=config.ci
kdmdocdir = $(datadir)/doc/kdm tdmdocdir = $(datadir)/doc/tdm
kdmdoc_DATA = README tdmdoc_DATA = README
install-data-local: install-data-local:
-@test -n "$(DESTDIR)" || test -z "$(PAM)" || { $(top_srcdir)/mkpamserv $(PAM) && $(top_srcdir)/mkpamserv -P $(PAM)-np; } -@test -n "$(DESTDIR)" || test -z "$(PAM)" || { $(top_srcdir)/mkpamserv $(PAM) && $(top_srcdir)/mkpamserv -P $(PAM)-np; }
@ -15,6 +15,6 @@ config.ci: $(srcdir)/config.def $(srcdir)/confproc.pl
CLEANFILES = config.ci CLEANFILES = config.ci
### this is *only* for the kdm home page maintainer! ### ### this is *only* for the tdm home page maintainer! ###
hp: hp:
scp README ChangeLog TODO devel-home:files/kdm scp README ChangeLog TODO devel-home:files/tdm

120
kdm/README
Unescape View File

@ -1,78 +1,78 @@
This is the K Display Manager (KDM) for KDE 3.4, This is the K Display Manager (TDM) for KDE 3.4,
the KDE replacement for the X Display Manager (XDM). the KDE replacement for the X Display Manager (XDM).
Semi-official home page: http://devel-home.kde.org/~ossi/sw/kdm.html Semi-official home page: http://devel-home.kde.org/~ossi/sw/tdm.html
configure options that affect KDM configure options that affect TDM
--------------------------------- ---------------------------------
--with-pam[=service] --with-pam[=service]
Compile KDM (and other parts of tdebase) with PAM support. The default Compile TDM (and other parts of tdebase) with PAM support. The default
service is "kde". PAM is automatically used if found. service is "kde". PAM is automatically used if found.
--with-kdm-pam=service --with-tdm-pam=service
Override the PAM service used specifically by KDM. Depends on --with-pam. Override the PAM service used specifically by TDM. Depends on --with-pam.
--with-shadow --with-shadow
Compile KDM (and other parts of tdebase) with shadow password support. Compile TDM (and other parts of tdebase) with shadow password support.
Shadow passwords are automatically used if found. This affects KDM only Shadow passwords are automatically used if found. This affects TDM only
if PAM is not used. if PAM is not used.
--with-krb4[=path] --with-krb4[=path]
Compile KDM (and the LDAP KIO slave) with KTH Kerberos 4 support. Note Compile TDM (and the LDAP KIO slave) with KTH Kerberos 4 support. Note
that this does not work with the Kerberos 4 compatibility layer found in that this does not work with the Kerberos 4 compatibility layer found in
MIT Kerberos 5. This affects KDM only if PAM is not used. MIT Kerberos 5. This affects TDM only if PAM is not used.
--with-afs --with-afs
Compile KDM with AFS support. Depends on --with-krb4. Compile TDM with AFS support. Depends on --with-krb4.
--with-krb5auth[=path] --with-krb5auth[=path]
--with-rpcauth --with-rpcauth
Compile KDM with Kerberos 5 resp. secure RPC support for X authorization Compile TDM with Kerberos 5 resp. secure RPC support for X authorization
cookies. It's pretty pointless to enable this if you don't use an X server cookies. It's pretty pointless to enable this if you don't use an X server
that supports it. that supports it.
If you want user authentication against a Kerberos realm, compile KDM with If you want user authentication against a Kerberos realm, compile TDM with
PAM support and use the appropriate module. PAM support and use the appropriate module.
--without-xdmcp --without-xdmcp
Compile KDM without XDMCP support. Compile TDM without XDMCP support.
--with-kdm-xconsole --with-tdm-xconsole
Compile KDM with a builtin "xconsole" replacement in the greeter. I don't Compile TDM with a builtin "xconsole" replacement in the greeter. I don't
consider this too useful, but SuSE wanted it, so it's there. ;) consider this too useful, but SuSE wanted it, so it's there. ;)
KDM's file system layout TDM's file system layout
------------------------ ------------------------
${kde_confdir} is usually ${prefix}/share/config ${kde_confdir} is usually ${prefix}/share/config
${kde_datadir} is usually ${prefix}/share/apps ${kde_datadir} is usually ${prefix}/share/apps
The indented locations are envisioned for a configuration shared with GDM. The indented locations are envisioned for a configuration shared with GDM.
${kde_confdir}/kdm/{kdmrc,Xservers,Xaccess,Xwilling,...} ${kde_confdir}/tdm/{tdmrc,Xservers,Xaccess,Xwilling,...}
${kde_datadir}/kdm/sessions/*.desktop ${kde_datadir}/tdm/sessions/*.desktop
/etc/X11/sessions/,/usr/share/xsessions/ /etc/X11/sessions/,/usr/share/xsessions/
${kde_datadir}/kdm/pics/users/ ${kde_datadir}/tdm/pics/users/
${kde_datadir}/kdm/pics/ ${kde_datadir}/tdm/pics/
${kde_datadir}/kdm/faces/*.face{,.icon} ${kde_datadir}/tdm/faces/*.face{,.icon}
/usr/share/faces/ /usr/share/faces/
/var/run/xauth/A* /var/run/xauth/A*
/var/run/xdmctl/xdmctl* /var/run/xdmctl/xdmctl*
/var/run/kdm.pid /var/run/tdm.pid
/var/lib/kdm/kdmsts /var/lib/tdm/tdmsts
<site-specific>/*.dmrc <site-specific>/*.dmrc
$HOME/.face{,.icon} $HOME/.face{,.icon}
$HOME/.dmrc $HOME/.dmrc
How to setup KDM How to setup TDM
---------------- ----------------
KDM's config files are all located in ${kde_confdir}/kdm. TDM's config files are all located in ${kde_confdir}/tdm.
"make install" will create a probably working configuration, either by "make install" will create a probably working configuration, either by
deriving it from an already present KDM/XDM installation or by using deriving it from an already present TDM/XDM installation or by using
defaults if no previous installation is found. defaults if no previous installation is found.
You can change the configuration from the KDE Control Center. You will You can change the configuration from the KDE Control Center. You will
@ -101,29 +101,29 @@ that's what will be saved to ~/.dmrc and what DESKTOP_SESSION will be set to.
For every magic Exec constant a session type of the same name exists. For every magic Exec constant a session type of the same name exists.
Unless your system is configured differently already, you should create a Unless your system is configured differently already, you should create a
directory ${kde_confdir}/kdm/sessions and add this to kdmrc: directory ${kde_confdir}/tdm/sessions and add this to tdmrc:
[X-*-Core] [X-*-Core]
SessionsDirs=${kde_confdir}/kdm/sessions,${kde_datadir}/kdm/sessions SessionsDirs=${kde_confdir}/tdm/sessions,${kde_datadir}/tdm/sessions
(Note that you must use actual paths instead of variables, see the section (Note that you must use actual paths instead of variables, see the section
about KDM's file system layout.) about TDM's file system layout.)
Do any changes only in the config directory - any changes in the data Do any changes only in the config directory - any changes in the data
directory will be lost after the next KDE update. directory will be lost after the next KDE update.
To override a session type, copy the .desktop file from the data dir to the To override a session type, copy the .desktop file from the data dir to the
config dir and edit it at will. Removing the shipped session types can be config dir and edit it at will. Removing the shipped session types can be
accomplished by "shadowing" them with .desktop files containing Hidden=true. accomplished by "shadowing" them with .desktop files containing Hidden=true.
For the magic session types no .desktop files exist by default, but KDM For the magic session types no .desktop files exist by default, but TDM
pretends they would, so you can override them like any other type. pretends they would, so you can override them like any other type.
I guess you already know how to add a new session type by now. ;-) I guess you already know how to add a new session type by now. ;-)
Running KDM from init Running TDM from init
--------------------- ---------------------
NOTE, that this description applies to RedHat 5.x and must be adapted for NOTE, that this description applies to RedHat 5.x and must be adapted for
other distributions/systems. Generally I'd advise _against_ starting KDM other distributions/systems. Generally I'd advise _against_ starting TDM
directly from init - better use a proper init script, possibly by slightly directly from init - better use a proper init script, possibly by slightly
modifying the XDM init script shipped by your distribution. modifying the XDM init script shipped by your distribution.
@ -135,13 +135,13 @@ modifying the XDM init script shipped by your distribution.
Replace it with: Replace it with:
x:5:respawn:/opt/kde/bin/kdm x:5:respawn:/opt/kde/bin/tdm
This tells init(8) to respawn KDM, the KDE display manager, when This tells init(8) to respawn TDM, the KDE display manager, when
the system is in run level 5. the system is in run level 5.
Note that KDM does not need the -nodaemon option. Note that TDM does not need the -nodaemon option.
To start KDM, either run (as root) /sbin/telinit 5 (to switch to To start TDM, either run (as root) /sbin/telinit 5 (to switch to
run level 5), or (this is risky! don't do it until you _know_ you run level 5), or (this is risky! don't do it until you _know_ you
want the system to boot into this every time!) edit /etc/inittab want the system to boot into this every time!) edit /etc/inittab
and change the line: and change the line:
@ -153,14 +153,14 @@ modifying the XDM init script shipped by your distribution.
id:5:initdefault: id:5:initdefault:
If you do the latter step, then every time your system boots If you do the latter step, then every time your system boots
successfully it will go into run level 5 and run KDM, successfully it will go into run level 5 and run TDM,
presenting you the exceedingly cute KDE login screen. presenting you the exceedingly cute KDE login screen.
The command sockets The command sockets
------------------- -------------------
This is a feature you can use to remote-control KDM. It's mostly intended This is a feature you can use to remote-control TDM. It's mostly intended
for use by ksmserver and kdesktop from a running session, but other for use by ksmserver and kdesktop from a running session, but other
applications are possible as well. applications are possible as well.
@ -209,7 +209,7 @@ Commands for all sockets:
"caps" "caps"
- Returns a list this socket's capabilities: - Returns a list this socket's capabilities:
"kdm" - identifies kdm, in case some other DM implements this protocol, too. "tdm" - identifies tdm, in case some other DM implements this protocol, too.
"list", "activate", "lock", "suicide", "login" - the respective command "list", "activate", "lock", "suicide", "login" - the respective command
is supported. is supported.
"bootoptions" - the "listbootoptions" command and the "=" option to "bootoptions" - the "listbootoptions" command and the "=" option to
@ -272,7 +272,7 @@ Commands for all sockets:
- end is the latest time at which the shutdown should be performed if active - end is the latest time at which the shutdown should be performed if active
sessions are still running. If it starts with a plus-sign, the start time sessions are still running. If it starts with a plus-sign, the start time
is added. Minus one means wait infinitely. If end is through and active is added. Minus one means wait infinitely. If end is through and active
sessions are still running, KDM can do one of the following: sessions are still running, TDM can do one of the following:
* "cancel" - give up the shutdown. * "cancel" - give up the shutdown.
* "force" - shut down nonetheless. * "force" - shut down nonetheless.
* "forcemy" - shut down nonetheless if all active sessions belong to the * "forcemy" - shut down nonetheless if all active sessions belong to the
@ -304,18 +304,18 @@ Commands for all sockets:
There are two ways of using the sockets: There are two ways of using the sockets:
- Connecting them directly. FifoDir is exported as $DM_CONTROL; the name - Connecting them directly. FifoDir is exported as $DM_CONTROL; the name
of per-display sockets can be derived from $DISPLAY. of per-display sockets can be derived from $DISPLAY.
- By using the kdmctl command (e.g., from within a shell script). - By using the tdmctl command (e.g., from within a shell script).
Try "kdmctl -h" to find out more. Try "tdmctl -h" to find out more.
Here is an example bash script "reboot into FreeBSD": Here is an example bash script "reboot into FreeBSD":
if kdmctl | grep -q shutdown; then if tdmctl | grep -q shutdown; then
IFS=$'\t' IFS=$'\t'
set -- `kdmctl listbootoptions` set -- `tdmctl listbootoptions`
if [ "$1" = ok ]; then if [ "$1" = ok ]; then
fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}') fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}')
if [ -n "$fbsd" ]; then if [ -n "$fbsd" ]; then
kdmctl shutdown reboot "=$fbsd" ask > /dev/null tdmctl shutdown reboot "=$fbsd" ask > /dev/null
else else
echo "FreeBSD boot unavailable." echo "FreeBSD boot unavailable."
fi fi
@ -332,7 +332,7 @@ fi
More input! ;-) More input! ;-)
KDM accepts two command line options related to logging: TDM accepts two command line options related to logging:
-debug <n> -debug <n>
<n> is a decimal or hexadecimal (prefix 0x) number. <n> is a decimal or hexadecimal (prefix 0x) number.
@ -363,10 +363,10 @@ KDM accepts two command line options related to logging:
-logfile <file> -logfile <file>
<file> is the file to log various messages to. The default log file is <file> is the file to log various messages to. The default log file is
/var/log/kdm.log. For internal reasons there is no option in kdmrc to /var/log/tdm.log. For internal reasons there is no option in tdmrc to
permanently specify the log file location. If you redirect KDM's permanently specify the log file location. If you redirect TDM's
standard error output to a file, KDM will log there. standard error output to a file, TDM will log there.
If KDM is configured to use syslog (and it _very_ probably is on any If TDM is configured to use syslog (and it _very_ probably is on any
modern system), all internally generated messages are logged to the modern system), all internally generated messages are logged to the
"daemon" facility. The log usually can be found in /var/log/debug.log "daemon" facility. The log usually can be found in /var/log/debug.log
and /var/log/daemon.log; make sure that daemon.* is logged (look at and /var/log/daemon.log; make sure that daemon.* is logged (look at
@ -377,29 +377,29 @@ KDM accepts two command line options related to logging:
Send me all the logs together with a detailed description of what you did Send me all the logs together with a detailed description of what you did
and what happened. If your problem is related to a specific configuration, and what happened. If your problem is related to a specific configuration,
you should also attach a tar.gz archive of your KDM config directory. you should also attach a tar.gz archive of your TDM config directory.
If I request a backtrace from you and KDM didn't create one yet via the If I request a backtrace from you and TDM didn't create one yet via the
usual drkonqi procedure, you'll have to do that yourself. The keyphrase usual drkonqi procedure, you'll have to do that yourself. The keyphrase
is "attaching gdb". How exactly this is done depends on the part that is "attaching gdb". How exactly this is done depends on the part that
crashes: crashes:
- master daemon. Actually you should never need to attach to it, as - master daemon. Actually you should never need to attach to it, as
you can start it within the debugger already: you can start it within the debugger already:
# gdb --args kdm -nodaemon -debug 7 # gdb --args tdm -nodaemon -debug 7
(gdb) run (gdb) run
- display subdaemon. Find (using ps) the process with a name like - display subdaemon. Find (using ps) the process with a name like
"-:0" (where :0 is actually the display this process is for). This "-:0" (where :0 is actually the display this process is for). This
process' PPID is the master daemon. Attach to it this way: process' PPID is the master daemon. Attach to it this way:
# gdb kdm <the PID you found> # gdb tdm <the PID you found>
(gdb) cont (gdb) cont
If the subdaemon crashes before you can attach, add 16 to the debug flags If the subdaemon crashes before you can attach, add 16 to the debug flags
when you start KDM. when you start TDM.
- config reader. You will have to add 32 to the debug flags almost certainly. - config reader. You will have to add 32 to the debug flags almost certainly.
The PPID will be the master daemon as well. The PPID will be the master daemon as well.
# gdb kdm_config $(pidof kdm_config) # gdb tdm_config $(pidof tdm_config)
(gdb) cont (gdb) cont
- greeter. If it's too fast, add 64 to -debug. The PPID will be the subdaemon. - greeter. If it's too fast, add 64 to -debug. The PPID will be the subdaemon.
# gdb kdm_greet $(pidof kdm_greet) # gdb tdm_greet $(pidof tdm_greet)
(gdb) cont (gdb) cont
The simplification with "pidof" works only if you have only one display, The simplification with "pidof" works only if you have only one display,
otherwise you have to find the PID manually (by using ps -fx). otherwise you have to find the PID manually (by using ps -fx).
@ -426,7 +426,7 @@ configure flag if at all possible.
Random rambings and license information Random rambings and license information
--------------------------------------- ---------------------------------------
Version 0.1 of KDM is copyright Version 0.1 of TDM is copyright
Matthias Ettrich <ettrich@trolltech.com> Matthias Ettrich <ettrich@trolltech.com>
All later versions copyright: All later versions copyright:
(C) 1997-2000 Steffen Hansen <hansen@kde.org> (C) 1997-2000 Steffen Hansen <hansen@kde.org>
@ -443,7 +443,7 @@ Duncan Haldane for investigation of PAM issues.
Stephan Kulow for helping with the autoconf stuff. Stephan Kulow for helping with the autoconf stuff.
Martin Baehr for intensive testing and writing the sample Xsession scripts. Martin Baehr for intensive testing and writing the sample Xsession scripts.
Harald Hoyer <Harald.Hoyer@redhat.de> for the (now obsoleted) chooser. Harald Hoyer <Harald.Hoyer@redhat.de> for the (now obsoleted) chooser.
SuSE for employing me (ossi) for three months to work on kdm. SuSE for employing me (ossi) for three months to work on tdm.
BasysKom for sponsoring my (ossi's) work on the conversation plugin stuff. BasysKom for sponsoring my (ossi's) work on the conversation plugin stuff.
... and _many_ others ... ... and _many_ others ...

14
kdm/TODO
Unescape View File

@ -41,14 +41,14 @@ theming (#37349):
- add support for XRandR (#48602) - add support for XRandR (#48602)
save these options to .dmrc? save these options to .dmrc?
- per-display sections in .dmrc. read-only, as far as kdm is concerned, as - per-display sections in .dmrc. read-only, as far as tdm is concerned, as
otherwise the GUI would become insanely complex. otherwise the GUI would become insanely complex.
- make config position independent - make config position independent
- parse /etc/kderc? - parse /etc/kderc?
- merge multiple kdmrcs in the style of kconfig. how to set section priorities? - merge multiple tdmrcs in the style of kconfig. how to set section priorities?
- genkdmconf: treat backgroundrc as an ini file, not as a text blob - gentdmconf: treat backgroundrc as an ini file, not as a text blob
- add proper quoting and dequoting to genkdmconf ini parser & writer - add proper quoting and dequoting to gentdmconf ini parser & writer
- write generic conversation plugin - write generic conversation plugin
- write modern conv plugin. or maybe this should be a parallel vs. serial - write modern conv plugin. or maybe this should be a parallel vs. serial
@ -113,7 +113,7 @@ and the session. .dmrc later affects only the session, not the greeter.
- add a minimalistic window manager to the greeter (#17716, #51039) - add a minimalistic window manager to the greeter (#17716, #51039)
- write a separate configurator application, as kcontrol does not scale well - write a separate configurator application, as kcontrol does not scale well
enough to cover all of kdm's options. enough to cover all of tdm's options.
- Different logos for each session type (see #74500) - Different logos for each session type (see #74500)
- User pictures in logo field - User pictures in logo field
@ -143,7 +143,7 @@ and the session. .dmrc later affects only the session, not the greeter.
- lbxproxy integration (tell ghakko) - lbxproxy integration (tell ghakko)
- in kcm_kdm, detach backgroundrc change status from kdmrc change status. - in kcm_tdm, detach backgroundrc change status from tdmrc change status.
- when a shutdown is scheduled, don't remove all login possibilities. - when a shutdown is scheduled, don't remove all login possibilities.
instead, display a warning in the greeter. use SIGUSR1 to notify already instead, display a warning in the greeter. use SIGUSR1 to notify already
@ -173,7 +173,7 @@ internal stuff:
- implement auto-re-login by keeping the display subdaemon alive instead - implement auto-re-login by keeping the display subdaemon alive instead
of starting a new one and feeding it the old auth data. of starting a new one and feeding it the old auth data.
- options for running the greeter and the core unprivileged. problem: xauth. - options for running the greeter and the core unprivileged. problem: xauth.
- rethink the coupling of the kdm components, particularily the config reader. - rethink the coupling of the tdm components, particularily the config reader.
options: options:
- keep things basically as-is, make the Xaccess interface even more flexible, - keep things basically as-is, make the Xaccess interface even more flexible,
add capability flags. add capability flags.

8
kdm/backend/CMakeLists.txt
Unescape View File

@ -21,11 +21,11 @@ link_directories(
${DBUS_TQT_LIBRARY_DIRS} ${DBUS_TQT_LIBRARY_DIRS}
) )
##### kdm (executable) ########################## ##### tdm (executable) ##########################
add_custom_command( OUTPUT config.ci add_custom_command( OUTPUT config.ci
COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci
DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def )
set_property( SOURCE auth.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) set_property( SOURCE auth.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
@ -35,7 +35,7 @@ else()
set( XDMCP_LIBRARIES "" ) set( XDMCP_LIBRARIES "" )
endif() endif()
tde_add_executable( kdm tde_add_executable( tdm
SOURCES SOURCES
access.c auth.c bootman.c choose.c client.c consolekit.c access.c auth.c bootman.c choose.c client.c consolekit.c
ctrl.c daemon.c dm.c dpylist.c error.c genauth.c ctrl.c daemon.c dm.c dpylist.c error.c genauth.c

6
kdm/backend/Makefile.am
Unescape View File

@ -6,8 +6,8 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) $(LIBSHADOW) $(LIBGEN) \
$(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \ $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
$(LIBUCB) $(LIBUTIL) $(LIBPOSIX4) $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
bin_PROGRAMS = kdm bin_PROGRAMS = tdm
kdm_SOURCES = \ tdm_SOURCES = \
access.c \ access.c \
auth.c \ auth.c \
bootman.c \ bootman.c \
@ -44,4 +44,4 @@ EXTRA_DIST = printf.c
noinst_HEADERS = dm.h dm_socket.h dm_error.h dm_auth.h greet.h noinst_HEADERS = dm.h dm_socket.h dm_error.h dm_auth.h greet.h
# for unsermake (automake is handled by SUBDIRS in ../) # for unsermake (automake is handled by SUBDIRS in ../)
kdm_COMPILE_FIRST = ../config.ci tdm_COMPILE_FIRST = ../config.ci

2
kdm/backend/client.c
Unescape View File

@ -1305,7 +1305,7 @@ StartClient()
env = setEnv( env, "SHELL", p->pw_shell ); env = setEnv( env, "SHELL", p->pw_shell );
env = setEnv( env, "HOME", p->pw_dir ); env = setEnv( env, "HOME", p->pw_dir );
if (cursource == PWSRC_AUTOLOGIN) if (cursource == PWSRC_AUTOLOGIN)
env = setEnv (env, "KDM_AUTOLOGIN", curuser); env = setEnv (env, "TDM_AUTOLOGIN", curuser);
#if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS) #if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS)
if (krbtkfile[0] != '\0') if (krbtkfile[0] != '\0')
env = setEnv( env, "KRBTKFILE", krbtkfile ); env = setEnv( env, "KRBTKFILE", krbtkfile );

2
kdm/backend/ctrl.c
Unescape View File

@ -520,7 +520,7 @@ processCtrl( const char *string, int len, int fd, struct display *d )
if (fd >= 0 && !strcmp( ar[0], "caps" )) { if (fd >= 0 && !strcmp( ar[0], "caps" )) {
if (ar[1]) if (ar[1])
goto exce; goto exce;
Reply( "ok\tkdm\tlist\t" ); Reply( "ok\ttdm\tlist\t" );
if (bootManager != BO_NONE) if (bootManager != BO_NONE)
Reply( "bootoptions\t" ); Reply( "bootoptions\t" );
if (d) { if (d) {

2
kdm/backend/error.c
Unescape View File

@ -113,7 +113,7 @@ InitErrorLog( const char *errorLogFile )
# endif # endif
# define WARNMSG \ # define WARNMSG \
"********************************************************************************\n" \ "********************************************************************************\n" \
"Note that your system uses syslog. All of kdm's internally generated messages\n" \ "Note that your system uses syslog. All of tdm's internally generated messages\n" \
"(i.e., not from libraries and external programs/scripts it uses) go to the\n" \ "(i.e., not from libraries and external programs/scripts it uses) go to the\n" \
"daemon.* syslog facility; check your syslog configuration to find out to which\n" \ "daemon.* syslog facility; check your syslog configuration to find out to which\n" \
"file(s) it is logged." PAMLOG "\n" \ "file(s) it is logged." PAMLOG "\n" \

324
kdm/config.def
View File

File diff suppressed because it is too large Load Diff

8
kdm/configure.in.bot
Unescape View File

@ -1,8 +1,8 @@
if $kdm_no_Xau; then if $tdm_no_Xau; then
AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!]) AC_MSG_WARN([Cannot build TDM! Make sure that libXau.a is installed!])
fi fi
if $kdm_no_Xdmcp; then if $tdm_no_Xdmcp; then
AC_MSG_WARN([Cannot build KDM! Make sure that libXdmcp.a and Xdmcp.h AC_MSG_WARN([Cannot build TDM! Make sure that libXdmcp.a and Xdmcp.h
are installed or use --without-xdmcp to disable XDMCP support!]) are installed or use --without-xdmcp to disable XDMCP support!])
fi fi

52
kdm/configure.in.in
Unescape View File

@ -80,20 +80,20 @@ done
]) ])
AC_CHECK_FUNC(vsyslog, [ AC_CHECK_FUNC(vsyslog, [
AC_DEFINE(USE_SYSLOG, 1, [Define if kdm should be built with syslog support])]) AC_DEFINE(USE_SYSLOG, 1, [Define if tdm should be built with syslog support])])
kdm_no_Xau=false tdm_no_Xau=false
kdm_no_Xdmcp=false tdm_no_Xdmcp=false
AC_CHECK_LIB(Xau, main, [:], AC_CHECK_LIB(Xau, main, [:],
[ [
kdm_no_Xau=true tdm_no_Xau=true
DO_NOT_COMPILE="$DO_NOT_COMPILE kdm" DO_NOT_COMPILE="$DO_NOT_COMPILE tdm"
], ],
$X_LDFLAGS -lX11 $LIBSOCKET) $X_LDFLAGS -lX11 $LIBSOCKET)
AC_ARG_WITH(xdmcp, AC_ARG_WITH(xdmcp,
AC_HELP_STRING([--without-xdmcp],[build kdm without xdmcp support [default=with xdmcp]]), , AC_HELP_STRING([--without-xdmcp],[build tdm without xdmcp support [default=with xdmcp]]), ,
[with_xdmcp=yes]) [with_xdmcp=yes])
if test "x$with_xdmcp" = xyes; then if test "x$with_xdmcp" = xyes; then
AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET) AC_CHECK_LIB(Xdmcp, main, [LIBXDMCP="-lXdmcp"], , $X_LDFLAGS -lX11 $LIBSOCKET)
@ -104,14 +104,14 @@ if test "x$with_xdmcp" = xyes; then
CPPFLAGS=$cppflags_safe CPPFLAGS=$cppflags_safe
fi fi
if test -z "$HAVE_X11_XDMCP_H"; then if test -z "$HAVE_X11_XDMCP_H"; then
kdm_no_Xdmcp=true tdm_no_Xdmcp=true
DO_NOT_COMPILE="$DO_NOT_COMPILE kdm" DO_NOT_COMPILE="$DO_NOT_COMPILE tdm"
fi fi
AC_DEFINE(XDMCP, 1, [Define if kdm should be built with XDMCP support]) AC_DEFINE(XDMCP, 1, [Define if tdm should be built with XDMCP support])
ac_save_libs=$LIBS ac_save_libs=$LIBS
LIBS="$LIBS $LIBXDMCP" LIBS="$LIBS $LIBXDMCP"
AC_CHECK_FUNC(XdmcpWrap, [ AC_CHECK_FUNC(XdmcpWrap, [
AC_DEFINE(HASXDMAUTH, 1, [Define if kdm should be built with XDMAUTH support]) AC_DEFINE(HASXDMAUTH, 1, [Define if tdm should be built with XDMAUTH support])
]) ])
LIBS=$ac_save_libs LIBS=$ac_save_libs
fi fi
@ -178,9 +178,9 @@ KRB5_INCS=
KRB5_LIBS= KRB5_LIBS=
KRB5_RPATH= KRB5_RPATH=
AC_MSG_CHECKING([whether to use Kerberos5 for Xauth cookies in kdm]) AC_MSG_CHECKING([whether to use Kerberos5 for Xauth cookies in tdm])
AC_ARG_WITH(krb5auth, AC_ARG_WITH(krb5auth,
AC_HELP_STRING([--with-krb5auth=PATH],[Use Kerberos5 for Xauth cookies in kdm]), , AC_HELP_STRING([--with-krb5auth=PATH],[Use Kerberos5 for Xauth cookies in tdm]), ,
[ with_krb5auth=no ]) [ with_krb5auth=no ])
if test "x$with_krb5auth" = xno; then if test "x$with_krb5auth" = xno; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -197,7 +197,7 @@ else
keepcflags=$CFLAGS keepcflags=$CFLAGS
CFLAGS="$KRB5_INCS $CFLAGS" CFLAGS="$KRB5_INCS $CFLAGS"
AC_CHECK_HEADER(krb5/krb5.h, AC_CHECK_HEADER(krb5/krb5.h,
[ AC_DEFINE(K5AUTH, 1, [Define if kdm should use Kerberos 5 for Xauth cookies.]) ], [ AC_DEFINE(K5AUTH, 1, [Define if tdm should use Kerberos 5 for Xauth cookies.]) ],
[ AC_MSG_ERROR([--with-krb5auth requires Kerberos5 header files. [ AC_MSG_ERROR([--with-krb5auth requires Kerberos5 header files.
Due to a problem with X includes you probably have to run "ln -s . krb5" Due to a problem with X includes you probably have to run "ln -s . krb5"
in the directory where the krb5.h include resides to make things actually work.])]) in the directory where the krb5.h include resides to make things actually work.])])
@ -208,36 +208,36 @@ AC_SUBST(KRB5_INCS)
AC_SUBST(KRB5_LIBS) AC_SUBST(KRB5_LIBS)
AC_SUBST(KRB5_RPATH) AC_SUBST(KRB5_RPATH)
AC_MSG_CHECKING([whether to use Sun's secure RPC for Xauth cookies in kdm]) AC_MSG_CHECKING([whether to use Sun's secure RPC for Xauth cookies in tdm])
AC_ARG_WITH(rpcauth, AC_ARG_WITH(rpcauth,
AC_HELP_STRING([--with-rpcauth],[Use Sun's secure RPC for Xauth cookies in kdm.]), , AC_HELP_STRING([--with-rpcauth],[Use Sun's secure RPC for Xauth cookies in tdm.]), ,
[ with_rpcauth=no ]) [ with_rpcauth=no ])
if test "x$with_rpcauth" = xno; then if test "x$with_rpcauth" = xno; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_CHECK_HEADER(rpc/rpc.h, AC_CHECK_HEADER(rpc/rpc.h,
[ AC_DEFINE(SECURE_RPC, 1, [Define if kdm should use Sun's secure RPC for Xauth cookies.]) ], [ AC_DEFINE(SECURE_RPC, 1, [Define if tdm should use Sun's secure RPC for Xauth cookies.]) ],
[ AC_MSG_ERROR([--with-rpcauth requires Sun RPC header files.])]) [ AC_MSG_ERROR([--with-rpcauth requires Sun RPC header files.])])
fi fi
if test "x$use_pam" = xyes; then if test "x$use_pam" = xyes; then
AC_DEFINE(USE_PAM, 1, [Define if kdm should use PAM]) AC_DEFINE(USE_PAM, 1, [Define if tdm should use PAM])
elif test "x$use_shadow" = xyes; then elif test "x$use_shadow" = xyes; then
AC_DEFINE(USESHADOW, 1, [Define if kdm should use shadow passwords]) AC_DEFINE(USESHADOW, 1, [Define if tdm should use shadow passwords])
fi fi
if test "x$with_krb4" != xno; then if test "x$with_krb4" != xno; then
AC_DEFINE(KERBEROS, 1, [Define if kdm should use Kerberos IV]) AC_DEFINE(KERBEROS, 1, [Define if tdm should use Kerberos IV])
if test "x$with_afs" = xno; then if test "x$with_afs" = xno; then
AC_DEFINE(NO_AFS, 1, [Define if kdm should not use AFS]) AC_DEFINE(NO_AFS, 1, [Define if tdm should not use AFS])
fi fi
fi fi
AC_ARG_WITH(kdm-xconsole, AC_ARG_WITH(tdm-xconsole,
AC_HELP_STRING([--with-kdm-xconsole],[build kdm with built-in xconsole [default=no]]), , AC_HELP_STRING([--with-tdm-xconsole],[build tdm with built-in xconsole [default=no]]), ,
[with_kdm_xconsole=no]) [with_tdm_xconsole=no])
if test "x$with_kdm_xconsole" = xyes; then if test "x$with_tdm_xconsole" = xyes; then
AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole]) AC_DEFINE(WITH_TDM_XCONSOLE, 1, [Build tdm with built-in xconsole])
fi fi
########### Check for DBus ########### Check for DBus
@ -334,7 +334,7 @@ fi
AC_SUBST(DBUS_INCS) AC_SUBST(DBUS_INCS)
AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_LIBS)
dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop) dnl AC_OUTPUT(tdm/kfrontend/sessions/kde.desktop)
AC_ARG_WITH(libaudit, AC_ARG_WITH(libaudit,

18
kdm/confproc.pl
Unescape View File

@ -66,7 +66,7 @@ sub dedb($)
$t =~ s,&nbsp;, ,g; $t =~ s,&nbsp;, ,g;
$t =~ s,&lt;,<,g; $t =~ s,&lt;,<,g;
$t =~ s,&gt;,>,g; $t =~ s,&gt;,>,g;
$t =~ s,&kdm;,KDM,g; $t =~ s,&tdm;,TDM,g;
$t =~ s,&XDMCP;,XDMCP,g; $t =~ s,&XDMCP;,XDMCP,g;
$t =~ s,&X-Server;,X-server,g; $t =~ s,&X-Server;,X-server,g;
return $t; return $t;
@ -241,10 +241,10 @@ while (<INFILE>) {
last if (/^<\/code>\n$/); last if (/^<\/code>\n$/);
$raw_out .= $_; $raw_out .= $_;
} }
} elsif (/^<kdmrc>$/) { } elsif (/^<tdmrc>$/) {
my $comm = ""; my $comm = "";
while (<INFILE>) { while (<INFILE>) {
last if (/^<\/kdmrc>\n$/); last if (/^<\/tdmrc>\n$/);
chop; chop;
if (/^\[(.*)\]$/) { if (/^\[(.*)\]$/) {
defined($ex_sects{$1}) && defined($ex_sects{$1}) &&
@ -294,7 +294,7 @@ while (<INFILE>) {
my @oa = ([ "{ \"".$what."\", (char *)-1, 0, ".$proc." },", "XMO" ]); my @oa = ([ "{ \"".$what."\", (char *)-1, 0, ".$proc." },", "XMO" ]);
add_cond($kif, $what, \@oa, \%ov_xm_conds); add_cond($kif, $what, \@oa, \%ov_xm_conds);
$ov_xm[$dsp] .= $oa[0][0]." \\\n"; $ov_xm[$dsp] .= $oa[0][0]." \\\n";
} elsif ($src =~ /^kdm:(.*)\/(.*)$/) { } elsif ($src =~ /^tdm:(.*)\/(.*)$/) {
my ($sec, $key) = ($1, $2); my ($sec, $key) = ($1, $2);
my @oa = ([ "{ \"".$key."\", (char *)-1, 0, ".$proc." },", "KMO".($mcnt++) ]); my @oa = ([ "{ \"".$key."\", (char *)-1, 0, ".$proc." },", "KMO".($mcnt++) ]);
add_cond($kif, $key, \@oa, \%ov_km_conds); add_cond($kif, $key, \@oa, \%ov_km_conds);
@ -528,7 +528,7 @@ while (<INFILE>) {
); );
add_cond($kif, $key, \@oa, \%ov_xm_conds); add_cond($kif, $key, \@oa, \%ov_xm_conds);
$ov_xm[$sect =~ /^-/] .= $oa[0][0]." \\\n"; $ov_xm[$sect =~ /^-/] .= $oa[0][0]." \\\n";
} elsif ($merge =~ /^kdm:([^\(]+)(\((.+)\))?$/) { } elsif ($merge =~ /^tdm:([^\(]+)(\((.+)\))?$/) {
my ($where, $func) = ($1, $3); my ($where, $func) = ($1, $3);
my $sec = ""; my $sec = "";
($where =~ s/^([^\/]+)\///) && ($sec = $1); ($where =~ s/^([^\/]+)\///) && ($sec = $1);
@ -594,8 +594,8 @@ while (<INFILE>) {
$doc_ref .= "<para>Empty by default.</para>\n"; $doc_ref .= "<para>Empty by default.</para>\n";
} else { } else {
$ddflt =~ s/\"//g; $ddflt =~ s/\"//g;
$ddflt =~ s,KDMCONF ,\${<envar>kde_confdir</envar>}/kdm,; $ddflt =~ s,TDMCONF ,\${<envar>kde_confdir</envar>}/tdm,;
$ddflt =~ s,KDMDATA ,\${<envar>kde_datadir</envar>}/kdm,; $ddflt =~ s,TDMDATA ,\${<envar>kde_datadir</envar>}/tdm,;
$ddflt =~ s,XBINDIR ,\${<envar>x_bindir</envar>},; $ddflt =~ s,XBINDIR ,\${<envar>x_bindir</envar>},;
$doc_ref .= "<para>The default is <quote>".$ddflt."</quote>.</para>\n"; $doc_ref .= "<para>The default is <quote>".$ddflt."</quote>.</para>\n";
} }
@ -654,8 +654,8 @@ while (<INFILE>) {
$sna = "section"; $sna = "section";
} }
$doc_ref .= $doc_ref .=
"\n<sect2 id=\"kdmrc-".$sref."\">\n". "\n<sect2 id=\"tdmrc-".$sref."\">\n".
"<title>The [".$stit."] ".$sna." of &kdmrc;</title>\n\n"; "<title>The [".$stit."] ".$sna." of &tdmrc;</title>\n\n";
if (/^Description:(( -)?)$/) { if (/^Description:(( -)?)$/) {
if ($1 ne " -") { if ($1 ne " -") {
my $desc = 0; my $desc = 0;

48
kdm/kfrontend/CMakeLists.txt
Unescape View File

@ -17,8 +17,8 @@ add_subdirectory( sessions )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kdm/backend ${CMAKE_SOURCE_DIR}/tdm/backend
${CMAKE_SOURCE_DIR}/kdmlib ${CMAKE_SOURCE_DIR}/tdmlib
${CMAKE_SOURCE_DIR}/kcontrol/background ${CMAKE_SOURCE_DIR}/kcontrol/background
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
@ -31,43 +31,43 @@ link_directories(
##### other data ################################ ##### other data ################################
if( NOT DEFINED GENKDMCONF_FLAGS ) if( NOT DEFINED GENTDMCONF_FLAGS )
set( GENKDMCONF_FLAGS "--no-old" ) set( GENTDMCONF_FLAGS "--no-old" )
endif( ) endif( )
install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" ) install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/tdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENTDMCONF_FLAGS} )" )
##### config.ci (generated) ##################### ##### config.ci (generated) #####################
add_custom_command( OUTPUT config.ci add_custom_command( OUTPUT config.ci
COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci
DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def )
##### kdm_config (executable) ################### ##### tdm_config (executable) ###################
set_property( SOURCE kdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) set_property( SOURCE tdm_config.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
tde_add_executable( kdm_config tde_add_executable( tdm_config
SOURCES kdm_config.c SOURCES tdm_config.c
LINK LINK
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
##### kdm_greet (executable) #################### ##### tdm_greet (executable) ####################
if( WITH_XRANDR ) if( WITH_XRANDR )
set( KDMGREET_OPTIONAL_LINK "krandr-shared" ) set( TDMGREET_OPTIONAL_LINK "krandr-shared" )
endif ( ) endif ( )
tde_add_executable( kdm_greet AUTOMOC tde_add_executable( tdm_greet AUTOMOC
SOURCES SOURCES
kdm_greet.c kdmconfig.cpp kdmclock.cpp kconsole.cpp tdm_greet.c tdmconfig.cpp tdmclock.cpp kconsole.cpp
kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp
kdmshutdown.cpp kdmadmindialog.cpp kgreeter.cpp tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp
kgapp.cpp sakdlg.cc kgapp.cpp sakdlg.cc
LINK kdmthemer-static tdeui-shared Xtst ${KDMGREET_OPTIONAL_LINK} LINK tdmthemer-static tdeui-shared Xtst ${TDMGREET_OPTIONAL_LINK}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
@ -81,21 +81,21 @@ tde_add_executable( krootimage AUTOMOC
) )
##### genkdmconf (executable) ################### ##### gentdmconf (executable) ###################
set_property( SOURCE genkdmconf.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) set_property( SOURCE gentdmconf.c APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
tde_add_executable( genkdmconf AUTOMOC tde_add_executable( gentdmconf AUTOMOC
SOURCES genkdmconf.c SOURCES gentdmconf.c
LINK X11 LINK X11
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )
##### kdmctl (executable) ####################### ##### tdmctl (executable) #######################
tde_add_executable( kdmctl tde_add_executable( tdmctl
SOURCES kdmctl.c SOURCES tdmctl.c
LINK LINK
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
) )

58
kdm/kfrontend/Makefile.am
Unescape View File

@ -1,31 +1,31 @@
# use 'make GENKDMCONF_FLAGS=... install' to override # use 'make GENTDMCONF_FLAGS=... install' to override
GENKDMCONF_FLAGS = --no-old GENTDMCONF_FLAGS = --no-old
SUBDIRS = themer themes pics sessions SUBDIRS = themer themes pics sessions
AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \ AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
-I$(top_srcdir)/kdmlib $(all_includes) -I$(top_srcdir)/tdmlib $(all_includes)
bin_PROGRAMS = kdm_config kdm_greet krootimage genkdmconf kdmctl bin_PROGRAMS = tdm_config tdm_greet krootimage gentdmconf tdmctl
kdm_config_SOURCES = kdm_config.c tdm_config_SOURCES = tdm_config.c
kdm_config_LDADD = $(LIBRESOLV) $(LIBSOCKET) $(LIBPOSIX4) tdm_config_LDADD = $(LIBRESOLV) $(LIBSOCKET) $(LIBPOSIX4)
kdm_greet_SOURCES = \ tdm_greet_SOURCES = \
kdm_greet.c \ tdm_greet.c \
kdmconfig.cpp \ tdmconfig.cpp \
kdmclock.cpp \ tdmclock.cpp \
kconsole.cpp \ kconsole.cpp \
kfdialog.cpp \ kfdialog.cpp \
kgdialog.cpp \ kgdialog.cpp \
kchooser.cpp \ kchooser.cpp \
kgverify.cpp \ kgverify.cpp \
kdmshutdown.cpp \ tdmshutdown.cpp \
kdmadmindialog.cpp \ tdmadmindialog.cpp \
kgreeter.cpp \ kgreeter.cpp \
kgapp.cpp kgapp.cpp
kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4) tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4)
krootimage_SOURCES = krootimage.cpp krootimage_SOURCES = krootimage.cpp
krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
@ -33,35 +33,35 @@ krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO)
METASOURCES = AUTO METASOURCES = AUTO
genkdmconf_SOURCES = genkdmconf.c gentdmconf_SOURCES = gentdmconf.c
genkdmconf_LDFLAGS = $(X_LDFLAGS) $(X_RPATH) gentdmconf_LDFLAGS = $(X_LDFLAGS) $(X_RPATH)
genkdmconf_LDADD = $(LIB_X11) gentdmconf_LDADD = $(LIB_X11)
kdmctl_SOURCES = kdmctl.c tdmctl_SOURCES = tdmctl.c
kdmctl_LDADD = $(LIBSOCKET) tdmctl_LDADD = $(LIBSOCKET)
install-data-local: genkdmconf install-data-local: gentdmconf
./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) ./gentdmconf --in $(DESTDIR)$(kde_confdir)/tdm --no-in-notice --face-src $(srcdir)/pics $(GENTDMCONF_FLAGS)
messages: messages:
$(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/tdmgreet.pot
noinst_HEADERS = \ noinst_HEADERS = \
kdm_greet.h \ tdm_greet.h \
kdmconfig.h \ tdmconfig.h \
kdmclock.h \ tdmclock.h \
kconsole.h \ kconsole.h \
kfdialog.h \ kfdialog.h \
kgdialog.h \ kgdialog.h \
kchooser.h \ kchooser.h \
kgverify.h \ kgverify.h \
kdmshutdown.h \ tdmshutdown.h \
kgreeter.h \ kgreeter.h \
kgapp.h \ kgapp.h \
\ \
krootimage.h krootimage.h
kdm_greet_COMPILE_FIRST = ../config.ci tdm_greet_COMPILE_FIRST = ../config.ci
kdm_config_COMPILE_FIRST = ../config.ci tdm_config_COMPILE_FIRST = ../config.ci
genkdmconf_COMPILE_FIRST = ../config.ci gentdmconf_COMPILE_FIRST = ../config.ci

160
kdm/kfrontend/genkdmconf.c
Unescape View File

@ -1,6 +1,6 @@
/* /*
Create a suitable configuration for kdm taking old xdm/kdm Create a suitable configuration for tdm taking old xdm/tdm
installations into account installations into account
Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org>
@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
static int old_scripts, no_old_scripts, old_confs, no_old, static int old_scripts, no_old_scripts, old_confs, no_old,
no_backup, no_in_notice, use_destdir, mixed_scripts; no_backup, no_in_notice, use_destdir, mixed_scripts;
static const char *newdir = KDMCONF, *facesrc = KDMDATA "/pics/users", static const char *newdir = TDMCONF, *facesrc = TDMDATA "/pics/users",
*oldxdm, *oldkde; *oldxdm, *oldkde;
static int oldver; static int oldver;
@ -350,7 +350,7 @@ locate( const char *exe )
/* /*
* target data to be written to kdmrc * target data to be written to tdmrc
*/ */
typedef struct Entry { typedef struct Entry {
@ -369,10 +369,10 @@ typedef struct Section {
Entry *ents; Entry *ents;
} Section; } Section;
static Section *config; /* the kdmrc data to be written */ static Section *config; /* the tdmrc data to be written */
/* /*
* Specification of the (currently possible) kdmrc entries * Specification of the (currently possible) tdmrc entries
*/ */
typedef struct Ent { typedef struct Ent {
@ -392,7 +392,7 @@ static Sect *findSect( const char *name );
static Ent *findEnt( Sect *sect, const char *key ); static Ent *findEnt( Sect *sect, const char *key );
/* /*
* Functions to manipulate the current kdmrc data * Functions to manipulate the current tdmrc data
*/ */
static const char * static const char *
@ -594,12 +594,12 @@ static const char def_startup[] =
" xmessage -file /etc/nologin -geometry 640x480\n" " xmessage -file /etc/nologin -geometry 640x480\n"
" fi\n" " fi\n"
" if [ \"$(id -u)\" != \"0\" ] && \\\n" " if [ \"$(id -u)\" != \"0\" ] && \\\n"
" ! grep -qs '^ignore-nologin' /etc/trinity/kdm/kdm.options; then\n" " ! grep -qs '^ignore-nologin' /etc/trinity/tdm/tdm.options; then\n"
" exit 1\n" " exit 1\n"
" fi\n" " fi\n"
"fi\n" "fi\n"
"\n" "\n"
"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n" "if grep -qs '^use-sessreg' /etc/trinity/tdm/tdm.options && \\\n"
" which sessreg > /dev/null 2>&1; then\n" " which sessreg > /dev/null 2>&1; then\n"
" exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n" " exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\n"
" -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" " -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
@ -620,7 +620,7 @@ static const char def_reset[] =
"#devname=`echo $DISPLAY | cut -c1-8`\n" "#devname=`echo $DISPLAY | cut -c1-8`\n"
"#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\"" "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\""
#else #else
"if grep -qs '^use-sessreg' /etc/trinity/kdm/kdm.options && \\\n" "if grep -qs '^use-sessreg' /etc/trinity/tdm/tdm.options && \\\n"
" which sessreg > /dev/null 2>&1; then\n" " which sessreg > /dev/null 2>&1; then\n"
" exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n" " exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
" -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" " -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
@ -765,7 +765,7 @@ resect( const char *sec, const char *name )
static int static int
inNewDir( const char *name ) inNewDir( const char *name )
{ {
return !memcmp( name, KDMCONF "/", sizeof(KDMCONF) ); return !memcmp( name, TDMCONF "/", sizeof(TDMCONF) );
} }
static int static int
@ -839,7 +839,7 @@ copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
return 1; return 1;
tptr = strrchr( tname, '/' ); tptr = strrchr( tname, '/' );
ASPrintf( &nname, KDMCONF "/%s", tptr ? tptr + 1 : tname ); ASPrintf( &nname, TDMCONF "/%s", tptr ? tptr + 1 : tname );
if (inList( cflist, ce->value ) || if (inList( cflist, ce->value ) ||
inList( eflist, ce->value ) || inList( eflist, ce->value ) ||
inList( lflist, ce->value )) inList( lflist, ce->value ))
@ -1322,7 +1322,7 @@ cp_keyfile( Entry *ce, Section *cs ATTR_UNUSED )
if (old_confs) if (old_confs)
linkfile( ce ); linkfile( ce );
else else
if (!copyfile( ce, "kdmkeys", 0600, 0 )) if (!copyfile( ce, "tdmkeys", 0600, 0 ))
ce->active = 0; ce->active = 0;
} }
@ -1351,7 +1351,7 @@ mk_willing( Entry *ce, Section *cs ATTR_UNUSED )
dlinkfile( fname ); dlinkfile( fname );
else { else {
dflt: dflt:
ce->value = KDMCONF "/Xwilling"; ce->value = TDMCONF "/Xwilling";
ce->active = ce->written = 1; ce->active = ce->written = 1;
writefile( ce->value, 0755, def_willing ); writefile( ce->value, 0755, def_willing );
} }
@ -1459,18 +1459,18 @@ edit_setup( File *file )
int chg = int chg =
delstr( file, "\n" delstr( file, "\n"
"(\n" "(\n"
" PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" " PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n"
" */kdmdesktop\t&\n" " */tdmdesktop\t&\n"
" echo $! >$PIDFILE\n" " echo $! >$PIDFILE\n"
" wait $!\n" " wait $!\n"
" rm $PIDFILE\n" " rm $PIDFILE\n"
")\t&\n" ) | ")\t&\n" ) |
delstr( file, "\n" delstr( file, "\n"
"*/kdmdesktop\t&\n" ) | "*/tdmdesktop\t&\n" ) |
delstr( file, "\n" delstr( file, "\n"
"kdmdesktop\t&\n" ) | "tdmdesktop\t&\n" ) |
delstr( file, "\n" delstr( file, "\n"
"kdmdesktop\n" ); "tdmdesktop\n" );
putval( "UseBackground", chg ? "true" : "false" ); putval( "UseBackground", chg ? "true" : "false" );
return chg; return chg;
} }
@ -1490,7 +1490,7 @@ mk_setup( Entry *ce, Section *cs )
else else
linkfile( ce ); linkfile( ce );
} else { } else {
ce->value = KDMCONF "/Xsetup"; ce->value = TDMCONF "/Xsetup";
ce->active = ce->written = 1; ce->active = ce->written = 1;
writefile( ce->value, 0755, def_setup ); writefile( ce->value, 0755, def_setup );
} }
@ -1504,12 +1504,12 @@ edit_startup( File *file )
if (mod_usebg && if (mod_usebg &&
(delstr( file, "\n" (delstr( file, "\n"
"PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" "PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n"
"if [[] -f $PIDFILE ] ; then\n" "if [[] -f $PIDFILE ] ; then\n"
" kill `cat $PIDFILE`\n" " kill `cat $PIDFILE`\n"
"fi\n" ) || "fi\n" ) ||
delstr( file, "\n" delstr( file, "\n"
"PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" "PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n"
"test -f $PIDFILE && kill `cat $PIDFILE`\n" ))) "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
chg1 = 1; chg1 = 1;
if (oldver < 0x0203) { if (oldver < 0x0203) {
@ -1571,7 +1571,7 @@ mk_startup( Entry *ce, Section *cs )
else else
linkfile( ce ); linkfile( ce );
} else { } else {
ce->value = KDMCONF "/Xstartup"; ce->value = TDMCONF "/Xstartup";
ce->active = ce->written = 1; ce->active = ce->written = 1;
writefile( ce->value, 0755, def_startup ); writefile( ce->value, 0755, def_startup );
} }
@ -1616,7 +1616,7 @@ mk_reset( Entry *ce, Section *cs ATTR_UNUSED )
else else
linkfile( ce ); linkfile( ce );
} else { } else {
ce->value = KDMCONF "/Xreset"; ce->value = TDMCONF "/Xreset";
ce->active = ce->written = 1; ce->active = ce->written = 1;
writefile( ce->value, 0755, def_reset ); writefile( ce->value, 0755, def_reset );
} }
@ -1639,7 +1639,7 @@ mk_session( Entry *ce, Section *cs ATTR_UNUSED )
"`tempfile`" : "`tempfile`" :
"$HOME/.xsession-env-$DISPLAY"; "$HOME/.xsession-env-$DISPLAY";
ASPrintf( &def_session, "%s%s%s", def_session1, tmpf, def_session2 ); ASPrintf( &def_session, "%s%s%s", def_session1, tmpf, def_session2 );
ce->value = KDMCONF "/Xsession"; ce->value = TDMCONF "/Xsession";
ce->active = ce->written = 1; ce->active = ce->written = 1;
writefile( ce->value, 0755, def_session ); writefile( ce->value, 0755, def_session );
} }
@ -1770,8 +1770,8 @@ upd_datadir( Entry *ce, Section *cs ATTR_UNUSED )
return; return;
dir = ce->active ? ce->value : def_DataDir; dir = ce->active ? ce->value : def_DataDir;
if (mkdirp( dir, 0755, "data", 0 ) && oldkde) { if (mkdirp( dir, 0755, "data", 0 ) && oldkde) {
ASPrintf( &oldsts, "%s/kdm/kdmsts", oldkde ); ASPrintf( &oldsts, "%s/tdm/tdmsts", oldkde );
ASPrintf( &newsts, "%s/kdmsts", dir ); ASPrintf( &newsts, "%s/tdmsts", dir );
rename( oldsts, newsts ); rename( oldsts, newsts );
} }
} }
@ -1808,7 +1808,7 @@ upd_facedir( Entry *ce, Section *cs ATTR_UNUSED )
setpwent(); setpwent();
while ((pw = getpwent())) while ((pw = getpwent()))
if (strcmp( pw->pw_name, "root" )) { if (strcmp( pw->pw_name, "root" )) {
ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/%s.png", ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/%s.png",
oldkde, pw->pw_name ); oldkde, pw->pw_name );
ASPrintf( &newpic, "%s/%s.face.icon", dir, pw->pw_name ); ASPrintf( &newpic, "%s/%s.face.icon", dir, pw->pw_name );
rename( oldpic, newpic ); rename( oldpic, newpic );
@ -1816,10 +1816,10 @@ upd_facedir( Entry *ce, Section *cs ATTR_UNUSED )
free( oldpic ); free( oldpic );
} }
endpwent(); endpwent();
ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/default.png", oldkde ); ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/default.png", oldkde );
if (!rename( oldpic, defpic )) if (!rename( oldpic, defpic ))
defpic = 0; defpic = 0;
ASPrintf( &oldpic, "%s/../apps/kdm/pics/users/root.png", oldkde ); ASPrintf( &oldpic, "%s/../apps/tdm/pics/users/root.png", oldkde );
if (!rename( oldpic, rootpic )) if (!rename( oldpic, rootpic ))
rootpic = 0; rootpic = 0;
} }
@ -2051,12 +2051,12 @@ mergeKdmRcOld( const char *path )
char *p; char *p;
struct stat st; struct stat st;
ASPrintf( &p, "%s/kdmrc", path ); ASPrintf( &p, "%s/tdmrc", path );
if (stat( p, &st )) { if (stat( p, &st )) {
free( p ); free( p );
return 0; return 0;
} }
printf( "Information: ignoring old kdmrc %s from kde < 2.2\n", p ); printf( "Information: ignoring old tdmrc %s from kde < 2.2\n", p );
free( p ); free( p );
return 1; return 1;
} }
@ -2083,18 +2083,18 @@ applydefs( FDefs *chgdef, int ndefs, const char *path )
} }
#ifdef XDMCP #ifdef XDMCP
static FDefs kdmdefs_all[] = { static FDefs tdmdefs_all[] = {
{ "Xdmcp", "Xaccess", "%s/kdm/Xaccess", 0 }, { "Xdmcp", "Xaccess", "%s/tdm/Xaccess", 0 },
{ "Xdmcp", "Willing", "", 0 }, { "Xdmcp", "Willing", "", 0 },
}; };
#endif #endif
static FDefs kdmdefs_eq_22[] = { static FDefs tdmdefs_eq_22[] = {
{ "General", "PidFile", "/var/run/xdm.pid", 0 }, { "General", "PidFile", "/var/run/xdm.pid", 0 },
{ "X-*-Core", "Setup", "%s/kdm/Xsetup", 0 }, { "X-*-Core", "Setup", "%s/tdm/Xsetup", 0 },
{ "X-*-Core", "Startup", "%s/kdm/Xstartup", 0 }, { "X-*-Core", "Startup", "%s/tdm/Xstartup", 0 },
{ "X-*-Core", "Reset", "%s/kdm/Xreset", 0 }, { "X-*-Core", "Reset", "%s/tdm/Xreset", 0 },
{ "X-*-Core", "Session", "%s/kdm/Xsession", 0 }, { "X-*-Core", "Session", "%s/tdm/Xsession", 0 },
}; };
#ifdef XDMCP #ifdef XDMCP
@ -2104,13 +2104,13 @@ if_xdmcp (void)
return isTrue( getfqval( "Xdmcp", "Enable", "true" ) ); return isTrue( getfqval( "Xdmcp", "Enable", "true" ) );
} }
static FDefs kdmdefs_le_30[] = { static FDefs tdmdefs_le_30[] = {
{ "Xdmcp", "KeyFile", "%s/kdm/kdmkeys", if_xdmcp }, { "Xdmcp", "KeyFile", "%s/tdm/tdmkeys", if_xdmcp },
}; };
#endif #endif
/* HACK: misused by is22conf() below */ /* HACK: misused by is22conf() below */
static FDefs kdmdefs_ge_30[] = { static FDefs tdmdefs_ge_30[] = {
{ "X-*-Core", "Setup", "", 0 }, { "X-*-Core", "Setup", "", 0 },
{ "X-*-Core", "Startup", "", 0 }, { "X-*-Core", "Startup", "", 0 },
{ "X-*-Core", "Reset", "", 0 }, { "X-*-Core", "Reset", "", 0 },
@ -2123,8 +2123,8 @@ if_usebg (void)
return isTrue( getfqval( "X-*-Greeter", "UseBackground", "true" ) ); return isTrue( getfqval( "X-*-Greeter", "UseBackground", "true" ) );
} }
static FDefs kdmdefs_ge_31[] = { static FDefs tdmdefs_ge_31[] = {
{ "X-*-Greeter","BackgroundCfg","%s/kdm/backgroundrc", if_usebg }, { "X-*-Greeter","BackgroundCfg","%s/tdm/backgroundrc", if_usebg },
}; };
static int static int
@ -2134,10 +2134,10 @@ is22conf( const char *path )
const char *val; const char *val;
int i, sl; int i, sl;
sl = ASPrintf( &p, "%s/kdm/", path ); sl = ASPrintf( &p, "%s/tdm/", path );
/* safe bet, i guess ... */ /* safe bet, i guess ... */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
val = getfqval( "X-*-Core", kdmdefs_ge_30[i].key, 0 ); val = getfqval( "X-*-Core", tdmdefs_ge_30[i].key, 0 );
if (val && !memcmp( val, p, sl )) { if (val && !memcmp( val, p, sl )) {
free( p ); free( p );
return 0; return 0;
@ -2184,12 +2184,12 @@ mergeKdmRcNewer( const char *path )
int i, j; int i, j;
static char sname[64]; static char sname[64];
ASPrintf( &p, "%s/kdm/kdmrc", path ); ASPrintf( &p, "%s/tdm/tdmrc", path );
if (!(rootsect = ReadConf( p ))) { if (!(rootsect = ReadConf( p ))) {
free( p ); free( p );
return 0; return 0;
} }
printf( "Information: reading current kdmrc %s (from kde >= 2.2.x)\n", p ); printf( "Information: reading current tdmrc %s (from kde >= 2.2.x)\n", p );
free( p ); free( p );
for (cs = rootsect; cs; cs = cs->next) { for (cs = rootsect; cs; cs = cs->next) {
@ -2241,29 +2241,29 @@ mergeKdmRcNewer( const char *path )
} }
#ifdef XDMCP #ifdef XDMCP
applydefs( kdmdefs_all, as(kdmdefs_all), path ); applydefs( tdmdefs_all, as(tdmdefs_all), path );
#endif #endif
if (!*(cp = getfqval( "General", "ConfigVersion", "" ))) { /* < 3.1 */ if (!*(cp = getfqval( "General", "ConfigVersion", "" ))) { /* < 3.1 */
mod_usebg = 1; mod_usebg = 1;
if (is22conf( path )) { if (is22conf( path )) {
/* work around 2.2.x defaults borkedness */ /* work around 2.2.x defaults borkedness */
applydefs( kdmdefs_eq_22, as(kdmdefs_eq_22), path ); applydefs( tdmdefs_eq_22, as(tdmdefs_eq_22), path );
printf( "Information: current kdmrc is from kde 2.2\n" ); printf( "Information: current tdmrc is from kde 2.2\n" );
} else { } else {
applydefs( kdmdefs_ge_30, as(kdmdefs_ge_30), path ); applydefs( tdmdefs_ge_30, as(tdmdefs_ge_30), path );
printf( "Information: current kdmrc is from kde 3.0\n" ); printf( "Information: current tdmrc is from kde 3.0\n" );
} }
#ifdef XDMCP #ifdef XDMCP
/* work around minor <= 3.0.x defaults borkedness */ /* work around minor <= 3.0.x defaults borkedness */
applydefs( kdmdefs_le_30, as(kdmdefs_le_30), path ); applydefs( tdmdefs_le_30, as(tdmdefs_le_30), path );
#endif #endif
} else { } else {
int ma, mi; int ma, mi;
sscanf( cp, "%d.%d", &ma, &mi ); sscanf( cp, "%d.%d", &ma, &mi );
oldver = (ma << 8) | mi; oldver = (ma << 8) | mi;
printf( "Information: current kdmrc is from kde >= 3.1 (config version %d.%d)\n", ma, mi ); printf( "Information: current tdmrc is from kde >= 3.1 (config version %d.%d)\n", ma, mi );
applydefs( kdmdefs_ge_30, as(kdmdefs_ge_30), path ); applydefs( tdmdefs_ge_30, as(tdmdefs_ge_30), path );
applydefs( kdmdefs_ge_31, as(kdmdefs_ge_31), path ); applydefs( tdmdefs_ge_31, as(tdmdefs_ge_31), path );
} }
return 1; return 1;
@ -2384,12 +2384,12 @@ P_requestPort( const char *sect, char **value )
} }
#endif #endif
static int kdmrcmode = 0644; static int tdmrcmode = 0644;
static void static void
P_autoPass( const char *sect ATTR_UNUSED, char **value ATTR_UNUSED ) P_autoPass( const char *sect ATTR_UNUSED, char **value ATTR_UNUSED )
{ {
kdmrcmode = 0600; tdmrcmode = 0600;
} }
CONF_GEN_XMERGE CONF_GEN_XMERGE
@ -2547,7 +2547,7 @@ static const char *oldxdms[] = {
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
const char **where; const char **where;
char *newkdmrc; char *newtdmrc;
FILE *f; FILE *f;
StrList *fp; StrList *fp;
Section *cs; Section *cs;
@ -2560,41 +2560,41 @@ int main( int argc, char **argv )
for (ap = 1; ap < argc; ap++) { for (ap = 1; ap < argc; ap++) {
if (!strcmp( argv[ap], "--help" )) { if (!strcmp( argv[ap], "--help" )) {
printf( printf(
"genkdmconf - generate configuration files for kdm\n" "gentdmconf - generate configuration files for tdm\n"
"\n" "\n"
"If an older xdm/kdm configuration is found, its config files are \"absorbed\";\n" "If an older xdm/tdm configuration is found, its config files are \"absorbed\";\n"
"if it lives in the new target directory, its scripts are reused (and possibly\n" "if it lives in the new target directory, its scripts are reused (and possibly\n"
"modified) as well, otherwise the scripts are ignored and default scripts are\n" "modified) as well, otherwise the scripts are ignored and default scripts are\n"
"installed.\n" "installed.\n"
"\n" "\n"
"options:\n" "options:\n"
" --in /path/to/new/kdm-config-dir\n" " --in /path/to/new/tdm-config-dir\n"
" In which directory to put the new configuration. You can use this\n" " In which directory to put the new configuration. You can use this\n"
" to support a $(DESTDIR), but not to change the final location of\n" " to support a $(DESTDIR), but not to change the final location of\n"
" the installation - the paths inside the files are not affected.\n" " the installation - the paths inside the files are not affected.\n"
" Default is " KDMCONF ".\n" " Default is " TDMCONF ".\n"
" --old-xdm /path/to/old/xdm-dir\n" " --old-xdm /path/to/old/xdm-dir\n"
" Where to look for the config files of an xdm/older kdm.\n" " Where to look for the config files of an xdm/older tdm.\n"
" Default is to scan /etc/X11/kdm, $XLIBDIR/kdm, /etc/X11/xdm,\n" " Default is to scan /etc/X11/tdm, $XLIBDIR/tdm, /etc/X11/xdm,\n"
" $XLIBDIR/xdm; there in turn look for kdm-config and xdm-config.\n" " $XLIBDIR/xdm; there in turn look for tdm-config and xdm-config.\n"
" Note that you possibly need to use --no-old-kde to make this take effect.\n" " Note that you possibly need to use --no-old-kde to make this take effect.\n"
" --old-kde /path/to/old/kde-config-dir\n" " --old-kde /path/to/old/kde-config-dir\n"
" Where to look for the kdmrc of an older kdm.\n" " Where to look for the tdmrc of an older tdm.\n"
" Default is to scan " KDE_CONFDIR " and\n" " Default is to scan " KDE_CONFDIR " and\n"
" {/usr,/usr/local,{/opt,/usr/local}/{trinity,kde,kde2,kde1}}/share/config.\n" " {/usr,/usr/local,{/opt,/usr/local}/{trinity,kde,kde2,kde1}}/share/config.\n"
" --no-old\n" " --no-old\n"
" Don't look at older xdm/kdm configurations, just create default config.\n" " Don't look at older xdm/tdm configurations, just create default config.\n"
" --no-old-xdm\n" " --no-old-xdm\n"
" Don't look at older xdm configurations.\n" " Don't look at older xdm configurations.\n"
" --no-old-kde\n" " --no-old-kde\n"
" Don't look at older kdm configurations.\n" " Don't look at older tdm configurations.\n"
" --old-scripts\n" " --old-scripts\n"
" Directly use all scripts from the older xdm/kdm configuration.\n" " Directly use all scripts from the older xdm/tdm configuration.\n"
" --no-old-scripts\n" " --no-old-scripts\n"
" Don't use scripts from the older xdm/kdm configuration even if it lives\n" " Don't use scripts from the older xdm/tdm configuration even if it lives\n"
" in the new target directory.\n" " in the new target directory.\n"
" --old-confs\n" " --old-confs\n"
" Directly use all ancillary config files from the older xdm/kdm\n" " Directly use all ancillary config files from the older xdm/tdm\n"
" configuration. This is usually a bad idea.\n" " configuration. This is usually a bad idea.\n"
" --no-backup\n" " --no-backup\n"
" Overwrite/delete old config files instead of backing them up.\n" " Overwrite/delete old config files instead of backing them up.\n"
@ -2654,7 +2654,7 @@ int main( int argc, char **argv )
} }
*where = argv[++ap]; *where = argv[++ap];
} }
if (memcmp( newdir, KDMCONF, sizeof(KDMCONF) )) if (memcmp( newdir, TDMCONF, sizeof(TDMCONF) ))
use_destdir = 1; use_destdir = 1;
if (!mkdirp( newdir, 0755, "target", 1 )) if (!mkdirp( newdir, 0755, "target", 1 ))
@ -2685,7 +2685,7 @@ int main( int argc, char **argv )
if (oldkde) { if (oldkde) {
if (!(newer = mergeKdmRcNewer( oldkde )) && !mergeKdmRcOld( oldkde )) if (!(newer = mergeKdmRcNewer( oldkde )) && !mergeKdmRcOld( oldkde ))
fprintf( stderr, fprintf( stderr,
"Cannot read old kdmrc at specified location\n" ); "Cannot read old tdmrc at specified location\n" );
} else if (!no_old_kde) { } else if (!no_old_kde) {
for (i = 0; i < as(oldkdes); i++) { for (i = 0; i < as(oldkdes); i++) {
if ((newer = mergeKdmRcNewer( oldkdes[i] )) || if ((newer = mergeKdmRcNewer( oldkdes[i] )) ||
@ -2701,7 +2701,7 @@ int main( int argc, char **argv )
if (oldxdm) { if (oldxdm) {
if (!mergeXdmCfg( oldxdm )) if (!mergeXdmCfg( oldxdm ))
fprintf( stderr, fprintf( stderr,
"Cannot read old kdm-config/xdm-config at specified location\n" ); "Cannot read old tdm-config/xdm-config at specified location\n" );
} else } else
for (i = 0; i < as(oldxdms); i++) for (i = 0; i < as(oldxdms); i++)
if (mergeXdmCfg( oldxdms[i] )) { if (mergeXdmCfg( oldxdms[i] )) {
@ -2791,8 +2791,8 @@ int main( int argc, char **argv )
for (ce = cs->ents; ce; ce = ce->next) for (ce = cs->ents; ce; ce = ce->next)
if (ce->spec->func && i == ce->spec->prio) if (ce->spec->func && i == ce->spec->prio)
ce->spec->func( ce, cs ); ce->spec->func( ce, cs );
ASPrintf( &newkdmrc, "%s/kdmrc", newdir ); ASPrintf( &newtdmrc, "%s/tdmrc", newdir );
f = Create( newkdmrc, kdmrcmode ); f = Create( newtdmrc, tdmrcmode );
wrconf( f ); wrconf( f );
fclose( f ); fclose( f );
@ -2800,12 +2800,12 @@ int main( int argc, char **argv )
f = Create( nname, 0644 ); f = Create( nname, 0644 );
fprintf( f, fprintf( f,
"This automatically generated configuration consists of the following files:\n" ); "This automatically generated configuration consists of the following files:\n" );
fprintf( f, "- " KDMCONF "/kdmrc\n" ); fprintf( f, "- " TDMCONF "/tdmrc\n" );
for (fp = aflist; fp; fp = fp->next) for (fp = aflist; fp; fp = fp->next)
fprintf( f, "- %s\n", fp->str ); fprintf( f, "- %s\n", fp->str );
if (use_destdir && !no_in_notice) if (use_destdir && !no_in_notice)
fwrapprintf( f, fwrapprintf( f,
"All files destined for " KDMCONF " were actually saved in %s; " "All files destined for " TDMCONF " were actually saved in %s; "
"this config won't be workable until moved in place.\n", newdir ); "this config won't be workable until moved in place.\n", newdir );
if (uflist || eflist || cflist || lflist) { if (uflist || eflist || cflist || lflist) {
fprintf( f, fprintf( f,
@ -2841,7 +2841,7 @@ int main( int argc, char **argv )
"Old files that would have been overwritten were renamed to <oldname>.bak.\n" ); "Old files that would have been overwritten were renamed to <oldname>.bak.\n" );
} }
fprintf( f, fprintf( f,
"\nTry 'genkdmconf --help' if you want to generate another configuration.\n" "\nTry 'gentdmconf --help' if you want to generate another configuration.\n"
"\nYou may delete this README.\n" ); "\nYou may delete this README.\n" );
fclose( f ); fclose( f );

8
kdm/kfrontend/kchooser.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
chooser widget for KDM chooser widget for TDM
Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org>
based on the chooser (C) 1999 by Harald Hoyer <Harald.Hoyer@RedHat.de> based on the chooser (C) 1999 by Harald Hoyer <Harald.Hoyer@RedHat.de>
@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kchooser.h" #include "kchooser.h"
#include "kconsole.h" #include "kconsole.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kdm_greet.h" #include "tdm_greet.h"
#include <klocale.h> #include <klocale.h>
@ -101,7 +101,7 @@ ChooserDlg::ChooserDlg()
// TQPushButton *helpButton = new TQPushButton( i18n("&Help"), this ); // TQPushButton *helpButton = new TQPushButton( i18n("&Help"), this );
// hbox->addWidget( helpButton ); // hbox->addWidget( helpButton );
#ifdef WITH_KDM_XCONSOLE #ifdef WITH_TDM_XCONSOLE
if (consoleView) if (consoleView)
vbox->addWidget( consoleView ); vbox->addWidget( consoleView );
#endif #endif

2
kdm/kfrontend/kchooser.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
chooser widget for KDM chooser widget for TDM
Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org>
based on the chooser (C) 1999 by Harald Hoyer <Harald.Hoyer@RedHat.de> based on the chooser (C) 1999 by Harald Hoyer <Harald.Hoyer@RedHat.de>

8
kdm/kfrontend/kconsole.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
xconsole widget for KDM xconsole widget for TDM
Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org>
@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <config.h> #include <config.h>
#ifdef WITH_KDM_XCONSOLE #ifdef WITH_TDM_XCONSOLE
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -53,8 +53,8 @@ extern "C" {
#include "kconsole.h" #include "kconsole.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kdm_greet.h" #include "tdm_greet.h"
#include <klocale.h> #include <klocale.h>
#include <kpty.h> #include <kpty.h>

2
kdm/kfrontend/kconsole.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
xconsole widget for KDM xconsole widget for TDM
Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org>

44
kdm/kfrontend/kdm_config.c
Unescape View File

@ -1,6 +1,6 @@
/* /*
Read options from kdmrc Read options from tdmrc
Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2001-2005 Oswald Buddenhagen <ossi@kde.org>
@ -117,7 +117,7 @@ static void *Malloc( size_t size );
static void *Realloc( void *ptr, size_t size ); static void *Realloc( void *ptr, size_t size );
#define PRINT_QUOTES #define PRINT_QUOTES
#define LOG_NAME "kdm_config" #define LOG_NAME "tdm_config"
#define LOG_DEBUG_MASK DEBUG_CONFIG #define LOG_DEBUG_MASK DEBUG_CONFIG
#define LOG_PANIC_EXIT 1 #define LOG_PANIC_EXIT 1
#define STATIC static #define STATIC static
@ -381,8 +381,8 @@ PautoLoginX( Value *retval )
CONF_READ_ENTRIES CONF_READ_ENTRIES
static const char *kdmrc = KDMCONF "/kdmrc"; static const char *tdmrc = TDMCONF "/tdmrc";
static const char *kdmrc_dist = KDMCONF "/kdmdistrc"; static const char *tdmrc_dist = TDMCONF "/tdmdistrc";
static Section *rootsec; static Section *rootsec;
@ -403,14 +403,14 @@ ReadConf()
return; return;
confread = 1; confread = 1;
Debug( "reading config %s ...\n", kdmrc_dist ); Debug( "reading config %s ...\n", tdmrc_dist );
if (!readFile( &file, kdmrc_dist, "master configuration" )) { if (!readFile( &file, tdmrc_dist, "master configuration" )) {
Debug( "reading config %s ...\n", kdmrc ); Debug( "reading config %s ...\n", tdmrc );
if (!readFile( &file, kdmrc, "master configuration" )) if (!readFile( &file, tdmrc, "master configuration" ))
return; return;
} }
else { else {
kdmrc = kdmrc_dist; tdmrc = tdmrc_dist;
} }
for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) { for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) {
@ -436,7 +436,7 @@ ReadConf()
e--; e--;
if (*e != ']') { if (*e != ']') {
cursec = 0; cursec = 0;
LogError( "Invalid section header at %s:%d\n", kdmrc, line ); LogError( "Invalid section header at %s:%d\n", tdmrc, line );
continue; continue;
} }
nstr = sl + 1; nstr = sl + 1;
@ -446,7 +446,7 @@ ReadConf()
!memcmp( nstr, cursec->name, nlen )) !memcmp( nstr, cursec->name, nlen ))
{ {
LogInfo( "Multiple occurrences of section [%.*s] in %s. " LogInfo( "Multiple occurrences of section [%.*s] in %s. "
"Consider merging them.\n", nlen, nstr, kdmrc ); "Consider merging them.\n", nlen, nstr, tdmrc );
goto secfnd; goto secfnd;
} }
if (nstr[0] == 'X' && nstr[1] == '-') { if (nstr[0] == 'X' && nstr[1] == '-') {
@ -502,7 +502,7 @@ ReadConf()
illsec: illsec:
cursec = 0; cursec = 0;
LogError( "Unrecognized section name [%.*s] at %s:%d\n", LogError( "Unrecognized section name [%.*s] at %s:%d\n",
nlen, nstr, kdmrc, line ); nlen, nstr, tdmrc, line );
continue; continue;
newsec: newsec:
if (!(cursec = Malloc( sizeof(*cursec) ))) if (!(cursec = Malloc( sizeof(*cursec) )))
@ -530,7 +530,7 @@ ReadConf()
if (!cursec) { if (!cursec) {
if (sectmoan) { if (sectmoan) {
sectmoan = 0; sectmoan = 0;
LogError( "Entry outside any section at %s:%d", kdmrc, line ); LogError( "Entry outside any section at %s:%d", tdmrc, line );
} }
goto sktoeol; goto sktoeol;
} }
@ -538,13 +538,13 @@ ReadConf()
for (; (s < file.eof) && (*s != '\n'); s++) for (; (s < file.eof) && (*s != '\n'); s++)
if (*s == '=') if (*s == '=')
goto haveeq; goto haveeq;
LogError( "Invalid entry (missing '=') at %s:%d\n", kdmrc, line ); LogError( "Invalid entry (missing '=') at %s:%d\n", tdmrc, line );
continue; continue;
haveeq: haveeq:
for (ek = s - 1; ; ek--) { for (ek = s - 1; ; ek--) {
if (ek < sl) { if (ek < sl) {
LogError( "Invalid entry (empty key) at %s:%d\n", kdmrc, line ); LogError( "Invalid entry (empty key) at %s:%d\n", tdmrc, line );
goto sktoeol; goto sktoeol;
} }
if (!isspace( *ek )) if (!isspace( *ek ))
@ -558,7 +558,7 @@ ReadConf()
if (*s == '\\') { if (*s == '\\') {
s++; s++;
if (s >= file.eof || *s == '\n') { if (s >= file.eof || *s == '\n') {
LogError( "Trailing backslash at %s:%d\n", kdmrc, line ); LogError( "Trailing backslash at %s:%d\n", tdmrc, line );
break; break;
} }
switch (*s) { switch (*s) {
@ -587,14 +587,14 @@ ReadConf()
goto keyok; goto keyok;
} }
LogError( "Unrecognized key '%.*s' in section [%.*s] at %s:%d\n", LogError( "Unrecognized key '%.*s' in section [%.*s] at %s:%d\n",
nlen, nstr, cursec->nlen, cursec->name, kdmrc, line ); nlen, nstr, cursec->nlen, cursec->name, tdmrc, line );
continue; continue;
keyok: keyok:
for (curent = cursec->entries; curent; curent = curent->next) for (curent = cursec->entries; curent; curent = curent->next)
if (ce == curent->ent) { if (ce == curent->ent) {
LogError( "Multiple occurrences of key '%s' in section [%.*s]" LogError( "Multiple occurrences of key '%s' in section [%.*s]"
" of %s\n", " of %s\n",
ce->name, cursec->nlen, cursec->name, kdmrc ); ce->name, cursec->nlen, cursec->name, tdmrc );
goto keyfnd; goto keyfnd;
} }
if (!(curent = Malloc( sizeof(*curent) ))) if (!(curent = Malloc( sizeof(*curent) )))
@ -796,7 +796,7 @@ GetValue( Ent *et, DSpec *dspec, Value *retval, char **eopts )
if (!(errs = CvtValue( et, retval, ent->vallen, ent->val, eopts ))) if (!(errs = CvtValue( et, retval, ent->vallen, ent->val, eopts )))
return; return;
LogError( "Invalid %s value '%.*s' at %s:%d\n", LogError( "Invalid %s value '%.*s' at %s:%d\n",
errs, ent->vallen, ent->val, kdmrc, ent->line ); errs, ent->vallen, ent->val, tdmrc, ent->line );
} }
Debug( "default: %s = %'s\n", et->name, et->def ); Debug( "default: %s = %'s\n", et->name, et->def );
if ((errs = CvtValue( et, retval, strlen( et->def ), et->def, eopts ))) if ((errs = CvtValue( et, retval, strlen( et->def ), et->def, eopts )))
@ -1368,7 +1368,7 @@ int main( int argc ATTR_UNUSED, char **argv )
int what; int what;
if (!(ci = getenv( "CONINFO" ))) { if (!(ci = getenv( "CONINFO" ))) {
fprintf( stderr, "This program is part of kdm and should not be run manually.\n" ); fprintf( stderr, "This program is part of tdm and should not be run manually.\n" );
return 1; return 1;
} }
if (sscanf( ci, "%d %d", &rfd, &wfd ) != 2) if (sscanf( ci, "%d %d", &rfd, &wfd ) != 2)
@ -1381,7 +1381,7 @@ int main( int argc ATTR_UNUSED, char **argv )
/* Debug ("parsing command line\n");*/ /* Debug ("parsing command line\n");*/
if (**++argv) if (**++argv)
kdmrc_dist = kdmrc = *argv; tdmrc_dist = tdmrc = *argv;
/* /*
while (*++argv) { while (*++argv) {
} }
@ -1402,7 +1402,7 @@ int main( int argc ATTR_UNUSED, char **argv )
#else #else
GSendInt( 1 ); GSendInt( 1 );
#endif #endif
GSendStr( kdmrc ); GSendStr( tdmrc );
GSendInt( -1 ); GSendInt( -1 );
#ifdef XDMCP #ifdef XDMCP
GSendNStr( VXaccess.ptr, VXaccess.len - 1 ); GSendNStr( VXaccess.ptr, VXaccess.len - 1 );

8
kdm/kfrontend/kdm_greet.c
Unescape View File

@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <config.h> #include <config.h>
#include "kdm_greet.h" #include "tdm_greet.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -71,7 +71,7 @@ Realloc( void *ptr, size_t size )
#define PRINT_QUOTES #define PRINT_QUOTES
#define PRINT_ARRAYS #define PRINT_ARRAYS
#define LOG_NAME "kdm_greet" #define LOG_NAME "tdm_greet"
#define LOG_DEBUG_MASK DEBUG_GREET #define LOG_DEBUG_MASK DEBUG_GREET
#define LOG_PANIC_EXIT 1 #define LOG_PANIC_EXIT 1
#define STATIC #define STATIC
@ -742,7 +742,7 @@ main( int argc ATTR_UNUSED, char **argv )
char qtrc[40]; char qtrc[40];
if (!(ci = getenv( "CONINFO" ))) { if (!(ci = getenv( "CONINFO" ))) {
fprintf( stderr, "This program is part of kdm and should not be run manually.\n" ); fprintf( stderr, "This program is part of tdm and should not be run manually.\n" );
return 1; return 1;
} }
if (sscanf( ci, "%d %d %d %d", &srfd, &swfd, &mrfd, &mwfd ) != 4) if (sscanf( ci, "%d %d %d %d", &srfd, &swfd, &mrfd, &mwfd ) != 4)

6
kdm/kfrontend/kdm_greet.h
Unescape View File

@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef _KDM_GREET_H_ #ifndef _TDM_GREET_H_
#define _KDM_GREET_H_ #define _TDM_GREET_H_
#include <greet.h> /* for the ATTR_ defines */ #include <greet.h> /* for the ATTR_ defines */
#include <config.ci> /* for the HAVE_VTS define */ #include <config.ci> /* for the HAVE_VTS define */
@ -88,4 +88,4 @@ extern char *dname; /* d->name */
} }
#endif #endif
#endif /* _KDM_GREET_H_ */ #endif /* _TDM_GREET_H_ */

34
kdm/kfrontend/kdmadmindialog.cpp
Unescape View File

@ -22,10 +22,10 @@
*/ */
#include "kdmadmindialog.h" #include "tdmadmindialog.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kgdialog.h" #include "kgdialog.h"
#include "kdm_greet.h" #include "tdm_greet.h"
#include <stdlib.h> #include <stdlib.h>
#include <kapplication.h> #include <kapplication.h>
@ -41,10 +41,10 @@
#include <tqaccel.h> #include <tqaccel.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
int KDMAdmin::curPlugin = -1; int TDMAdmin::curPlugin = -1;
PluginList KDMAdmin::pluginList; PluginList TDMAdmin::pluginList;
KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent ) TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent )
: inherited( _parent ) : inherited( _parent )
, verify( 0 ), curUser(user) , verify( 0 ), curUser(user)
{ {
@ -93,14 +93,14 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent )
slotWhenChanged(); slotWhenChanged();
} }
KDMAdmin::~KDMAdmin() TDMAdmin::~TDMAdmin()
{ {
hide(); hide();
delete verify; delete verify;
} }
void void
KDMAdmin::slotActivatePlugMenu() TDMAdmin::slotActivatePlugMenu()
{ {
TQPopupMenu *cmnu = verify->getPlugMenu(); TQPopupMenu *cmnu = verify->getPlugMenu();
TQSize sh( cmnu->sizeHint() / 2 ); TQSize sh( cmnu->sizeHint() / 2 );
@ -108,13 +108,13 @@ KDMAdmin::slotActivatePlugMenu()
} }
void void
KDMAdmin::accept() TDMAdmin::accept()
{ {
verify->accept(); verify->accept();
} }
void void
KDMAdmin::slotWhenChanged() TDMAdmin::slotWhenChanged()
{ {
verify->abort(); verify->abort();
verify->setEnabled( 1 ); verify->setEnabled( 1 );
@ -122,7 +122,7 @@ KDMAdmin::slotWhenChanged()
} }
void void
KDMAdmin::bye_bye() TDMAdmin::bye_bye()
{ {
GSendInt( G_GetDmrc ); GSendInt( G_GetDmrc );
GSendStr( "Session" ); GSendStr( "Session" );
@ -141,36 +141,36 @@ KDMAdmin::bye_bye()
} }
void void
KDMAdmin::verifyPluginChanged( int id ) TDMAdmin::verifyPluginChanged( int id )
{ {
curPlugin = id; curPlugin = id;
adjustSize(); adjustSize();
} }
void void
KDMAdmin::verifyOk() TDMAdmin::verifyOk()
{ {
bye_bye(); bye_bye();
} }
void void
KDMAdmin::verifyFailed() TDMAdmin::verifyFailed()
{ {
okButton->setEnabled( false ); okButton->setEnabled( false );
cancelButton->setEnabled( false ); cancelButton->setEnabled( false );
} }
void void
KDMAdmin::verifyRetry() TDMAdmin::verifyRetry()
{ {
okButton->setEnabled( true ); okButton->setEnabled( true );
cancelButton->setEnabled( true ); cancelButton->setEnabled( true );
} }
void void
KDMAdmin::verifySetUser( const TQString & ) TDMAdmin::verifySetUser( const TQString & )
{ {
} }
#include "kdmadmindialog.moc" #include "tdmadmindialog.moc"

10
kdm/kfrontend/kdmadmindialog.h
Unescape View File

@ -23,8 +23,8 @@
*/ */
#ifndef KDMADMIN_H #ifndef TDMADMIN_H
#define KDMADMIN_H #define TDMADMIN_H
#include "kgverify.h" #include "kgverify.h"
@ -36,13 +36,13 @@ class KPushButton;
class TQButtonGroup; class TQButtonGroup;
class TQComboBox; class TQComboBox;
class KDMAdmin : public FDialog, public KGVerifyHandler { class TDMAdmin : public FDialog, public KGVerifyHandler {
Q_OBJECT Q_OBJECT
typedef FDialog inherited; typedef FDialog inherited;
public: public:
KDMAdmin( const TQString &user, TQWidget *_parent = 0 ); TDMAdmin( const TQString &user, TQWidget *_parent = 0 );
~KDMAdmin(); ~TDMAdmin();
public slots: public slots:
void accept(); void accept();

6
kdm/kfrontend/kdmclock.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
clock module for kdm clock module for tdm
Copyright (C) 2000 Espen Sand, espen@kde.org Copyright (C) 2000 Espen Sand, espen@kde.org
Based on work by NN(yet to be determined) Based on work by NN(yet to be determined)
@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kdmclock.h" #include "tdmclock.h"
//#include <kapplication.h> //#include <kapplication.h>
//#include <kconfig.h> //#include <kconfig.h>
@ -173,4 +173,4 @@ void KdmClock::paintEvent( TQPaintEvent * )
bitBlt( this, contentsRect().topLeft(), &pm ); bitBlt( this, contentsRect().topLeft(), &pm );
} }
#include "kdmclock.moc" #include "tdmclock.moc"

6
kdm/kfrontend/kdmclock.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
clock module for kdm clock module for tdm
Copyright (C) 2000 Espen Sand, espen@kde.org Copyright (C) 2000 Espen Sand, espen@kde.org
Based on work by NN (yet to be determined) Based on work by NN (yet to be determined)
@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef _KDM_CLOCK_H_ #ifndef _TDM_CLOCK_H_
#define _KDM_CLOCK_H_ #define _TDM_CLOCK_H_
#include <tqframe.h> #include <tqframe.h>

10
kdm/kfrontend/kdmconfig.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
Config for kdm Config for tdm
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>
@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kdm_greet.h" #include "tdm_greet.h"
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
@ -110,7 +110,7 @@ void init_config( void )
_hasConsole = _hasConsole && _isLocal && GetCfgInt( C_hasConsole ); _hasConsole = _hasConsole && _isLocal && GetCfgInt( C_hasConsole );
_authorized = GetCfgInt( C_isAuthorized ); _authorized = GetCfgInt( C_isAuthorized );
_stsFile = _dataDir + "/kdmsts"; _stsFile = _dataDir + "/tdmsts";
// Greet String // Greet String
char hostname[256], *ptr; char hostname[256], *ptr;
@ -138,7 +138,7 @@ void init_config( void )
case 's': ptr = tuname.sysname; break; case 's': ptr = tuname.sysname; break;
case 'r': ptr = tuname.release; break; case 'r': ptr = tuname.release; break;
case 'm': ptr = tuname.machine; break; case 'm': ptr = tuname.machine; break;
default: _greetString += i18n("[fix kdmrc!]"); continue; default: _greetString += i18n("[fix tdmrc!]"); continue;
} }
_greetString += TQString::fromLocal8Bit( ptr ); _greetString += TQString::fromLocal8Bit( ptr );
} else } else

8
kdm/kfrontend/kdmconfig.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
Configuration for kdm Configuration for tdm
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>
@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef KDMCONFIG_H #ifndef TDMCONFIG_H
#define KDMCONFIG_H #define TDMCONFIG_H
#include <config.h> #include <config.h>
@ -66,4 +66,4 @@ void init_config( void );
CONF_GREET_C_DECLS CONF_GREET_C_DECLS
#endif /* KDMCONFIG_H */ #endif /* TDMCONFIG_H */

14
kdm/kfrontend/kdmctl.c
Unescape View File

@ -1,6 +1,6 @@
/* /*
KDM remote control application TDM remote control application
Copyright (C) 2004 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2004 Oswald Buddenhagen <ossi@kde.org>
@ -59,7 +59,7 @@ readcfg( const char *cfg )
if (!(fp = fopen( cfg, "r" ))) { if (!(fp = fopen( cfg, "r" ))) {
fprintf( stderr, fprintf( stderr,
"Cannot open kdm config file '%s'.\n", "Cannot open tdm config file '%s'.\n",
cfg ); cfg );
return 0; return 0;
} }
@ -148,7 +148,7 @@ main( int argc, char **argv )
{ {
char *dpy = getenv( "DISPLAY" ); char *dpy = getenv( "DISPLAY" );
const char *ctl = getenv( "DM_CONTROL" ); const char *ctl = getenv( "DM_CONTROL" );
const char *cfg = KDE_CONFDIR "/kdm/kdmrc"; const char *cfg = KDE_CONFDIR "/tdm/tdmrc";
char *ptr; char *ptr;
int fd; int fd;
@ -162,19 +162,19 @@ main( int argc, char **argv )
ptr++; ptr++;
if (!strcmp( ptr, "h" ) || !strcmp( ptr, "help" )) { if (!strcmp( ptr, "h" ) || !strcmp( ptr, "help" )) {
puts( puts(
"Usage: kdmctl [options] [command [command arguments]]\n" "Usage: tdmctl [options] [command [command arguments]]\n"
"\n" "\n"
"Options are:\n" "Options are:\n"
" -h -help This help message.\n" " -h -help This help message.\n"
" -g -global Use global control socket even if $DISPLAY is set\n" " -g -global Use global control socket even if $DISPLAY is set\n"
" -d -display Override $DISPLAY\n" " -d -display Override $DISPLAY\n"
" -s -sockets Override $DM_CONTROL\n" " -s -sockets Override $DM_CONTROL\n"
" -c -config Use alternative kdm config file\n" " -c -config Use alternative tdm config file\n"
"\n" "\n"
"The directory in which the sockets are located is determined this way:\n" "The directory in which the sockets are located is determined this way:\n"
"- the -s option is examined\n" "- the -s option is examined\n"
"- the $DM_CONTROL variable is examined\n" "- the $DM_CONTROL variable is examined\n"
"- the kdm config file is searched for the FifoDir key\n" "- the tdm config file is searched for the FifoDir key\n"
"- /var/run/xdmctl and /var/run are tried\n" "- /var/run/xdmctl and /var/run are tried\n"
"\n" "\n"
"If $DISPLAY is set (or -d was specified) and -g was not specified, the\n" "If $DISPLAY is set (or -d was specified) and -g was not specified, the\n"
@ -184,7 +184,7 @@ main( int argc, char **argv )
"Command arguments can be specified as separate command line parameters,\n" "Command arguments can be specified as separate command line parameters,\n"
"in which case they are simply concatenated with tabs in between.\n" "in which case they are simply concatenated with tabs in between.\n"
"\n" "\n"
"If the command is '-', kdmctl reads commands from stdin.\n" "If the command is '-', tdmctl reads commands from stdin.\n"
"The default command is 'caps'.\n" "The default command is 'caps'.\n"
); );
return 0; return 0;

108
kdm/kfrontend/kdmshutdown.cpp
Unescape View File

@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kdmshutdown.h" #include "tdmshutdown.h"
#include "kdm_greet.h" #include "tdm_greet.h"
#include <kapplication.h> #include <kapplication.h>
#include <kseparator.h> #include <kseparator.h>
@ -59,10 +59,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
extern bool has_twin; extern bool has_twin;
int KDMShutdownBase::curPlugin = -1; int TDMShutdownBase::curPlugin = -1;
PluginList KDMShutdownBase::pluginList; PluginList TDMShutdownBase::pluginList;
KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent ) TDMShutdownBase::TDMShutdownBase( int _uid, TQWidget *_parent )
: inherited( _parent ) : inherited( _parent )
, box( new TQVBoxLayout( this, KDmh, KDsh ) ) , box( new TQVBoxLayout( this, KDmh, KDsh ) )
#ifdef HAVE_VTS #ifdef HAVE_VTS
@ -79,14 +79,14 @@ KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent )
{ {
} }
KDMShutdownBase::~KDMShutdownBase() TDMShutdownBase::~TDMShutdownBase()
{ {
hide(); hide();
delete verify; delete verify;
} }
void void
KDMShutdownBase::complete( TQWidget *prevWidget ) TDMShutdownBase::complete( TQWidget *prevWidget )
{ {
TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
@ -143,7 +143,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
} }
void void
KDMShutdownBase::slotActivatePlugMenu() TDMShutdownBase::slotActivatePlugMenu()
{ {
if (needRoot) { if (needRoot) {
TQPopupMenu *cmnu = verify->getPlugMenu(); TQPopupMenu *cmnu = verify->getPlugMenu();
@ -155,7 +155,7 @@ KDMShutdownBase::slotActivatePlugMenu()
} }
void void
KDMShutdownBase::accept() TDMShutdownBase::accept()
{ {
if (needRoot == 1) if (needRoot == 1)
verify->accept(); verify->accept();
@ -164,13 +164,13 @@ KDMShutdownBase::accept()
} }
void void
KDMShutdownBase::slotSched() TDMShutdownBase::slotSched()
{ {
done( Schedule ); done( Schedule );
} }
void void
KDMShutdownBase::updateNeedRoot() TDMShutdownBase::updateNeedRoot()
{ {
int nNeedRoot = uid && int nNeedRoot = uid &&
(((willShut && _allowShutdown == SHUT_ROOT) || (((willShut && _allowShutdown == SHUT_ROOT) ||
@ -187,40 +187,40 @@ KDMShutdownBase::updateNeedRoot()
} }
void void
KDMShutdownBase::accepted() TDMShutdownBase::accepted()
{ {
inherited::done( needRoot ? (int)Authed : (int)Accepted ); inherited::done( needRoot ? (int)Authed : (int)Accepted );
} }
void void
KDMShutdownBase::verifyPluginChanged( int id ) TDMShutdownBase::verifyPluginChanged( int id )
{ {
curPlugin = id; curPlugin = id;
adjustSize(); adjustSize();
} }
void void
KDMShutdownBase::verifyOk() TDMShutdownBase::verifyOk()
{ {
accepted(); accepted();
} }
void void
KDMShutdownBase::verifyFailed() TDMShutdownBase::verifyFailed()
{ {
okButton->setEnabled( false ); okButton->setEnabled( false );
cancelButton->setEnabled( false ); cancelButton->setEnabled( false );
} }
void void
KDMShutdownBase::verifyRetry() TDMShutdownBase::verifyRetry()
{ {
okButton->setEnabled( true ); okButton->setEnabled( true );
cancelButton->setEnabled( true ); cancelButton->setEnabled( true );
} }
void void
KDMShutdownBase::verifySetUser( const TQString & ) TDMShutdownBase::verifySetUser( const TQString & )
{ {
} }
@ -241,7 +241,7 @@ doShutdown( int type, const char *os )
KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
: inherited( _uid, _parent ) : inherited( _uid, _parent )
{ {
setCaption(i18n("Shutdown TDE")); setCaption(i18n("Shutdown TDE"));
@ -254,11 +254,11 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
hlay->addWidget( howGroup, 0, AlignTop ); hlay->addWidget( howGroup, 0, AlignTop );
TQRadioButton *rb; TQRadioButton *rb;
rb = new KDMRadioButton( i18n("&Turn off computer"), howGroup ); rb = new TDMRadioButton( i18n("&Turn off computer"), howGroup );
rb->setChecked( true ); rb->setChecked( true );
rb->setFocus(); rb->setFocus();
restart_rb = new KDMRadioButton( i18n("&Restart computer"), howGroup ); restart_rb = new TDMRadioButton( i18n("&Restart computer"), howGroup );
connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) );
@ -337,7 +337,7 @@ get_date( const char *str )
} }
void void
KDMShutdown::accept() TDMShutdown::accept()
{ {
if (le_start->text() == "0" || le_start->text() == "now") if (le_start->text() == "0" || le_start->text() == "now")
sch_st = time( 0 ); sch_st = time( 0 );
@ -362,20 +362,20 @@ KDMShutdown::accept()
} }
void void
KDMShutdown::slotTargetChanged() TDMShutdown::slotTargetChanged()
{ {
restart_rb->setChecked( true ); restart_rb->setChecked( true );
} }
void void
KDMShutdown::slotWhenChanged() TDMShutdown::slotWhenChanged()
{ {
doesNuke = cb_force->isChecked(); doesNuke = cb_force->isChecked();
updateNeedRoot(); updateNeedRoot();
} }
void void
KDMShutdown::accepted() TDMShutdown::accepted()
{ {
GSet( 1 ); GSet( 1 );
GSendInt( G_Shutdown ); GSendInt( G_Shutdown );
@ -392,7 +392,7 @@ KDMShutdown::accepted()
} }
void void
KDMShutdown::scheduleShutdown( TQWidget *_parent ) TDMShutdown::scheduleShutdown( TQWidget *_parent )
{ {
GSet( 1 ); GSet( 1 );
GSendInt( G_QueryShutdown ); GSendInt( G_QueryShutdown );
@ -405,7 +405,7 @@ KDMShutdown::scheduleShutdown( TQWidget *_parent )
GSet( 0 ); GSet( 0 );
if (how) { if (how) {
int ret = int ret =
KDMCancelShutdown( how, start, timeout, force, uid, os, TDMCancelShutdown( how, start, timeout, force, uid, os,
_parent ).exec(); _parent ).exec();
if (!ret) if (!ret)
return; return;
@ -415,23 +415,23 @@ KDMShutdown::scheduleShutdown( TQWidget *_parent )
uid = -1; uid = -1;
if (os) if (os)
free( os ); free( os );
KDMShutdown( uid, _parent ).exec(); TDMShutdown( uid, _parent ).exec();
} }
KDMRadioButton::KDMRadioButton( const TQString &label, TQWidget *parent ) TDMRadioButton::TDMRadioButton( const TQString &label, TQWidget *parent )
: inherited( label, parent ) : inherited( label, parent )
{ {
} }
void void
KDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * ) TDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * )
{ {
emit doubleClicked(); emit doubleClicked();
} }
KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item, TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item,
TQWidget *parent, TQWidget *parent,
const char *name ) const char *name )
: inherited( item, parent, name ) : inherited( item, parent, name )
@ -442,31 +442,31 @@ KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item,
connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
} }
void KDMDelayedPushButton::setPopup( TQPopupMenu *p ) void TDMDelayedPushButton::setPopup( TQPopupMenu *p )
{ {
pop = p; pop = p;
setIsMenuButton( p != 0 ); setIsMenuButton( p != 0 );
} }
void KDMDelayedPushButton::slotPressed() void TDMDelayedPushButton::slotPressed()
{ {
if (pop) if (pop)
popt.start( TQApplication::startDragTime() ); popt.start( TQApplication::startDragTime() );
} }
void KDMDelayedPushButton::slotReleased() void TDMDelayedPushButton::slotReleased()
{ {
popt.stop(); popt.stop();
} }
void KDMDelayedPushButton::slotTimeout() void TDMDelayedPushButton::slotTimeout()
{ {
popt.stop(); popt.stop();
pop->popup( mapToGlobal( rect().bottomLeft() ) ); pop->popup( mapToGlobal( rect().bottomLeft() ) );
setDown( false ); setDown( false );
} }
KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
: inherited( _parent ) : inherited( _parent )
, targetList( 0 ) , targetList( 0 )
{ {
@ -540,7 +540,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
hbuttonbox2->setAlignment( Qt::AlignRight ); hbuttonbox2->setAlignment( Qt::AlignRight );
// Back to kdm // Back to tdm
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
hbuttonbox2->addWidget( btnBack ); hbuttonbox2->addWidget( btnBack );
connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
@ -556,7 +556,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
// we need to set the minimum size for the logout box, since it // we need to set the minimum size for the logout box, since it
// gets too small if there all options are not available // gets too small if there all options are not available
TQLabel *icon = new TQLabel( lfrm ); TQLabel *icon = new TQLabel( lfrm );
icon->setPixmap( TQPixmap( locate( "data", "kdm/pics/shutdown.jpg" ) ) ); icon->setPixmap( TQPixmap( locate( "data", "tdm/pics/shutdown.jpg" ) ) );
TQVBoxLayout *iconlay = new TQVBoxLayout( lfrm ); TQVBoxLayout *iconlay = new TQVBoxLayout( lfrm );
iconlay->addWidget( icon ); iconlay->addWidget( icon );
@ -571,8 +571,8 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
buttonlay->addSpacing( KDialog::spacingHint() ); buttonlay->addSpacing( KDialog::spacingHint() );
KDMDelayedPushButton *btnReboot = new TDMDelayedPushButton *btnReboot = new
KDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this );
buttonlay->addWidget( btnReboot ); buttonlay->addWidget( btnReboot );
connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) ); connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) );
@ -619,63 +619,63 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
} }
KDMSlimShutdown::~KDMSlimShutdown() TDMSlimShutdown::~TDMSlimShutdown()
{ {
freeStrArr( targetList ); freeStrArr( targetList );
} }
void void
KDMSlimShutdown::slotSched() TDMSlimShutdown::slotSched()
{ {
reject(); reject();
KDMShutdown::scheduleShutdown(); TDMShutdown::scheduleShutdown();
} }
void void
KDMSlimShutdown::slotHalt() TDMSlimShutdown::slotHalt()
{ {
if (checkShutdown( SHUT_HALT, 0 )) if (checkShutdown( SHUT_HALT, 0 ))
doShutdown( SHUT_HALT, 0 ); doShutdown( SHUT_HALT, 0 );
} }
void void
KDMSlimShutdown::slotReboot() TDMSlimShutdown::slotReboot()
{ {
if (checkShutdown( SHUT_REBOOT, 0 )) if (checkShutdown( SHUT_REBOOT, 0 ))
doShutdown( SHUT_REBOOT, 0 ); doShutdown( SHUT_REBOOT, 0 );
} }
void void
KDMSlimShutdown::slotReboot( int opt ) TDMSlimShutdown::slotReboot( int opt )
{ {
if (checkShutdown( SHUT_REBOOT, targetList[opt] )) if (checkShutdown( SHUT_REBOOT, targetList[opt] ))
doShutdown( SHUT_REBOOT, targetList[opt] ); doShutdown( SHUT_REBOOT, targetList[opt] );
} }
bool bool
KDMSlimShutdown::checkShutdown( int type, const char *os ) TDMSlimShutdown::checkShutdown( int type, const char *os )
{ {
reject(); reject();
dpySpec *sess = fetchSessions( lstRemote | lstTTY ); dpySpec *sess = fetchSessions( lstRemote | lstTTY );
if (!sess && _allowShutdown != SHUT_ROOT) if (!sess && _allowShutdown != SHUT_ROOT)
return true; return true;
int ret = KDMConfShutdown( -1, sess, type, os ).exec(); int ret = TDMConfShutdown( -1, sess, type, os ).exec();
disposeSessions( sess ); disposeSessions( sess );
if (ret == Schedule) { if (ret == Schedule) {
KDMShutdown::scheduleShutdown(); TDMShutdown::scheduleShutdown();
return false; return false;
} }
return ret; return ret;
} }
void void
KDMSlimShutdown::externShutdown( int type, const char *os, int uid ) TDMSlimShutdown::externShutdown( int type, const char *os, int uid )
{ {
dpySpec *sess = fetchSessions( lstRemote | lstTTY ); dpySpec *sess = fetchSessions( lstRemote | lstTTY );
int ret = KDMConfShutdown( uid, sess, type, os ).exec(); int ret = TDMConfShutdown( uid, sess, type, os ).exec();
disposeSessions( sess ); disposeSessions( sess );
if (ret == Schedule) if (ret == Schedule)
KDMShutdown( uid ).exec(); TDMShutdown( uid ).exec();
else if (ret) else if (ret)
doShutdown( type, os ); doShutdown( type, os );
} }
@ -804,7 +804,7 @@ void FlatButton::keyReleaseEvent( TQKeyEvent* e )
KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char *os, TDMConfShutdown::TDMConfShutdown( int _uid, dpySpec *sess, int type, const char *os,
TQWidget *_parent ) TQWidget *_parent )
: inherited( _uid, _parent ) : inherited( _uid, _parent )
{ {
@ -863,7 +863,7 @@ KDMConfShutdown::KDMConfShutdown( int _uid, dpySpec *sess, int type, const char
} }
KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout, TDMCancelShutdown::TDMCancelShutdown( int how, int start, int timeout,
int force, int uid, const char *os, int force, int uid, const char *os,
TQWidget *_parent ) TQWidget *_parent )
: inherited( -1, _parent ) : inherited( -1, _parent )
@ -922,4 +922,4 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout,
complete( 0 ); complete( 0 );
} }
#include "kdmshutdown.moc" #include "tdmshutdown.moc"

46
kdm/kfrontend/kdmshutdown.h
Unescape View File

@ -23,10 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef KDMSHUTDOWN_H #ifndef TDMSHUTDOWN_H
#define KDMSHUTDOWN_H #define TDMSHUTDOWN_H
#include "kdmconfig.h" // for HAVE_VTS #include "tdmconfig.h" // for HAVE_VTS
#include "kgverify.h" #include "kgverify.h"
#include <kpushbutton.h> #include <kpushbutton.h>
@ -45,13 +45,13 @@ class TQLineEdit;
enum { Authed = TQDialog::Accepted + 1, Schedule }; enum { Authed = TQDialog::Accepted + 1, Schedule };
class KDMShutdownBase : public FDialog, public KGVerifyHandler { class TDMShutdownBase : public FDialog, public KGVerifyHandler {
Q_OBJECT Q_OBJECT
typedef FDialog inherited; typedef FDialog inherited;
public: public:
KDMShutdownBase( int _uid, TQWidget *_parent ); TDMShutdownBase( int _uid, TQWidget *_parent );
virtual ~KDMShutdownBase(); virtual ~TDMShutdownBase();
protected slots: protected slots:
virtual void accept(); virtual void accept();
@ -93,12 +93,12 @@ class KDMShutdownBase : public FDialog, public KGVerifyHandler {
}; };
class KDMShutdown : public KDMShutdownBase { class TDMShutdown : public TDMShutdownBase {
Q_OBJECT Q_OBJECT
typedef KDMShutdownBase inherited; typedef TDMShutdownBase inherited;
public: public:
KDMShutdown( int _uid, TQWidget *_parent = 0 ); TDMShutdown( int _uid, TQWidget *_parent = 0 );
static void scheduleShutdown( TQWidget *_parent = 0 ); static void scheduleShutdown( TQWidget *_parent = 0 );
protected slots: protected slots:
@ -123,12 +123,12 @@ class KDMShutdown : public KDMShutdownBase {
}; };
class KDMRadioButton : public TQRadioButton { class TDMRadioButton : public TQRadioButton {
Q_OBJECT Q_OBJECT
typedef TQRadioButton inherited; typedef TQRadioButton inherited;
public: public:
KDMRadioButton( const TQString &label, TQWidget *parent ); TDMRadioButton( const TQString &label, TQWidget *parent );
private: private:
virtual void mouseDoubleClickEvent( TQMouseEvent * ); virtual void mouseDoubleClickEvent( TQMouseEvent * );
@ -138,12 +138,12 @@ class KDMRadioButton : public TQRadioButton {
}; };
class KDMDelayedPushButton : public KPushButton { class TDMDelayedPushButton : public KPushButton {
Q_OBJECT Q_OBJECT
typedef KPushButton inherited; typedef KPushButton inherited;
public: public:
KDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 ); TDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name = 0 );
void setPopup( TQPopupMenu *pop ); void setPopup( TQPopupMenu *pop );
private slots: private slots:
@ -156,13 +156,13 @@ class KDMDelayedPushButton : public KPushButton {
TQTimer popt; TQTimer popt;
}; };
class KDMSlimShutdown : public FDialog { class TDMSlimShutdown : public FDialog {
Q_OBJECT Q_OBJECT
typedef FDialog inherited; typedef FDialog inherited;
public: public:
KDMSlimShutdown( TQWidget *_parent = 0 ); TDMSlimShutdown( TQWidget *_parent = 0 );
~KDMSlimShutdown(); ~TDMSlimShutdown();
static void externShutdown( int type, const char *os, int uid ); static void externShutdown( int type, const char *os, int uid );
private slots: private slots:
@ -177,21 +177,21 @@ class KDMSlimShutdown : public FDialog {
}; };
class KDMConfShutdown : public KDMShutdownBase { class TDMConfShutdown : public TDMShutdownBase {
Q_OBJECT Q_OBJECT
typedef KDMShutdownBase inherited; typedef TDMShutdownBase inherited;
public: public:
KDMConfShutdown( int _uid, struct dpySpec *sess, int type, const char *os, TDMConfShutdown( int _uid, struct dpySpec *sess, int type, const char *os,
TQWidget *_parent = 0 ); TQWidget *_parent = 0 );
}; };
class KDMCancelShutdown : public KDMShutdownBase { class TDMCancelShutdown : public TDMShutdownBase {
Q_OBJECT Q_OBJECT
typedef KDMShutdownBase inherited; typedef TDMShutdownBase inherited;
public: public:
KDMCancelShutdown( int how, int start, int timeout, int force, int uid, TDMCancelShutdown( int how, int start, int timeout, int force, int uid,
const char *os, TQWidget *_parent ); const char *os, TQWidget *_parent );
}; };
@ -237,4 +237,4 @@ class FlatButton : public TQToolButton
}; };
#endif /* KDMSHUTDOWN_H */ #endif /* TDMSHUTDOWN_H */

14
kdm/kfrontend/kfdialog.cpp
Unescape View File

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kfdialog.h" #include "kfdialog.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include <klocale.h> #include <klocale.h>
#include <kpushbutton.h> #include <kpushbutton.h>
@ -61,7 +61,7 @@ FDialog::FDialog( TQWidget *parent, bool framed )
} else } else
winFrame = 0; winFrame = 0;
setCaption(KDM_LOGIN_SCREEN_BASE_TITLE); setCaption(TDM_LOGIN_SCREEN_BASE_TITLE);
if (framed) { if (framed) {
if (m_wmTitle) setFixedSize(sizeHint()); if (m_wmTitle) setFixedSize(sizeHint());
@ -158,11 +158,11 @@ FDialog::box( TQWidget *parent, TQMessageBox::Icon type, const TQString &text )
KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &text ) KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &text )
: inherited( parent, !is_themed ) : inherited( parent, !is_themed )
{ {
if (type == TQMessageBox::NoIcon) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE); if (type == TQMessageBox::NoIcon) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE);
if (type == TQMessageBox::Question) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Question")); if (type == TQMessageBox::Question) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Question"));
if (type == TQMessageBox::Information) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Information")); if (type == TQMessageBox::Information) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Information"));
if (type == TQMessageBox::Warning) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Warning")); if (type == TQMessageBox::Warning) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Warning"));
if (type == TQMessageBox::Critical) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Error")); if (type == TQMessageBox::Critical) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Error"));
TQLabel *label1 = new TQLabel( this ); TQLabel *label1 = new TQLabel( this );
label1->setPixmap( TQMessageBox::standardIcon( type ) ); label1->setPixmap( TQMessageBox::standardIcon( type ) );

2
kdm/kfrontend/kfdialog.h
Unescape View File

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#define KDM_LOGIN_SCREEN_BASE_TITLE i18n("Login to TDE") #define TDM_LOGIN_SCREEN_BASE_TITLE i18n("Login to TDE")
#ifndef FDIALOG_H #ifndef FDIALOG_H
#define FDIALOG_H #define FDIALOG_H

10
kdm/kfrontend/kgapp.cpp
Unescape View File

@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <config.h> #include <config.h>
#include "kdm_greet.h" #include "tdm_greet.h"
#include "kdmshutdown.h" #include "tdmshutdown.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kgapp.h" #include "kgapp.h"
#include "kgreeter.h" #include "kgreeter.h"
#ifdef XDMCP #ifdef XDMCP
@ -179,7 +179,7 @@ checkSAK(GreeterApp* app)
void void
kg_main( const char *argv0 ) kg_main( const char *argv0 )
{ {
static char *argv[] = { (char *)"kdmgreet", 0 }; static char *argv[] = { (char *)"tdmgreet", 0 };
KCmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true ); KCmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true );
kdDebug() << timestamp() << "start" << endl; kdDebug() << timestamp() << "start" << endl;
@ -327,7 +327,7 @@ kg_main( const char *argv0 )
if (cmd == G_ConfShutdown) { if (cmd == G_ConfShutdown) {
int how = GRecvInt(), uid = GRecvInt(); int how = GRecvInt(), uid = GRecvInt();
char *os = GRecvStr(); char *os = GRecvStr();
KDMSlimShutdown::externShutdown( how, os, uid ); TDMSlimShutdown::externShutdown( how, os, uid );
if (os) if (os)
free( os ); free( os );
GSendInt( G_Ready ); GSendInt( G_Ready );

16
kdm/kfrontend/kgdialog.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
Base class for various kdm greeter dialogs Base class for various tdm greeter dialogs
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org>
@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kgdialog.h" #include "kgdialog.h"
#include "kgverify.h" #include "kgverify.h"
#include "kconsole.h" #include "kconsole.h"
#include "kdmshutdown.h" #include "tdmshutdown.h"
#include "kdm_greet.h" #include "tdm_greet.h"
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
KGDialog::KGDialog( bool themed ) : inherited( 0, !themed ) KGDialog::KGDialog( bool themed ) : inherited( 0, !themed )
{ {
#ifdef WITH_KDM_XCONSOLE #ifdef WITH_TDM_XCONSOLE
consoleView = _showLog ? new KConsole( this ) : 0; consoleView = _showLog ? new KConsole( this ) : 0;
#endif #endif
@ -171,7 +171,7 @@ KGDialog::slotConsole()
if (sess) { if (sess) {
if (verify) if (verify)
verify->suspend(); verify->suspend();
int ret = KDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec(); int ret = TDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec();
if (verify) if (verify)
verify->resume(); verify->resume();
disposeSessions( sess ); disposeSessions( sess );
@ -194,11 +194,11 @@ KGDialog::slotShutdown( int id )
verify->suspend(); verify->suspend();
if (id < 0) { if (id < 0) {
if (_scheduledSd == SHUT_ALWAYS) if (_scheduledSd == SHUT_ALWAYS)
KDMShutdown::scheduleShutdown( this ); TDMShutdown::scheduleShutdown( this );
else else
KDMSlimShutdown( this ).exec(); TDMSlimShutdown( this ).exec();
} else } else
KDMSlimShutdown::externShutdown( id, 0, -1 ); TDMSlimShutdown::externShutdown( id, 0, -1 );
if (verify) if (verify)
verify->resume(); verify->resume();
} }

8
kdm/kfrontend/kgdialog.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
Base class for various kdm greeter dialogs Base class for various tdm greeter dialogs
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org>
@ -26,9 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef KGDIALOG_H #ifndef KGDIALOG_H
#define KGDIALOG_H #define KGDIALOG_H
#include <config.h> // for WITH_KDM_XCONSOLE #include <config.h> // for WITH_TDM_XCONSOLE
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kfdialog.h" #include "kfdialog.h"
class TQPopupMenu; class TQPopupMenu;
@ -67,7 +67,7 @@ class KGDialog : public FDialog {
bool needSep; bool needSep;
TQPopupMenu *optMenu; TQPopupMenu *optMenu;
KGVerify *verify; KGVerify *verify;
#ifdef WITH_KDM_XCONSOLE #ifdef WITH_TDM_XCONSOLE
KConsole *consoleView; KConsole *consoleView;
#endif #endif

36
kdm/kfrontend/kgreeter.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
Greeter widget for kdm Greeter widget for tdm
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org>
@ -24,13 +24,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kgreeter.h" #include "kgreeter.h"
#include "kconsole.h" #include "kconsole.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kdmclock.h" #include "tdmclock.h"
#include "kdm_greet.h" #include "tdm_greet.h"
#include "kdmadmindialog.h" #include "tdmadmindialog.h"
#include "themer/kdmthemer.h" #include "themer/tdmthemer.h"
#include "themer/kdmitem.h" #include "themer/tdmitem.h"
#include "themer/kdmlabel.h" #include "themer/tdmlabel.h"
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
@ -86,9 +86,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <X11/Xlib.h> #include <X11/Xlib.h>
#define FIFO_DIR "/tmp/ksocket-global/kdm" #define FIFO_DIR "/tmp/ksocket-global/tdm"
#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1" #define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1"
#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1" #define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1"
class UserListView : public KListView { class UserListView : public KListView {
public: public:
@ -872,7 +872,7 @@ KStdGreeter::KStdGreeter()
, pixLabel( 0 ) , pixLabel( 0 )
{ {
TQBoxLayout *main_box; TQBoxLayout *main_box;
#ifdef WITH_KDM_XCONSOLE #ifdef WITH_TDM_XCONSOLE
if (consoleView) { if (consoleView) {
TQBoxLayout *ex_box = new TQVBoxLayout( this, 10, 10 ); TQBoxLayout *ex_box = new TQVBoxLayout( this, 10, 10 );
main_box = new TQHBoxLayout( ex_box, 10 ); main_box = new TQHBoxLayout( ex_box, 10 );
@ -952,7 +952,7 @@ KStdGreeter::KStdGreeter()
TQWidget *prec; TQWidget *prec;
if (userView) if (userView)
prec = userView; prec = userView;
#ifdef WITH_KDM_XCONSOLE #ifdef WITH_TDM_XCONSOLE
else if (consoleView) else if (consoleView)
prec = consoleView; prec = consoleView;
#endif #endif
@ -1060,10 +1060,10 @@ KThemedGreeter::KThemedGreeter()
connect( themer, TQT_SIGNAL(activated( const TQString & )), connect( themer, TQT_SIGNAL(activated( const TQString & )),
TQT_SLOT(slotThemeActivated( const TQString & )) ); TQT_SLOT(slotThemeActivated( const TQString & )) );
console_rect = themer->findNode( "xconsole" ); // kdm ext console_rect = themer->findNode( "xconsole" ); // tdm ext
userlist_rect = themer->findNode( "userlist" ); userlist_rect = themer->findNode( "userlist" );
caps_warning = themer->findNode( "caps-lock-warning" ); caps_warning = themer->findNode( "caps-lock-warning" );
xauth_warning = themer->findNode( "xauth-warning" ); // kdm ext xauth_warning = themer->findNode( "xauth-warning" ); // tdm ext
pam_error = themer->findNode( "pam-error" ); pam_error = themer->findNode( "pam-error" );
timed_label = themer->findNode( "timed-label" ); timed_label = themer->findNode( "timed-label" );
if (pam_error && pam_error->isA( "KdmLabel" )) if (pam_error && pam_error->isA( "KdmLabel" ))
@ -1075,7 +1075,7 @@ KThemedGreeter::KThemedGreeter()
if ((itm = themer->findNode( "language_button" ))) // not implemented yet if ((itm = themer->findNode( "language_button" ))) // not implemented yet
itm->hide( true ); itm->hide( true );
#ifdef WITH_KDM_XCONSOLE #ifdef WITH_TDM_XCONSOLE
if (console_rect) { if (console_rect) {
if (consoleView) if (consoleView)
console_rect->setWidget( consoleView ); console_rect->setWidget( consoleView );
@ -1097,7 +1097,7 @@ KThemedGreeter::KThemedGreeter()
TQWidget *prec; TQWidget *prec;
if (userView) if (userView)
prec = userView; prec = userView;
#ifdef WITH_KDM_XCONSOLE #ifdef WITH_TDM_XCONSOLE
else if (consoleView) else if (consoleView)
prec = consoleView; prec = consoleView;
#endif #endif
@ -1268,7 +1268,7 @@ KThemedGreeter::keyPressEvent( TQKeyEvent *e )
void void
KThemedGreeter::slotAskAdminPassword() KThemedGreeter::slotAskAdminPassword()
{ {
KDMAdmin k(curUser, this); TDMAdmin k(curUser, this);
if (k.exec()) { if (k.exec()) {
GSendInt(G_Ready); GSendInt(G_Ready);
hide(); hide();

2
kdm/kfrontend/kgreeter.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
Greeter widget for kdm Greeter widget for tdm
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org>

12
kdm/kfrontend/kgverify.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
Shell for kdm conversation plugins Shell for tdm conversation plugins
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org>
@ -25,11 +25,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <config.h> #include <config.h>
#include "kgverify.h" #include "kgverify.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kdm_greet.h" #include "tdm_greet.h"
#include "themer/kdmthemer.h" #include "themer/tdmthemer.h"
#include "themer/kdmitem.h" #include "themer/tdmitem.h"
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
@ -461,7 +461,7 @@ KGVerify::VErrBox( TQWidget *parent, const TQString &user, const char *msg )
if (!msg) { if (!msg) {
mesg = i18n("A critical error occurred.\n" mesg = i18n("A critical error occurred.\n"
"Please look at KDM's logfile(s) for more information\n" "Please look at TDM's logfile(s) for more information\n"
"or contact your system administrator."); "or contact your system administrator.");
icon = errorbox; icon = errorbox;
} else { } else {

2
kdm/kfrontend/kgverify.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
Shell for kdm conversation plugins Shell for tdm conversation plugins
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org>

2
kdm/kfrontend/krootimage.cpp
Unescape View File

@ -35,7 +35,7 @@ Boston, MA 02110-1301, USA.
#include <stdlib.h> #include <stdlib.h>
static const char description[] = static const char description[] =
I18N_NOOP( "Fancy desktop background for kdm" ); I18N_NOOP( "Fancy desktop background for tdm" );
static const char version[] = "v2.0"; static const char version[] = "v2.0";

4
kdm/kfrontend/krootimage.h
Unescape View File

@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA.
*/ */
#ifndef __KDMDESKTOP_H__ #ifndef __TDMDESKTOP_H__
#define __KDMDESKTOP_H__ #define __TDMDESKTOP_H__
#include <kapplication.h> #include <kapplication.h>

4
kdm/kfrontend/pics/CMakeLists.txt
Unescape View File

@ -11,8 +11,8 @@
install( FILES install( FILES
kdelogo.png kdelogo-crystal.png shutdown.jpg kdelogo.png kdelogo-crystal.png shutdown.jpg
DESTINATION ${DATA_INSTALL_DIR}/kdm/pics ) DESTINATION ${DATA_INSTALL_DIR}/tdm/pics )
install( FILES install( FILES
default1.png default2.png default3.png root1.png default1.png default2.png default3.png root1.png
DESTINATION ${DATA_INSTALL_DIR}/kdm/pics/users ) DESTINATION ${DATA_INSTALL_DIR}/tdm/pics/users )

2
kdm/kfrontend/pics/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
picsdir = $(kde_datadir)/kdm/pics picsdir = $(kde_datadir)/tdm/pics
pics_DATA = kdelogo.png kdelogo-crystal.png shutdown.jpg pics_DATA = kdelogo.png kdelogo-crystal.png shutdown.jpg
usersdir = $(picsdir)/users usersdir = $(picsdir)/users

10
kdm/kfrontend/sakdlg.cc
Unescape View File

@ -73,9 +73,9 @@
# define AF_LOCAL AF_UNIX # define AF_LOCAL AF_UNIX
#endif #endif
#define FIFO_DIR "/tmp/ksocket-global/kdm" #define FIFO_DIR "/tmp/ksocket-global/tdm"
#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1" #define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1"
#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1" #define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1"
bool trinity_desktop_lock_use_system_modal_dialogs = TRUE; bool trinity_desktop_lock_use_system_modal_dialogs = TRUE;
extern bool trinity_desktop_lock_use_sak; extern bool trinity_desktop_lock_use_sak;
@ -94,7 +94,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); kde_wm_system_modal_notification = XInternAtom(qt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
XChangeProperty(qt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); XChangeProperty(qt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
} }
setCaption(KDM_LOGIN_SCREEN_BASE_TITLE); setCaption(TDM_LOGIN_SCREEN_BASE_TITLE);
frame = new TQFrame( this ); frame = new TQFrame( this );
if (trinity_desktop_lock_use_system_modal_dialogs) if (trinity_desktop_lock_use_system_modal_dialogs)
@ -125,7 +125,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
installEventFilter(this); installEventFilter(this);
mSAKProcess = new KProcess; mSAKProcess = new KProcess;
*mSAKProcess << "kdmtsak" << "dm"; *mSAKProcess << "tdmtsak" << "dm";
connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited())); connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
mSAKProcess->start(); mSAKProcess->start();

2
kdm/kfrontend/sessions/CMakeLists.txt
Unescape View File

@ -26,4 +26,4 @@ install( FILES
twm.desktop ude.desktop vtwm.desktop w9wm.desktop twm.desktop ude.desktop vtwm.desktop w9wm.desktop
waimea.desktop wm2.desktop wmaker.desktop xfce.desktop waimea.desktop wm2.desktop wmaker.desktop xfce.desktop
xfce4.desktop xfce4.desktop
DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions ) DESTINATION ${DATA_INSTALL_DIR}/tdm/sessions )

2
kdm/kfrontend/sessions/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
sessionsdir = $(kde_datadir)/kdm/sessions sessionsdir = $(kde_datadir)/tdm/sessions
sessions_DATA = \ sessions_DATA = \
admin.desktop tde.desktop gnome.desktop \ admin.desktop tde.desktop gnome.desktop \
9wm.desktop \ 9wm.desktop \

18
kdm/kfrontend/themer/CMakeLists.txt
Unescape View File

@ -12,8 +12,8 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kdm/kfrontend ${CMAKE_SOURCE_DIR}/tdm/kfrontend
${CMAKE_SOURCE_DIR}/kdmlib ${CMAKE_SOURCE_DIR}/tdmlib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -27,15 +27,15 @@ link_directories(
##### config.ci (generated) ##################### ##### config.ci (generated) #####################
add_custom_command( OUTPUT config.ci add_custom_command( OUTPUT config.ci
COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci
DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def )
set_property( SOURCE kdmthemer.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) set_property( SOURCE tdmthemer.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci )
##### kdmthemer (static) ######################## ##### tdmthemer (static) ########################
tde_add_library( kdmthemer STATIC_PIC AUTOMOC tde_add_library( tdmthemer STATIC_PIC AUTOMOC
SOURCES SOURCES
kdmthemer.cpp kdmitem.cpp kdmpixmap.cpp tdmthemer.cpp tdmitem.cpp tdmpixmap.cpp
kdmrect.cpp kdmlabel.cpp kdmlayout.cpp tdmrect.cpp tdmlabel.cpp tdmlayout.cpp
) )

20
kdm/kfrontend/themer/Makefile.am
Unescape View File

@ -1,16 +1,16 @@
AM_CPPFLAGS = -I$(srcdir)/../../backend -I$(srcdir)/.. -I../.. \ AM_CPPFLAGS = -I$(srcdir)/../../backend -I$(srcdir)/.. -I../.. \
-I$(top_srcdir)/kdmlib \ -I$(top_srcdir)/tdmlib \
$(all_includes) $(all_includes)
noinst_LIBRARIES = libkdmthemer.a noinst_LIBRARIES = libtdmthemer.a
libkdmthemer_a_SOURCES = \ libtdmthemer_a_SOURCES = \
kdmthemer.cpp \ tdmthemer.cpp \
kdmitem.cpp \ tdmitem.cpp \
kdmpixmap.cpp \ tdmpixmap.cpp \
kdmrect.cpp \ tdmrect.cpp \
kdmlabel.cpp \ tdmlabel.cpp \
kdmlayout.cpp tdmlayout.cpp
METASOURCES = AUTO METASOURCES = AUTO
libkdmthemer_a_COMPILE_FIRST = ../../config.ci libtdmthemer_a_COMPILE_FIRST = ../../config.ci

8
kdm/kfrontend/themer/kdmitem.cpp
Unescape View File

@ -25,9 +25,9 @@
// #define DRAW_OUTLINE 1 // for debugging only // #define DRAW_OUTLINE 1 // for debugging only
#include "kdmitem.h" #include "tdmitem.h"
#include "kdmlayout.h" #include "tdmlayout.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include <kglobal.h> #include <kglobal.h>
#include <kdebug.h> #include <kdebug.h>
@ -654,4 +654,4 @@ KdmItem::parentWidget() const
return ((KdmItem*)parent())->parentWidget(); return ((KdmItem*)parent())->parentWidget();
} }
#include "kdmitem.moc" #include "tdmitem.moc"

6
kdm/kfrontend/themer/kdmitem.h
Unescape View File

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef KDMITEM_H #ifndef TDMITEM_H
#define KDMITEM_H #define TDMITEM_H
#include <tqobject.h> #include <tqobject.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
@ -35,7 +35,7 @@ class TQPainter;
class TQLayoutItem; class TQLayoutItem;
/** class KdmItem /** class KdmItem
* @short Base class for every kdmthemes' element. * @short Base class for every tdmthemes' element.
* *
* This class provides methods for arranging it and its children to the * This class provides methods for arranging it and its children to the
* screen (see note below), painting the whole area or a sub-region using * screen (see note below), painting the whole area or a sub-region using

6
kdm/kfrontend/themer/kdmlabel.cpp
Unescape View File

@ -20,8 +20,8 @@
*/ */
#include <config.h> #include <config.h>
#include "kdmlabel.h" #include "tdmlabel.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include "../kgreeter.h" #include "../kgreeter.h"
#include <kglobal.h> #include <kglobal.h>
@ -273,4 +273,4 @@ KdmLabel::lookupText( const TQString &t )
return KMacroExpander::expandMacros( text, m ); return KMacroExpander::expandMacros( text, m );
} }
#include "kdmlabel.moc" #include "tdmlabel.moc"

2
kdm/kfrontend/themer/kdmlabel.h
Unescape View File

@ -22,7 +22,7 @@
#ifndef KDELABEL_H #ifndef KDELABEL_H
#define KDELABEL_H #define KDELABEL_H
#include "kdmitem.h" #include "tdmitem.h"
#include <tqcolor.h> #include <tqcolor.h>
#include <tqfont.h> #include <tqfont.h>

6
kdm/kfrontend/themer/kdmlayout.cpp
Unescape View File

@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kdmlayout.h" #include "tdmlayout.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include "kdmitem.h" #include "tdmitem.h"
#include <kdebug.h> #include <kdebug.h>

4
kdm/kfrontend/themer/kdmlayout.h
Unescape View File

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef KDMLAYOUT_H #ifndef TDMLAYOUT_H
#define KDMLAYOUT_H #define TDMLAYOUT_H
/** /**
* this is a container for a lot of other stuff * this is a container for a lot of other stuff

10
kdm/kfrontend/themer/kdmpixmap.cpp
Unescape View File

@ -21,8 +21,8 @@
#include <config.h> #include <config.h>
#include "kdmpixmap.h" #include "tdmpixmap.h"
#include <kdmconfig.h> #include <tdmconfig.h>
#include <kimageeffect.h> #include <kimageeffect.h>
#ifdef HAVE_LIBART #ifdef HAVE_LIBART
@ -68,10 +68,10 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
parseColor( el.attribute( "tint", "#ffffff" ), pixmap.normal.tint ); parseColor( el.attribute( "tint", "#ffffff" ), pixmap.normal.tint );
pixmap.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat(); pixmap.normal.alpha = el.attribute( "alpha", "1.0" ).toFloat();
if (el.attribute( "file", "" ) == "@@@KDMBACKGROUND@@@") { if (el.attribute( "file", "" ) == "@@@TDMBACKGROUND@@@") {
if ((_compositor.isEmpty()) || (!argb_visual_available)) { if ((_compositor.isEmpty()) || (!argb_visual_available)) {
// Software blend only (no compositing support) // Software blend only (no compositing support)
// Use the preset KDM background... // Use the preset TDM background...
KStandardDirs *m_pDirs = KGlobal::dirs(); KStandardDirs *m_pDirs = KGlobal::dirs();
KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) ); KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) );
config->setGroup("Desktop0"); config->setGroup("Desktop0");
@ -337,4 +337,4 @@ KdmPixmap::statusChanged()
needUpdate(); needUpdate();
} }
#include "kdmpixmap.moc" #include "tdmpixmap.moc"

6
kdm/kfrontend/themer/kdmpixmap.h
Unescape View File

@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef KDMPIXMAP_H #ifndef TDMPIXMAP_H
#define KDMPIXMAP_H #define TDMPIXMAP_H
#include "kdmitem.h" #include "tdmitem.h"
//#include <tqrect.h> //#include <tqrect.h>
#include <tqpixmap.h> #include <tqpixmap.h>

8
kdm/kfrontend/themer/kdmrect.cpp
Unescape View File

@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kdmrect.h" #include "tdmrect.h"
#include "kdmthemer.h" #include "tdmthemer.h"
#include "kdmconfig.h" #include "tdmconfig.h"
#include <kimageeffect.h> #include <kimageeffect.h>
#include <kdebug.h> #include <kdebug.h>
@ -178,4 +178,4 @@ KdmRect::setWidget( TQWidget *widget )
//setAttribs( widget ); //setAttribs( widget );
} }
#include "kdmrect.moc" #include "tdmrect.moc"

6
kdm/kfrontend/themer/kdmrect.h
Unescape View File

@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef KDMRECT_H #ifndef TDMRECT_H
#define KDMRECT_H #define TDMRECT_H
#include "kdmitem.h" #include "tdmitem.h"
#include <tqcolor.h> #include <tqcolor.h>
#include <tqfont.h> #include <tqfont.h>

16
kdm/kfrontend/themer/kdmthemer.cpp
Unescape View File

@ -19,13 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kdmthemer.h" #include "tdmthemer.h"
#include "kdmitem.h" #include "tdmitem.h"
#include "kdmpixmap.h" #include "tdmpixmap.h"
#include "kdmrect.h" #include "tdmrect.h"
#include "kdmlabel.h" #include "tdmlabel.h"
#include <kdmconfig.h> #include <tdmconfig.h>
#include <kfdialog.h> #include <kfdialog.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -76,7 +76,7 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget
return; return;
} }
// Set the root (screen) item // Set the root (screen) item
rootItem = new KdmRect( parent, TQDomNode(), "kdm root" ); rootItem = new KdmRect( parent, TQDomNode(), "tdm root" );
connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )), connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )),
widget(), TQT_SLOT(update( int, int, int, int )) ); widget(), TQT_SLOT(update( int, int, int, int )) );
@ -401,4 +401,4 @@ KdmThemer::slotPaintRoot()
TQT_TQWIDGET(TQApplication::desktop()->screen())->erase(); TQT_TQWIDGET(TQApplication::desktop()->screen())->erase();
} }
#include "kdmthemer.moc" #include "tdmthemer.moc"

4
kdm/kfrontend/themer/kdmthemer.h
Unescape View File

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef KDMTHEMER_H #ifndef TDMTHEMER_H
#define KDMTHEMER_H #define TDMTHEMER_H
#include <tqobject.h> #include <tqobject.h>
#include <tqdom.h> #include <tqdom.h>

2
kdm/kfrontend/themes/circles/CMakeLists.txt
Unescape View File

@ -12,4 +12,4 @@
install( FILES install( FILES
GdmGreeterTheme.desktop circles.xml background.svg GdmGreeterTheme.desktop circles.xml background.svg
flower.png help.png options.png screenshot.png flower.png help.png options.png screenshot.png
DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/circles ) DESTINATION ${DATA_INSTALL_DIR}/tdm/themes/circles )

2
kdm/kfrontend/themes/circles/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
circlesdir = $(kde_datadir)/kdm/themes/circles circlesdir = $(kde_datadir)/tdm/themes/circles
circles_DATA = \ circles_DATA = \
GdmGreeterTheme.desktop \ GdmGreeterTheme.desktop \
circles.xml \ circles.xml \

2
kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt
Unescape View File

@ -13,4 +13,4 @@ install( FILES
Dialog.png enter_normal.png enter_over.png enter_pressed.png Dialog.png enter_normal.png enter_over.png enter_pressed.png
enterprise.xml GdmGreeterTheme.desktop preview.png enterprise.xml GdmGreeterTheme.desktop preview.png
system_normal.png system_over.png system_pressed.png system_normal.png system_over.png system_pressed.png
DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/o2_enterprise ) DESTINATION ${DATA_INSTALL_DIR}/tdm/themes/o2_enterprise )

2
kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop
Unescape View File

@ -5,6 +5,6 @@
Encoding=UTF-8 Encoding=UTF-8
Greeter=enterprise.xml Greeter=enterprise.xml
Name=O2 Enterprise Name=O2 Enterprise
Description=A sleek and professional looking KDM theme for Trinity Description=A sleek and professional looking TDM theme for Trinity
Author=Ken Wimer (wimer@kde.org) and Timothy Pearson (kb9vqf@pearsoncomputing.net) Author=Ken Wimer (wimer@kde.org) and Timothy Pearson (kb9vqf@pearsoncomputing.net)
Screenshot=preview.png Screenshot=preview.png

2
kdm/kfrontend/themes/o2_enterprise/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
o2_enterprisedir = $(kde_datadir)/kdm/themes/o2_enterprise o2_enterprisedir = $(kde_datadir)/tdm/themes/o2_enterprise
o2_enterprise_DATA = \ o2_enterprise_DATA = \
Dialog.png \ Dialog.png \
enter_normal.png \ enter_normal.png \

2
kdm/kfrontend/themes/o2_enterprise/enterprise.xml
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE greeter SYSTEM "greeter.dtd"> <!DOCTYPE greeter SYSTEM "greeter.dtd">
<greeter> <greeter>
<item type="pixmap" > <item type="pixmap" >
<normal file="@@@KDMBACKGROUND@@@" /> <normal file="@@@TDMBACKGROUND@@@" />
<pos width="100%" x="0" y="0" height="100%" /> <pos width="100%" x="0" y="0" height="100%" />
</item> </item>
<item type="pixmap" > <item type="pixmap" >

16
kdmlib/CMakeLists.txt
Unescape View File

@ -11,7 +11,7 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kdm/kfrontend ${CMAKE_SOURCE_DIR}/tdm/kfrontend
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
@ -21,7 +21,7 @@ link_directories(
${TQT_LIBRARY_DIRS} ${TQT_LIBRARY_DIRS}
) )
if( BUILD_KDM ) if( BUILD_TDM )
##### headers ################################### ##### headers ###################################
@ -57,12 +57,12 @@ tde_add_kpart( kgreet_winbind AUTOMOC
endif( BUILD_KDM ) endif( BUILD_TDM )
##### dmctl (static) ############################ ##### dmctl (static) ############################
if( BUILD_KICKER OR BUILD_KDESKTOP OR BUILD_KDM OR BUILD_KSMSERVER ) if( BUILD_KICKER OR BUILD_KDESKTOP OR BUILD_TDM OR BUILD_KSMSERVER )
tde_add_library( dmctl STATIC_PIC tde_add_library( dmctl STATIC_PIC
SOURCES dmctl.cpp SOURCES dmctl.cpp
@ -71,15 +71,15 @@ if( BUILD_KICKER OR BUILD_KDESKTOP OR BUILD_KDM OR BUILD_KSMSERVER )
endif( ) endif( )
##### kdmtsak (executable) ####################### ##### tdmtsak (executable) #######################
if( BUILD_TSAK ) if( BUILD_TSAK )
tde_add_executable( kdmtsak tde_add_executable( tdmtsak
SOURCES kdmtsak.cpp SOURCES tdmtsak.cpp
LINK ${TQT_LIBRARIES} LINK ${TQT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}
SETUID SETUID
DESCRIPTION "Secure Attention Key interface for KDM" DESCRIPTION "Secure Attention Key interface for TDM"
AUTHORS "Timothy Pearson" AUTHORS "Timothy Pearson"
) )
endif( BUILD_TSAK ) endif( BUILD_TSAK )

2
kdmlib/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/kdm/kfrontend $(all_includes) AM_CPPFLAGS = -I$(top_srcdir)/tdm/kfrontend $(all_includes)
kde_module_LTLIBRARIES = kgreet_classic.la kgreet_pam.la kgreet_winbind.la kde_module_LTLIBRARIES = kgreet_classic.la kgreet_pam.la kgreet_winbind.la

30
kdmlib/dmctl.cpp
Unescape View File

@ -37,7 +37,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
static enum { Dunno, NoDM, NewKDM, OldKDM, GDM } DMType = Dunno; static enum { Dunno, NoDM, NewTDM, OldTDM, GDM } DMType = Dunno;
static const char *ctl, *dpy; static const char *ctl, *dpy;
DM::DM() : fd( -1 ) DM::DM() : fd( -1 )
@ -49,9 +49,9 @@ DM::DM() : fd( -1 )
if (!(dpy = ::getenv( "DISPLAY" ))) if (!(dpy = ::getenv( "DISPLAY" )))
DMType = NoDM; DMType = NoDM;
else if ((ctl = ::getenv( "DM_CONTROL" ))) else if ((ctl = ::getenv( "DM_CONTROL" )))
DMType = NewKDM; DMType = NewTDM;
else if ((ctl = ::getenv( "XDM_MANAGED" )) && ctl[0] == '/') else if ((ctl = ::getenv( "XDM_MANAGED" )) && ctl[0] == '/')
DMType = OldKDM; DMType = OldTDM;
else if (::getenv( "GDMSESSION" )) else if (::getenv( "GDMSESSION" ))
DMType = GDM; DMType = GDM;
else else
@ -60,7 +60,7 @@ DM::DM() : fd( -1 )
switch (DMType) { switch (DMType) {
default: default:
return; return;
case NewKDM: case NewTDM:
case GDM: case GDM:
if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0) if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0)
return; return;
@ -88,7 +88,7 @@ DM::DM() : fd( -1 )
} }
} }
break; break;
case OldKDM: case OldTDM:
{ {
TQString tf( ctl ); TQString tf( ctl );
tf.truncate( tf.find( ',' ) ); tf.truncate( tf.find( ',' ) );
@ -113,16 +113,16 @@ DM::exec( const char *cmd )
} }
/** /**
* Execute a KDM/GDM remote control command. * Execute a TDM/GDM remote control command.
* @param cmd the command to execute. FIXME: undocumented yet. * @param cmd the command to execute. FIXME: undocumented yet.
* @param buf the result buffer. * @param buf the result buffer.
* @return result: * @return result:
* @li If true, the command was successfully executed. * @li If true, the command was successfully executed.
* @p ret might contain addional results. * @p ret might contain addional results.
* @li If false and @p ret is empty, a communication error occurred * @li If false and @p ret is empty, a communication error occurred
* (most probably KDM is not running). * (most probably TDM is not running).
* @li If false and @p ret is non-empty, it contains the error message * @li If false and @p ret is non-empty, it contains the error message
* from KDM. * from TDM.
*/ */
bool bool
DM::exec( const char *cmd, TQCString &buf ) DM::exec( const char *cmd, TQCString &buf )
@ -143,7 +143,7 @@ DM::exec( const char *cmd, TQCString &buf )
buf.resize( 0 ); buf.resize( 0 );
return false; return false;
} }
if (DMType == OldKDM) { if (DMType == OldTDM) {
buf.resize( 0 ); buf.resize( 0 );
return true; return true;
} }
@ -172,7 +172,7 @@ DM::exec( const char *cmd, TQCString &buf )
bool bool
DM::canShutdown() DM::canShutdown()
{ {
if (DMType == OldKDM) if (DMType == OldTDM)
return strstr( ctl, ",maysd" ) != 0; return strstr( ctl, ",maysd" ) != 0;
TQCString re; TQCString re;
@ -192,7 +192,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
return; return;
bool cap_ask; bool cap_ask;
if (DMType == NewKDM) { if (DMType == NewTDM) {
TQCString re; TQCString re;
cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0; cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0;
} else { } else {
@ -228,7 +228,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType,
bool bool
DM::bootOptions( TQStringList &opts, int &defopt, int &current ) DM::bootOptions( TQStringList &opts, int &defopt, int &current )
{ {
if (DMType != NewKDM) if (DMType != NewTDM)
return false; return false;
TQCString re; TQCString re;
@ -264,7 +264,7 @@ DM::setLock( bool on )
bool bool
DM::isSwitchable() DM::isSwitchable()
{ {
if (DMType == OldKDM) if (DMType == OldTDM)
return dpy[0] == ':'; return dpy[0] == ':';
if (DMType == GDM) if (DMType == GDM)
@ -281,7 +281,7 @@ DM::numReserve()
if (DMType == GDM) if (DMType == GDM)
return 1; /* Bleh */ return 1; /* Bleh */
if (DMType == OldKDM) if (DMType == OldTDM)
return strstr( ctl, ",rsvd" ) ? 1 : -1; return strstr( ctl, ",rsvd" ) ? 1 : -1;
TQCString re; TQCString re;
@ -304,7 +304,7 @@ DM::startReserve()
bool bool
DM::localSessions( SessList &list ) DM::localSessions( SessList &list )
{ {
if (DMType == OldKDM) if (DMType == OldTDM)
return false; return false;
TQCString re; TQCString re;

6
kdmlib/kdmtsak.cpp
Unescape View File

@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#include "kdmtsak.h" #include "tdmtsak.h"
#include <tqstringlist.h> #include <tqstringlist.h>
@ -45,7 +45,7 @@ bool is_vt_local() {
} }
else { else {
TQString cvtName = ""; TQString cvtName = "";
TQString output = exec("kdmctl list"); TQString output = exec("tdmctl list");
TQStringList sessionList = TQStringList::split('\t', output, false); TQStringList sessionList = TQStringList::split('\t', output, false);
// See if the current session is local // See if the current session is local
for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) { for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) {
@ -69,7 +69,7 @@ bool is_vt_active() {
} }
else { else {
TQString cvtName = ""; TQString cvtName = "";
TQString output = exec("kdmctl list"); TQString output = exec("tdmctl list");
TQString curConsole = exec("fgconsole"); TQString curConsole = exec("fgconsole");
bool intFound; bool intFound;
int curConsoleNum = curConsole.toInt(&intFound); int curConsoleNum = curConsole.toInt(&intFound);

2
kdmlib/kdmtsak.h
Unescape View File

@ -77,7 +77,7 @@ inline int tde_sak_verify_calling_process()
#ifdef DEBUG #ifdef DEBUG
printf("Parent executable name is: %s\n\r", procparent.ascii()); printf("Parent executable name is: %s\n\r", procparent.ascii());
#endif #endif
if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "kdm")) { if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "tdm")) {
authorized = true; authorized = true;
} }
else if (procparent == "tdeinit") { else if (procparent == "tdeinit") {

24
kdmlib/kgreet_classic.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
Conversation widget for kdm greeter Conversation widget for tdm greeter
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>
@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kgreet_classic.h" #include "kgreet_classic.h"
#include "themer/kdmthemer.h" #include "themer/tdmthemer.h"
#include "themer/kdmitem.h" #include "themer/tdmitem.h"
#include <klocale.h> #include <klocale.h>
#include <klineedit.h> #include <klineedit.h>
@ -35,10 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqlayout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
class KDMPasswordEdit : public KPasswordEdit { class TDMPasswordEdit : public KPasswordEdit {
public: public:
KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected: protected:
virtual void contextMenuEvent( TQContextMenuEvent * ) {} virtual void contextMenuEvent( TQContextMenuEvent * ) {}
}; };
@ -105,9 +105,9 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 ); grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
} }
if (echoMode == -1) if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( parent ); passwdEdit = new TDMPasswordEdit( parent );
else else
passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent ); parent );
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) ); TQT_SLOT(slotActivity()) );
@ -135,11 +135,11 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
} }
if (func != Authenticate) { if (func != Authenticate) {
if (echoMode == -1) { if (echoMode == -1) {
passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); passwd1Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); passwd2Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
} else { } else {
passwd1Edit = new KDMPasswordEdit( parent ); passwd1Edit = new TDMPasswordEdit( parent );
passwd2Edit = new KDMPasswordEdit( parent ); passwd2Edit = new TDMPasswordEdit( parent );
} }
passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent ); passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent );
passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent ); passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent );

2
kdmlib/kgreet_classic.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
Conversation widget for kdm greeter Conversation widget for tdm greeter
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>

52
kdmlib/kgreet_pam.cpp
Unescape View File

@ -1,10 +1,10 @@
/* /*
Conversation widget for kdm greeter Conversation widget for tdm greeter
Copyright (C) 2008 Dirk Mueller <mueller@kde.org> Copyright (C) 2008 Dirk Mueller <mueller@kde.org>
based on classic kdm greeter: based on classic tdm greeter:
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>
@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kgreet_pam.h" #include "kgreet_pam.h"
#include "themer/kdmthemer.h" #include "themer/tdmthemer.h"
#include "themer/kdmlabel.h" #include "themer/tdmlabel.h"
#include <klocale.h> #include <klocale.h>
#include <klineedit.h> #include <klineedit.h>
@ -47,10 +47,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//#define PAM_GREETER_DEBUG //#define PAM_GREETER_DEBUG
class KDMPasswordEdit : public KPasswordEdit { class TDMPasswordEdit : public KPasswordEdit {
public: public:
KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected: protected:
virtual void contextMenuEvent( TQContextMenuEvent * ) {} virtual void contextMenuEvent( TQContextMenuEvent * ) {}
}; };
@ -148,9 +148,9 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
} }
#if 0 #if 0
if (echoMode == -1) if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( parent ); passwdEdit = new TDMPasswordEdit( parent );
else else
passwdEdit = new KDMPasswordEdit( echoMode, passwdEdit = new TDMPasswordEdit( echoMode,
parent ); parent );
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) ); TQT_SLOT(slotActivity()) );
@ -177,11 +177,11 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
} }
if (func != Authenticate) { if (func != Authenticate) {
if (echoMode == -1) { if (echoMode == -1) {
authEdit << new KDMPasswordEdit( echoMode, parent ); authEdit << new TDMPasswordEdit( echoMode, parent );
authEdit << new KDMPasswordEdit( echoMode, parent ); authEdit << new TDMPasswordEdit( echoMode, parent );
} else { } else {
authEdit << new KDMPasswordEdit( parent ); authEdit << new TDMPasswordEdit( parent );
authEdit << new KDMPasswordEdit( parent ); authEdit << new TDMPasswordEdit( parent );
} }
authLabel << new TQLabel( authEdit[0], i18n("&New password:"), parent ); authLabel << new TQLabel( authEdit[0], i18n("&New password:"), parent );
authLabel << new TQLabel( authEdit[1], i18n("Con&firm password:"), parent ); authLabel << new TQLabel( authEdit[1], i18n("Con&firm password:"), parent );
@ -338,11 +338,11 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
if (loginLabel) if (loginLabel)
loginLabel->setText(TQString::fromUtf8(prompt)); loginLabel->setText(TQString::fromUtf8(prompt));
else if (m_themer) { else if (m_themer) {
KdmLabel *kdmlabel = static_cast<KdmLabel*>(m_themer->findNode("user-label")); KdmLabel *tdmlabel = static_cast<KdmLabel*>(m_themer->findNode("user-label"));
if (kdmlabel) { if (tdmlabel) {
//userLabel->setText(TQString::fromUtf8(prompt)); //userLabel->setText(TQString::fromUtf8(prompt));
kdmlabel->label.text = TQString::fromUtf8(prompt); tdmlabel->label.text = TQString::fromUtf8(prompt);
TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update())); TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
} }
} }
} }
@ -356,21 +356,21 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
kg_debug("themer found!"); kg_debug("themer found!");
KdmItem *pw_label = 0; KdmItem *pw_label = 0;
KdmLabel *kdmlabel = static_cast<KdmLabel*>(m_themer->findNode("pw-label")); KdmLabel *tdmlabel = static_cast<KdmLabel*>(m_themer->findNode("pw-label"));
if (kdmlabel) { if (tdmlabel) {
//userLabel->setText(TQString::fromUtf8(prompt)); //userLabel->setText(TQString::fromUtf8(prompt));
TQString str = TQString::fromUtf8(prompt); TQString str = TQString::fromUtf8(prompt);
kdmlabel->label.text = str; tdmlabel->label.text = str;
TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update())); TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
} }
} }
KDMPasswordEdit* passwdEdit; TDMPasswordEdit* passwdEdit;
if (echoMode == -1) if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( m_parentWidget ); passwdEdit = new TDMPasswordEdit( m_parentWidget );
else else
passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget); passwdEdit = new TDMPasswordEdit( echoMode, m_parentWidget);
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) ); TQT_SLOT(slotActivity()) );
connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
@ -400,8 +400,8 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
if (0) { if (0) {
//userLabel->setText(TQString::fromUtf8(prompt)); //userLabel->setText(TQString::fromUtf8(prompt));
//kdmlabel->label.text = TQString::fromUtf8(prompt); //tdmlabel->label.text = TQString::fromUtf8(prompt);
//TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update())); //TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
} }
} }
else else

2
kdmlib/kgreet_pam.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
Conversation widget for kdm greeter Conversation widget for tdm greeter
Copyright (C) 2008 Dirk Mueller <mueller@kde.org> Copyright (C) 2008 Dirk Mueller <mueller@kde.org>

24
kdmlib/kgreet_winbind.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
Conversation widget for kdm greeter Conversation widget for tdm greeter
Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org>
@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "kgreet_winbind.h" #include "kgreet_winbind.h"
#include "themer/kdmthemer.h" #include "themer/tdmthemer.h"
#include "themer/kdmitem.h" #include "themer/tdmitem.h"
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <stdlib.h> #include <stdlib.h>
class KDMPasswordEdit : public KPasswordEdit { class TDMPasswordEdit : public KPasswordEdit {
public: public:
KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {}
KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {}
protected: protected:
virtual void contextMenuEvent( TQContextMenuEvent * ) {} virtual void contextMenuEvent( TQContextMenuEvent * ) {}
}; };
@ -148,9 +148,9 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 ); grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 );
} }
if (echoMode == -1) if (echoMode == -1)
passwdEdit = new KDMPasswordEdit( parent ); passwdEdit = new TDMPasswordEdit( parent );
else else
passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent ); parent );
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) ); TQT_SLOT(slotActivity()) );
@ -180,11 +180,11 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
} }
if (func != Authenticate) { if (func != Authenticate) {
if (echoMode == -1) { if (echoMode == -1) {
passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); passwd1Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); passwd2Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent );
} else { } else {
passwd1Edit = new KDMPasswordEdit( parent ); passwd1Edit = new TDMPasswordEdit( parent );
passwd2Edit = new KDMPasswordEdit( parent ); passwd2Edit = new TDMPasswordEdit( parent );
} }
passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent ); passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent );
passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent ); passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent );

2
kdmlib/kgreet_winbind.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
Conversation widget for kdm greeter Conversation widget for tdm greeter
Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org>
Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org> Copyright (C) 2000-2003 Oswald Buddenhagen <ossi@kde.org>

14
kdmlib/kgreeterplugin.h
Unescape View File

@ -81,7 +81,7 @@ public:
/** /**
* Abstract base class for conversation plugins ("talkers") to be used with * Abstract base class for conversation plugins ("talkers") to be used with
* KDM, kdesktop_lock, etc. * TDM, kdesktop_lock, etc.
* The authentication method used by a particular instance of a plugin * The authentication method used by a particular instance of a plugin
* may be configurable, but the instance must handle exactly one method, * may be configurable, but the instance must handle exactly one method,
* i.e., info->method must be determined at the latest at init() time. * i.e., info->method must be determined at the latest at init() time.
@ -101,10 +101,10 @@ public:
/** /**
* Contexts the talker can be used in: * Contexts the talker can be used in:
* - Login: kdm login dialog * - Login: tdm login dialog
* - Shutdown: kdm shutdown dialog * - Shutdown: tdm shutdown dialog
* - Unlock: kdm unlock dialog (TODO) * - Unlock: tdm unlock dialog (TODO)
* - ChangeTok: kdm password change dialog (TODO) * - ChangeTok: tdm password change dialog (TODO)
* - ExUnlock: kdesktop_lock unlock dialog * - ExUnlock: kdesktop_lock unlock dialog
* - ExChangeTok: kdepasswd password change dialog (TODO) * - ExChangeTok: kdepasswd password change dialog (TODO)
* *
@ -343,9 +343,9 @@ struct KDE_EXPORT kgreeterplugin_info {
* above, it can ignore this parameter. * above, it can ignore this parameter.
* @param getConf can be used to obtain configuration items from the * @param getConf can be used to obtain configuration items from the
* greeter; you have to pass it the @p ctx pointer. * greeter; you have to pass it the @p ctx pointer.
* The only predefined key (in KDM) is "EchoMode", which is an int * The only predefined key (in TDM) is "EchoMode", which is an int
* (in fact, KPasswordEdit::EchoModes). * (in fact, KPasswordEdit::EchoModes).
* Other keys are obtained from the PluginOptions option; see kdmrc * Other keys are obtained from the PluginOptions option; see tdmrc
* for details. * for details.
* If the key is unknown, dflt is returned. * If the key is unknown, dflt is returned.
* @param ctx context pointer for @p getConf * @param ctx context pointer for @p getConf

2
kicker/kicker/core/kicker.cpp
Unescape View File

@ -108,7 +108,7 @@ Kicker::Kicker()
KGlobal::iconLoader()->addExtraDesktopThemes(); KGlobal::iconLoader()->addExtraDesktopThemes();
KGlobal::locale()->insertCatalogue("kdmgreet"); KGlobal::locale()->insertCatalogue("tdmgreet");
KGlobal::locale()->insertCatalogue("libkonq"); KGlobal::locale()->insertCatalogue("libkonq");
KGlobal::locale()->insertCatalogue("libdmctl"); KGlobal::locale()->insertCatalogue("libdmctl");
KGlobal::locale()->insertCatalogue("libtaskbar"); KGlobal::locale()->insertCatalogue("libtaskbar");

2
kicker/kicker/ui/CMakeLists.txt
Unescape View File

@ -17,7 +17,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/kicker/libkicker ${CMAKE_SOURCE_DIR}/kicker/libkicker
${CMAKE_SOURCE_DIR}/kicker/kicker/core ${CMAKE_SOURCE_DIR}/kicker/kicker/core
${CMAKE_SOURCE_DIR}/kicker/kicker/buttons ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons
${CMAKE_SOURCE_DIR}/kdmlib ${CMAKE_SOURCE_DIR}/tdmlib
${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/libkonq
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}

4
kicker/kicker/ui/Makefile.am
Unescape View File

@ -1,6 +1,6 @@
INCLUDES = -I$(srcdir)/../core -I../core -I$(srcdir)/../buttons \ INCLUDES = -I$(srcdir)/../core -I../core -I$(srcdir)/../buttons \
-I../../libkicker -I$(srcdir)/../../libkicker \ -I../../libkicker -I$(srcdir)/../../libkicker \
-I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(DBUS_INCS) $(all_includes) -I$(top_srcdir)/libkonq -I$(top_srcdir)/tdmlib $(DBUS_INCS) $(all_includes)
noinst_LTLIBRARIES = libkicker_ui.la noinst_LTLIBRARIES = libkicker_ui.la
@ -16,7 +16,7 @@ libkicker_ui_la_SOURCES = addbutton_mnu.cpp appletitem.ui appletview.ui addapple
addappletvisualfeedback.cpp clicklineedit.cpp flipscrollview.cpp \ addappletvisualfeedback.cpp clicklineedit.cpp flipscrollview.cpp \
media_watcher.cpp media_watcher.skel mykickoffsearchinterface.cpp query.cpp media_watcher.cpp media_watcher.skel mykickoffsearchinterface.cpp query.cpp
libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kdmlib/libdmctl.la \ libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/tdmlib/libdmctl.la \
$(LIB_KABC) ../interfaces/libkickoffsearch_interfaces.la $(LIB_KABC) ../interfaces/libkickoffsearch_interfaces.la
libkicker_ui_la_METASOURCES = AUTO libkicker_ui_la_METASOURCES = AUTO

2
kioslave/finger/finger.protocol
Unescape View File

@ -6,4 +6,4 @@ output=stream
reading=true reading=true
defaultMimetype=text/html defaultMimetype=text/html
DocPath=kioslave/finger.html DocPath=kioslave/finger.html
Icon=kdmconfig Icon=tdmconfig

2
ksmserver/CMakeLists.txt
Unescape View File

@ -16,7 +16,7 @@ endif()
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kdmlib ${CMAKE_SOURCE_DIR}/tdmlib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS} ${DBUS_TQT_INCLUDE_DIRS}

6
ksmserver/Makefile.am
Unescape View File

@ -17,7 +17,7 @@
SUBDIRS = . SUBDIRS = .
INCLUDES= -I$(top_srcdir)/kdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS) INCLUDES= -I$(top_srcdir)/tdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS)
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
@ -31,7 +31,7 @@ ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \
KSMServerInterface.skel server.skel timed.ui KSMServerInterface.skel server.skel timed.ui
ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_TDEUI) $(HAL_LIBS) $(DBUS_LIBS) ksmserver_la_LIBADD = ../tdmlib/libdmctl.la $(LIB_TDEUI) $(HAL_LIBS) $(DBUS_LIBS)
picsdir = $(kde_datadir)/ksmserver/pics picsdir = $(kde_datadir)/ksmserver/pics
pics_DATA = shutdownkonq.png pics_DATA = shutdownkonq.png
@ -44,7 +44,7 @@ updatedir = $(kde_datadir)/kconf_update
EXTRA_PROGRAMS = testsh EXTRA_PROGRAMS = testsh
testsh_SOURCES = test.cpp timed.ui testsh_SOURCES = test.cpp timed.ui
testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS)
messages: messages:
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot

2
ksmserver/shutdowndlg.cpp
Unescape View File

@ -898,7 +898,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
btnHalt->setFont( btnFont ); btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt ); buttonlay->addWidget( btnHalt );
connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
if ( sdtype == KApplication::ShutdownTypeHalt || getenv("KDM_AUTOLOGIN") ) if ( sdtype == KApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") )
btnHalt->setFocus(); btnHalt->setFocus();
// Reboot // Reboot

14
ksplashml/themeengine/redmond/themeredmond.cpp
Unescape View File

@ -185,7 +185,7 @@ void ThemeRedmond::_initUi()
greetingString = kes.getSetting( KEMailSettings::RealName ); greetingString = kes.getSetting( KEMailSettings::RealName );
} }
// Try to load the user's KDM icon... TODO: Make this overridable by the Theme. // Try to load the user's TDM icon... TODO: Make this overridable by the Theme.
if( mUseKdmUserIcon ) if( mUseKdmUserIcon )
{ {
const TQString defSys( ".default.face.icon" ); // The system-wide default image const TQString defSys( ".default.face.icon" ); // The system-wide default image
@ -195,10 +195,10 @@ void ThemeRedmond::_initUi()
const int fUserOnly = fUserFirst+1; const int fUserOnly = fUserFirst+1;
int faceSource = fAdminOnly; int faceSource = fAdminOnly;
KConfig *kdmconfig = new KConfig("kdm/kdmrc", true); KConfig *tdmconfig = new KConfig("tdm/tdmrc", true);
kdmconfig->setGroup("X-*-Greeter"); tdmconfig->setGroup("X-*-Greeter");
TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; TQString userPicsDir = tdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
TQString fs = kdmconfig->readEntry( "FaceSource" ); TQString fs = tdmconfig->readEntry( "FaceSource" );
if (fs == TQString::fromLatin1("UserOnly")) if (fs == TQString::fromLatin1("UserOnly"))
faceSource = fUserOnly; faceSource = fUserOnly;
else if (fs == TQString::fromLatin1("PreferUser")) else if (fs == TQString::fromLatin1("PreferUser"))
@ -207,7 +207,7 @@ void ThemeRedmond::_initUi()
faceSource = fAdminFirst; faceSource = fAdminFirst;
else else
faceSource = fAdminOnly; // Admin Only faceSource = fAdminOnly; // Admin Only
delete kdmconfig; delete tdmconfig;
TQPixmap userp; TQPixmap userp;
if ( faceSource == fAdminFirst ) if ( faceSource == fAdminFirst )
@ -341,7 +341,7 @@ void ThemeRedmond::_readSettings()
mShowUsernameText = cfg->readBoolEntry( "Show Username", true ); mShowUsernameText = cfg->readBoolEntry( "Show Username", true );
mShowActionText = cfg->readBoolEntry( "Show Action", true ); mShowActionText = cfg->readBoolEntry( "Show Action", true );
mShowIcon = cfg->readBoolEntry( "Show Icon", true ); mShowIcon = cfg->readBoolEntry( "Show Icon", true );
mUseKdmUserIcon = cfg->readBoolEntry( "Use KDM User Icon", true ); mUseKdmUserIcon = cfg->readBoolEntry( "Use TDM User Icon", true );
// Setup our fonts. There are only 3 elements which use 'em, so this is fairly // Setup our fonts. There are only 3 elements which use 'em, so this is fairly
// straightforward. // straightforward.

2
ksysguard/gui/SensorDisplayLib/ProcessList.cc
Unescape View File

@ -183,7 +183,7 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
aliases.insert("tdeinit", new TQString("kdeapp")); aliases.insert("tdeinit", new TQString("kdeapp"));
aliases.insert("kdesktop", new TQString("kdeapp")); aliases.insert("kdesktop", new TQString("kdeapp"));
aliases.insert("tdesud", new TQString("kdeapp")); aliases.insert("tdesud", new TQString("kdeapp"));
aliases.insert("kdm", new TQString("kdeapp")); aliases.insert("tdm", new TQString("kdeapp"));
aliases.insert("khotkeys", new TQString("kdeapp")); aliases.insert("khotkeys", new TQString("kdeapp"));
aliases.insert("kio_file", new TQString("kdeapp")); aliases.insert("kio_file", new TQString("kdeapp"));
aliases.insert("kio_uiserver", new TQString("kdeapp")); aliases.insert("kio_uiserver", new TQString("kdeapp"));

BIN
pics/wallpapers/isadora.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 728 KiB

After

Width:  |  Height:  |  Size: 728 KiB

2
tdeprint/tdeprintfax/configdlg.cpp
Unescape View File

@ -31,7 +31,7 @@
ConfigDlg::ConfigDlg(TQWidget *parent, const char *name) ConfigDlg::ConfigDlg(TQWidget *parent, const char *name)
: KDialogBase(IconList, i18n("Configuration"), Ok|Cancel, Ok, parent, name, true) : KDialogBase(IconList, i18n("Configuration"), Ok|Cancel, Ok, parent, name, true)
{ {
TQVBox *page1 = addVBoxPage(i18n("Personal"), i18n("Personal Settings"), DesktopIcon("kdmconfig")); TQVBox *page1 = addVBoxPage(i18n("Personal"), i18n("Personal Settings"), DesktopIcon("tdmconfig"));
m_general = new ConfGeneral(page1, "Personal"); m_general = new ConfGeneral(page1, "Personal");
TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy")); TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy"));

Write Preview
Loading…
Cancel
Save