diff options
154 files changed, 1632 insertions, 1632 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index acfcc2d6c..830eea998 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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_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_PAM "kdm should use PAM" ${WITH_ALL_OPTIONS} ) -option( WITH_SHADOW "kdm should use shadow passwords" ${WITH_ALL_OPTIONS} ) -option( WITH_XDMCP "xdmcp support for kdm" ${WITH_ALL_OPTIONS} ) +option( WITH_PAM "tdm should use PAM" ${WITH_ALL_OPTIONS} ) +option( WITH_SHADOW "tdm should use shadow passwords" ${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_ARTS "Enable aRts support" ${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_KREADCONFIG "Build kreadconfig" ${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_KSPLASHML "Build ksplashml" ${BUILD_ALL} ) option( BUILD_STARTKDE "Build starttde" ${BUILD_ALL} ) @@ -156,7 +156,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### tdebase directories ####################### -add_subdirectory( kdmlib ) +add_subdirectory( tdmlib ) tde_conditional_add_subdirectory( BUILD_L10N l10n ) 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_KREADCONFIG kreadconfig ) 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_KSPLASHML ksplashml ) tde_conditional_add_subdirectory( BUILD_KFIND kfind ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index aa7453af1..8c84b5bc8 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -9,8 +9,8 @@ # ################################################# -# termios.h (kdm, kioslave) -if( BUILD_KDM OR BUILD_KIOSLAVES ) +# termios.h (tdm, kioslave) +if( BUILD_TDM OR BUILD_KIOSLAVES ) check_include_file( termios.h HAVE_TERMIOS_H ) endif( ) @@ -22,7 +22,7 @@ endif( ) # 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 ) if( HAVE_PAM ) check_include_file( "security/pam_appl.h" SECURITY_PAM_APPL_H ) @@ -166,26 +166,26 @@ if( BUILD_KIOSLAVES OR BUILD_KSYSGUARD ) endif( ) -# getifaddrs (kcontrol, kdm) -if( BUILD_KCONTROL OR BUILD_KDM ) +# getifaddrs (kcontrol, tdm) +if( BUILD_KCONTROL OR BUILD_TDM ) check_function_exists( getifaddrs HAVE_GETIFADDRS ) endif( ) -# xkb (konsole, kdm, kxkb) -if( BUILD_KONSOLE OR BUILD_KDM OR BUILD_KXKB ) +# xkb (konsole, tdm, kxkb) +if( BUILD_KONSOLE OR BUILD_TDM OR BUILD_KXKB ) check_include_file( X11/XKBlib.h HAVE_X11_XKBLIB_H ) if( HAVE_X11_XKBLIB_H ) check_library_exists( X11 XkbLockModifiers "" HAVE_XKB ) - if( BUILD_KDM ) + if( BUILD_TDM ) check_library_exists( X11 XkbSetPerClientControls "" HAVE_XKBSETPERCLIENTCONTROLS ) endif( ) endif( ) endif( ) -# XBINDIR, XLIBDIR (kdm, kxkb) -if( BUILD_KDM OR BUILD_KXKB ) +# XBINDIR, XLIBDIR (tdm, kxkb) +if( BUILD_TDM OR BUILD_KXKB ) find_program( some_x_program NAMES iceauth xrdb xterm ) if( NOT some_x_program ) set( some_x_program /usr/bin/xrdb ) @@ -216,8 +216,8 @@ find_package( TDE ) # dbus-tqt need Qt flags -# dbus (kdm, ksmserver) -if( BUILD_KDM OR BUILD_KSMSERVER ) +# dbus (tdm, ksmserver) +if( BUILD_TDM OR BUILD_KSMSERVER ) pkg_search_module( DBUS dbus-1 ) if( NOT DBUS_FOUND ) diff --git a/Makefile.am.in b/Makefile.am.in index dce02a8ec..b38382ab1 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -2,10 +2,10 @@ ## (C) 1997 Stephan Kulow COMPILE_FIRST = libkonq -COMPILE_AFTER_kdmlib = kdesktop kicker ksmserver +COMPILE_AFTER_tdmlib = kdesktop kicker ksmserver COMPILE_BEFORE_konqueror = kate COMPILE_BEFORE_kcontrol = kicker -COMPILE_AFTER_kcontrol = kdm kdesktop +COMPILE_AFTER_kcontrol = tdm kdesktop AUTOMAKE_OPTIONS = foreign 1.6.1 @@ -62,7 +62,7 @@ libraries. Here is an overview of the directories: * kdialog Allows to display menu boxes from shell scripts. -* kdm +* tdm Replacement for XDM, for those people that like graphical logins. * kfind diff --git a/README.pam b/README.pam index 544b4e83f..c7db9908a 100644 --- a/README.pam +++ b/README.pam @@ -1,5 +1,5 @@ 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). 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 override it for all KDE programs by using --with-pam=<service> and/or 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 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. There are also two example service definitions in this directory - 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! If there is ever any doubt about which PAM service a program was 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. 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 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 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 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). Note 2: Screensavers typically only authenticate a user to allow her to diff --git a/applnk/compat/userinfo.desktop b/applnk/compat/userinfo.desktop index 79d1df1f2..2ea26f29f 100644 --- a/applnk/compat/userinfo.desktop +++ b/applnk/compat/userinfo.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Exec=kcmshell kcm_useraccount -Icon=kdmconfig +Icon=tdmconfig DocPath=kcontrol/userinfo/index.html 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[zh_CN]=更改您的账户信息 Comment[zh_TW]=更改帳號資訊 -Keywords=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account -Keywords[ar]=كلمات المرور,كلمة المرور,غيير كلمة المرور,أيقونة,وجه,kdm,إسم المستخدم,الإسم,الحساب -Keywords[az]=şifrələr,şifrə,dəyişdir,dəyişdirmək,timsal,şəkil,sifət,kdm,istifadəçi,ad,hesab -Keywords[be]=Паролі,Пароль,Змена паролю,Значка,твар,Імя карыстальніка,Уліковы рахунак,Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account -Keywords[bg]=парола, сметка, промяна на парола, име, потребител, Passwords, Password, Change Password, Icon, face, kdm, 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[ca]=Contrasenyes,Contrasenya,Canvia contrasenya,Icona,aspecte,kdm,Nom d'usuari,Nom,Compte -Keywords[cs]=hesla,heslo,změnit heslo,ikona,obličej,kdm,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[cy]=Cyfrinair,Cyfrineiriau,Newid Cyfrinair,Eicon,wyneb,kdm,Defnydd-enw, Enw Defnyddiwr,Enw,Cyfrif -Keywords[da]=Kodeord,Adgangskode,Ændr kodeord,Ikon,ansigt,kdm,Brugernavn,Navn,Konto -Keywords[de]=Passwörter,Passwort,Passwort ändern,Symbol,Schriftart,kdm,User,Benutzername,Name,Account,Zugang,Konto -Keywords[el]=Κωδικοί πρόσβασης,Κωδικός πρόσβασης,Αλλαγή κωδικού πρόσβασης,Εικονίδιο,πρόσωπο,kdm,Όνομα χρήστη,Όνομα,Λογαριασμός -Keywords[eo]=Pasvortoj,Pasvorto,Ŝanĝu la pasvorton,Piktogramo,vizaĝo,kdm,Uzantnomo,Nomo,Konto -Keywords[es]=Contraseñas,Contraseña,Cambiar contraseña,Icono,cara,kdm,Nombre de usuario,Nombre,Cuenta -Keywords[et]=Paroolid,Parool,Parooli muutmine,Ikoon,nägu,kdm,Kasutajanimi,Nimi,Konto -Keywords[eu]=Pasahitzak,Pasahitza,Aldatu pasahitza,Ikonoa,aurpegia,kdm,Erabiltzaile izena,Izena,Kontua -Keywords[fa]=اسم رمزها، اسم رمز، تغییر اسم رمز، شمایل، سطح، kdm ، نام کاربر، نام، حساب +Keywords=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account +Keywords[ar]=كلمات المرور,كلمة المرور,غيير كلمة المرور,أيقونة,وجه,tdm,إسم المستخدم,الإسم,الحساب +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,tdm,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,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,tdm,Nom d'usuari,Nom,Compte +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,tdm,brëkòwnik,miono,nôzwëskò,kònto +Keywords[cy]=Cyfrinair,Cyfrineiriau,Newid Cyfrinair,Eicon,wyneb,tdm,Defnydd-enw, Enw Defnyddiwr,Enw,Cyfrif +Keywords[da]=Kodeord,Adgangskode,Ændr kodeord,Ikon,ansigt,tdm,Brugernavn,Navn,Konto +Keywords[de]=Passwörter,Passwort,Passwort ändern,Symbol,Schriftart,tdm,User,Benutzername,Name,Account,Zugang,Konto +Keywords[el]=Κωδικοί πρόσβασης,Κωδικός πρόσβασης,Αλλαγή κωδικού πρόσβασης,Εικονίδιο,πρόσωπο,tdm,Όνομα χρήστη,Όνομα,Λογαριασμός +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,tdm,Nombre de usuario,Nombre,Cuenta +Keywords[et]=Paroolid,Parool,Parooli muutmine,Ikoon,nägu,tdm,Kasutajanimi,Nimi,Konto +Keywords[eu]=Pasahitzak,Pasahitza,Aldatu pasahitza,Ikonoa,aurpegia,tdm,Erabiltzaile izena,Izena,Kontua +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[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[fy]=Wachtwurden,Wachtwurd,Wachtwurd feroarje,ikoan,face,kdm,Brûkersnamme,Namme,Akkount -Keywords[ga]=Focail Fhaire,Focal Faire,Athraigh focal faire,Deilbhín,aghaidh, kdm,Ainm Úsáideora,Ainm -Keywords[gl]=Contrasinais,Contrasinal,Trocar contrasinal,icona,aspeito,kdm,Nome de Usuario,Nome,Conta -Keywords[he]=ססמאות, ססמה, שנה ססמה, סמל, פרצות, KDM,שם משתמש, שם,חשבון,Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account +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,tdm,Brûkersnamme,Namme,Akkount +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,tdm,Nome de Usuario,Nome,Conta +Keywords[he]=ססמאות, ססמה, שנה ססמה, סמל, פרצות, TDM,שם משתמש, שם,חשבון,Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account 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[is]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,lykilorð,Breyta lykilorði,andlit,mynd,nafn -Keywords[it]=Password,CambiaPassword,Icona,faccia,kdm,Utente,Nome utente,Nome,Account -Keywords[ja]=パスワード,パスワード変更,アイコン,顔,kdm,ユーザ名,名前,アカウント -Keywords[ka]=პაროლები, პაროლი, პაროლის შეცვლა, ხატულა, სახე, kdm, მომხმარებლის სახელი, სახელი,ანგარიში -Keywords[km]=ពាក្យសម្ងាត់,ផ្លាស់ប្ដូរពាក្យសម្ងាត់,រូបតំណាង,មុខ,kdm,ឈ្មោះអ្នកប្រើ,ឈ្មោះ,គណនី -Keywords[ko]=암호,비밀번호,아이콘,얼굴,사용자 이름,계정,kdm -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[lv]=Paroles,Parole,Mainīt paroli,Ikona,seja,kdm,Lietotāja vārds,Vārds,Konts -Keywords[mk]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Лозинки,Лозинка,Смени лозинка,Икона,лице,Корисничко Име,Име,Сметка -Keywords[ms]=Kata laluan, Kata laluan, Tukar kata laluan,Ikon,face,kdm,Nama Pengguna,Nama,Akaun -Keywords[mt]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,Kont,Ibdel Password,Ikona,Isem -Keywords[nb]=Passord,Passord,Endre passord,Ikon,utseende,kdm,brukernavn,navn,konto -Keywords[nds]=Passwöör,Passwoort,Passwoort ännern,Lüttbild,icon,Gesicht,kdm,User Name,Brukernaam,Naam,Konto +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,tdm,User Name,Name,Account,lykilorð,Breyta lykilorði,andlit,mynd,nafn +Keywords[it]=Password,CambiaPassword,Icona,faccia,tdm,Utente,Nome utente,Nome,Account +Keywords[ja]=パスワード,パスワード変更,アイコン,顔,tdm,ユーザ名,名前,アカウント +Keywords[ka]=პაროლები, პაროლი, პაროლის შეცვლა, ხატულა, სახე, tdm, მომხმარებლის სახელი, სახელი,ანგარიში +Keywords[km]=ពាក្យសម្ងាត់,ផ្លាស់ប្ដូរពាក្យសម្ងាត់,រូបតំណាង,មុខ,tdm,ឈ្មោះអ្នកប្រើ,ឈ្មោះ,គណនី +Keywords[ko]=암호,비밀번호,아이콘,얼굴,사용자 이름,계정,tdm +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,tdm,Lietotāja vārds,Vārds,Konts +Keywords[mk]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,Лозинки,Лозинка,Смени лозинка,Икона,лице,Корисничко Име,Име,Сметка +Keywords[ms]=Kata laluan, Kata laluan, Tukar kata laluan,Ikon,face,tdm,Nama Pengguna,Nama,Akaun +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,tdm,brukernavn,navn,konto +Keywords[nds]=Passwöör,Passwoort,Passwoort ännern,Lüttbild,icon,Gesicht,tdm,User Name,Brukernaam,Naam,Konto Keywords[ne]=पासवर्डहरू, पासवर्ड, पासवर्ड परिवर्तन, प्रतिमा, मोहडा, के डी एम, प्रयोगकर्ता नाम, नाम, खाता -Keywords[nl]=wachtwoorden,passwords,wachtwoord,password,password wijzigen,wachtwoord wijzigen,pictogram,face,kdm,gebruikersnaam,naam,account -Keywords[nn]=passord,endra passord,ikon,fjes,bilete,kdm,brukarnamn,namn,konto -Keywords[pa]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,ਖਾਤਾ,ਗੁਪਤ-ਕੋਡ,ਆਈਕਾਨ,ਉਪਭੋਗੀ ਨਾਂ,ਨਾਂ -Keywords[pl]=hasło,hasła,zmień hasło,ikona,kdm,użytkownik,imię,nazwisko,konto -Keywords[pt]=senhas,senha,mudar a senha,ícone,face,kdm,nome de utilizador,nome,conta -Keywords[pt_BR]=senhas,senhas,mudar senha,ícone,cara,kdm,nome do usuário, nome,conta -Keywords[ro]=parole,parolă,schimbă parolă,iconiță,față,kdm,nume utilizator,nume,cont -Keywords[ru]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,пользователь,пароль -Keywords[rw]=Amagambobanga,Ijambobanga,Guhindura Ijambobanga, Agashushondanga,isura,kdm,Izina ry'Ukoresha,Izina, Konti -Keywords[se]=beassanasánit,beassansátni,rievdat beassansáni,govaš,amadádju,kdm,geavaheaddjenamma,namma,kontu -Keywords[sk]=heslá,heslo,zmena hesla,ikona,obrázok,foto,kdm,používateľ,meno,účet -Keywords[sl]=gesla,geslo,spremeni geslo,ikona,obraz,kdm,uporabniško ime, ime,račun -Keywords[sr]=Passwords,Password,Change Password,Icon,face,kdm,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[sv]=lösenord,ändra lösenord,ikon,bild,KDM,användarnamn,namn,konto -Keywords[ta]=கடவுச்சொற்கள்,கடவுச்சொல்,கடவுச்சொலை மாற்று,சின்னம்,முகம்,kdm,பயனர் பெயர்,பெயர்,கணக்கு +Keywords[nl]=wachtwoorden,passwords,wachtwoord,password,password wijzigen,wachtwoord wijzigen,pictogram,face,tdm,gebruikersnaam,naam,account +Keywords[nn]=passord,endra passord,ikon,fjes,bilete,tdm,brukarnamn,namn,konto +Keywords[pa]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,ਖਾਤਾ,ਗੁਪਤ-ਕੋਡ,ਆਈਕਾਨ,ਉਪਭੋਗੀ ਨਾਂ,ਨਾਂ +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,tdm,nome de utilizador,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ță,tdm,nume utilizator,nume,cont +Keywords[ru]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,пользователь,пароль +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,tdm,geavaheaddjenamma,namma,kontu +Keywords[sk]=heslá,heslo,zmena hesla,ikona,obrázok,foto,tdm,používateľ,meno,účet +Keywords[sl]=gesla,geslo,spremeni geslo,ikona,obraz,tdm,uporabniško ime, ime,račun +Keywords[sr]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,Лозинке,Лозинка,Икона,лице,Име,Налог,Кориснички налог +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,TDM,användarnamn,namn,konto +Keywords[ta]=கடவுச்சொற்கள்,கடவுச்சொல்,கடவுச்சொலை மாற்று,சின்னம்,முகம்,tdm,பயனர் பெயர்,பெயர்,கணக்கு Keywords[te]=పాస్ వర్డులు, పాస్ వర్డ్, పాస్ వర్డ్ ను మార్చు, ప్రతిమ, ముఖము, కెడిఎం, యూజర్ పేరు, పేరు, ఖాతా -Keywords[tr]=Parolalar,Parola,Parola Değişimi,Simge,yüz,kdm,Kullanıcı Adı,İsim,Ad,Hesap -Keywords[uk]=паролі,пароль,зміна пароля,піктограма,обличчя,kdm,ім'я користувача,ім'я,рахунок -Keywords[uz]=Foydalanuvchining ismi,Maxfiy soʻzlar,Maxfiy soʻz,Maxfiy soʻzni oʻzgartirish,Nishoncha,Foydalanuvchi,Hisob,kdm -Keywords[uz@cyrillic]=Фойдаланувчининг исми,Махфий сўзлар,Махфий сўз,Махфий сўзни ўзгартириш,Нишонча,Фойдаланувчи,Ҳисоб,kdm -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[wa]=Sicrets,Sicret,Candjî l' sicret,imådjete,kdm,No d' uzeu,No d' elodjaedje,No,Conte -Keywords[zh_CN]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,密码,更改密码,图标,头像,用户名,姓名,账户 -Keywords[zh_TW]=Passwords,Password,Change Password,Icon,face,kdm,User Name,Name,Account,密碼,改變密碼,圖示,外觀,使用者名稱,名稱,帳號 +Keywords[tr]=Parolalar,Parola,Parola Değişimi,Simge,yüz,tdm,Kullanıcı Adı,İsim,Ad,Hesap +Keywords[uk]=паролі,пароль,зміна пароля,піктограма,обличчя,tdm,ім'я користувача,ім'я,рахунок +Keywords[uz]=Foydalanuvchining ismi,Maxfiy soʻzlar,Maxfiy soʻz,Maxfiy soʻzni oʻzgartirish,Nishoncha,Foydalanuvchi,Hisob,tdm +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,tdm,Tên Người dùng,Tên,Tài khoản +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,tdm,User Name,Name,Account,密码,更改密码,图标,头像,用户名,姓名,账户 +Keywords[zh_TW]=Passwords,Password,Change Password,Icon,face,tdm,User Name,Name,Account,密碼,改變密碼,圖示,外觀,使用者名稱,名稱,帳號 diff --git a/config.h.cmake b/config.h.cmake index b4ca189a9..84dd7eb2c 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -15,13 +15,13 @@ // kdesktop, kcontrol, ksplashml #cmakedefine HAVE_XCURSOR 1 -// konsole, kdm, kxkb +// konsole, tdm, kxkb #cmakedefine HAVE_XKB 1 // kxkb #cmakedefine HAVE_XTEST 1 -// kdm, kioslave +// tdm, kioslave #cmakedefine HAVE_TERMIOS_H 1 // kioslave/media @@ -37,7 +37,7 @@ // kioslave/smtp, kioslave/pop3 #cmakedefine HAVE_LIBSASL2 1 -// kdm, kcontrol +// tdm, kcontrol #cmakedefine HAVE_GETIFADDRS 1 // kio_fish @@ -96,7 +96,7 @@ #cmakedefine HAVE_SYS_WAIT_H 1 #cmakedefine DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@" -// kdm, kcheckpass, kdesktop +// tdm, kcheckpass, kdesktop #cmakedefine HAVE_PAM 1 // kcheckpass @@ -105,7 +105,7 @@ // kdesktop #cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@" -// kdm +// tdm #cmakedefine XBINDIR "@XBINDIR@" #define KDE_BINDIR "@TDE_BIN_DIR@" #define KDE_DATADIR "@TDE_DATA_DIR@" @@ -145,7 +145,7 @@ #cmakedefine DEV_RANDOM "@DEV_RANDOM@" #cmakedefine USE_PAM 1 -#cmakedefine KDM_PAM_SERVICE "@KDM_PAM_SERVICE@" +#cmakedefine TDM_PAM_SERVICE "@TDM_PAM_SERVICE@" #define USESHADOW 1 #define HAVE_SHADOW 1 @@ -163,8 +163,8 @@ #cmakedefine HAVE_ARTS 1 #cmakedefine COVARIANT_RETURN_BROKEN 1 -// kdm, kxkb +// tdm, kxkb #cmakedefine XLIBDIR "@XLIBDIR@" -// kdm, kcontrol +// tdm, kcontrol #cmakedefine WITH_XRANDR "@WITH_XRANDR@" diff --git a/configure.in.in b/configure.in.in index 96f59f21d..bdad1ca08 100644 --- a/configure.in.in +++ b/configure.in.in @@ -5,7 +5,7 @@ KDE_ENABLE_HIDDEN_VISIBILITY dnl PAM, shadow passwords, libcrypt KDE_PASSWDLIBS -DEF_PAM_SERVICE(kdm, kdm, KDM) +DEF_PAM_SERVICE(tdm, tdm, TDM) DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS) DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER) @@ -230,7 +230,7 @@ AH_VERBATIM(_broken_xkb, [ #endif ]) -dnl this is for kdm and kcontrol +dnl this is for tdm and kcontrol KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir) AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory]) 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_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], [ AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/]) ]) diff --git a/doc/faq/configkde.docbook b/doc/faq/configkde.docbook index f1393d829..10a6b5f3c 100644 --- a/doc/faq/configkde.docbook +++ b/doc/faq/configkde.docbook @@ -71,9 +71,9 @@ a line saying <userinput>id:3:initdefault:</userinput>. Change it to comment out the following line: <literal>x:5:respawn:/usr/bin/X11/xdm -nodaemon</literal> and 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>. -<note><para>The location of &kdm; may differ on your +<note><para>The location of &tdm; may differ on your system.</para></note></para> <para>For changes to take effect immediately, type <command>init 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> and change one of the lines that look like <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> </answer> </qandaentry> @@ -136,11 +136,11 @@ to whatever you want.</para> <qandaentry> <question> -<para>&kde; (&kdm;) does not read my +<para>&kde; (&tdm;) does not read my <filename>.bash_profile</filename>!</para> </question> <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>, <filename>.bash_profile</filename>, &etc; are not 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 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; -Display Manager</quote>. If you are not using &kdm; as your login screen +<para>In &kde;, this program is called &tdm; which stands for <quote>&kde; +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 accomplish multiple sessions.</para> <para>By default, this will be configured at installation time automatically -if &kdm; supports virtual terminals on your system (currently Linux only). -If it was not configured automatically, consult the &kdm; manual, section -<ulink url="help:/kdm/kdmrc-xservers">Specifying permanent &X-Server;s</ulink>. -After modifying kdmrc, you will have to let &kdm; know about it; just -invoke <command>killall -HUP kdm</command>.</para> +if &tdm; supports virtual terminals on your system (currently Linux only). +If it was not configured automatically, consult the &tdm; manual, section +<ulink url="help:/tdm/tdmrc-xservers">Specifying permanent &X-Server;s</ulink>. +After modifying tdmrc, you will have to let &tdm; know about it; just +invoke <command>killall -HUP tdm</command>.</para> </answer> </qandaentry> </qandaset> diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook index 5548d2f24..8ef76e97e 100644 --- a/doc/faq/install.docbook +++ b/doc/faq/install.docbook @@ -383,7 +383,7 @@ path.</para> <para>Edit the file <filename>.xinitrc</filename> in your home folder (make a backup copy first!), remove everything that looks like calling a window 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 folder, simply create a new one with just one line containing <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 <command>starttde</command> at the end of your <filename>.xsession</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 <filename>.xsession</filename>, <filename>.xinitrc</filename>, or <filename>.Xclients</filename> in your home folder, simply create a new one diff --git a/doc/faq/notrelated.docbook b/doc/faq/notrelated.docbook index fd66e1a6c..f39ee7705 100644 --- a/doc/faq/notrelated.docbook +++ b/doc/faq/notrelated.docbook @@ -44,7 +44,7 @@ start &X-Window; using <command>startx <option> -bpp <replaceable>number</replaceable></option></command> where <replaceable>number</replaceable> can be 8, 16, 24 or 32, depending on the depth you want. Alternatively, if you are using -<application>xdm</application>/&kdm;, you +<application>xdm</application>/&tdm;, you need to edit <filename>/etc/X11/xdm/Xservers</filename> (may vary) and enter <userinput>:0 local /usr/X11R6/bin/X -bpp 16</userinput> for 16 bit color diff --git a/doc/kcontrol/kcmsmserver/index.docbook b/doc/kcontrol/kcmsmserver/index.docbook index 65cb9423f..fb98fc123 100644 --- a/doc/kcontrol/kcmsmserver/index.docbook +++ b/doc/kcontrol/kcmsmserver/index.docbook @@ -86,7 +86,7 @@ first place? --></para></listitem> <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 -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, leave the default settings. They are:</para> diff --git a/doc/kcontrol/kdm/CMakeLists.txt b/doc/kcontrol/kdm/CMakeLists.txt index 11f2b8477..4bdd0a66d 100644 --- a/doc/kcontrol/kdm/CMakeLists.txt +++ b/doc/kcontrol/kdm/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_create_handbook( DESTINATION kcontrol/kdm ) +tde_create_handbook( DESTINATION kcontrol/tdm ) diff --git a/doc/kcontrol/kdm/Makefile.am b/doc/kcontrol/kdm/Makefile.am index 511936b0f..c81f42bd9 100644 --- a/doc/kcontrol/kdm/Makefile.am +++ b/doc/kcontrol/kdm/Makefile.am @@ -1,2 +1,2 @@ KDE_LANG = en -KDE_DOCS = kcontrol/kdm +KDE_DOCS = kcontrol/tdm diff --git a/doc/kcontrol/kdm/index.docbook b/doc/kcontrol/kdm/index.docbook index 090b78225..ef1d0b7d4 100644 --- a/doc/kcontrol/kdm/index.docbook +++ b/doc/kcontrol/kdm/index.docbook @@ -21,7 +21,7 @@ <keywordset> <keyword>KDE</keyword> <keyword>KControl</keyword> -<keyword>KDM configuration</keyword> +<keyword>TDM configuration</keyword> <keyword>login manager</keyword> <keyword>login</keyword> </keywordset> @@ -31,20 +31,20 @@ <title>Login Manager</title> <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 computer.</para> <para>In order to organize all of these options, this module is divided into six sections: <link -linkend="kdmconfig-appearance"><guilabel>Appearance</guilabel></link>, -<link linkend="kdmconfig-font"><guilabel>Font</guilabel></link>, <link -linkend="kdmconfig-background"><guilabel>Background</guilabel></link>, +linkend="tdmconfig-appearance"><guilabel>Appearance</guilabel></link>, +<link linkend="tdmconfig-font"><guilabel>Font</guilabel></link>, <link +linkend="tdmconfig-background"><guilabel>Background</guilabel></link>, <link -linkend="kdmconfig-sessions"><guilabel>Sessions</guilabel></link>, -<link linkend="kdmconfig-users"><guilabel>Users</guilabel></link> and +linkend="tdmconfig-sessions"><guilabel>Sessions</guilabel></link>, +<link linkend="tdmconfig-users"><guilabel>Users</guilabel></link> and <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 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 module.</para></note> -<sect2 id="kdmconfig-appearance"> +<sect2 id="tdmconfig-appearance"> <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> <para>The greeting string is the title of the login screen. If the 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> <para>You can then choose to show either the current system time, a logo @@ -87,11 +87,11 @@ dialog.</para> </itemizedlist> <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> <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> <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 id="kdmconfig-font"> +<sect2 id="tdmconfig-font"> <title>Font</title> <para>From this section of the module you can change the fonts used in @@ -130,7 +130,7 @@ login window.</para> </sect2> -<sect2 id="kdmconfig-background"> +<sect2 id="tdmconfig-background"> <title>Background</title> <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 id="kdmconfig-sessions"> +<sect2 id="tdmconfig-sessions"> <title>Sessions</title> <para><guilabel>Allow to shutdown</guilabel></para> <para>Use this dropdown box to choose who is allowed to shut down:</para> <itemizedlist> <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> </listitem> <listitem> <para><guilabel>All</guilabel>: Everyone can shutdown the computer using -&kdm;.</para> +&tdm;.</para> </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 computer.</para></listitem> <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>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 need to supply the correct paths to your <command>lilo</command> command and to lilo's map file.</para> -<sect3 id="kdmconfig-sess"> +<sect3 id="tdmconfig-sess"> <title>Session types</title> <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 id="kdmconfig-users"> +<sect2 id="tdmconfig-users"> <title>Users</title> <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 this terminal.</para> -<sect3 id="kdmconfig-showusers"> +<sect3 id="tdmconfig-showusers"> <title>To show (and sort) or not to show users</title> <para>Along the right edge of the window are two check boxes:</para> @@ -376,7 +376,7 @@ effect.</para> </sect3> -<sect3 id="kdmconfig-whichusers"> +<sect3 id="tdmconfig-whichusers"> <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 @@ -395,7 +395,7 @@ users</guilabel> is not checked, this has no effect. </para></listitem> </sect3> -<sect3 id="kdmconfig-select"> +<sect3 id="tdmconfig-select"> <title>Select users</title> <para>This page contains three listboxes. The large listbox on the left @@ -413,7 +413,7 @@ to the leftmost box.</para> </sect3> -<sect3 id="kdmconfig-image"> +<sect3 id="tdmconfig-image"> <title>Images</title> <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 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 -<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> <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 id="kdmconfig-convenience"> +<sect2 id="tdmconfig-convenience"> <title>Convenience</title> <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 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> -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 if you kill the X server, ⪚ by pressing <keycombo action="simul">&Ctrl;&Alt;<keycap>Backspace</keycap></keycombo>.</para> @@ -504,7 +504,7 @@ password-less login, ⪚ option allows you to skip the authentication procedure when your X server accidentally crashed. <guilabel>Show previous user</guilabel> 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 least one valid login.</para> diff --git a/doc/kcontrol/mouse/index.docbook b/doc/kcontrol/mouse/index.docbook index 62d223de1..c099f9bf4 100644 --- a/doc/kcontrol/mouse/index.docbook +++ b/doc/kcontrol/mouse/index.docbook @@ -408,7 +408,7 @@ and permissions, as shown below: if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] then # 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> if [ -f /var/run/console.lock ] then diff --git a/doc/kdm/CMakeLists.txt b/doc/kdm/CMakeLists.txt index fe876f955..9a29fa8f8 100644 --- a/doc/kdm/CMakeLists.txt +++ b/doc/kdm/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_create_handbook( DESTINATION kdm ) +tde_create_handbook( DESTINATION tdm ) diff --git a/doc/kdm/Makefile.am b/doc/kdm/Makefile.am index c04fe0908..3db537e3f 100644 --- a/doc/kdm/Makefile.am +++ b/doc/kdm/Makefile.am @@ -1,6 +1,6 @@ -conf_def = $(top_srcdir)/kdm/config.def -ref: $(conf_def) $(top_srcdir)/kdm/confproc.pl - $(PERL) -w $(top_srcdir)/kdm/confproc.pl --doc $(conf_def) kdmrc-ref.docbook +conf_def = $(top_srcdir)/tdm/config.def +ref: $(conf_def) $(top_srcdir)/tdm/confproc.pl + $(PERL) -w $(top_srcdir)/tdm/confproc.pl --doc $(conf_def) tdmrc-ref.docbook KDE_LANG = en KDE_DOCS = AUTO diff --git a/doc/kdm/index.docbook b/doc/kdm/index.docbook index 43cec1bde..dde535328 100644 --- a/doc/kdm/index.docbook +++ b/doc/kdm/index.docbook @@ -1,21 +1,21 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kappname "&kdm;"> + <!ENTITY kappname "&tdm;"> <!ENTITY package "tdebase"> - <!ENTITY kdmrc "<filename>kdmrc</filename>"> + <!ENTITY tdmrc "<filename>tdmrc</filename>"> <!ENTITY ksmserver "<application>ksmserver</application>"> <!ENTITY kdesktop "<application>kdesktop</application>"> <!ENTITY XDMCP "<acronym>XDMCP</acronym>"> <!ENTITY xdm "<application>xdm</application>"> - <!ENTITY kdmrc-ref SYSTEM "kdmrc-ref.docbook"> + <!ENTITY tdmrc-ref SYSTEM "tdmrc-ref.docbook"> <!ENTITY % addindex "INCLUDE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> ]> <book lang="&language;"> <bookinfo> -<title>The &kdm; Handbook</title> +<title>The &tdm; Handbook</title> <authorgroup> <author> @@ -53,13 +53,13 @@ <releaseinfo>0.05.02</releaseinfo> <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> </abstract> <keywordset> <keyword>KDE</keyword> -<keyword>kdm</keyword> +<keyword>tdm</keyword> <keyword>xdm</keyword> <keyword>display manager</keyword> <keyword>login manager</keyword> @@ -70,9 +70,9 @@ is also known as the <quote>Login Manager</quote>.</para> <chapter id="introduction"> <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 -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> </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 * Adding more session types (GNOME, 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) * XDMCP by query * 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> 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 -<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 linkend="login" />.</para> @@ -154,7 +154,7 @@ above for each of them.</para> <note> <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 through the rest of this manual to find out how to do these things.</para> </note> @@ -164,7 +164,7 @@ through the rest of this manual to find out how to do these things.</para> <chapter id="login"> <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> <itemizedlist> @@ -186,7 +186,7 @@ imitation of the login box on &IRIX;).</para> </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 environments installed on the system.</para> </listitem> @@ -233,7 +233,7 @@ and bring up the login dialog again.</para> <listitem> <para>(Optionally on local displays) A <guimenuitem>Console 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> </listitem> </itemizedlist> @@ -285,56 +285,56 @@ software.</para> <para>Pressing the <guibutton>OK</guibutton> button initiates the selected action; pressing the <guibutton>Cancel</guibutton> button returns to the -main &kdm; dialog box. </para> +main &tdm; dialog box. </para> </chapter> <!-- *********************************************************************** --> -<chapter id="configuring-kdm"> -<title>Configuring &kdm;</title> +<chapter id="configuring-tdm"> +<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> -<para>When &kdm; starts up, it reads its configuration from the folder -<filename class="directory">$TDEDIR/share/config/kdm/</filename> (this may -be <filename class="directory">/etc/trinity/kdm/</filename> or something else +<para>When &tdm; starts up, it reads its configuration from the folder +<filename class="directory">$TDEDIR/share/config/tdm/</filename> (this may +be <filename class="directory">/etc/trinity/tdm/</filename> or something else 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 the system - but usually that would not make much sense for obvious 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 &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 -user-specific configuration files; all users share the common &kdmrc;. It -follows from this that the configuration of &kdm; can only be altered by +user-specific configuration files; all users share the common &tdmrc;. It +follows from this that the configuration of &tdm; can only be altered by 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 class="username">root</systemitem>).</para> -<para>You can view the &kdmrc; file currently in use on your system, and you -can configure &kdm; by editing this file. Alternatively, you can use the +<para>You can view the &tdmrc; file currently in use on your system, and you +can configure &tdm; by editing this file. Alternatively, you can use the graphical configuration tool provided by the &kcontrolcenter; (under <menuchoice><guisubmenu>System Administration</guisubmenu><guimenuitem>Login Manager</guimenuitem></menuchoice>), which is described in <ulink url="help:/kcontrol/login-manager.html">the &kcontrolcenter; help files</ulink>. </para> -<para>The remainder of this chapter describes configuration of &kdm; -via the &kcontrolcenter; module, and the <link linkend="kdm-files">next -chapter</link> describes the options available in &kdmrc; itself. If +<para>The remainder of this chapter describes configuration of &tdm; +via the &kcontrolcenter; module, and the <link linkend="tdm-files">next +chapter</link> describes the options available in &tdmrc; itself. If you only need to configure for local users, the &kcontrolcenter; module 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> -<sect1 id="kdm-kcontrol-module"> +<sect1 id="tdm-kcontrol-module"> <sect1info> <authorgroup> <author>&Thomas.Tanghus; &Thomas.Tanghus.mail;</author> @@ -346,31 +346,31 @@ on.</para> <title>The Login Manager &kcontrolcenter; Module</title> <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 computer.</para> <note><para>All settings will be written to the configuration file -&kdmrc;, which in its original state has many comments to help you -configure &kdm;. Using this &kcontrolcenter; module will strip these -comments from the file. All available options in &kdmrc; are covered -in <xref linkend="kdm-files"/>.</para> +&tdmrc;, which in its original state has many comments to help you +configure &tdm;. Using this &kcontrolcenter; module will strip these +comments from the file. All available options in &tdmrc; are covered +in <xref linkend="tdm-files"/>.</para> <para>The options listed in this chapter are cross referenced with -their equivalents in &kdmrc;. All options available in the &kcontrol; -module are also available directly in &kdmrc; but the reverse is not +their equivalents in &tdmrc;. All options available in the &kcontrol; +module are also available directly in &tdmrc; but the reverse is not true.</para></note> <para>In order to organize all of these options, this module is divided into several sections: <link -linkend="kdmconfig-appearance"><guilabel>Appearance</guilabel></link>, -<link linkend="kdmconfig-font"><guilabel>Font</guilabel></link>, <link -linkend="kdmconfig-background"><guilabel>Background</guilabel></link>, +linkend="tdmconfig-appearance"><guilabel>Appearance</guilabel></link>, +<link linkend="tdmconfig-font"><guilabel>Font</guilabel></link>, <link +linkend="tdmconfig-background"><guilabel>Background</guilabel></link>, <link -linkend="kdmconfig-shutdown"><guilabel>Shutdown</guilabel></link>, -<link linkend="kdmconfig-users"><guilabel>Users</guilabel></link> and +linkend="tdmconfig-shutdown"><guilabel>Shutdown</guilabel></link>, +<link linkend="tdmconfig-users"><guilabel>Users</guilabel></link> and <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 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 module.</para></note> -<sect2 id="kdmconfig-appearance"> +<sect2 id="tdmconfig-appearance"> <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> <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 along with the corresponding key <link linkend="option-greetstring"><option>GreetString</option></link> - in &kdmrc;. + in &tdmrc;. </para> <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 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 logo:</para> @@ -414,7 +414,7 @@ dialog.</para> </itemizedlist> <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> <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. These correspond to the key <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 -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. These correspond to the keys <link linkend="option-guistyle"><option>GUIStyle</option></link> and <link 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 your login box, corresponding to setting <option>Language</option> in -&kdmrc;.</para> +&tdmrc;.</para> </sect2> -<sect2 id="kdmconfig-font"> +<sect2 id="tdmconfig-font"> <title>Font</title> <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 id="kdmconfig-background"> +<sect2 id="tdmconfig-background"> <title>Background</title> <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 id="kdmconfig-shutdown"> +<sect2 id="tdmconfig-shutdown"> <title><guilabel>Shutdown</guilabel></title> <para><guilabel>Allow Shutdown</guilabel></para> @@ -620,13 +620,13 @@ stretched to fit all four corners.</para> </listitem> <itemizedlist> <listitem> <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> <para><guilabel>Everybody</guilabel>: Everyone can shutdown the computer using -&kdm;.</para> +&tdm;.</para> </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 computer.</para></listitem> </itemizedlist> @@ -638,12 +638,12 @@ shutdown command for the <guilabel>Local:</guilabel> and <para><emphasis>Commands</emphasis></para> <para>Use these text fields to define the exact shutdown command.</para> <para>The <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 defaults to <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 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 @@ -651,13 +651,13 @@ option is not available on all operating systems.</para> </sect2> -<sect2 id="kdmconfig-users"> +<sect2 id="tdmconfig-users"> <title>Users</title> <para>From here you can change the way users are represented in the 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> <variablelist> @@ -692,7 +692,7 @@ over 65000, are not shown.</para> <para>You can also enable the <guilabel>Sort users</guilabel> checkbox, to have the user list sorted alphabetically. If this is 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> <para>If you choose to show users, then the login window will show @@ -714,7 +714,7 @@ this terminal.</para> </sect2> -<sect2 id="kdmconfig-convenience"> +<sect2 id="tdmconfig-convenience"> <title>Convenience</title> <para>In the <guilabel>convenience</guilabel> tab you can configure @@ -758,12 +758,12 @@ password-less login, ⪚ <systemitem>guest</systemitem>.</para></important> <para>You can also choose which user is <quote>preselected</quote> -when &kdm; starts. The default is <guilabel>None</guilabel>, but you -can choose <guilabel>Previous</guilabel> to have &kdm; default to the +when &tdm; starts. The default is <guilabel>None</guilabel>, but you +can choose <guilabel>Previous</guilabel> to have &tdm; default to the last successfully logged in user, or you can <guilabel>Specify</guilabel> a particular user to always be selected -from the list. You can also have &kdm; set the focus to the password -field, so that when you reach the &kdm; login screen, you can type the +from the list. You can also have &tdm; set the focus to the password +field, so that when you reach the &tdm; login screen, you can type the password immediately.</para> <para>The <guilabel>Automatically login after X server crash</guilabel> @@ -778,18 +778,18 @@ server accidentally crashed.</para> </chapter> -&kdmrc-ref; +&tdmrc-ref; <!-- ************************************************************ --> -<chapter id="configuring-your-system-for-kdm"> -<title>Configuring your system to use &kdm;</title> +<chapter id="configuring-your-system-for-tdm"> +<title>Configuring your system to use &tdm;</title> <para>This chapter assumes that your system is already configured to run the &X-Window;, and that you only need to reconfigure it to allow graphical login.</para> -<sect1 id="setting-up-kdm"> -<title>Setting up &kdm;</title> +<sect1 id="setting-up-tdm"> +<title>Setting up &tdm;</title> <para>The fundamental thing that controls whether your computer boots to a terminal prompt (console mode) or a graphical login prompt is the default @@ -829,11 +829,11 @@ distributions is:</para> </itemizedlist> <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 -change your system configuration so that &kdm; starts automatically +can start &tdm; from the command line. Once this is working, you can +change your system configuration so that &tdm; starts automatically 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> <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 &xdm; successfully, you should not need to make any 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 <abbrev>PAM</abbrev> is beyond the scope of this handbook, but <abbrev>PAM</abbrev> comes with comprehensive documentation (try looking in <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> -<screen><command>kdm <option>-nodaemon</option></command> +<screen><command>tdm <option>-nodaemon</option></command> </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 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 -&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; libraries.</para> @@ -883,8 +883,8 @@ libraries.</para> make sure that you are not suffering from a more serious X configuration problem.</para> -<para>When you are able to start &kdm; successfully, you can start to -replace &xdm; by &kdm;. Again, this is distribution-dependent.</para> +<para>When you are able to start &tdm; successfully, you can start to +replace &xdm; by &tdm;. Again, this is distribution-dependent.</para> <itemizedlist> <listitem> @@ -892,16 +892,16 @@ replace &xdm; by &kdm;. Again, this is distribution-dependent.</para> line:</para> <screen>x:5:respawn:/usr/X11/bin/xdm -nodaemon</screen> <para>and replace with:</para> -<screen>x:5:respawn:/opt/kde/bin/kdm</screen> -<para>This tells <command>init</command>(8) to respawn &kdm; when the -system is in run level 5. Note that &kdm; does not need the +<screen>x:5:respawn:/opt/kde/bin/tdm</screen> +<para>This tells <command>init</command>(8) to respawn &tdm; when the +system is in run level 5. Note that &tdm; does not need the <option>-nodaemon</option> option.</para> </listitem> <listitem> <para>For &Mandrake;, the X11 runlevel in <filename>/etc/inittab</filename> invokes the shell script <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> </listitem> <listitem> @@ -909,22 +909,22 @@ the paths are correct for your installation.</para> first line:</para> <screen>. /etc/rc.config -DISPLAYMANAGER=kdm +DISPLAYMANAGER=tdm export DISPLAYMANAGER</screen> </listitem> <listitem><para>For FreeBSD, edit <filename>/etc/ttys</filename> and find the line like this:</para> <screen>ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure</screen> <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><para>Most other distributions are a variation of one of these.</para></listitem> </itemizedlist> -<para>At this stage, you can test &kdm; again by bringing your system -to the runlevel that should now run &kdm;. To do so, issue a command +<para>At this stage, you can test &tdm; again by bringing your system +to the runlevel that should now run &tdm;. To do so, issue a command like this:</para> <screen><command>/sbin/init <option>5</option></command> @@ -950,7 +950,7 @@ at your peril.</para></warning> <screen>id:5:initdefault:</screen> <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 environment used at boot time differs from the environment that you used for @@ -964,24 +964,24 @@ some way.</para> </chapter> -<chapter id="different-window-managers-with-kdm"> +<chapter id="different-window-managers-with-tdm"> <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 -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 run is in the <envar>PATH</envar> and has not been renamed during the install into something unexpected.</para> <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 <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 role="extension">.desktop</literal> file in this directory. The fields are:</para> @@ -995,7 +995,7 @@ Exec=<replaceable>executable name</replaceable> <lineannotation>Passed to <command>eval exec</command> in a Bourne shell</lineannotation> TryExec=<replaceable>executable name</replaceable> <lineannotation>Supported 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> @@ -1004,7 +1004,7 @@ Name=<replaceable>name to show in the &kdm; session list</replaceable></programl <term>default</term> <listitem> <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. </para> </listitem> @@ -1032,14 +1032,14 @@ purposes. 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 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 now. ;-)</para> </chapter> -<chapter id="xdmcp-with-kdm"> -<title>Using &kdm; for Remote Logins (&XDMCP;)</title> +<chapter id="xdmcp-with-tdm"> +<title>Using &tdm; for Remote Logins (&XDMCP;)</title> <para>&XDMCP; is the Open Group standard, the <quote>X Display Manager Control Protocol</quote>. This is used to set up connections between @@ -1068,7 +1068,7 @@ this.</para> <sect1 id="command-sockets"> <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 other applications are possible as well.</para> @@ -1149,9 +1149,9 @@ is attempted, but a scheduled "login" command will be executed.</para> <variablelist> <varlistentry> -<term><returnvalue>&kdm;</returnvalue></term> +<term><returnvalue>&tdm;</returnvalue></term> <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> </listitem> </varlistentry> @@ -1280,7 +1280,7 @@ means immediately.</para> <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 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> <itemizedlist> <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> </listitem> <listitem> -<para>By using the <command>kdmctl</command> command (⪚ from within a -shell script). Try <command>kdmctl</command> <option>-h</option> to find out +<para>By using the <command>tdmctl</command> command (⪚ from within a +shell script). Try <command>tdmctl</command> <option>-h</option> to find out more.</para> </listitem> </itemizedlist> <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' - set -- `kdmctl listbootoptions` + set -- `tdmctl listbootoptions` if [ "$1" = ok ]; then fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}') if [ -n "$fbsd" ]; then - kdmctl shutdown reboot "=$fbsd" ask > /dev/null + tdmctl shutdown reboot "=$fbsd" ask > /dev/null else echo "FreeBSD boot unavailable." fi @@ -1372,14 +1372,14 @@ else fi</programlisting> </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 <sect1 id="dm-themes"> <title>Themes</title> -&kdm; has limited support for desktop manager themes. You may enable them -by adding <userinput>UseTheme=true</userinput> to <filename>kdmrc</filename> +&tdm; has limited support for desktop manager themes. You may enable them +by adding <userinput>UseTheme=true</userinput> to <filename>tdmrc</filename> and <userinput>Theme=/path/to/theme.xml</userinput>. </sect1> --> @@ -1388,12 +1388,12 @@ and <userinput>Theme=/path/to/theme.xml</userinput>. <chapter id="Other-Information"> <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 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 -questions about &kdm; that are not answered by this handbook, take advantage of -the fact the &kdm; is provided under the terms of the <abbrev>&GNU;</abbrev> +questions about &tdm; that are not answered by this handbook, take advantage of +the fact the &tdm; is provided under the terms of the <abbrev>&GNU;</abbrev> General Public License: look at the source code. </para> @@ -1402,19 +1402,19 @@ General Public License: look at the source code. <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> -<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 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; -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> -<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: <itemizedlist> @@ -1449,7 +1449,7 @@ man page, which is © Keith Packard.</para> <glossentry id="gloss-greeter"> <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> </glossdef> </glossentry> diff --git a/doc/kdm/kdmrc-ref.docbook b/doc/kdm/kdmrc-ref.docbook index 9ebcfbdd3..f2cfd2f0e 100644 --- a/doc/kdm/kdmrc-ref.docbook +++ b/doc/kdm/kdmrc-ref.docbook @@ -1,19 +1,19 @@ -<!-- generated from ../../kdm/config.def - DO NOT EDIT! --> +<!-- generated from ../../tdm/config.def - DO NOT EDIT! --> -<chapter id="kdm-files"> -<title>The Files &kdm; Uses for Configuration</title> +<chapter id="tdm-files"> +<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 not all.</para> -<sect1 id="kdmrc"> -<title>&kdmrc; - The &kdm; master configuration file</title> +<sect1 id="tdmrc"> +<title>&tdmrc; - The &tdm; master configuration file</title> <para>The basic format of the file is <quote>INI-like</quote>. Options are key/value pairs, placed in sections. 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> <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 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 kcontrol frontend.</para></note> -<sect2 id="kdmrc-general"> -<title>The [General] section of &kdmrc;</title> +<sect2 id="tdmrc-general"> +<title>The [General] section of &tdmrc;</title> <para> 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> This option exists solely for the purpose of clean automatic upgrades. <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> </listitem> </varlistentry> @@ -153,12 +153,12 @@ upgrades and this could result in &kdm; failing to run. <term id="option-staticservers"><option>StaticServers</option></term> <listitem> <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, -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; 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>The default is <quote>:0</quote>.</para> </listitem> @@ -180,7 +180,7 @@ List of on-demand displays. See <option>StaticServers</option> for syntax. <para> 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 -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 in this list. Currently Linux only. @@ -194,14 +194,14 @@ Currently Linux only. <listitem> <para> 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. Currently this applies only to Linux. </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 <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>Empty by default.</para> </listitem> @@ -212,7 +212,7 @@ If none of them is active for some time, &kdm; switches back to the X login. <listitem> <para> 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. </para> <para>Empty by default.</para> @@ -223,7 +223,7 @@ if the filename is empty. <term id="option-lockpidfile"><option>LockPidFile</option></term> <listitem> <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. </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> <listitem> <para> -This names a directory under which &kdm; stores &X-Server; authorization -files while initializing the session. &kdm; expects the system to clean up +This names a directory under which &tdm; stores &X-Server; authorization +files while initializing the session. &tdm; expects the system to clean up this directory from stale files on reboot. </para><para> 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> <listitem> <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. </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> <listitem> <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; otherwise, it should not be necessary very often. </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 <option>RandomDevice</option>) and no entropy daemon like EGD (see <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 (which, obviously, should change frequently). </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> <listitem> <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. </para><para> 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> <listitem> <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. </para> -<para>The default is <quote>/var/lib/kdm</quote>.</para> +<para>The default is <quote>/var/lib/tdm</quote>.</para> </listitem> </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> <listitem> <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 (like with AFS). </para> @@ -371,11 +371,11 @@ needed if the home directories are not readable before actually logging in </sect2> -<sect2 id="kdmrc-xdmcp"> -<title>The [Xdmcp] section of &kdmrc;</title> +<sect2 id="tdmrc-xdmcp"> +<title>The [Xdmcp] section of &tdmrc;</title> <para> -This section contains options that control &kdm;'s handling of +This section contains options that control &tdm;'s handling of &XDMCP; requests. </para> @@ -385,7 +385,7 @@ This section contains options that control &kdm;'s handling of <term id="option-enable"><option>Enable</option></term> <listitem> <para> -Whether &kdm; should listen to incoming &XDMCP; requests. +Whether &tdm; should listen to incoming &XDMCP; requests. </para> <para>The default is <quote>true</quote>.</para> </listitem> @@ -395,7 +395,7 @@ Whether &kdm; should listen to incoming &XDMCP; requests. <term id="option-port"><option>Port</option></term> <listitem> <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 default value. </para> @@ -408,7 +408,7 @@ default value. <listitem> <para> 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 display name and the shared key. </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 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 -described in <xref linkend="kdmrc-xaccess"/>. +described in <xref linkend="tdmrc-xaccess"/>. </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> </varlistentry> @@ -450,7 +450,7 @@ is offered again. <para> 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 -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 is enabled. </para> @@ -489,8 +489,8 @@ displayed in a chooser window. If no program is specified, the string </sect2> -<sect2 id="kdmrc-shutdown"> -<title>The [Shutdown] section of &kdmrc;</title> +<sect2 id="tdmrc-shutdown"> +<title>The [Shutdown] section of &tdmrc;</title> <para> This section contains global options concerning system shutdown. @@ -504,7 +504,7 @@ This section contains global options concerning system shutdown. <para> The command (subject to word splitting) to run to halt/poweroff the system. </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 <option>-h</option> <parameter>now</parameter></command>. </para> </listitem> @@ -516,7 +516,7 @@ The default is something reasonable for the system on which &kdm; was built, lik <para> The command (subject to word splitting) to run to reboot the system. </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 <option>-r</option> <parameter>now</parameter></command>. </para> </listitem> @@ -549,7 +549,7 @@ This will have no effect unless <option>AllowFifo</option> is enabled. <term id="option-bootmanager"><option>BootManager</option></term> <listitem> <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. </para> <variablelist> @@ -574,12 +574,12 @@ shutdown dialog. </sect2> -<sect2 id="kdmrc-core"> -<title>The [X-*-Core] section class of &kdmrc;</title> +<sect2 id="tdmrc-core"> +<title>The [X-*-Core] section class of &tdmrc;</title> <para> This section class contains options concerning the configuration -of the &kdm; backend (core). +of the &tdm; backend (core). </para> <variablelist> @@ -608,7 +608,7 @@ See <option>OpenRepeat</option>. <term id="option-openrepeat"><option>OpenRepeat</option></term> <listitem> <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 of the pause (in seconds) between successive attempts, <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> <listitem> <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 and disabling it. 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> <listitem> <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. </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> <listitem> <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>The default is <quote>15</quote>.</para> </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. This string is subject to word splitting. </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>. </para> </listitem> @@ -698,7 +698,7 @@ This string is subject to word splitting. <para> The VT the &X-Server; should run on. <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> alltogether - this is required for setups with multiple physical consoles. Currently Linux only. @@ -711,13 +711,13 @@ Currently Linux only. <listitem> <para> 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. </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 <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>Empty by default.</para> </listitem> @@ -737,7 +737,7 @@ See <option>PingTimeout</option>. <term id="option-pingtimeout"><option>PingTimeout</option></term> <listitem> <para> -To discover when <emphasis>remote</emphasis> displays disappear, &kdm; +To discover when <emphasis>remote</emphasis> displays disappear, &tdm; regularly pings them. <option>PingInterval</option> specifies the time (in minutes) between the pings and <option>PingTimeout</option> specifies the maximum amount of @@ -757,7 +757,7 @@ accidentally disabled. <term id="option-terminateserver"><option>TerminateServer</option></term> <listitem> <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 on reset attempts. </para> @@ -789,7 +789,7 @@ The signal number to use to terminate the local &X-Server;. <term id="option-authorize"><option>Authorize</option></term> <listitem> <para> -Controls whether &kdm; generates and uses authorization for +Controls whether &tdm; generates and uses authorization for <emphasis>local</emphasis> &X-Server; connections. For &XDMCP; displays the authorization requested by the display is used; foreign non-&XDMCP; displays do not support authorization at all. @@ -817,9 +817,9 @@ depending on the build configuration. <para> Some <emphasis>old</emphasis> &X-Server;s re-read the authorization file 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 -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, during which time the new authorization information will be read. </para> @@ -831,7 +831,7 @@ during which time the new authorization information will be read. <term id="option-authfile"><option>AuthFile</option></term> <listitem> <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 option. It should be kept in a directory which is not world-writable 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 to run <command>xconsole</command> here). The conventional name for a program used here is <command>Xsetup</command>. -See <xref linkend="kdmrc-xsetup"/>. +See <xref linkend="tdmrc-xsetup"/>. </para> <para>Empty by default.</para> </listitem> @@ -894,7 +894,7 @@ It specifies a program which is run (as <systemitem class="username">root</systemitem>) after the user authentication process succeeds. The conventional name for a program used here is <command>Xstartup</command>. -See <xref linkend="kdmrc-xstartup"/>. +See <xref linkend="tdmrc-xstartup"/>. </para> <para>Empty by default.</para> </listitem> @@ -909,7 +909,7 @@ It specifies a program which is run (as <systemitem class="username">root</systemitem>) after the session terminates. The conventional name for a program used here is <command>Xreset</command>. -See <xref linkend="kdmrc-xreset"/>. +See <xref linkend="tdmrc-xreset"/>. </para> <para>Empty by default.</para> </listitem> @@ -923,7 +923,7 @@ This string is subject to word splitting. It specifies the session program to be executed (as the user owning the session). The conventional name for a program used here is <command>Xsession</command>. -See <xref linkend="kdmrc-xsession"/>. +See <xref linkend="tdmrc-xsession"/>. </para> <para>The default is <quote>${<envar>x_bindir</envar>}/xterm -ls -T</quote>.</para> </listitem> @@ -933,10 +933,10 @@ See <xref linkend="kdmrc-xsession"/>. <term id="option-failsafeclient"><option>FailsafeClient</option></term> <listitem> <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, 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>The default is <quote>${<envar>x_bindir</envar>}/xterm</quote>.</para> </listitem> @@ -949,7 +949,7 @@ have had (see <xref linkend="kdmrc-xsession"/>). The <envar>PATH</envar> environment variable for non-<systemitem class="username">root</systemitem> <option>Session</option>s. </para><para> -The default depends on the system &kdm; was built on. +The default depends on the system &tdm; was built on. </para> </listitem> </varlistentry> @@ -963,7 +963,7 @@ non-<systemitem class="username">root</systemitem> <option>Session</option>s. Note that it is good practice not to include <literal>.</literal> (the current directory) into this entry. </para><para> -The default depends on the system &kdm; was built on. +The default depends on the system &tdm; was built on. </para> </listitem> </varlistentry> @@ -983,7 +983,7 @@ The <envar>SHELL</envar> environment variable for all programs but the <term id="option-userauthdir"><option>UserAuthDir</option></term> <listitem> <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 directory and points the environment variable <envar>XAUTHORITY</envar> at the created file. @@ -996,7 +996,7 @@ at the created file. <term id="option-autorelogin"><option>AutoReLogin</option></term> <listitem> <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 feature opens a security hole: a secured display lock can be circumvented (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> 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 -option, you should <command>chmod <option>600</option> <filename>kdmrc</filename></command> for obvious reasons. +option, you should <command>chmod <option>600</option> <filename>tdmrc</filename></command> for obvious reasons. </para> <para>Empty by default.</para> </listitem> @@ -1219,7 +1219,7 @@ KDE sessions. <para> A list of directories containing session type definitions. </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> </varlistentry> @@ -1240,7 +1240,7 @@ literal <literal>%</literal>. <term id="option-usesessreg"><option>UseSessReg</option></term> <listitem> <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 in the <option>Startup</option> and <option>Reset</option> scripts, or, alternatively, the pam_lastlog module should be used on @@ -1254,12 +1254,12 @@ alternatively, the pam_lastlog module should be used on </sect2> -<sect2 id="kdmrc-greeter"> -<title>The [X-*-Greeter] section class of &kdmrc;</title> +<sect2 id="tdmrc-greeter"> +<title>The [X-*-Greeter] section class of &tdmrc;</title> <para> This section class contains options concerning the configuration -of the &kdm; frontend (greeter). +of the &tdm; frontend (greeter). </para> <variablelist> @@ -1329,7 +1329,7 @@ The image to show in the greeter if <option>LogoArea</option> is <listitem> <para> 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. </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> <listitem> <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: </para> <variablelist> @@ -1587,7 +1587,7 @@ images from: <para> 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. 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 @@ -1603,7 +1603,7 @@ tooltip. <para> See <option>FaceSource</option>. </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> </varlistentry> @@ -1692,7 +1692,7 @@ character</para></listitem> <term id="option-usebackground"><option>UseBackground</option></term> <listitem> <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 is responsible for the background. </para> @@ -1709,7 +1709,7 @@ It contains a section named <literal>[Desktop0]</literal> like <filename>kdesktoprc</filename> does. Its options are not described herein; guess their meanings or use the control center. </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> </varlistentry> @@ -1735,11 +1735,11 @@ grabbed until just before the session begins. <term id="option-grabtimeout"><option>GrabTimeout</option></term> <listitem> <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 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 -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. </para> <para>The default is <quote>3</quote>.</para> @@ -1826,10 +1826,10 @@ login domain. <term id="option-showlog"><option>ShowLog</option></term> <listitem> <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. -This option is available only if &kdm; was <command>configure</command>d -with <option>--enable-kdm-xconsole</option>. +This option is available only if &tdm; was <command>configure</command>d +with <option>--enable-tdm-xconsole</option>. </para> <para>The default is <quote>false</quote>.</para> </listitem> @@ -1839,7 +1839,7 @@ with <option>--enable-kdm-xconsole</option>. <term id="option-logsource"><option>LogSource</option></term> <listitem> <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 <filename>/dev/console</filename>. Has no effect if <option>ShowLog</option> is disabled. @@ -1950,13 +1950,13 @@ file. </sect1> -<sect1 id="kdmrc-xservers"> +<sect1 id="tdmrc-xservers"> <title>Specifying permanent &X-Server;s</title> <para>Each entry in the <option>StaticServers</option> list indicates a display which should constantly be 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 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 <literal>localhost</literal> prefix from locally running &XDMCP; displays is <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 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. When using &XDMCP;, the display is required to specify the display class, 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> <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>). If reserve displays are specified, the &kde; menu will have a <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 reserve displays available, the menu item will be disabled.</para> -<para>When &kdm; starts a session, it sets up authorization data for the -&X-Server;. For local servers, &kdm; passes +<para>When &tdm; starts a session, it sets up authorization data for the +&X-Server;. For local servers, &tdm; passes <command><option>-auth</option> <filename><replaceable>filename</replaceable></filename></command> 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> </sect1> -<sect1 id="kdmrc-xaccess"> +<sect1 id="tdmrc-xaccess"> <title>&XDMCP; access control</title> <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;. The file contains four types of entries: entries which control the response to <quote>Direct</quote> and <quote>Broadcast</quote> queries, entries which control the response to <quote>Indirect</quote> queries, macro definitions for <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 delimiter causing the rest of that line to be ignored, and <literal>\</literal> 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. To only respond to <quote>Direct</quote> queries for a host or pattern, 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> <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>, <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 all the hosts that respond. The host list may contain the keyword <literal>BROADCAST</literal>, to make the chooser send a @@ -2079,21 +2079,21 @@ The formal syntax is <screen> <userinput> <literal>LISTEN</literal> [<replaceable>interface</replaceable> [<replaceable>multicast list</replaceable>]]</userinput> </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. <replaceable>interface</replaceable> may be a hostname or IP address representing a network interface on this machine, or the wildcard <literal>*</literal> to represent all available network interfaces. 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 permanently assigned range of multicast addresses for &XDMCP;. The <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 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. -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 compiled with IPv6 support). To disable listening for &XDMCP; requests altogether, a @@ -2103,11 +2103,11 @@ the <literal>[Xdmcp]</literal> <option>Enable</option> option is preferred. </sect1> -<sect1 id="kdm-scripts"> +<sect1 id="tdm-scripts"> <title>Supplementary programs</title> <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. </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. </para> -<sect2 id="kdmrc-xsetup"> +<sect2 id="tdmrc-xsetup"> <title>Setup program</title> <para> @@ -2156,7 +2156,7 @@ the following environment variables are passed:</para> </varlistentry> </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, 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 @@ -2166,7 +2166,7 @@ at all. Resources for this program can be put into the file named by </sect2> -<sect2 id="kdmrc-xstartup"> +<sect2 id="tdmrc-xstartup"> <title>Startup program</title> <para>The <filename>Xstartup</filename> program is run as @@ -2215,13 +2215,13 @@ the following environment variables are passed:</para> </varlistentry> </variablelist> -<para>&kdm; waits until this program exits before starting the user session. -If the exit value of this program is non-zero, &kdm; discontinues the session +<para>&tdm; waits until this program exits before starting the user session. +If the exit value of this program is non-zero, &tdm; discontinues the session and starts another authentication cycle.</para> </sect2> -<sect2 id="kdmrc-xsession"> +<sect2 id="tdmrc-xsession"> <title>Session program</title> <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 id="kdmrc-xreset"> +<sect2 id="tdmrc-xreset"> <title>Reset program</title> <para>Symmetrical with <filename>Xstartup</filename>, the diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook index 247b7fd87..296bd7eb0 100644 --- a/doc/ksplashml/index.docbook +++ b/doc/ksplashml/index.docbook @@ -418,7 +418,7 @@ true.</entry> <entry>Indicates whether icon should be shown. Default is true</entry> </row> <row> -<entry>Use KDM User Icon</entry> +<entry>Use TDM User Icon</entry> <entry>[true/false]</entry> <entry>Show user's login icon. Default is true.</entry> </row> diff --git a/doc/tdesu/index.docbook b/doc/tdesu/index.docbook index 4233837d9..c753dba4e 100644 --- a/doc/tdesu/index.docbook +++ b/doc/tdesu/index.docbook @@ -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 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 -manager, <application>kdm</application>, you could issue -<command>tdesu <option>-c kdmconfig -f -kdmrc</option></command></para></listitem> +manager, <application>tdm</application>, you could issue +<command>tdesu <option>-c tdmconfig -f +tdmrc</option></command></para></listitem> </varlistentry> <varlistentry> <term><option>-i</option> <replaceable>icon name</replaceable></term> diff --git a/doc/tdesu/man-tdesu.1.docbook b/doc/tdesu/man-tdesu.1.docbook index fd99812fd..28b08765a 100644 --- a/doc/tdesu/man-tdesu.1.docbook +++ b/doc/tdesu/man-tdesu.1.docbook @@ -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 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 -manager, <application>kdm</application>, you could issue -<command>tdesu <option>-c kdmconfig -f -kdmrc</option></command></para></listitem> +manager, <application>tdm</application>, you could issue +<command>tdesu <option>-c tdmconfig -f +tdmrc</option></command></para></listitem> </varlistentry> <varlistentry> <term><option>-i</option> <replaceable>icon name</replaceable></term> diff --git a/doc/userguide/control-center.docbook b/doc/userguide/control-center.docbook index e89441cea..06e862f3e 100644 --- a/doc/userguide/control-center.docbook +++ b/doc/userguide/control-center.docbook @@ -878,8 +878,8 @@ configuration files for a &Linux; kernel. This configurator is compatible with k </varlistentry> <varlistentry> <term><guilabel>Login Manager</guilabel></term> -<listitem><para>This module allows you to configure the &kde; login manager, &kdm;. &kdm; 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> +<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 &tdm; handbook. </para></listitem> </varlistentry> <varlistentry> <term><guilabel>Paths</guilabel></term> diff --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook index e9fb63f47..44a0f5d90 100644 --- a/doc/userguide/index.docbook +++ b/doc/userguide/index.docbook @@ -357,7 +357,7 @@ programs here (and not links to removable media, like CDs).</para> </sect1info> <title>Logging In and Logging Out</title> -<para>Basic KDM & starttde stuff.</para> +<para>Basic TDM & starttde stuff.</para> <!-- Not sure what exactly to say about starttde and where to say it --> <!-- (Phil) --> <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"> <title>Logging in Graphically</title> <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 start up your computer, then you are all set for logging in @@ -410,9 +410,9 @@ for now, hit <guibutton>Cancel</guibutton>.</para> <itemizedlist> <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 -by entering <userinput>help:/kdm</userinput> in &konqueror;'s +by entering <userinput>help:/tdm</userinput> in &konqueror;'s <guilabel>Location</guilabel> bar.</para> </listitem> </itemizedlist> diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook index 029eedb8a..5fb497f95 100644 --- a/doc/userguide/kde-for-admins.docbook +++ b/doc/userguide/kde-for-admins.docbook @@ -781,11 +781,11 @@ Auto Save Interval=25 <sect1 id="kde-startup-sequence"> <title>&kde; Startup Sequence</title> -<sect2 id="kdm"> -<title>&kdm;</title> +<sect2 id="tdm"> +<title>&tdm;</title> <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 like:</para> @@ -796,7 +796,7 @@ like:</para> <para>Relevant startup files are also: </para> <simplelist> <member> -[X-*-Core] section in <filename>kdmrc</filename> +[X-*-Core] section in <filename>tdmrc</filename> </member> <member> 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 <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> script:</para> @@ -2107,7 +2107,7 @@ screen</para></listitem> <varlistentry> <term><option>start_new_session</option></term> <listitem><para>Whether the user may start a second X session (see also -&kdm;)</para></listitem> +&tdm;)</para></listitem> </varlistentry> <varlistentry> <term><option>opengl_screensavers</option></term> diff --git a/doc/userguide/switching-sessions.docbook b/doc/userguide/switching-sessions.docbook index d869d0808..2f27871d9 100644 --- a/doc/userguide/switching-sessions.docbook +++ b/doc/userguide/switching-sessions.docbook @@ -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 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 -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> <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> -<term>Switch Session in &kdm;</term> -<listitem><para>If you are in &kdm; and want to switch to another active +<term>Switch Session in &tdm;</term> +<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 <guisubmenu>Switch User</guisubmenu> which is mainly the same as described above.</para> diff --git a/kcontrol/CMakeLists.txt b/kcontrol/CMakeLists.txt index ced7671ef..b6fe70f40 100644 --- a/kcontrol/CMakeLists.txt +++ b/kcontrol/CMakeLists.txt @@ -11,7 +11,7 @@ # 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 ) @@ -37,7 +37,7 @@ if( BUILD_KCONTROL ) add_subdirectory( kded ) add_subdirectory( launch ) add_subdirectory( keys ) - add_subdirectory( kdm ) + add_subdirectory( tdm ) add_subdirectory( kio ) add_subdirectory( konq ) add_subdirectory( style ) diff --git a/kcontrol/Makefile.am b/kcontrol/Makefile.am index d1fe576ac..1b848574a 100644 --- a/kcontrol/Makefile.am +++ b/kcontrol/Makefile.am @@ -32,7 +32,7 @@ JOYSTICK_SUBDIR=joystick endif # '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 \ konqhtml ebrowsing arts kcontrol knotify\ clock pics $(ACCESS_SUBDIR) colors energy fonts css \ diff --git a/kcontrol/background/CMakeLists.txt b/kcontrol/background/CMakeLists.txt index 693d6330c..9f3f492f3 100644 --- a/kcontrol/background/CMakeLists.txt +++ b/kcontrol/background/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_KDM ) +if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_TDM ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 3b67667a2..5842412e8 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -312,7 +312,7 @@ wp_load: } // _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 (file.endsWith(".svg") || file.endsWith(".svgz")) { #ifdef HAVE_LIBART @@ -400,7 +400,7 @@ wp_load: // HACK: Use KFileMetaInfo only when we're attached to DCOP. // 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()) { KFileMetaInfo metaInfo(file); if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) { diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index b03dae586..3bea0f1e4 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -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" " 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" - " 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" " of font hinting should be checked.</p>" ); TQWhatsThis::add(comboForceDpi, whatsthis); diff --git a/kcontrol/kdm/AUTHORS b/kcontrol/kdm/AUTHORS index 61d720a4d..3b7927243 100644 --- a/kcontrol/kdm/AUTHORS +++ b/kcontrol/kdm/AUTHORS @@ -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 - written by Thomas Tanghus <tanghus@earthling.net> diff --git a/kcontrol/kdm/CMakeLists.txt b/kcontrol/kdm/CMakeLists.txt index 81fb197f4..004282250 100644 --- a/kcontrol/kdm/CMakeLists.txt +++ b/kcontrol/kdm/CMakeLists.txt @@ -23,18 +23,18 @@ link_directories( ##### 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( main.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" ) -tde_add_kpart( kcm_kdm AUTOMOC +tde_add_kpart( kcm_tdm AUTOMOC SOURCES - background.cpp kdm-appear.cpp kdm-font.cpp kdm-shut.cpp - kdm-users.cpp kdm-conv.cpp main.cpp kbackedcombobox.cpp + background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.cpp + tdm-users.cpp tdm-conv.cpp main.cpp kbackedcombobox.cpp LINK kcmbgnd-static bgnd-static knewstuff-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kdm/Makefile.am b/kcontrol/kdm/Makefile.am index 2a210a1b9..e6193d7df 100644 --- a/kcontrol/kdm/Makefile.am +++ b/kcontrol/kdm/Makefile.am @@ -1,11 +1,11 @@ -kde_module_LTLIBRARIES = kcm_kdm.la +kde_module_LTLIBRARIES = kcm_tdm.la # _don't_ add a theme configurator!! -kcm_kdm_la_SOURCES = background.cpp kdm-appear.cpp kdm-font.cpp kdm-shut.cpp \ - kdm-users.cpp kdm-conv.cpp main.cpp kbackedcombobox.cpp +kcm_tdm_la_SOURCES = background.cpp tdm-appear.cpp tdm-font.cpp tdm-shut.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_kdm_la_LIBADD = $(top_builddir)/kcontrol/background/libkcmbgnd.la $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) $(LIB_KNEWSTUFF) +kcm_tdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined +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 \ -I$(top_srcdir)/kcontrol/background \ @@ -14,6 +14,6 @@ AM_CPPFLAGS= -I$(top_builddir)/kcontrol/background \ METASOURCES = AUTO 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 diff --git a/kcontrol/kdm/background.cpp b/kcontrol/kdm/background.cpp index b5ce18ff5..4078bd393 100644 --- a/kcontrol/kdm/background.cpp +++ b/kcontrol/kdm/background.cpp @@ -46,12 +46,12 @@ KBackground::KBackground(TQWidget *parent, const char *name) // Enabling checkbox m_pCBEnable = new TQCheckBox( i18n("E&nable background"), this ); 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." " 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" ); - 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 ); connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp index a68b90881..cdd5f2fc9 100644 --- a/kcontrol/kdm/kdm-appear.cpp +++ b/kcontrol/kdm/kdm-appear.cpp @@ -44,13 +44,13 @@ #include <kurldrag.h> #include <kimagefilepreview.h> -#include "kdm-appear.h" +#include "tdm-appear.h" #include "kbackedcombobox.h" extern KSimpleConfig *config; -KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) +TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { TQString wtstr; @@ -74,9 +74,9 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); 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>" - "KDM will substitute the following character pairs with the " + "TDM will substitute the following character pairs with the " "respective contents:<br><ul>" "<li>%d -> current display</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(logobutton, 1, 1, Qt::AlignCenter); 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 " "(e.g. from Konqueror)."); TQWhatsThis::add( logoLabel, wtstr ); @@ -177,7 +177,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) connect(compositorcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hglay->addWidget(label, 0, 0); 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( compositorcombo, wtstr ); @@ -190,7 +190,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) hglay->addWidget(label, 1, 0); hglay->addWidget(guicombo, 1, 1); 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( guicombo, wtstr ); @@ -203,7 +203,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) hglay->addWidget(label, 2, 0); hglay->addWidget(colcombo, 2, 1); 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( colcombo, wtstr ); @@ -215,7 +215,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hglay->addWidget(label, 3, 0); 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( echocombo, wtstr ); @@ -232,7 +232,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) hbox->setColStretch(1, 1); hbox->addWidget(label, 1, 0); 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."); TQWhatsThis::add( label, 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()), this, TQT_SLOT(slotLogoButtonClicked()) ); @@ -274,7 +274,7 @@ void KDMAppearanceWidget::makeReadOnly() sakbox->setEnabled(false); } -void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) +void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) { TQStringList langlist = KGlobal::dirs()->findAllResources("locale", 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 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 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() ? - locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) : + locate("data", TQString::fromLatin1("tdm/pics/kdelogo.png") ) : logo; TQImage p(flogo); if (p.isNull()) @@ -358,10 +358,10 @@ bool KDMAppearanceWidget::setLogo(TQString logo) } -void KDMAppearanceWidget::slotLogoButtonClicked() +void TDMAppearanceWidget::slotLogoButtonClicked() { KImageIO::registerFormats(); - KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")), + KFileDialog dialogue(locate("data", TQString::fromLatin1("tdm/pics/")), KImageIO::pattern( KImageIO::Reading ), this, 0, true); 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 ); logoLabel->setEnabled( id == KdmLogo ); } -bool KDMAppearanceWidget::eventFilter(TQObject *, TQEvent *e) +bool TDMAppearanceWidget::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::DragEnter) { iconLoaderDragEnterEvent((TQDragEnterEvent *) e); @@ -399,7 +399,7 @@ bool KDMAppearanceWidget::eventFilter(TQObject *, TQEvent *e) return false; } -void KDMAppearanceWidget::iconLoaderDragEnterEvent(TQDragEnterEvent *e) +void TDMAppearanceWidget::iconLoaderDragEnterEvent(TQDragEnterEvent *e) { e->accept(KURLDrag::canDecode(e)); } @@ -407,7 +407,7 @@ void KDMAppearanceWidget::iconLoaderDragEnterEvent(TQDragEnterEvent *e) KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg); -void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) +void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) { KURL pixurl; 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. if(!url->isLocalFile()) { pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() + - "kdm/pics/" + url->fileName()); + "tdm/pics/" + url->fileName()); KIO::NetAccess::copy(*url, pixurl, parentWidget()); istmp = true; } else { @@ -441,7 +441,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) } -void KDMAppearanceWidget::save() +void TDMAppearanceWidget::save() { config->setGroup("X-*-Greeter"); @@ -468,7 +468,7 @@ void KDMAppearanceWidget::save() } -void KDMAppearanceWidget::load() +void TDMAppearanceWidget::load() { config->setGroup("X-*-Greeter"); @@ -520,7 +520,7 @@ void KDMAppearanceWidget::load() } -void KDMAppearanceWidget::defaults() +void TDMAppearanceWidget::defaults() { greetstr_lined->setText( i18n("Welcome to %n") ); logoRadio->setChecked( true ); @@ -537,18 +537,18 @@ void KDMAppearanceWidget::defaults() 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" - " of the KDM login manager, i.e. a greeting string, an icon etc.<p>" - " For further refinement of KDM's appearance, see the \"Font\" and \"Background\" " + return i18n("<h1>TDM - Appearance</h1> Here you can configure the basic appearance" + " of the TDM login manager, i.e. a greeting string, an icon etc.<p>" + " For further refinement of TDM's appearance, see the \"Font\" and \"Background\" " " tabs."); } -void KDMAppearanceWidget::changed() +void TDMAppearanceWidget::changed() { emit changed(true); } -#include "kdm-appear.moc" +#include "tdm-appear.moc" diff --git a/kcontrol/kdm/kdm-appear.h b/kcontrol/kdm/kdm-appear.h index 958a91fb3..0d4047e10 100644 --- a/kcontrol/kdm/kdm-appear.h +++ b/kcontrol/kdm/kdm-appear.h @@ -18,8 +18,8 @@ */ -#ifndef __KDMAPPEAR_H__ -#define __KDMAPPEAR_H__ +#ifndef __TDMAPPEAR_H__ +#define __TDMAPPEAR_H__ #include <tqdir.h> @@ -42,12 +42,12 @@ class TQLineEdit; class KLineEdit; -class KDMAppearanceWidget : public TQWidget +class TDMAppearanceWidget : public TQWidget { Q_OBJECT public: - KDMAppearanceWidget(TQWidget *parent, const char *name=0); + TDMAppearanceWidget(TQWidget *parent, const char *name=0); void load(); void save(); diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp index 155d5b380..64b8b9727 100644 --- a/kcontrol/kdm/kdm-conv.cpp +++ b/kcontrol/kdm/kdm-conv.cpp @@ -35,11 +35,11 @@ #include <ksimpleconfig.h> #include <klocale.h> -#include "kdm-conv.h" +#include "tdm-conv.h" extern KSimpleConfig *config; -KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) +TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { TQString wtstr; @@ -53,7 +53,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) alGroup->setSizePolicy( vpref ); 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!") ); 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 ); connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); 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.") ); autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup ); connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); @@ -117,7 +117,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) hlpl->addWidget(puserlb); hlpl->addStretch( 1 ); 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. " "Use this to save one key press per login, if the preselection usually does not need to " "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" " 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!") ); 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); userlb->setEnabled(false); @@ -190,7 +190,7 @@ void KDMConvenienceWidget::makeReadOnly() cbjumppw->setEnabled(false); } -void KDMConvenienceWidget::slotPresChanged() +void TDMConvenienceWidget::slotPresChanged() { bool en = spRadio->isChecked(); pu_label->setEnabled(en); @@ -198,7 +198,7 @@ void KDMConvenienceWidget::slotPresChanged() cbjumppw->setEnabled(!npRadio->isChecked()); } -void KDMConvenienceWidget::save() +void TDMConvenienceWidget::save() { config->setGroup("X-:0-Core"); config->writeEntry( "AutoLoginEnable", alGroup->isChecked() ); @@ -223,7 +223,7 @@ void KDMConvenienceWidget::save() } -void KDMConvenienceWidget::load() +void TDMConvenienceWidget::load() { config->setGroup("X-:0-Core"); bool alenable = config->readBoolEntry( "AutoLoginEnable", false); @@ -257,7 +257,7 @@ void KDMConvenienceWidget::load() } -void KDMConvenienceWidget::defaults() +void TDMConvenienceWidget::defaults() { alGroup->setChecked(false); delaysb->setValue(0); @@ -275,22 +275,22 @@ void KDMConvenienceWidget::defaults() } -void KDMConvenienceWidget::slotChanged() +void TDMConvenienceWidget::slotChanged() { emit changed(true); } -void KDMConvenienceWidget::slotSetAutoUser( const TQString &user ) +void TDMConvenienceWidget::slotSetAutoUser( const TQString &user ) { autoUser = user; } -void KDMConvenienceWidget::slotSetPreselUser( const TQString &user ) +void TDMConvenienceWidget::slotSetPreselUser( const TQString &user ) { preselUser = user; } -void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item ) +void TDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item ) { if ( !item ) return; @@ -305,7 +305,7 @@ void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item ) } } -void KDMConvenienceWidget::slotClearUsers() +void TDMConvenienceWidget::slotClearUsers() { userlb->clear(); puserlb->clear(); @@ -316,7 +316,7 @@ void KDMConvenienceWidget::slotClearUsers() puserlb->insertItem(preselUser); } -void KDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users) +void TDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users) { TQMapConstIterator<TQString,int> it; for (it = users.begin(); it != users.end(); ++it) { @@ -342,7 +342,7 @@ void KDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users) puserlb->setCurrentItem(preselUser); } -void KDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users) +void TDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users) { TQMapConstIterator<TQString,int> 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" diff --git a/kcontrol/kdm/kdm-conv.h b/kcontrol/kdm/kdm-conv.h index be8bebf35..3f8dda974 100644 --- a/kcontrol/kdm/kdm-conv.h +++ b/kcontrol/kdm/kdm-conv.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KDMCONV_H__ -#define __KDMCONV_H__ +#ifndef __TDMCONV_H__ +#define __TDMCONV_H__ #include <tqptrlist.h> #include <tqstring.h> @@ -39,12 +39,12 @@ #include <pwd.h> -class KDMConvenienceWidget : public TQWidget +class TDMConvenienceWidget : public TQWidget { Q_OBJECT public: - KDMConvenienceWidget(TQWidget *parent=0, const char *name=0); + TDMConvenienceWidget(TQWidget *parent=0, const char *name=0); void load(); void save(); diff --git a/kcontrol/kdm/kdm-font.cpp b/kcontrol/kdm/kdm-font.cpp index af83176b1..9947101c1 100644 --- a/kcontrol/kdm/kdm-font.cpp +++ b/kcontrol/kdm/kdm-font.cpp @@ -34,12 +34,12 @@ #include <kfontrequester.h> #include <klocale.h> -#include "kdm-font.h" +#include "tdm-font.h" extern KSimpleConfig *config; -KDMFontWidget::KDMFontWidget(TQWidget *parent, const char *name) +TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { 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); } -void KDMFontWidget::makeReadOnly() +void TDMFontWidget::makeReadOnly() { stdFontChooser->button()->setEnabled(false); failFontChooser->button()->setEnabled(false); @@ -83,19 +83,19 @@ void KDMFontWidget::makeReadOnly() aacb->setEnabled(false); } -void KDMFontWidget::configChanged() +void TDMFontWidget::configChanged() { emit changed(true); } -void KDMFontWidget::set_def() +void TDMFontWidget::set_def() { stdFontChooser->setFont(TQFont("Sans Serif", 10)); failFontChooser->setFont(TQFont("Sans Serif", 10, TQFont::Bold)); greetingFontChooser->setFont(TQFont("Sans Serif", 22)); } -void KDMFontWidget::save() +void TDMFontWidget::save() { config->setGroup("X-*-Greeter"); @@ -107,7 +107,7 @@ void KDMFontWidget::save() } -void KDMFontWidget::load() +void TDMFontWidget::load() { set_def(); @@ -125,10 +125,10 @@ void KDMFontWidget::load() } -void KDMFontWidget::defaults() +void TDMFontWidget::defaults() { set_def(); aacb->setChecked(true); } -#include "kdm-font.moc" +#include "tdm-font.moc" diff --git a/kcontrol/kdm/kdm-font.h b/kcontrol/kdm/kdm-font.h index c636a6f90..67b2c864d 100644 --- a/kcontrol/kdm/kdm-font.h +++ b/kcontrol/kdm/kdm-font.h @@ -17,20 +17,20 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KDMFONT_H__ -#define __KDMFONT_H__ +#ifndef __TDMFONT_H__ +#define __TDMFONT_H__ #include <tqwidget.h> class KFontRequester; class TQCheckBox; -class KDMFontWidget : public TQWidget +class TDMFontWidget : public TQWidget { Q_OBJECT public: - KDMFontWidget(TQWidget *parent=0, const char *name=0); + TDMFontWidget(TQWidget *parent=0, const char *name=0); void load(); void save(); diff --git a/kcontrol/kdm/kdm-shut.cpp b/kcontrol/kdm/kdm-shut.cpp index 3b442956a..434b55ae2 100644 --- a/kcontrol/kdm/kdm-shut.cpp +++ b/kcontrol/kdm/kdm-shut.cpp @@ -34,13 +34,13 @@ #include <kdialog.h> #include <kurlrequester.h> -#include "kdm-shut.h" +#include "tdm-shut.h" #include "kbackedcombobox.h" extern KSimpleConfig *config; -KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name) +TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { TQString wtstr; @@ -61,11 +61,11 @@ KDMSessionsWidget::KDMSessionsWidget(TQWidget *parent, const char *name) sdrcombo->insertItem(i18n("Nobody"), SdNone); connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); 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>" - " <li><em>Everybody:</em> everybody can shutdown the computer using KDM</li>" - " <li><em>Only root:</em> KDM 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>Everybody:</em> everybody can shutdown the computer using TDM</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 TDM</li></ul>") ); 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); sdrcombo->setEnabled(false); @@ -151,7 +151,7 @@ void KDMSessionsWidget::makeReadOnly() bm_combo->setEnabled(false); } -void KDMSessionsWidget::writeSD(TQComboBox *combo) +void TDMSessionsWidget::writeSD(TQComboBox *combo) { TQString what; switch (combo->currentItem()) { @@ -162,7 +162,7 @@ void KDMSessionsWidget::writeSD(TQComboBox *combo) config->writeEntry( "AllowShutdown", what); } -void KDMSessionsWidget::save() +void TDMSessionsWidget::save() { config->setGroup("X-:*-Core"); writeSD(sdlcombo); @@ -177,7 +177,7 @@ void KDMSessionsWidget::save() 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); SdModes sdMode; @@ -190,7 +190,7 @@ void KDMSessionsWidget::readSD(TQComboBox *combo, TQString def) combo->setCurrentItem(sdMode); } -void KDMSessionsWidget::load() +void TDMSessionsWidget::load() { config->setGroup("X-:*-Core"); readSD(sdlcombo, "All"); @@ -207,7 +207,7 @@ void KDMSessionsWidget::load() -void KDMSessionsWidget::defaults() +void TDMSessionsWidget::defaults() { restart_lined->setURL("/sbin/reboot"); shutdown_lined->setURL("/sbin/poweroff"); @@ -219,9 +219,9 @@ void KDMSessionsWidget::defaults() } -void KDMSessionsWidget::changed() +void TDMSessionsWidget::changed() { emit changed(true); } -#include "kdm-shut.moc" +#include "tdm-shut.moc" diff --git a/kcontrol/kdm/kdm-shut.h b/kcontrol/kdm/kdm-shut.h index 0e7cdb654..bbc6fdc29 100644 --- a/kcontrol/kdm/kdm-shut.h +++ b/kcontrol/kdm/kdm-shut.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KDMSESS_H__ -#define __KDMSESS_H__ +#ifndef __TDMSESS_H__ +#define __TDMSESS_H__ #include <tqstring.h> @@ -28,12 +28,12 @@ class TQCheckBox; class KURLRequester; class KBackedComboBox; -class KDMSessionsWidget : public TQWidget +class TDMSessionsWidget : public TQWidget { Q_OBJECT public: - KDMSessionsWidget(TQWidget *parent=0, const char *name=0); + TDMSessionsWidget(TQWidget *parent=0, const char *name=0); void load(); void save(); diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp index 3d6139a25..f4b48b9a6 100644 --- a/kcontrol/kdm/kdm-users.cpp +++ b/kcontrol/kdm/kdm-users.cpp @@ -38,14 +38,14 @@ #include <kmessagebox.h> #include <kurldrag.h> -#include "kdm-users.h" +#include "tdm-users.h" #include <sys/stat.h> extern KSimpleConfig *config; -KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) +TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { #ifdef __linux__ @@ -71,10 +71,10 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) defmaxuid = "65000"; #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. 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; TQDir testDir( m_userPixDir ); if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() ) @@ -86,7 +86,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) TQString wtstr; 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" " explicitly hidden in \"Not hidden\" mode.")); 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(slotChanged()) ); 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.") ); 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.") ); cbinverted = new TQCheckBox( i18n("Inverse selection"), usrGroup ); 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.")); cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup ); 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.") ); wstack = new TQWidgetStack( this ); @@ -130,7 +130,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) optinlv = new KListView( this ); optinlv->addColumn( i18n("Selected Users") ); 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 ); connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) ); @@ -139,7 +139,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) optoutlv = new KListView( this ); optoutlv->addColumn( i18n("Hidden Users") ); 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 ); connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) ); @@ -147,9 +147,9 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) TQT_SLOT(slotChanged()) ); 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." - " \"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.") ); connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) ); 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" " of images or drag and drop your own image on to the button (e.g. from Konqueror).") ); 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()), TQT_SLOT(slotUnsetUserPix()) ); 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); lemaxuid->setReadOnly(true); @@ -224,7 +224,7 @@ void KDMUsersWidget::makeReadOnly() rstuserbutton->setEnabled(false); } -void KDMUsersWidget::slotShowOpts() +void TDMUsersWidget::slotShowOpts() { bool en = cbshowlist->isChecked() || cbcomplete->isChecked(); cbinverted->setEnabled( en ); @@ -241,7 +241,7 @@ void KDMUsersWidget::slotShowOpts() slotFaceOpts(); } -void KDMUsersWidget::slotFaceOpts() +void TDMUsersWidget::slotFaceOpts() { bool en = !rbusronly->isChecked(); usercombo->setEnabled( en ); @@ -252,7 +252,7 @@ void KDMUsersWidget::slotFaceOpts() rstuserbutton->setEnabled( false ); } -void KDMUsersWidget::slotUserSelected() +void TDMUsersWidget::slotUserSelected() { TQString user = usercombo->currentText(); 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() ); if (user == m_defaultText) @@ -298,10 +298,10 @@ void KDMUsersWidget::changeUserPix(const TQString &pix) slotUserSelected(); } -void KDMUsersWidget::slotUserButtonClicked() +void TDMUsersWidget::slotUserButtonClicked() { 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 ), this, 0, true); dlg.setOperationMode( KFileDialog::Opening ); @@ -317,13 +317,13 @@ void KDMUsersWidget::slotUserButtonClicked() changeUserPix( dlg.selectedFile() ); } -void KDMUsersWidget::slotUnsetUserPix() +void TDMUsersWidget::slotUnsetUserPix() { TQFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" ); slotUserSelected(); } -bool KDMUsersWidget::eventFilter(TQObject *, TQEvent *e) +bool TDMUsersWidget::eventFilter(TQObject *, TQEvent *e) { if (e->type() == TQEvent::DragEnter) { TQDragEnterEvent *ee = (TQDragEnterEvent *) e; @@ -341,7 +341,7 @@ bool KDMUsersWidget::eventFilter(TQObject *, TQEvent *e) KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg); -void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e) +void TDMUsersWidget::userButtonDropEvent(TQDropEvent *e) { KURL *url = decodeImgDrop(e, this); if (url) { @@ -353,7 +353,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e) } } -void KDMUsersWidget::save() +void TDMUsersWidget::save() { 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 ) 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 ); } -void KDMUsersWidget::slotUpdateOptOut( TQListViewItem *item ) +void TDMUsersWidget::slotUpdateOptOut( TQListViewItem *item ) { updateOptList( item, hiddenUsers ); } -void KDMUsersWidget::slotClearUsers() +void TDMUsersWidget::slotClearUsers() { optinlv->clear(); optoutlv->clear(); @@ -409,7 +409,7 @@ void KDMUsersWidget::slotClearUsers() usercombo->insertItem( m_defaultText ); } -void KDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users) +void TDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users) { TQMapConstIterator<TQString,int> it; for (it = users.begin(); it != users.end(); ++it) { @@ -427,7 +427,7 @@ void KDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users) usercombo->listBox()->sort(); } -void KDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users) +void TDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users) { TQMapConstIterator<TQString,int> 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; @@ -472,7 +472,7 @@ void KDMUsersWidget::load() slotFaceOpts(); } -void KDMUsersWidget::defaults() +void TDMUsersWidget::defaults() { leminuid->setText( defminuid ); lemaxuid->setText( defmaxuid ); @@ -487,14 +487,14 @@ void KDMUsersWidget::defaults() slotFaceOpts(); } -void KDMUsersWidget::slotMinMaxChanged() +void TDMUsersWidget::slotMinMaxChanged() { emit setMinMaxUID( leminuid->text().toInt(), lemaxuid->text().toInt() ); } -void KDMUsersWidget::slotChanged() +void TDMUsersWidget::slotChanged() { emit changed(true); } -#include "kdm-users.moc" +#include "tdm-users.moc" diff --git a/kcontrol/kdm/kdm-users.h b/kcontrol/kdm/kdm-users.h index 574a9d1ed..8a87c28dd 100644 --- a/kcontrol/kdm/kdm-users.h +++ b/kcontrol/kdm/kdm-users.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KDMUSERS_H__ -#define __KDMUSERS_H__ +#ifndef __TDMUSERS_H__ +#define __TDMUSERS_H__ #include <tqwidget.h> #include <tqptrlist.h> @@ -37,12 +37,12 @@ #include <pwd.h> -class KDMUsersWidget : public TQWidget +class TDMUsersWidget : public TQWidget { Q_OBJECT public: - KDMUsersWidget( TQWidget *parent = 0, const char *name = 0 ); + TDMUsersWidget( TQWidget *parent = 0, const char *name = 0 ); void load(); void save(); diff --git a/kcontrol/kdm/kdm.desktop b/kcontrol/kdm/kdm.desktop index c3f85d4b7..978918ec4 100644 --- a/kcontrol/kdm/kdm.desktop +++ b/kcontrol/kdm/kdm.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Exec=kcmshell kdm -Icon=kdmconfig +Exec=kcmshell tdm +Icon=tdmconfig Type=Application -DocPath=kdm/index.html#configuring-kdm +DocPath=tdm/index.html#configuring-tdm X-KDE-SubstituteUID=true -X-KDE-Library=kdm +X-KDE-Library=tdm X-KDE-RootOnly=true X-KDE-ParentApp=kcontrol @@ -40,7 +40,7 @@ Name[gl]=Xestor de Login Name[he]=מנהל הכניסה למערכת Name[hi]=लॉगइन प्रबंधक Name[hr]=Upravljanje prijavljivanjem -Name[hu]=Bejelentkező felület (KDM) +Name[hu]=Bejelentkező felület (TDM) Name[id]=Manajer Login Name[is]=Innstimplunarstjóri Name[it]=Gestione degli accessi @@ -93,151 +93,151 @@ Name[zh_CN]=登录管理器 Name[zh_TW]=登錄管理程式 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[ar]=إعداد مسيير الدخول (KDM) -Comment[az]=Giriş İdarəçisi (KDM) Qurğuları -Comment[be]=Настаўленні кіраўніка ўваходу (KDM) +Comment[ar]=إعداد مسيير الدخول (TDM) +Comment[az]=Giriş İdarəçisi (TDM) Qurğuları +Comment[be]=Настаўленні кіраўніка ўваходу (TDM) Comment[bg]=Настройване на графичната системата за вход Comment[bn]=লগ-ইন ম্যানেজার কনফিগার করুন -Comment[br]=Kefluniañ ar merour ereañ (KDM) -Comment[bs]=Podesite menadžer prijavom (KDM) -Comment[ca]=Configura el gestor d'accés (KDM) -Comment[cs]=Nastavení správce přihlášení (KDM) -Comment[csb]=Kònfigùracëjô menedżera logòwaniô (KDM) -Comment[cy]=Ffurfweddu y rheolydd mewngofnodi (KDM) -Comment[da]=Indstil indlogningshåndtering (KDM) -Comment[de]=Anmeldungsmanager KDM einrichten -Comment[el]=Ρυθμίστε το διαχειριστή σύνδεσης (KDM) -Comment[eo]=Agordu la salutadminstrilon (KDM) -Comment[es]=Configura el gestor de acceso (KDM) -Comment[et]=Sisselogimise halduri seadistamine (KDM) -Comment[eu]=Konfiguratu saio-hasieraren kudeatzailea (KDM) -Comment[fa]=پیکربندی مدیر ورود (KDM) +Comment[br]=Kefluniañ ar merour ereañ (TDM) +Comment[bs]=Podesite menadžer prijavom (TDM) +Comment[ca]=Configura el gestor d'accés (TDM) +Comment[cs]=Nastavení správce přihlášení (TDM) +Comment[csb]=Kònfigùracëjô menedżera logòwaniô (TDM) +Comment[cy]=Ffurfweddu y rheolydd mewngofnodi (TDM) +Comment[da]=Indstil indlogningshåndtering (TDM) +Comment[de]=Anmeldungsmanager TDM einrichten +Comment[el]=Ρυθμίστε το διαχειριστή σύνδεσης (TDM) +Comment[eo]=Agordu la salutadminstrilon (TDM) +Comment[es]=Configura el gestor de acceso (TDM) +Comment[et]=Sisselogimise halduri seadistamine (TDM) +Comment[eu]=Konfiguratu saio-hasieraren kudeatzailea (TDM) +Comment[fa]=پیکربندی مدیر ورود (TDM) Comment[fi]=Sisäänkirjautumisasetukset -Comment[fr]=Configuration du gestionnaire de connexion (KDM) -Comment[fy]=Hjir kinne jo it oanmeldskerm ynstelle (KDM) -Comment[ga]=Cumraigh an bainisteoir logála isteach (KDM) -Comment[gl]=Configurar o xestor de início (KDM) -Comment[he]=שינוי הגדרות מנהל הכניסה למערכת (KDM) +Comment[fr]=Configuration du gestionnaire de connexion (TDM) +Comment[fy]=Hjir kinne jo it oanmeldskerm ynstelle (TDM) +Comment[ga]=Cumraigh an bainisteoir logála isteach (TDM) +Comment[gl]=Configurar o xestor de início (TDM) +Comment[he]=שינוי הגדרות מנהל הכניסה למערכת (TDM) 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[is]=Stilla innstimplunarstjórann (KDM) -Comment[it]=Configurazione della gestione degli accessi (KDM) -Comment[ja]=ログインマネージャ (KDM) の設定 -Comment[ka]=შევლის მენეჯერის კონფიგურირება (KDM) -Comment[kk]=Жүйеге кіруді басқаруын (KDM) баптау -Comment[km]=កំណត់រចនាសម្ព័ន្ធកម្មវិធីគ្រប់គ្រងការចូល (KDM) -Comment[ko]=로그인 관리자 KDM 설정 +Comment[is]=Stilla innstimplunarstjórann (TDM) +Comment[it]=Configurazione della gestione degli accessi (TDM) +Comment[ja]=ログインマネージャ (TDM) の設定 +Comment[ka]=შევლის მენეჯერის კონფიგურირება (TDM) +Comment[kk]=Жүйеге кіруді басқаруын (TDM) баптау +Comment[km]=កំណត់រចនាសម្ព័ន្ធកម្មវិធីគ្រប់គ្រងការចូល (TDM) +Comment[ko]=로그인 관리자 TDM 설정 Comment[lo]=ປັບແຕ່ງປລັກອິນແລະການເຊື່ອມ ຕໍ່ສຳລັບລະບົບ KDB -Comment[lt]=Konfigūruoti registravimos tvarkyklę (KDM) -Comment[lv]=Konfigure pieteiksanās menedžeri KDM -Comment[mk]=Конфигурирајте го менаџерот на најави (KDM) -Comment[mn]=Нэвтрэлт удирдагч KDM тохируулах -Comment[ms]=Konfigur pengurus login (KDM) -Comment[mt]=Ikkonfigura l-manager tal-logins (KDM) -Comment[nb]=Tilpass innlogingsbehandler (KDM) -Comment[nds]=Den Anmellen-Schirm instellen (KDM) -Comment[ne]=लगइन प्रबन्धक (KDM) कन्फिगर गर्नुहोस् -Comment[nl]=Hier kunt u het aanmeldscherm (KDM) instellen -Comment[nn]=Set opp innloggingshandsamaren (KDM) -Comment[nso]=Beakanya molaodoi wa tseno (KDM) -Comment[pa]=ਲਾਗਆਨ ਮੈਨੇਜਰ ਸੰਰਚਨਾ(KDM) -Comment[pl]=Konfiguracja menedżera logowania (KDM) -Comment[pt]=Configuração do gestor de autenticação (KDM) -Comment[pt_BR]=Configura o gerenciador de login (KDM) -Comment[ro]=Configurează managerul de logare grafică (KDM) -Comment[ru]=Настройка менеджера входа в систему (KDM) -Comment[rw]=Kuboneza mugenga w'ifashayinjira (KDM) -Comment[se]=Heivet sisačálihangieđahalli (KDM) -Comment[sk]=Nastavenie správcu prihlásenia (KDM) -Comment[sl]=Nastavitve upravitelja prijav (KDM) -Comment[sr]=Подешавање менаџера за пријављивање (KDM) -Comment[sr@Latn]=Podešavanje menadžera za prijavljivanje (KDM) -Comment[sv]=Anpassa inloggningshanteraren (KDM) -Comment[ta]=புகுபதிகை மேலாளரை அமை (KDM) -Comment[tg]=Танзими мудири вуруд (KDM) -Comment[th]=ปรับแต่งเครื่องมือจัดการการล็อกอิน (KDM) -Comment[tr]=Giriş yöneticisini yapılandır (KDM) -Comment[tt]=Kerü idäräçen caylaw urını (KDM) -Comment[uk]=Налаштування менеджера реєстрації (KDM) -Comment[uz]=Tizimga kirish boshqaruvchisini (KDM) moslash -Comment[uz@cyrillic]=Тизимга кириш бошқарувчисини (KDM) мослаш -Comment[ven]=Ni nga dzudzanya mulanguli wau loga (KDM) -Comment[vi]=Cấu hình trình đăng nhập (KDM) -Comment[wa]=Apontyî l' manaedjeu d' elodjaedje (KDM) -Comment[xh]=Qwalasela umphathi wegama elithile (KDM) -Comment[zh_CN]=配置登录管理器(KDM) -Comment[zh_TW]=設定登入管理程式 (KDM) -Comment[zu]=Hlanganisela imenenja yokungena ngaphakathi (KDM) +Comment[lt]=Konfigūruoti registravimos tvarkyklę (TDM) +Comment[lv]=Konfigure pieteiksanās menedžeri TDM +Comment[mk]=Конфигурирајте го менаџерот на најави (TDM) +Comment[mn]=Нэвтрэлт удирдагч TDM тохируулах +Comment[ms]=Konfigur pengurus login (TDM) +Comment[mt]=Ikkonfigura l-manager tal-logins (TDM) +Comment[nb]=Tilpass innlogingsbehandler (TDM) +Comment[nds]=Den Anmellen-Schirm instellen (TDM) +Comment[ne]=लगइन प्रबन्धक (TDM) कन्फिगर गर्नुहोस् +Comment[nl]=Hier kunt u het aanmeldscherm (TDM) instellen +Comment[nn]=Set opp innloggingshandsamaren (TDM) +Comment[nso]=Beakanya molaodoi wa tseno (TDM) +Comment[pa]=ਲਾਗਆਨ ਮੈਨੇਜਰ ਸੰਰਚਨਾ(TDM) +Comment[pl]=Konfiguracja menedżera logowania (TDM) +Comment[pt]=Configuração do gestor de autenticação (TDM) +Comment[pt_BR]=Configura o gerenciador de login (TDM) +Comment[ro]=Configurează managerul de logare grafică (TDM) +Comment[ru]=Настройка менеджера входа в систему (TDM) +Comment[rw]=Kuboneza mugenga w'ifashayinjira (TDM) +Comment[se]=Heivet sisačálihangieđahalli (TDM) +Comment[sk]=Nastavenie správcu prihlásenia (TDM) +Comment[sl]=Nastavitve upravitelja prijav (TDM) +Comment[sr]=Подешавање менаџера за пријављивање (TDM) +Comment[sr@Latn]=Podešavanje menadžera za prijavljivanje (TDM) +Comment[sv]=Anpassa inloggningshanteraren (TDM) +Comment[ta]=புகுபதிகை மேலாளரை அமை (TDM) +Comment[tg]=Танзими мудири вуруд (TDM) +Comment[th]=ปรับแต่งเครื่องมือจัดการการล็อกอิน (TDM) +Comment[tr]=Giriş yöneticisini yapılandır (TDM) +Comment[tt]=Kerü idäräçen caylaw urını (TDM) +Comment[uk]=Налаштування менеджера реєстрації (TDM) +Comment[uz]=Tizimga kirish boshqaruvchisini (TDM) moslash +Comment[uz@cyrillic]=Тизимга кириш бошқарувчисини (TDM) мослаш +Comment[ven]=Ni nga dzudzanya mulanguli wau loga (TDM) +Comment[vi]=Cấu hình trình đăng nhập (TDM) +Comment[wa]=Apontyî l' manaedjeu d' elodjaedje (TDM) +Comment[xh]=Qwalasela umphathi wegama elithile (TDM) +Comment[zh_CN]=配置登录管理器(TDM) +Comment[zh_TW]=設定登入管理程式 (TDM) +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[ar]=kdm,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[be]=кіраўнік дысплея,кіраўнік уваходу,карыстальнікі,уваход,запрашэнне,лагатып,стылі,стыль,мова,краіна,шрыфты,фон,шпалеры,сесіі,сесія,выключэнне,перазагрузка,kdm,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[ca]=kdm,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[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[cy]=kdm,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=tdm,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]=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]=кіраўнік дысплея,кіраўнік уваходу,карыстальнікі,уваход,запрашэнне,лагатып,стылі,стыль,мова,краіна,шрыфты,фон,шпалеры,сесіі,сесія,выключэнне,перазагрузка,tdm,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]=tdm,administrador de la pantalla,xdm,usuaris,accés,salutació,Logo,estils,llengua,país,lletres,fons,tapissos,sessions,apagar,reiniciar +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]=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]=tdm,rheolydd y dangosydd,xdm,defnyddwyr,mewngofnodi,cyfarchiad,Logo,arddulliau,iaith,gwlad,ffontiau,cefndir,papurau wal,sesiynau,cau,ailgychwyn +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[el]=kdm,διαχειριστής οθόνης,xdm,χρήστες,σύνδεση,χαιρετισμός,Λογότυπο,στυλ,γλώσσα,χώρα,γραμματοσειρές,φόντο,ταπετσαρίες,συνεδρίες,τερματισμός,επανεκκίνηση -Keywords[eo]=kdm,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[et]=kdm,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[fa]=kdm، مدیر نمایش، 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[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[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[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[gl]=kdm,xestor de entrada,xdm,usuarios,identificación,Logo,estilos,lingua,país,fontes,fondo,papeis tapiz,sesións,apagado,reinício +Keywords[el]=tdm,διαχειριστής οθόνης,xdm,χρήστες,σύνδεση,χαιρετισμός,Λογότυπο,στυλ,γλώσσα,χώρα,γραμματοσειρές,φόντο,ταπετσαρίες,συνεδρίες,τερματισμός,επανεκκίνηση +Keywords[eo]=tdm,ekrano,,xdm,uzantoj,saluto,emblemo,stilo,lingvo,lando,tiparo,fono,tapeto,seanco,adaiaŭo,relanĉo +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]=tdm,ekraanihaldur,xdm,kasutajad,sisselogimine,tervitus,logo,stiil,keel,riik,fondid,taust,taustapilt,seansid,töö lõpetamine,taaskäivitamine +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]=tdm، مدیر نمایش، xdm، کاربران، ورود، تبریک، آرمِ، سبک، زبان، کشور، قلمها، زمینه، کاغذهای دیواری، نشستها، تعطیل، بازآغازی +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]=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]=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]=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]=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[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[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[is]=kdm,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[ja]=kdm,ディスプレイマネージャ,xdm,ユーザ,ログイン,あいさつ,ロゴ,スタイル,言語,国,フォント,背景,壁紙,セッション,シャットダウン,再起動 -Keywords[km]=kdm,កម្មវិធីគ្រប់គ្រងការបង្ហាញ,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[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[mk]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,менаџер на екран,корисници,најава,поздрав,Лого,стилови,јазик,земја,фонтови,подлога,позадина,сесии,исклучување,рестартирање +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]=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]=tdm,skjár,gluggastjóri,innskráning,innstimplun,snið,tungumál,land,letur,bakgrunnur,bakgrunnar,veggfóður,setur,slökkva,endurræsa +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]=tdm,ディスプレイマネージャ,xdm,ユーザ,ログイン,あいさつ,ロゴ,スタイル,言語,国,フォント,背景,壁紙,セッション,シャットダウン,再起動 +Keywords[km]=tdm,កម្មវិធីគ្រប់គ្រងការបង្ហាញ,xdm,អ្នកប្រើ,ចូល,ស្វាគមន៍,រូបសញ្ញា,រចនាប័ទ្ម,ភាសា,ប្រទេស,ពុម្ពអក្សរ,ផ្ទៃខាងក្រោយ,ក្រដាសបិទជញ្ជាំង,សម័យ,បិទ,ចាប់ផ្ដើមឡើងវិញ +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]=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]=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[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[nb]=kdm,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[ne]=kdm, प्रदर्शन प्रबन्धक, 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[nn]=kdm,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[pa]=kdm,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[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_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[ro]=kdm,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[rw]=kdm,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[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[sl]=kdm,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@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[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[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]=tdm,skjermbehandler,xdm,brukere,innlogging,velkomst,logo,stiler,språk,land,skrifttyper,bakgrunn,bakgrunnsbilde,økter,skru av,slå av,omstart +Keywords[nds]=tdm,Startschirm,xdm,Bruker,anmellen,greeting,Logo,Stilen,Spraak,Land,Schriftoorden,Achtergrund,Tapeten,Törns,Utmaken,Nieg starten +Keywords[ne]=tdm, प्रदर्शन प्रबन्धक, xdm, प्रयोगकर्ताहरू, लगइन, अभिवादन, परिचायक चिन्ह, शैलीहरू, भाषा, देश, फन्टहरू, पृष्ठभूमि,वालपेपरहरू, सत्र, बन्द गर्नुहोस्, फेरि सुरु गर्नुहोस् +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]=tdm,xdm,brukarar,innlogging,helsing,logo,stil,språk,land,skrifttypar,bakgrunn,bakgrunnsbilete,økt,avslutt,slå av,omstart +Keywords[nso]=tdm,molaodi wa pontsho,xdm,badirisi,tseno,madume,Logo,mekgwa,leleme,naga,difonto,bokamorago,di-wallpaper,ditiragalo,timo,thomaleswa +Keywords[pa]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart, ਲੋਗੋ, ਭਾਸ਼ਾ, ਦੇਸ਼, ਫੋਂਟ, ਲਾਗਿੰਨ, ਉਪਭੋਗੀ,ਸ਼ੈਸ਼ਨ +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]=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]=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]=tdm,manager de ecran,xdm,utilizatori,logare,întîmpinare,logo,stiluri,limbaj,țară,fonturi,fundal,imagini de fundal,sesiuni,oprire,restartare +Keywords[ru]=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,перезагрузка,сеанс,шрифты,страна,фон,стили,обои +Keywords[rw]=tdm,kwerekana umuyobozi,xdm,abakoresha,ifashayinjira,gusuhuza,ikirango,imisusire,ururimi,igihugu,imyandikire,mbuganyuma,impapurorukuta,imikoro,kuzimya,kongera gutangiza +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]=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]=tdm,upravitelj zaslona,upravljalnik,xdm,uporabniki,prijava,login,pozdrav,logo,slogi,jezik,država,pisave,ozadje,tapete,seje,ugasnitev,vnovičen zagon +Keywords[sr]=tdm,display manager,xdm,users,login,greeting,Лого,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,менаџер,пријављивање,стил,језик,земља,фонтови,позадина,сесије,гашење +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]=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[th]=kdm,ตัวจัดการจอแสดงผล,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[uk]=kdm,менеджер дисплеїв,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@cyrillic]=kdm,кириш бошқарувчиси,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[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[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[xh]=kdm,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_TW]=kdm,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[th]=tdm,ตัวจัดการจอแสดงผล,xdm,ผู้ใช้,ล็อกอิน, ทักทาย,โลโก้,รูปแบบ,ภาษา,ประเทศ,แบบอักษร,พื้นหลัง, วอลล์เปเปอร์,วาระ,ปิด,เริ่มการทำงานใหม่ +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]=tdm,менеджер дисплеїв,xdm,користувачі,реєстрація,привітання,логотип,стилі,мова,країна,шрифти,тло,шпалери,сеанси,вимикання,перезапуск +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]=tdm,кириш бошқарувчиси,xdm,фойдаланувчилар,кириш,саломлашиш,Белги,услублар,тил,давлат,шрифтлар,орқа фон,сеанслар,ўчириш,ўчириб-ёқиш +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]=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]=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]=tdm,umphathi womboniso,xdm,abasebenzisi,igama elithile,umbuliso,ilogo,iintlobo,ulwimi,ilizwe,ubungakanani bamagama, imvelaphi,amaphepha odonga,iintlanganiso,vala,qala kwakhona +Keywords[zh_CN]=tdm,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]=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; diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp index 74230cfce..de4ea0fc7 100644 --- a/kcontrol/kdm/main.cpp +++ b/kcontrol/kdm/main.cpp @@ -31,11 +31,11 @@ #include <kmessagebox.h> #include <kurldrag.h> -#include "kdm-appear.h" -#include "kdm-font.h" -#include "kdm-users.h" -#include "kdm-shut.h" -#include "kdm-conv.h" +#include "tdm-appear.h" +#include "tdm-font.h" +#include "tdm-users.h" +#include "tdm-shut.h" +#include "tdm-conv.h" #include "main.h" #include "background.h" @@ -47,8 +47,8 @@ #include <pwd.h> #include <grp.h> -typedef KGenericFactory<KDModule, TQWidget> KDMFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_kdm, KDMFactory("kdmconfig") ) +typedef KGenericFactory<TDModule, TQWidget> TDMFactory; +K_EXPORT_COMPONENT_FACTORY( kcm_tdm, TDMFactory("tdmconfig") ) KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg) { @@ -78,16 +78,16 @@ KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg) KSimpleConfig *config; -KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KDMFactory::instance(), parent, name) +TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) + : KCModule(TDMFactory::instance(), parent, name) , minshowuid(0) , maxshowuid(0) , updateOK(false) { 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, - 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("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; struct stat st; - if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) { - config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" )); + if( stat( KDE_CONFDIR "/tdm/tdmdistrc" ,&st ) == 0) { + config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" )); } else { - config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); + config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" )); } 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!! // ***** - appearance = new KDMAppearanceWidget(this); + appearance = new TDMAppearanceWidget(this); tab->addTab(appearance, i18n("A&ppearance")); connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool))); - font = new KDMFontWidget(this); + font = new TDMFontWidget(this); tab->addTab(font, i18n("&Font")); 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")); connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - sessions = new KDMSessionsWidget(this); + sessions = new TDMSessionsWidget(this); tab->addTab(sessions, i18n("&Shutdown")); 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")); connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); 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(clearUsers()), users, TQT_SLOT(slotClearUsers())); - convenience = new KDMConvenienceWidget(this, 0); + convenience = new TDMConvenienceWidget(this, 0); tab->addTab(convenience, i18n("Con&venience")); 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> &))); @@ -231,12 +231,12 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) top->addWidget(tab); } -KDModule::~KDModule() +TDModule::~TDModule() { delete config; } -void KDModule::load() +void TDModule::load() { appearance->load(); font->load(); @@ -248,7 +248,7 @@ void KDModule::load() } -void KDModule::save() +void TDModule::save() { appearance->save(); font->save(); @@ -260,7 +260,7 @@ void KDModule::save() } -void KDModule::defaults() +void TDModule::defaults() { if ( getuid() == 0 ) { @@ -274,7 +274,7 @@ void KDModule::defaults() } } -void KDModule::propagateUsers() +void TDModule::propagateUsers() { groupmap.clear(); emit clearUsers(); @@ -298,7 +298,7 @@ void KDModule::propagateUsers() updateOK = true; } -void KDModule::slotMinMaxUID(int min, int max) +void TDModule::slotMinMaxUID(int min, int max) { if (updateOK) { TQMap<TQString,int> alusers, dlusers; diff --git a/kcontrol/kdm/main.h b/kcontrol/kdm/main.h index 90e88ceb9..d613f9c4e 100644 --- a/kcontrol/kdm/main.h +++ b/kcontrol/kdm/main.h @@ -21,29 +21,29 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __kdm_main_h -#define __kdm_main_h +#ifndef __tdm_main_h +#define __tdm_main_h #include <tqtabwidget.h> #include <tqmap.h> #include <kcmodule.h> -class KDMAppearanceWidget; -class KDMFontWidget; -class KDMSessionsWidget; -class KDMUsersWidget; -class KDMConvenienceWidget; +class TDMAppearanceWidget; +class TDMFontWidget; +class TDMSessionsWidget; +class TDMUsersWidget; +class TDMConvenienceWidget; class KBackground; -class KDModule : public KCModule +class TDModule : public KCModule { Q_OBJECT public: - KDModule(TQWidget *parent, const char *name, const TQStringList &); - ~KDModule(); + TDModule(TQWidget *parent, const char *name, const TQStringList &); + ~TDModule(); void load(); void save(); @@ -63,12 +63,12 @@ private: TQTabWidget *tab; - KDMAppearanceWidget *appearance; + TDMAppearanceWidget *appearance; KBackground *background; - KDMFontWidget *font; - KDMSessionsWidget *sessions; - KDMUsersWidget *users; - KDMConvenienceWidget *convenience; + TDMFontWidget *font; + TDMSessionsWidget *sessions; + TDMUsersWidget *users; + TDMConvenienceWidget *convenience; TQMap<TQString, QPair<int,TQStringList> > usermap; TQMap<TQString,int> groupmap; diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 171fec090..6a56fbf6a 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -116,7 +116,7 @@ <string>Default Shutdown Option</string> </property> <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> <vbox> <property name="name"> diff --git a/kdepasswd/kcm/kcm_useraccount.kcfg b/kdepasswd/kcm/kcm_useraccount.kcfg index 7f52bff9a..60007f4c9 100644 --- a/kdepasswd/kcm/kcm_useraccount.kcfg +++ b/kdepasswd/kcm/kcm_useraccount.kcfg @@ -5,11 +5,11 @@ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > <include>kglobal.h</include> <include>kstandarddirs.h</include> - <kcfgfile name="kdm/kdmrc"/> + <kcfgfile name="tdm/tdmrc"/> <group name="X-*-Greeter"> <entry name="faceDir" type="Path"> <default code="true"> - KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" + '/' + KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" + '/' </default> </entry> <entry name="UserFaceDir" type="Path"> @@ -18,7 +18,7 @@ <entry name="FaceSource" type="String"> <default>PreferAdmin</default> </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 ;-) --> <entry name = "FaceSize" type="Int"> <label>The size of login images</label> diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index 11a4547b3..97900e06d 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -147,7 +147,7 @@ void KCMUserAccount::load() _mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer )); TQString _userPicsDir = KCFGUserAccount::faceDir() + - KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; + KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces/"; TQString fs = KCFGUserAccount::faceSource(); if (fs == TQString::fromLatin1("UserOnly")) @@ -271,7 +271,7 @@ void KCMUserAccount::slotFaceButtonClicked() } ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() + - "/kdm/pics/users/" ); + "/tdm/pics/users/" ); if ( pDlg->exec() == TQDialog::Accepted && !pDlg->getFaceImage().isNull() ) changeFace( pDlg->getFaceImage() ); diff --git a/kdepasswd/kcm/pics/CMakeLists.txt b/kdepasswd/kcm/pics/CMakeLists.txt index 8346d035f..1bfe832db 100644 --- a/kdepasswd/kcm/pics/CMakeLists.txt +++ b/kdepasswd/kcm/pics/CMakeLists.txt @@ -16,4 +16,4 @@ install( FILES Heart.png Konqui.png Lion.png Monkey.png Penguin.png Pig.png Rabbit.png Ring.png Scream.png Shark.png Splash.png Star.png Teddybear.png Turtle.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/pics/users ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/pics/users ) diff --git a/kdepasswd/kcm/pics/Makefile.am b/kdepasswd/kcm/pics/Makefile.am index 5c1e95f75..7c2cca099 100644 --- a/kdepasswd/kcm/pics/Makefile.am +++ b/kdepasswd/kcm/pics/Makefile.am @@ -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 \ Butterfly.png Car.png Cow.png Daemon.png Dog.png Elephant.png \ Flower.png Frog.png Ghost.png Guitar.png Heart.png Konqui.png \ diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt index a7047e550..fa3d8547c 100644 --- a/kdesktop/CMakeLists.txt +++ b/kdesktop/CMakeLists.txt @@ -27,7 +27,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/tdmlib ${CMAKE_SOURCE_DIR}/kcontrol/background ${CMAKE_SOURCE_DIR}/libkonq ${TDE_INCLUDE_DIR} diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am index 5cdaa8b4b..1b4927db6 100644 --- a/kdesktop/Makefile.am +++ b/kdesktop/Makefile.am @@ -1,8 +1,8 @@ ## 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_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 diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index cf61030bb..cd0ff4c1d 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -525,7 +525,7 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) m_pDesktop->repaint(); static bool root_cleared = false; if( !root_cleared ) - { // clear the root window pixmap set by kdm + { // clear the root window pixmap set by tdm root_cleared = true; TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot())); // but make the pixmap visible until m_pDesktop is visible diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt index 5ea297037..5530d4c5c 100644 --- a/kdesktop/lock/CMakeLists.txt +++ b/kdesktop/lock/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/kdesktop ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/tdmlib ${CMAKE_SOURCE_DIR}/kcheckpass ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am index 7a1841086..158541a6f 100644 --- a/kdesktop/lock/Makefile.am +++ b/kdesktop/lock/Makefile.am @@ -1,8 +1,8 @@ ## 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_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 diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 1d459a0d3..2711c36c5 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -29,7 +29,7 @@ #include <kglobalsettings.h> #include <dcopref.h> -#include <kdmtsak.h> +#include <tdmtsak.h> #include <stdlib.h> diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index f600e6a21..17f54a115 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/kdesktop/lock/sakdlg.cc @@ -104,7 +104,7 @@ SAKDlg::SAKDlg(LockProcess *parent) installEventFilter(this); mSAKProcess = new KProcess; - *mSAKProcess << "kdmtsak"; + *mSAKProcess << "tdmtsak"; connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited())); mSAKProcess->start(); } diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index c5306e9d6..fb0f75447 100644 --- a/kdesktop/lockeng.cc +++ b/kdesktop/lockeng.cc @@ -54,7 +54,7 @@ SaverEngine::SaverEngine() TQT_SLOT(lockProcessExited())); mSAKProcess = new KProcess; - *mSAKProcess << "kdmtsak"; + *mSAKProcess << "tdmtsak"; connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited())); TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) ); diff --git a/kdm/CMakeLists.txt b/kdm/CMakeLists.txt index 0e7a32789..08096f84c 100644 --- a/kdm/CMakeLists.txt +++ b/kdm/CMakeLists.txt @@ -13,8 +13,8 @@ # FIXME needs more checks (for kerberos, etc) # FIXME Xsession need some improvements -if( NOT DEFINED KDM_PAM_SERVICE ) - set( KDM_PAM_SERVICE "kde" CACHE INTERNAL "" ) +if( NOT DEFINED TDM_PAM_SERVICE ) + set( TDM_PAM_SERVICE "kde" CACHE INTERNAL "" ) endif( ) include( ConfigureChecks.cmake ) diff --git a/kdm/ChangeLog b/kdm/ChangeLog index c03c31e68..58a3014f6 100644 --- a/kdm/ChangeLog +++ b/kdm/ChangeLog @@ -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 if they affect the configuration. @@ -28,7 +28,7 @@ if they affect the configuration. 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> @@ -38,7 +38,7 @@ if they affect the configuration. 2004-07-28 Oswald Buddenhagen <ossi@kde.org> * 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. 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> - * Changed AllowClose default to true; only the default kdmrc + * Changed AllowClose default to true; only the default tdmrc disables it for local display now. 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> - * 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 contains a full pathname and starttde fixes up PATH if necessary. * The default Xsession will emulate the startup behaviour of more 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. 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> - * 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 mechanisms can be handled; options PluginsLogin & PluginsShutdown. * 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> - * 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. 2003-09-23 Oswald Buddenhagen <ossi@kde.org> @@ -148,7 +148,7 @@ if they affect the configuration. - "custom" to ~/.xsession * The previous session type choice is now saved in a different file (~/.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 based installations. * 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 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 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 in kfrontend/Makefile.am to enable it. * 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. * The AutoLogin option and the -autolog/-noautolog switches are gone. * The AutoLogin1st option is gone. @@ -207,11 +207,11 @@ if they affect the configuration. 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 * krootimage will be automatically invoked by the greeter by default; 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 with the BackgroundRc option. * 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> * 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. * The Setup script is now executed synchronously. Long-lasting 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, 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 * Renamed the option Users to SelectedUsers and NoUsers to HiddenUsers. * 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> - * Added the tool 'genkdmconf'. It's supposed to create a suitable - configuration for KDM during 'make install' by merging new defaults - with a previous XDM/KDM config (if any is found). + * Added the tool 'gentdmconf'. It's supposed to create a suitable + configuration for TDM during 'make install' by merging new defaults + with a previous XDM/TDM config (if any is found). 2001-07-03 Oswald Buddenhagen <ossi@kde.org> @@ -318,26 +318,26 @@ if they affect the configuration. the DebugLevel resource is gone * The ErrorLogFile resource is gone * The greeter module libKdmGreet.so has been converted to an - executable named kdm_greet; the external config parser is now - named kdm_config. The resource GreeterLib and the command line + executable named tdm_greet; the external config parser is now + named tdm_config. The resource GreeterLib and the command line option -getcfg (and -cfg2get) are gone, as the locations of the config parser and greeter are derived from the location of the - kdm executable - * The config files are all located in ${kde_confdir}/kdm now; the + tdm executable + * The config files are all located in ${kde_confdir}/tdm now; the defaults for Setup & Session were adapted to this. - * The keys in kdmrc were reorganized: - - [KDM]/ShutdownButton -> [X-<dpy>-Greeter]/(ShutdownButton & + * The keys in tdmrc were reorganized: + - [TDM]/ShutdownButton -> [X-<dpy>-Greeter]/(ShutdownButton & ShutdownNeedsRoot) - - [KDM]/Shutdown -> [Shutdown]/HaltCmd - - [KDM]/Restart -> [Shutdown]/RebootCmd - - [KDM]/LogoArea -> [X-*-Greeter]/ {None,Logo,Clock} - - remaining keys from [KDM] -> [X-*-Greeter]/ + - [TDM]/Shutdown -> [Shutdown]/HaltCmd + - [TDM]/Restart -> [Shutdown]/RebootCmd + - [TDM]/LogoArea -> [X-*-Greeter]/ {None,Logo,Clock} + - remaining keys from [TDM] -> [X-*-Greeter]/ - [Lilo]/Lilo -> [Shutdown]/UseLilo - [Lilo]/LiloCommand -> [Shutdown]/LiloCmd - [Lilo]/LiloMap -> [Shutdown]/ - [Locale]/Language -> [X-*-Greeter]/ (Country key dropped) - * KDM will no longer use kdm-config; most of its resources were - absorbed into kdmrc: + * TDM will no longer use tdm-config; most of its resources were + absorbed into tdmrc: - Servers -> [General]/Xservers - RequestPort -> [Xdmcp]/(Port & Enable) - DaemonMode -> [General]/ @@ -366,11 +366,11 @@ if they affect the configuration. * In GreetString the HOSTNAME substitution was replaced with the %%, %d, %h, %n, %s, %r & %m expandos * EchoMode does not understand "NoStars" any more. Use "NoEcho". - * Defaults changed: AuthDir to /var/lib/kdm, KeyFile to - $kdm_confdir/kdmkeys, Xservers to $kdm_confdir/Xservers, Xaccess to - $kdm_confdir/Xaccess, Startup to $kdm_confdir/Xstartup, Reset to - $kdm_confdir/Xreset, removed kde2 from SessionTypes - * The previous user is now saved in $kdm_confdir/kdmsts, not kdmrc + * Defaults changed: AuthDir to /var/lib/tdm, KeyFile to + $tdm_confdir/tdmkeys, Xservers to $tdm_confdir/Xservers, Xaccess to + $tdm_confdir/Xaccess, Startup to $tdm_confdir/Xstartup, Reset to + $tdm_confdir/Xreset, removed kde2 from SessionTypes + * The previous user is now saved in $tdm_confdir/tdmsts, not tdmrc * Added option SessSaveFile, defaulting to .wmrc * Command line option changes: - -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; 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, KDE-like) configuration data into the XDM resources; command line 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 * Stolen idea for console mode handling from dtlogin; options ConsoleMode and AllowConsoleMode are gone; extension to Xservers @@ -427,13 +427,13 @@ if they affect the configuration. resource NoPassUsers * 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. The command line options -autolog/-noautolog and the resource AutoLogin can be used to disable auto-login and password-less login at once. * 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]. 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> - * Made kdmdesktop read the [Desktop0] section from kdmrc instead - of kdmdesktoprc. + * Made tdmdesktop read the [Desktop0] section from tdmrc instead + of tdmdesktoprc. 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> - * kdmdesktop replaced with ../kdesktop/kdmdesktop. Uses new config - file (kdmdesktoprc) with new options (all in section [Desktop0]): + * tdmdesktop replaced with ../kdesktop/tdmdesktop. Uses new config + file (tdmdesktoprc) with new options (all in section [Desktop0]): 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, 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> @@ -502,7 +502,7 @@ if they affect the configuration. 1998-10-08 Thomas Tanghus <tanghus@earthling.net> - * [KDMDESKTOP] option changes: + * [TDMDESKTOP] option changes: - BackgroundPictureTile, BackgroundPictureCenter, FancyBackground -> BackgroundPictureMode {None,Tile,Center,Scale, TopLeft,TopRight,BottomLeft,BottomRight,Fancy} @@ -513,7 +513,7 @@ if they affect the configuration. * Change defaults: - 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 - UserPath & SystemPath: no /usr/ucb for Linux & FreeBSD diff --git a/kdm/Makefile.am b/kdm/Makefile.am index 106e47862..0f038d4a7 100644 --- a/kdm/Makefile.am +++ b/kdm/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS = . backend kfrontend -PAM = @KDM_PAM_SERVICE@ +PAM = @TDM_PAM_SERVICE@ noinst_DATA=config.ci -kdmdocdir = $(datadir)/doc/kdm -kdmdoc_DATA = README +tdmdocdir = $(datadir)/doc/tdm +tdmdoc_DATA = README install-data-local: -@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 -### this is *only* for the kdm home page maintainer! ### +### this is *only* for the tdm home page maintainer! ### hp: - scp README ChangeLog TODO devel-home:files/kdm + scp README ChangeLog TODO devel-home:files/tdm diff --git a/kdm/README b/kdm/README index 4b0c8d6f4..6c0fce18b 100644 --- a/kdm/README +++ b/kdm/README @@ -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). -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] - 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. ---with-kdm-pam=service - Override the PAM service used specifically by KDM. Depends on --with-pam. +--with-tdm-pam=service + Override the PAM service used specifically by TDM. Depends on --with-pam. --with-shadow - Compile KDM (and other parts of tdebase) with shadow password support. - Shadow passwords are automatically used if found. This affects KDM only + Compile TDM (and other parts of tdebase) with shadow password support. + Shadow passwords are automatically used if found. This affects TDM only if PAM is not used. --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 - 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 - Compile KDM with AFS support. Depends on --with-krb4. + Compile TDM with AFS support. Depends on --with-krb4. --with-krb5auth[=path] --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 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. --without-xdmcp - Compile KDM without XDMCP support. + Compile TDM without XDMCP support. ---with-kdm-xconsole - Compile KDM with a builtin "xconsole" replacement in the greeter. I don't +--with-tdm-xconsole + 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. ;) -KDM's file system layout +TDM's file system layout ------------------------ ${kde_confdir} is usually ${prefix}/share/config ${kde_datadir} is usually ${prefix}/share/apps The indented locations are envisioned for a configuration shared with GDM. -${kde_confdir}/kdm/{kdmrc,Xservers,Xaccess,Xwilling,...} -${kde_datadir}/kdm/sessions/*.desktop +${kde_confdir}/tdm/{tdmrc,Xservers,Xaccess,Xwilling,...} +${kde_datadir}/tdm/sessions/*.desktop /etc/X11/sessions/,/usr/share/xsessions/ -${kde_datadir}/kdm/pics/users/ -${kde_datadir}/kdm/pics/ -${kde_datadir}/kdm/faces/*.face{,.icon} +${kde_datadir}/tdm/pics/users/ +${kde_datadir}/tdm/pics/ +${kde_datadir}/tdm/faces/*.face{,.icon} /usr/share/faces/ /var/run/xauth/A* /var/run/xdmctl/xdmctl* -/var/run/kdm.pid -/var/lib/kdm/kdmsts +/var/run/tdm.pid +/var/lib/tdm/tdmsts <site-specific>/*.dmrc $HOME/.face{,.icon} $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 -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. 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. 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] -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 -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 directory will be lost after the next KDE update. 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 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. 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 -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 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: - 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. - 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 want the system to boot into this every time!) edit /etc/inittab and change the line: @@ -153,14 +153,14 @@ modifying the XDM init script shipped by your distribution. id:5:initdefault: 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. 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 applications are possible as well. @@ -209,7 +209,7 @@ Commands for all sockets: "caps" - 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 is supported. "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 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 - 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. * "force" - shut down nonetheless. * "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: - Connecting them directly. FifoDir is exported as $DM_CONTROL; the name of per-display sockets can be derived from $DISPLAY. -- By using the kdmctl command (e.g., from within a shell script). - Try "kdmctl -h" to find out more. +- By using the tdmctl command (e.g., from within a shell script). + Try "tdmctl -h" to find out more. Here is an example bash script "reboot into FreeBSD": -if kdmctl | grep -q shutdown; then +if tdmctl | grep -q shutdown; then IFS=$'\t' - set -- `kdmctl listbootoptions` + set -- `tdmctl listbootoptions` if [ "$1" = ok ]; then fbsd=$(echo "$2" | tr ' ' '\n' | sed -ne 's,\\s, ,g;/freebsd/I{p;q}') if [ -n "$fbsd" ]; then - kdmctl shutdown reboot "=$fbsd" ask > /dev/null + tdmctl shutdown reboot "=$fbsd" ask > /dev/null else echo "FreeBSD boot unavailable." fi @@ -332,7 +332,7 @@ fi More input! ;-) -KDM accepts two command line options related to logging: +TDM accepts two command line options related to logging: -debug <n> <n> is a decimal or hexadecimal (prefix 0x) number. @@ -363,10 +363,10 @@ KDM accepts two command line options related to logging: -logfile <file> <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 - permanently specify the log file location. If you redirect KDM's - standard error output to a file, KDM will log there. - If KDM is configured to use syslog (and it _very_ probably is on any + /var/log/tdm.log. For internal reasons there is no option in tdmrc to + permanently specify the log file location. If you redirect TDM's + standard error output to a file, TDM will log there. + If TDM is configured to use syslog (and it _very_ probably is on any modern system), all internally generated messages are logged to the "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 @@ -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 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 is "attaching gdb". How exactly this is done depends on the part that crashes: - master daemon. Actually you should never need to attach to it, as you can start it within the debugger already: - # gdb --args kdm -nodaemon -debug 7 + # gdb --args tdm -nodaemon -debug 7 (gdb) run - display subdaemon. Find (using ps) the process with a name like "-:0" (where :0 is actually the display this process is for). This 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 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. The PPID will be the master daemon as well. - # gdb kdm_config $(pidof kdm_config) + # gdb tdm_config $(pidof tdm_config) (gdb) cont - 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 The simplification with "pidof" works only if you have only one display, 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 --------------------------------------- -Version 0.1 of KDM is copyright +Version 0.1 of TDM is copyright Matthias Ettrich <ettrich@trolltech.com> All later versions copyright: (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. Martin Baehr for intensive testing and writing the sample Xsession scripts. 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. ... and _many_ others ... @@ -41,14 +41,14 @@ theming (#37349): - add support for XRandR (#48602) 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. - make config position independent - parse /etc/kderc? -- merge multiple kdmrcs in the style of kconfig. how to set section priorities? -- genkdmconf: treat backgroundrc as an ini file, not as a text blob -- add proper quoting and dequoting to genkdmconf ini parser & writer +- merge multiple tdmrcs in the style of kconfig. how to set section priorities? +- gentdmconf: treat backgroundrc as an ini file, not as a text blob +- add proper quoting and dequoting to gentdmconf ini parser & writer - write generic conversation plugin - 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) - 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) - 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) -- 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. 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 of starting a new one and feeding it the old auth data. - 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: - keep things basically as-is, make the Xaccess interface even more flexible, add capability flags. diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt index b93174e4c..cd98b3a9c 100644 --- a/kdm/backend/CMakeLists.txt +++ b/kdm/backend/CMakeLists.txt @@ -21,11 +21,11 @@ link_directories( ${DBUS_TQT_LIBRARY_DIRS} ) -##### kdm (executable) ########################## +##### tdm (executable) ########################## add_custom_command( OUTPUT config.ci - COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci - DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) + COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci + 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 ) @@ -35,7 +35,7 @@ else() set( XDMCP_LIBRARIES "" ) endif() -tde_add_executable( kdm +tde_add_executable( tdm SOURCES access.c auth.c bootman.c choose.c client.c consolekit.c ctrl.c daemon.c dm.c dpylist.c error.c genauth.c diff --git a/kdm/backend/Makefile.am b/kdm/backend/Makefile.am index 58c2a9e43..6b5779d51 100644 --- a/kdm/backend/Makefile.am +++ b/kdm/backend/Makefile.am @@ -6,8 +6,8 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) $(LIBSHADOW) $(LIBGEN) \ $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \ $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4) -bin_PROGRAMS = kdm -kdm_SOURCES = \ +bin_PROGRAMS = tdm +tdm_SOURCES = \ access.c \ auth.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 # for unsermake (automake is handled by SUBDIRS in ../) -kdm_COMPILE_FIRST = ../config.ci +tdm_COMPILE_FIRST = ../config.ci diff --git a/kdm/backend/client.c b/kdm/backend/client.c index 56d9fa09f..0cf4e216b 100644 --- a/kdm/backend/client.c +++ b/kdm/backend/client.c @@ -1305,7 +1305,7 @@ StartClient() env = setEnv( env, "SHELL", p->pw_shell ); env = setEnv( env, "HOME", p->pw_dir ); 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 (krbtkfile[0] != '\0') env = setEnv( env, "KRBTKFILE", krbtkfile ); diff --git a/kdm/backend/ctrl.c b/kdm/backend/ctrl.c index f7ed05308..622c9370d 100644 --- a/kdm/backend/ctrl.c +++ b/kdm/backend/ctrl.c @@ -520,7 +520,7 @@ processCtrl( const char *string, int len, int fd, struct display *d ) if (fd >= 0 && !strcmp( ar[0], "caps" )) { if (ar[1]) goto exce; - Reply( "ok\tkdm\tlist\t" ); + Reply( "ok\ttdm\tlist\t" ); if (bootManager != BO_NONE) Reply( "bootoptions\t" ); if (d) { diff --git a/kdm/backend/error.c b/kdm/backend/error.c index 0680ed3a5..93ec40e70 100644 --- a/kdm/backend/error.c +++ b/kdm/backend/error.c @@ -113,7 +113,7 @@ InitErrorLog( const char *errorLogFile ) # endif # define WARNMSG \ "********************************************************************************\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" \ "daemon.* syslog facility; check your syslog configuration to find out to which\n" \ "file(s) it is logged." PAMLOG "\n" \ diff --git a/kdm/config.def b/kdm/config.def index 8f91bf6e2..a7ec59076 100644 --- a/kdm/config.def +++ b/kdm/config.def @@ -30,8 +30,8 @@ #define RCVERMAJOR 2 #define RCVERMINOR 3 -#define KDMCONF KDE_CONFDIR "/kdm" -#define KDMDATA KDE_DATADIR "/kdm" +#define TDMCONF KDE_CONFDIR "/tdm" +#define TDMDATA KDE_DATADIR "/tdm" #ifdef _AIX # define HALT_CMD "/usr/sbin/shutdown -h now" @@ -89,16 +89,16 @@ # lines). # Section headers are "condensation seeds" for the Instance:s in the key # definitions below. -<kdmrc> - &kdm; master configuration file +<tdmrc> + &tdm; master configuration file _ Please note: Settings in this file are sometimes ignored (overridden). - The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d + The default TDM startup script /etc/init.d/tdm looks in /etc/default/tdm.d for theme-related settings which, if found, take precedence. The possibly overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme. - See /usr/share/doc/kdm/README.Debian for details + See /usr/share/doc/tdm/README.Debian for details _ - Definition: the greeter is the login dialog, i.e., the part of &kdm; + Definition: the greeter is the login dialog, i.e., the part of &tdm; which the user sees. _ You can configure every X-display individually. @@ -134,7 +134,7 @@ _ Every comment applies to the following section or key. Note that all comments will be lost if you change this file with the kcontrol frontend. - The defaults refer to &kdm;'s built-in values, not anything set in this file. + The defaults refer to &tdm;'s built-in values, not anything set in this file. _ Special characters need to be backslash-escaped (leading and trailing spaces (\\s), tab (\\t), linefeed (\\n), carriage return (\\r) and the @@ -151,7 +151,7 @@ [Shutdown] - Rough estimations about how many seconds &kdm; will spend at most on + Rough estimations about how many seconds &tdm; will spend at most on - opening a connection to the X-server (OpenTime) if the attempt - times out: OpenTimeout - is refused: OpenRepeat * OpenDelay @@ -179,26 +179,26 @@ Greeter config for 1st local display [X-:0-Greeter] -</kdmrc> +</tdmrc> -# The contents of this section are copied into kdmrc-ref.docbook. +# The contents of this section are copied into tdmrc-ref.docbook. # The macro %REF% is replaced with the accumulated Description:s from the key # definitions below. <docu> -<chapter id="kdm-files"> -<title>The Files &kdm; Uses for Configuration</title> +<chapter id="tdm-files"> +<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 not all.</para> -<sect1 id="kdmrc"> -<title>&kdmrc; - The &kdm; master configuration file</title> +<sect1 id="tdmrc"> +<title>&tdmrc; - The &tdm; master configuration file</title> <para>The basic format of the file is <quote>INI-like</quote>. Options are key/value pairs, placed in sections. 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> <para>Lines beginning with <literal>#</literal> are comments; empty lines @@ -309,7 +309,7 @@ have the usual meaning; the backslash quotes everything (not only special characters). Note that the backslashes need to be doubled because of the 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 kcontrol frontend.</para></note> @@ -317,13 +317,13 @@ kcontrol frontend.</para></note> </sect1> -<sect1 id="kdmrc-xservers"> +<sect1 id="tdmrc-xservers"> <title>Specifying permanent &X-Server;s</title> <para>Each entry in the <option>StaticServers</option> list indicates a display which should constantly be 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 local machine or rather remotely.</para> @@ -342,7 +342,7 @@ The display name of &XDMCP; displays is derived from the display's address by reverse host name resolution. For configuration purposes, the <literal>localhost</literal> prefix from locally running &XDMCP; displays is <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 display-specific sections. This is useful if you have a large collection of @@ -350,11 +350,11 @@ similar displays (such as a corral of X terminals) and would like to set options for groups of them. When using &XDMCP;, the display is required to specify the display class, 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> <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>). If reserve displays are specified, the &kde; menu will have a <guilabel>Start New Session</guilabel> item near the bottom; use that to @@ -362,26 +362,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 reserve displays available, the menu item will be disabled.</para> -<para>When &kdm; starts a session, it sets up authorization data for the -&X-Server;. For local servers, &kdm; passes +<para>When &tdm; starts a session, it sets up authorization data for the +&X-Server;. For local servers, &tdm; passes <command><option>-auth</option> <filename><replaceable>filename</replaceable></filename></command> 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> </sect1> -<sect1 id="kdmrc-xaccess"> +<sect1 id="tdmrc-xaccess"> <title>&XDMCP; access control</title> <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;. The file contains four types of entries: entries which control the response to <quote>Direct</quote> and <quote>Broadcast</quote> queries, entries which control the response to <quote>Indirect</quote> queries, macro definitions for <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 delimiter causing the rest of that line to be ignored, and <literal>\</literal> causes an immediately following newline to be ignored, allowing indirect host @@ -406,7 +406,7 @@ Preceding the entry with a <literal>!</literal> character causes hosts which match that entry to be excluded. To only respond to <quote>Direct</quote> queries for a host or pattern, 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> <para>An <quote>Indirect</quote> entry also contains a host name or pattern, @@ -424,7 +424,7 @@ the hop count is used as the TTL. --> If the indirect host list contains the keyword <literal>CHOOSER</literal>, <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 all the hosts that respond. The host list may contain the keyword <literal>BROADCAST</literal>, to make the chooser send a @@ -446,21 +446,21 @@ The formal syntax is <screen> <userinput> <literal>LISTEN</literal> [<replaceable>interface</replaceable> [<replaceable>multicast list</replaceable>]]</userinput> </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. <replaceable>interface</replaceable> may be a hostname or IP address representing a network interface on this machine, or the wildcard <literal>*</literal> to represent all available network interfaces. 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 permanently assigned range of multicast addresses for &XDMCP;. The <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 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. -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 compiled with IPv6 support). To disable listening for &XDMCP; requests altogether, a @@ -470,11 +470,11 @@ the <literal>[Xdmcp]</literal> <option>Enable</option> option is preferred. </sect1> -<sect1 id="kdm-scripts"> +<sect1 id="tdm-scripts"> <title>Supplementary programs</title> <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. </para> @@ -486,7 +486,7 @@ Their first argument is <literal>auto</literal> if the session results from an automatic login; otherwise, no arguments are passed to them. </para> -<sect2 id="kdmrc-xsetup"> +<sect2 id="tdmrc-xsetup"> <title>Setup program</title> <para> @@ -523,7 +523,7 @@ the following environment variables are passed:</para> </varlistentry> </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, 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 @@ -533,7 +533,7 @@ at all. Resources for this program can be put into the file named by </sect2> -<sect2 id="kdmrc-xstartup"> +<sect2 id="tdmrc-xstartup"> <title>Startup program</title> <para>The <filename>Xstartup</filename> program is run as @@ -582,13 +582,13 @@ the following environment variables are passed:</para> </varlistentry> </variablelist> -<para>&kdm; waits until this program exits before starting the user session. -If the exit value of this program is non-zero, &kdm; discontinues the session +<para>&tdm; waits until this program exits before starting the user session. +If the exit value of this program is non-zero, &tdm; discontinues the session and starts another authentication cycle.</para> </sect2> -<sect2 id="kdmrc-xsession"> +<sect2 id="tdmrc-xsession"> <title>Session program</title> <para>The <filename>Xsession</filename> program is the command which is run @@ -662,7 +662,7 @@ the following environment variables are passed:</para> </sect2> -<sect2 id="kdmrc-xreset"> +<sect2 id="tdmrc-xreset"> <title>Reset program</title> <para>Symmetrical with <filename>Xstartup</filename>, the @@ -713,7 +713,7 @@ or unmounting directories from file servers.</para> # must be already quoted appropriately. The other types are auto-quoted. # If the default value is prefixed with a "*", a c #define def_<Key> is # created. -# The default is automatically appended to the kdmrc comment and the +# The default is automatically appended to the tdmrc comment and the # documentation entry. # CDefault: <verbose default> # Append this instead of the real default to the two docs. The quoting @@ -725,42 +725,42 @@ or unmounting directories from file servers.</para> # PostProc: <function> # A function to postprocess the read config value before using it. # User: (dummy|(core|greeter|greeter-c|dep|config)[(<variable>)][:font]) -# These entries specify which parts of kdm need the option in question: +# These entries specify which parts of tdm need the option in question: # dummy: no user; entry is there only for syntactical correctness. # dep: this option is an internal dependency for another option. # config: this option configures the config reader itself. -# core: the kdm backend needs this option. -# greeter-c: the kdm frontend needs this option as a C data type. -# greeter: the kdm frontend needs this option as a C++/Qt data type. +# core: the tdm backend needs this option. +# greeter-c: the tdm frontend needs this option as a C data type. +# greeter: the tdm frontend needs this option as a C++/Qt data type. # If a :font tag is appended, a string entry is converted to a QFont. # If no variable name is specified, it will be derived from the Key by # un-capitalizing it. # Instance: (-|[#][<display spec>/](!|<value>)) -# These entries specify option instances for the default/example kdmrc. +# These entries specify option instances for the default/example tdmrc. # A "-" entry is a dummy for syntactical correctness. -# A prefixing hash mark will be copied to kdmrc. +# A prefixing hash mark will be copied to tdmrc. # For options in a section class a display must be specified. # For bool options "!" can be used as the value to specify the negation # of the default. # Update: <function>[/<number>] -# Call this function on each occurence of this option in genkdmconf. +# Call this function on each occurence of this option in gentdmconf. # Options with higher numbers (default is 0) will be processed later. -# Merge: (xdm[:<resource>][(<function>)]|kdm:[<section>/][<key>][<function>]) -# Specify config options to merge from xdm and older kdm versions. +# Merge: (xdm[:<resource>][(<function>)]|tdm:[<section>/][<key>][<function>]) +# Specify config options to merge from xdm and older tdm versions. # Kdm options from the current version are automatically merged. # When merging an xdm resource and no resource name is specified, it is # derived from the Key by un-capitalizing it. -# When merging a kdm option, at least one of <section> and <key> must +# When merging a tdm option, at least one of <section> and <key> must # be given; an unspecified entity defaults to the current Section/Key. # <section> may be a dash-prefixed section class. # A function to postprocess the read value can be specified. # Comment: [&|-] -# A kdmrc comment for this option is expected in the next lines. +# A tdmrc comment for this option is expected in the next lines. # If "-" is given to Comment, no comment is generated at all. # If "&" is given, the comment is derived from the Description below by # applying some simple docbook interpretation to it. Note that the # Description must be preformatted in this case. Use -# sed -ne 's/^\(.\{79,\}\)$/\1/p' < kdmrc +# sed -ne 's/^\(.\{79,\}\)$/\1/p' < tdmrc # after running "make install" to see whether all lines still fit. # If Type is enum, a list of the previously defined element/description # pairs is appended; the descriptions undergo docbook interpretation. @@ -777,7 +777,7 @@ or unmounting directories from file servers.</para> # unless "DDefault: -" was specified. # Each option entry generates an anchor named option-<lowercase(Key)>; # it can be referenced in the main documentation. -# Do not forget to run "make ref" in tdebase/doc/kdm after changing +# Do not forget to run "make ref" in tdebase/doc/tdm after changing # Descriptions. Section: General @@ -797,12 +797,12 @@ Comment: Description: This option exists solely for the purpose of clean automatic upgrades. <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. Key: PAMService If: defined(USE_PAM) Type: string -Default: KDM_PAM_SERVICE +Default: TDM_PAM_SERVICE User: core Instance: - Comment: - @@ -810,8 +810,8 @@ Description: - <legacy> Proc: absorb_xservers -# note: this can miss Xservers from kdm for kde 2.2 because of stupid default. -Source: kdm:General/Xservers +# note: this can miss Xservers from tdm for kde 2.2 because of stupid default. +Source: tdm:General/Xservers Source: xdm:servers </legacy> @@ -824,12 +824,12 @@ Comment: List of permanent displays. Displays with a hostname are foreign. A display class may be specified separated by an underscore. Description: - 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, - 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; 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. Key: ReserveServers Type: list @@ -854,7 +854,7 @@ Comment: Description: 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 - 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 in this list. Currently Linux only. @@ -870,26 +870,26 @@ Comment: TTYs (without /dev/) to monitor for activity while in console mode. Description: 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. Currently this applies only to Linux. </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 <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. Key: PidFile Type: string Default: "" User: core -Instance: "/var/run/kdm.pid" +Instance: "/var/run/tdm.pid" Merge: xdm Comment: - Where &kdm; should store its PID (do not store if empty). + Where &tdm; should store its PID (do not store if empty). Description: 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. Key: LockPidFile @@ -899,10 +899,10 @@ User: core Instance: #! Merge: xdm Comment: - Whether &kdm; should lock the PID file to prevent having multiple &kdm; + Whether &tdm; should lock the PID file to prevent having multiple &tdm; instances running at once. Do not change unless you are brave. Description: - 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. Key: AuthDir @@ -915,8 +915,8 @@ Merge: xdm(P_authDir) Comment: Where to store authorization files. Description: - This names a directory under which &kdm; stores &X-Server; authorization - files while initializing the session. &kdm; expects the system to clean up + This names a directory under which &tdm; stores &X-Server; authorization + files while initializing the session. &tdm; expects the system to clean up this directory from stale files on reboot. </para><para> The authorization file to be used for a particular display can be @@ -929,10 +929,10 @@ User: core Instance: #! Merge: xdm Comment: - Whether &kdm; should automatically re-read configuration files, if it + Whether &tdm; should automatically re-read configuration files, if it finds them having changed. Description: - 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. Key: ExportList @@ -943,7 +943,7 @@ Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_List) Comment: & Description: - 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; otherwise, it should not be necessary very often. @@ -955,12 +955,12 @@ User: core Instance: #"" Merge: xdm Comment: - A file &kdm; should read entropy from. + A file &tdm; should read entropy from. Description: If the system has no native entropy source like /dev/urandom (see <option>RandomDevice</option>) and no entropy daemon like EGD (see <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 (which, obviously, should change frequently). </para><para> @@ -975,7 +975,7 @@ User: core Instance: #"/tmp/entropy" Merge: xdm Comment: - A UNIX domain socket &kdm; should read entropy from. + A UNIX domain socket &tdm; should read entropy from. Description: If the system has no native entropy source like /dev/urandom (see <option>RandomDevice</option>), read random data from a Pseudo-Random @@ -992,7 +992,7 @@ User: core Instance: #4840 Merge: xdm Comment: - A TCP socket on localhost &kdm; should read entropy from. + A TCP socket on localhost &tdm; should read entropy from. Description: Same as <option>PrngdSocket</option>, only use a TCP socket on localhost. @@ -1004,10 +1004,10 @@ User: core Instance: #"/dev/altrandom" Merge: xdm Comment: - A character device &kdm; should read entropy from. + A character device &tdm; should read entropy from. Empty means use the system's preferred entropy device. Description: - 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. </para><para> This option does not exist on OpenBSD, as it uses the arc4_random @@ -1025,7 +1025,7 @@ Comment: Description: The directory in which the command <acronym>FiFo</acronym>s should be created; make it empty to disable them. -# See <xref linkend="kdm-fifos"/> for the details. +# See <xref linkend="tdm-fifos"/> for the details. Key: FifoGroup Type: group @@ -1039,14 +1039,14 @@ Description: Key: DataDir Type: path -Default: *"/var/lib/kdm" +Default: *"/var/lib/tdm" User: greeter Instance: #"" Update: upd_datadir Comment: - The directory in which &kdm; should store persistent working data. + The directory in which &tdm; should store persistent working data. Description: - 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. Key: DmrcDir @@ -1056,7 +1056,7 @@ User: core Instance: #"/nfs-shared/var/dmrcs" Comment: & Description: - 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 (like with AFS). @@ -1064,9 +1064,9 @@ Description: Section: Xdmcp If: defined(XDMCP) Description: - This section contains options that control &kdm;'s handling of + This section contains options that control &tdm;'s handling of &XDMCP; requests. -# See <xref linkend="xdmcp-with-kdm"/> to find out what &XDMCP; is. +# See <xref linkend="xdmcp-with-tdm"/> to find out what &XDMCP; is. Key: Enable Type: bool @@ -1075,7 +1075,7 @@ User: dep(xdmcpEnable) Instance: false Comment: & Description: - Whether &kdm; should listen to incoming &XDMCP; requests. + Whether &tdm; should listen to incoming &XDMCP; requests. Key: Port Type: int @@ -1085,9 +1085,9 @@ User: core(request_port) Instance: # Merge: xdm:requestPort(P_requestPort) Comment: - The UDP port on which &kdm; should listen for &XDMCP; requests. Do not change. + The UDP port on which &tdm; should listen for &XDMCP; requests. Do not change. Description: - 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 default value. @@ -1095,21 +1095,21 @@ Key: KeyFile Type: string Default: "" User: core -Instance: #KDMCONF "/kdmkeys" +Instance: #TDMCONF "/tdmkeys" Update: cp_keyfile Merge: xdm Comment: File with the private keys of X-terminals. Required for XDM authentication. Description: 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 display name and the shared key. Key: Xaccess Type: string # differs from xdm -Default: *KDMCONF "/Xaccess" +Default: *TDMCONF "/Xaccess" User: config(Xaccess) Instance: #"" Update: mk_xaccess @@ -1121,7 +1121,7 @@ Description: IndirectQuery requests, this file contains a database of hostnames which 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 - described in <xref linkend="kdmrc-xaccess"/>. + described in <xref linkend="tdmrc-xaccess"/>. Key: ChoiceTimeout Type: int @@ -1151,7 +1151,7 @@ Comment: Description: 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 - 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 is enabled. @@ -1177,7 +1177,7 @@ User: core Instance: # Update: mk_willing Merge: xdm -Merge: kdm:Xwilling +Merge: tdm:Xwilling Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. @@ -1206,7 +1206,7 @@ Comment: Description: The command (subject to word splitting) to run to halt/poweroff the system. </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 <option>-h</option> <parameter>now</parameter></command>. Key: RebootCmd @@ -1220,7 +1220,7 @@ Comment: Description: The command (subject to word splitting) to run to reboot the system. </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 <option>-r</option> <parameter>now</parameter></command>. Key: AllowFifo @@ -1255,17 +1255,17 @@ Default: None User: core User: greeter Instance: #Grub -Merge: kdm:UseLilo(P_UseLilo) +Merge: tdm:UseLilo(P_UseLilo) Comment: & Description: - 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. Section: -Core Description: This section class contains options concerning the configuration - of the &kdm; backend (core). + of the &tdm; backend (core). Key: OpenDelay Type: int @@ -1299,7 +1299,7 @@ Comment: How many connection attempts to make during a start attempt. Note that a timeout aborts the entire start attempt. Description: - 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 of the pause (in seconds) between successive attempts, <option>OpenRepeat</option> is the number of attempts to make and @@ -1318,7 +1318,7 @@ Comment: Try at most that many times to start a display. If this fails, the display is disabled. Description: - 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 and disabling it. Local displays are attempted only once, and &XDMCP; displays are retried @@ -1335,7 +1335,7 @@ Comment: How often to try to run the &X-Server;. Running includes executing it and waiting for it to come up. Description: - 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. Key: ServerTimeout @@ -1346,7 +1346,7 @@ Instance: #:*/ Comment: How long to wait for a local &X-Server; to come up. Description: - 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. Key: ServerCmd Type: string @@ -1361,7 +1361,7 @@ Description: The command line to start the &X-Server;, without display number and VT spec. This string is subject to word splitting. </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/bin/X</command>. Key: ServerArgsLocal @@ -1396,7 +1396,7 @@ Comment: Description: The VT the &X-Server; should run on. <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> alltogether - this is required for setups with multiple physical consoles. Currently Linux only. @@ -1411,13 +1411,13 @@ Comment: The TTY line (without /dev/) the &X-Server; covers physically. Description: 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. </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 <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. Key: PingInterval Type: int @@ -1441,7 +1441,7 @@ Merge: xdm Comment: Wait for a Pong that many minutes. Description: - To discover when <emphasis>remote</emphasis> displays disappear, &kdm; + To discover when <emphasis>remote</emphasis> displays disappear, &tdm; regularly pings them. <option>PingInterval</option> specifies the time (in minutes) between the pings and <option>PingTimeout</option> specifies the maximum amount of @@ -1463,7 +1463,7 @@ Comment: Restart instead of resetting the local &X-Server; after session exit. Use it if the server leaks memory etc. Description: - 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 on reset attempts. @@ -1500,7 +1500,7 @@ Merge: xdm Comment: Create X-authorizations for local displays. Description: - Controls whether &kdm; generates and uses authorization for + Controls whether &tdm; generates and uses authorization for <emphasis>local</emphasis> &X-Server; connections. For &XDMCP; displays the authorization requested by the display is used; foreign non-&XDMCP; displays do not support authorization at all. @@ -1530,9 +1530,9 @@ Comment: Description: Some <emphasis>old</emphasis> &X-Server;s re-read the authorization file 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 - 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, during which time the new authorization information will be read. @@ -1546,7 +1546,7 @@ Comment: The name of this &X-Server;'s Xauth file. If empty, a random name in the AuthDir directory will be used. Description: - 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 option. It should be kept in a directory which is not world-writable as it could easily be removed, disabling the authorization mechanism in @@ -1605,7 +1605,7 @@ Description: around the greeter window or to put up other windows (e.g., you may want to run <command>xconsole</command> here). The conventional name for a file used here is <command>Xsetup</command>. - See <xref linkend="kdmrc-xsetup"/>. + See <xref linkend="tdmrc-xsetup"/>. Key: Startup Type: string @@ -1623,7 +1623,7 @@ Description: <systemitem class="username">root</systemitem>) after the user authentication process succeeds. The conventional name for a file used here is <command>Xstartup</command>. - See <xref linkend="kdmrc-xstartup"/>. + See <xref linkend="tdmrc-xstartup"/>. Key: Reset Type: string @@ -1641,7 +1641,7 @@ Description: <systemitem class="username">root</systemitem>) after the session terminates. The conventional name for a file used here is <command>Xreset</command>. - See <xref linkend="kdmrc-xreset"/>. + See <xref linkend="tdmrc-xreset"/>. Key: Session Type: string @@ -1660,7 +1660,7 @@ Description: It specifies the session program to be executed (as the user owning the session). The conventional name for a file used here is <command>Xsession</command>. - See <xref linkend="kdmrc-xsession"/>. + See <xref linkend="tdmrc-xsession"/>. Key: FailsafeClient Type: string @@ -1671,10 +1671,10 @@ Merge: xdm Comment: The program to run if Session fails. Description: - 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, 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"/>). Key: UserPath Type: string @@ -1689,7 +1689,7 @@ Description: The <envar>PATH</envar> environment variable for non-<systemitem class="username">root</systemitem> <option>Session</option>s. </para><para> - The default depends on the system &kdm; was built on. + The default depends on the system &tdm; was built on. Key: SystemPath Type: string @@ -1706,7 +1706,7 @@ Description: <option>Session</option>s. Note that it is good practice not to include <literal>.</literal> (the current directory) into this entry. </para><para> - The default depends on the system &kdm; was built on. + The default depends on the system &tdm; was built on. Key: SystemShell Type: string @@ -1730,7 +1730,7 @@ Comment: Where to put the user's &X-Server; authorization file if ~/.Xauthority cannot be created. Description: - 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 directory and points the environment variable <envar>XAUTHORITY</envar> at the created file. @@ -1746,7 +1746,7 @@ Comment: Note that enabling this makes circumventing screen lockers other than KDE's built-in one possible! Description: - 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 feature opens a security hole: a secured display lock can be circumvented (unless &kde;'s built-in screen locker is used). @@ -1787,7 +1787,7 @@ User: core User: greeter Instance: */Root Instance: :*/All -Merge: kdm:-Greeter/ +Merge: tdm:-Greeter/ Comment: & Description: Who is allowed to shut down the system. This applies both to the @@ -1914,7 +1914,7 @@ Comment: & Description: 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 - option, you should <command>chmod <option>600</option> <filename>kdmrc</filename></command> for obvious reasons. + option, you should <command>chmod <option>600</option> <filename>tdmrc</filename></command> for obvious reasons. Key: AutoLoginLocked Type: bool @@ -1928,15 +1928,15 @@ Description: Key: SessionsDirs Type: list -Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions" +Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions" User: core User: greeter-c -Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions" +Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions" Comment: The directories containing session type definitions in .desktop format. Description: A list of directories containing session type definitions. -# See <xref linkend="kdmrc-sessions"> for details. +# See <xref linkend="tdmrc-sessions"> for details. Key: ClientLogFile Type: string @@ -1959,9 +1959,9 @@ Default: false User: core Instance: #*/! Comment: - Whether &kdm;'s built-in utmp/wtmp/lastlog registration should be used. + Whether &tdm;'s built-in utmp/wtmp/lastlog registration should be used. Description: - 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 in the <option>Startup</option> and <option>Reset</option> scripts, or, alternatively, the pam_lastlog module should be used on @@ -1971,7 +1971,7 @@ Description: Section: -Greeter Description: This section class contains options concerning the configuration - of the &kdm; frontend (greeter). + of the &tdm; frontend (greeter). Key: GUIStyle Type: string @@ -2059,7 +2059,7 @@ Key: LogoPixmap Type: string Default: "" User: greeter(logo) -Instance: */KDMDATA "/pics/kdelogo.png" +Instance: */TDMDATA "/pics/kdelogo.png" Comment: The image to show when LogoArea=Logo. Description: @@ -2075,7 +2075,7 @@ Comment: The relative coordinates (X,Y in percent) of the center of the greeter. Description: 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. Key: GreeterScreen @@ -2254,7 +2254,7 @@ Type: list Default: "" User: greeter-c(users) Instance: #*/"root,johndoe" -Merge: kdm:Users +Merge: tdm:Users Comment: For ShowUsers=Selected. @<group> means all users in that group. Description: @@ -2267,7 +2267,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID Update: upd_hiddenusers/1 -Merge: kdm:NoUsers +Merge: tdm:NoUsers Comment: For ShowUsers=NotHidden. @<group> means all users in that group. Description: @@ -2322,13 +2322,13 @@ Instance: #*/PreferUser Comment: Specify, where the users' pictures should be taken from. Description: - 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: </para> %ENUM% <para> 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. 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 @@ -2336,7 +2336,7 @@ Description: Key: FaceDir Type: string -Default: *KDMDATA "/faces" +Default: *TDMDATA "/faces" User: greeter Instance: #*/"/usr/share/faces" Update: upd_facedir @@ -2412,16 +2412,16 @@ Default: true User: greeter Instance: #*/! Comment: - If true, krootimage will be automatically started by &kdm;; otherwise, the + If true, krootimage will be automatically started by &tdm;; otherwise, the Setup script should be used to setup the background. Description: - 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 is responsible for the background. Key: BackgroundCfg Type: string -Default: *KDMCONF "/backgroundrc" +Default: *TDMCONF "/backgroundrc" User: greeter-c Instance: #*/"" Update: handBgCfg @@ -2461,11 +2461,11 @@ Instance: #*/ Comment: How many seconds to wait for grab to succeed. Description: - 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 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 - 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. Key: AuthComplain @@ -2504,7 +2504,7 @@ User: core User: greeter Instance: :*/DefaultLocal # from make_it_cool branch and SuSE 8.1 -Merge: kdm:EnableChooser(P_EnableChooser) +Merge: tdm:EnableChooser(P_EnableChooser) Comment: & Description: Specify whether the greeter of local displays should start up in host chooser @@ -2540,31 +2540,31 @@ Description: login domain. Key: ShowLog -If: defined(WITH_KDM_XCONSOLE) +If: defined(WITH_TDM_XCONSOLE) Type: bool Default: false User: greeter Instance: :0/true Comment: - Enable &kdm;'s built-in xconsole. Note that this can be enabled for only + Enable &tdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. Description: - 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. - This option is available only if &kdm; was <command>configure</command>d - with <option>--enable-kdm-xconsole</option>. + This option is available only if &tdm; was <command>configure</command>d + with <option>--enable-tdm-xconsole</option>. Key: LogSource -If: defined(WITH_KDM_XCONSOLE) +If: defined(WITH_TDM_XCONSOLE) Type: string Default: "" User: greeter-c Instance: :0/"/dev/xconsole" Comment: - The data source for &kdm;'s built-in xconsole. + The data source for &tdm;'s built-in xconsole. If empty, a console log redirection is requested from /dev/console. Description: - 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 <filename>/dev/console</filename>. Has no effect if <option>ShowLog</option> is disabled. @@ -2653,9 +2653,9 @@ Description: Key: Theme Type: string -Default: KDMDATA "/themes/o2_enterprise" +Default: TDMDATA "/themes/o2_enterprise" User: greeter -Instance: */KDMDATA "/themes/o2_enterprise" +Instance: */TDMDATA "/themes/o2_enterprise" Comment: & Description: The theme to use for the greeter. Can point to either a directory or an XML diff --git a/kdm/configure.in.bot b/kdm/configure.in.bot index 838d29faa..a0d238b29 100644 --- a/kdm/configure.in.bot +++ b/kdm/configure.in.bot @@ -1,8 +1,8 @@ -if $kdm_no_Xau; then - AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!]) +if $tdm_no_Xau; then + AC_MSG_WARN([Cannot build TDM! Make sure that libXau.a is installed!]) fi -if $kdm_no_Xdmcp; then - AC_MSG_WARN([Cannot build KDM! Make sure that libXdmcp.a and Xdmcp.h +if $tdm_no_Xdmcp; then + AC_MSG_WARN([Cannot build TDM! Make sure that libXdmcp.a and Xdmcp.h are installed or use --without-xdmcp to disable XDMCP support!]) fi diff --git a/kdm/configure.in.in b/kdm/configure.in.in index 6ce44068c..5422e5a99 100644 --- a/kdm/configure.in.in +++ b/kdm/configure.in.in @@ -80,20 +80,20 @@ done ]) 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 -kdm_no_Xdmcp=false +tdm_no_Xau=false +tdm_no_Xdmcp=false AC_CHECK_LIB(Xau, main, [:], [ - kdm_no_Xau=true - DO_NOT_COMPILE="$DO_NOT_COMPILE kdm" + tdm_no_Xau=true + DO_NOT_COMPILE="$DO_NOT_COMPILE tdm" ], $X_LDFLAGS -lX11 $LIBSOCKET) 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]) if test "x$with_xdmcp" = xyes; then 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 fi if test -z "$HAVE_X11_XDMCP_H"; then - kdm_no_Xdmcp=true - DO_NOT_COMPILE="$DO_NOT_COMPILE kdm" + tdm_no_Xdmcp=true + DO_NOT_COMPILE="$DO_NOT_COMPILE tdm" 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 LIBS="$LIBS $LIBXDMCP" 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 fi @@ -178,9 +178,9 @@ KRB5_INCS= KRB5_LIBS= 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_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 ]) if test "x$with_krb5auth" = xno; then AC_MSG_RESULT(no) @@ -197,7 +197,7 @@ else keepcflags=$CFLAGS CFLAGS="$KRB5_INCS $CFLAGS" 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. 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.])]) @@ -208,36 +208,36 @@ AC_SUBST(KRB5_INCS) AC_SUBST(KRB5_LIBS) 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_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 ]) if test "x$with_rpcauth" = xno; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) 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.])]) fi 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 - AC_DEFINE(USESHADOW, 1, [Define if kdm should use shadow passwords]) + AC_DEFINE(USESHADOW, 1, [Define if tdm should use shadow passwords]) fi 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 - 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 -AC_ARG_WITH(kdm-xconsole, - AC_HELP_STRING([--with-kdm-xconsole],[build kdm with built-in xconsole [default=no]]), , - [with_kdm_xconsole=no]) -if test "x$with_kdm_xconsole" = xyes; then - AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole]) +AC_ARG_WITH(tdm-xconsole, + AC_HELP_STRING([--with-tdm-xconsole],[build tdm with built-in xconsole [default=no]]), , + [with_tdm_xconsole=no]) +if test "x$with_tdm_xconsole" = xyes; then + AC_DEFINE(WITH_TDM_XCONSOLE, 1, [Build tdm with built-in xconsole]) fi ########### Check for DBus @@ -334,7 +334,7 @@ fi AC_SUBST(DBUS_INCS) AC_SUBST(DBUS_LIBS) -dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop) +dnl AC_OUTPUT(tdm/kfrontend/sessions/kde.desktop) AC_ARG_WITH(libaudit, diff --git a/kdm/confproc.pl b/kdm/confproc.pl index 0ce0c1ae0..c187c88c0 100755 --- a/kdm/confproc.pl +++ b/kdm/confproc.pl @@ -66,7 +66,7 @@ sub dedb($) $t =~ s, , ,g; $t =~ s,<,<,g; $t =~ s,>,>,g; - $t =~ s,&kdm;,KDM,g; + $t =~ s,&tdm;,TDM,g; $t =~ s,&XDMCP;,XDMCP,g; $t =~ s,&X-Server;,X-server,g; return $t; @@ -241,10 +241,10 @@ while (<INFILE>) { last if (/^<\/code>\n$/); $raw_out .= $_; } - } elsif (/^<kdmrc>$/) { + } elsif (/^<tdmrc>$/) { my $comm = ""; while (<INFILE>) { - last if (/^<\/kdmrc>\n$/); + last if (/^<\/tdmrc>\n$/); chop; if (/^\[(.*)\]$/) { defined($ex_sects{$1}) && @@ -294,7 +294,7 @@ while (<INFILE>) { my @oa = ([ "{ \"".$what."\", (char *)-1, 0, ".$proc." },", "XMO" ]); add_cond($kif, $what, \@oa, \%ov_xm_conds); $ov_xm[$dsp] .= $oa[0][0]." \\\n"; - } elsif ($src =~ /^kdm:(.*)\/(.*)$/) { + } elsif ($src =~ /^tdm:(.*)\/(.*)$/) { my ($sec, $key) = ($1, $2); my @oa = ([ "{ \"".$key."\", (char *)-1, 0, ".$proc." },", "KMO".($mcnt++) ]); add_cond($kif, $key, \@oa, \%ov_km_conds); @@ -528,7 +528,7 @@ while (<INFILE>) { ); add_cond($kif, $key, \@oa, \%ov_xm_conds); $ov_xm[$sect =~ /^-/] .= $oa[0][0]." \\\n"; - } elsif ($merge =~ /^kdm:([^\(]+)(\((.+)\))?$/) { + } elsif ($merge =~ /^tdm:([^\(]+)(\((.+)\))?$/) { my ($where, $func) = ($1, $3); my $sec = ""; ($where =~ s/^([^\/]+)\///) && ($sec = $1); @@ -594,8 +594,8 @@ while (<INFILE>) { $doc_ref .= "<para>Empty by default.</para>\n"; } else { $ddflt =~ s/\"//g; - $ddflt =~ s,KDMCONF ,\${<envar>kde_confdir</envar>}/kdm,; - $ddflt =~ s,KDMDATA ,\${<envar>kde_datadir</envar>}/kdm,; + $ddflt =~ s,TDMCONF ,\${<envar>kde_confdir</envar>}/tdm,; + $ddflt =~ s,TDMDATA ,\${<envar>kde_datadir</envar>}/tdm,; $ddflt =~ s,XBINDIR ,\${<envar>x_bindir</envar>},; $doc_ref .= "<para>The default is <quote>".$ddflt."</quote>.</para>\n"; } @@ -654,8 +654,8 @@ while (<INFILE>) { $sna = "section"; } $doc_ref .= - "\n<sect2 id=\"kdmrc-".$sref."\">\n". - "<title>The [".$stit."] ".$sna." of &kdmrc;</title>\n\n"; + "\n<sect2 id=\"tdmrc-".$sref."\">\n". + "<title>The [".$stit."] ".$sna." of &tdmrc;</title>\n\n"; if (/^Description:(( -)?)$/) { if ($1 ne " -") { my $desc = 0; diff --git a/kdm/kfrontend/CMakeLists.txt b/kdm/kfrontend/CMakeLists.txt index cd432af4b..4a069a3ae 100644 --- a/kdm/kfrontend/CMakeLists.txt +++ b/kdm/kfrontend/CMakeLists.txt @@ -17,8 +17,8 @@ add_subdirectory( sessions ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdm/backend - ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/tdm/backend + ${CMAKE_SOURCE_DIR}/tdmlib ${CMAKE_SOURCE_DIR}/kcontrol/background ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} @@ -31,43 +31,43 @@ link_directories( ##### other data ################################ -if( NOT DEFINED GENKDMCONF_FLAGS ) - set( GENKDMCONF_FLAGS "--no-old" ) +if( NOT DEFINED GENTDMCONF_FLAGS ) + set( GENTDMCONF_FLAGS "--no-old" ) 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) ##################### add_custom_command( OUTPUT config.ci - COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci - DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) + COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci + 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 - SOURCES kdm_config.c +tde_add_executable( tdm_config + SOURCES tdm_config.c LINK DESTINATION ${BIN_INSTALL_DIR} ) -##### kdm_greet (executable) #################### +##### tdm_greet (executable) #################### if( WITH_XRANDR ) - set( KDMGREET_OPTIONAL_LINK "krandr-shared" ) + set( TDMGREET_OPTIONAL_LINK "krandr-shared" ) endif ( ) -tde_add_executable( kdm_greet AUTOMOC +tde_add_executable( tdm_greet AUTOMOC 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 - kdmshutdown.cpp kdmadmindialog.cpp kgreeter.cpp + tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp 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} ) @@ -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 - SOURCES genkdmconf.c +tde_add_executable( gentdmconf AUTOMOC + SOURCES gentdmconf.c LINK X11 DESTINATION ${BIN_INSTALL_DIR} ) -##### kdmctl (executable) ####################### +##### tdmctl (executable) ####################### -tde_add_executable( kdmctl - SOURCES kdmctl.c +tde_add_executable( tdmctl + SOURCES tdmctl.c LINK DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdm/kfrontend/Makefile.am b/kdm/kfrontend/Makefile.am index 889271292..7c58dc67f 100644 --- a/kdm/kfrontend/Makefile.am +++ b/kdm/kfrontend/Makefile.am @@ -1,31 +1,31 @@ -# use 'make GENKDMCONF_FLAGS=... install' to override -GENKDMCONF_FLAGS = --no-old +# use 'make GENTDMCONF_FLAGS=... install' to override +GENTDMCONF_FLAGS = --no-old SUBDIRS = themer themes pics sessions 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 -kdm_config_LDADD = $(LIBRESOLV) $(LIBSOCKET) $(LIBPOSIX4) +tdm_config_SOURCES = tdm_config.c +tdm_config_LDADD = $(LIBRESOLV) $(LIBSOCKET) $(LIBPOSIX4) -kdm_greet_SOURCES = \ - kdm_greet.c \ - kdmconfig.cpp \ - kdmclock.cpp \ +tdm_greet_SOURCES = \ + tdm_greet.c \ + tdmconfig.cpp \ + tdmclock.cpp \ kconsole.cpp \ kfdialog.cpp \ kgdialog.cpp \ kchooser.cpp \ kgverify.cpp \ - kdmshutdown.cpp \ - kdmadmindialog.cpp \ + tdmshutdown.cpp \ + tdmadmindialog.cpp \ kgreeter.cpp \ kgapp.cpp -kdm_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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4) krootimage_SOURCES = krootimage.cpp 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 -genkdmconf_SOURCES = genkdmconf.c -genkdmconf_LDFLAGS = $(X_LDFLAGS) $(X_RPATH) -genkdmconf_LDADD = $(LIB_X11) +gentdmconf_SOURCES = gentdmconf.c +gentdmconf_LDFLAGS = $(X_LDFLAGS) $(X_RPATH) +gentdmconf_LDADD = $(LIB_X11) -kdmctl_SOURCES = kdmctl.c -kdmctl_LDADD = $(LIBSOCKET) +tdmctl_SOURCES = tdmctl.c +tdmctl_LDADD = $(LIBSOCKET) -install-data-local: genkdmconf - ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +install-data-local: gentdmconf + ./gentdmconf --in $(DESTDIR)$(kde_confdir)/tdm --no-in-notice --face-src $(srcdir)/pics $(GENTDMCONF_FLAGS) messages: - $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/tdmgreet.pot noinst_HEADERS = \ - kdm_greet.h \ - kdmconfig.h \ - kdmclock.h \ + tdm_greet.h \ + tdmconfig.h \ + tdmclock.h \ kconsole.h \ kfdialog.h \ kgdialog.h \ kchooser.h \ kgverify.h \ - kdmshutdown.h \ + tdmshutdown.h \ kgreeter.h \ kgapp.h \ \ krootimage.h -kdm_greet_COMPILE_FIRST = ../config.ci -kdm_config_COMPILE_FIRST = ../config.ci -genkdmconf_COMPILE_FIRST = ../config.ci +tdm_greet_COMPILE_FIRST = ../config.ci +tdm_config_COMPILE_FIRST = ../config.ci +gentdmconf_COMPILE_FIRST = ../config.ci diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c index bfbeda32a..f55ffbbbc 100644 --- a/kdm/kfrontend/genkdmconf.c +++ b/kdm/kfrontend/genkdmconf.c @@ -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 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, 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; 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 { @@ -369,10 +369,10 @@ typedef struct Section { Entry *ents; } 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 { @@ -392,7 +392,7 @@ static Sect *findSect( const char *name ); 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 * @@ -594,12 +594,12 @@ static const char def_startup[] = " xmessage -file /etc/nologin -geometry 640x480\n" " fi\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" " fi\n" "fi\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" " exec sessreg -a -l \"$DISPLAY\" -u /var/run/utmp \\\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" "#exec sessreg -d -l xdm/$devname -h \"`echo $DISPLAY | cut -d: -f1`\"" #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" " exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n" " -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n" @@ -765,7 +765,7 @@ resect( const char *sec, const char *name ) static int inNewDir( const char *name ) { - return !memcmp( name, KDMCONF "/", sizeof(KDMCONF) ); + return !memcmp( name, TDMCONF "/", sizeof(TDMCONF) ); } static int @@ -839,7 +839,7 @@ copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) ) return 1; tptr = strrchr( tname, '/' ); - ASPrintf( &nname, KDMCONF "/%s", tptr ? tptr + 1 : tname ); + ASPrintf( &nname, TDMCONF "/%s", tptr ? tptr + 1 : tname ); if (inList( cflist, ce->value ) || inList( eflist, ce->value ) || inList( lflist, ce->value )) @@ -1322,7 +1322,7 @@ cp_keyfile( Entry *ce, Section *cs ATTR_UNUSED ) if (old_confs) linkfile( ce ); else - if (!copyfile( ce, "kdmkeys", 0600, 0 )) + if (!copyfile( ce, "tdmkeys", 0600, 0 )) ce->active = 0; } @@ -1351,7 +1351,7 @@ mk_willing( Entry *ce, Section *cs ATTR_UNUSED ) dlinkfile( fname ); else { dflt: - ce->value = KDMCONF "/Xwilling"; + ce->value = TDMCONF "/Xwilling"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_willing ); } @@ -1459,18 +1459,18 @@ edit_setup( File *file ) int chg = delstr( file, "\n" "(\n" - " PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" - " */kdmdesktop\t&\n" + " PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n" + " */tdmdesktop\t&\n" " echo $! >$PIDFILE\n" " wait $!\n" " rm $PIDFILE\n" ")\t&\n" ) | delstr( file, "\n" - "*/kdmdesktop\t&\n" ) | + "*/tdmdesktop\t&\n" ) | delstr( file, "\n" - "kdmdesktop\t&\n" ) | + "tdmdesktop\t&\n" ) | delstr( file, "\n" - "kdmdesktop\n" ); + "tdmdesktop\n" ); putval( "UseBackground", chg ? "true" : "false" ); return chg; } @@ -1490,7 +1490,7 @@ mk_setup( Entry *ce, Section *cs ) else linkfile( ce ); } else { - ce->value = KDMCONF "/Xsetup"; + ce->value = TDMCONF "/Xsetup"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_setup ); } @@ -1504,12 +1504,12 @@ edit_startup( File *file ) if (mod_usebg && (delstr( file, "\n" - "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" + "PIDFILE=/var/run/tdmdesktop-$DISPLAY.pid\n" "if [[] -f $PIDFILE ] ; then\n" " kill `cat $PIDFILE`\n" "fi\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" ))) chg1 = 1; if (oldver < 0x0203) { @@ -1571,7 +1571,7 @@ mk_startup( Entry *ce, Section *cs ) else linkfile( ce ); } else { - ce->value = KDMCONF "/Xstartup"; + ce->value = TDMCONF "/Xstartup"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_startup ); } @@ -1616,7 +1616,7 @@ mk_reset( Entry *ce, Section *cs ATTR_UNUSED ) else linkfile( ce ); } else { - ce->value = KDMCONF "/Xreset"; + ce->value = TDMCONF "/Xreset"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_reset ); } @@ -1639,7 +1639,7 @@ mk_session( Entry *ce, Section *cs ATTR_UNUSED ) "`tempfile`" : "$HOME/.xsession-env-$DISPLAY"; ASPrintf( &def_session, "%s%s%s", def_session1, tmpf, def_session2 ); - ce->value = KDMCONF "/Xsession"; + ce->value = TDMCONF "/Xsession"; ce->active = ce->written = 1; writefile( ce->value, 0755, def_session ); } @@ -1770,8 +1770,8 @@ upd_datadir( Entry *ce, Section *cs ATTR_UNUSED ) return; dir = ce->active ? ce->value : def_DataDir; if (mkdirp( dir, 0755, "data", 0 ) && oldkde) { - ASPrintf( &oldsts, "%s/kdm/kdmsts", oldkde ); - ASPrintf( &newsts, "%s/kdmsts", dir ); + ASPrintf( &oldsts, "%s/tdm/tdmsts", oldkde ); + ASPrintf( &newsts, "%s/tdmsts", dir ); rename( oldsts, newsts ); } } @@ -1808,7 +1808,7 @@ upd_facedir( Entry *ce, Section *cs ATTR_UNUSED ) setpwent(); while ((pw = getpwent())) 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 ); ASPrintf( &newpic, "%s/%s.face.icon", dir, pw->pw_name ); rename( oldpic, newpic ); @@ -1816,10 +1816,10 @@ upd_facedir( Entry *ce, Section *cs ATTR_UNUSED ) free( oldpic ); } 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 )) 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 )) rootpic = 0; } @@ -2051,12 +2051,12 @@ mergeKdmRcOld( const char *path ) char *p; struct stat st; - ASPrintf( &p, "%s/kdmrc", path ); + ASPrintf( &p, "%s/tdmrc", path ); if (stat( p, &st )) { free( p ); 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 ); return 1; } @@ -2083,18 +2083,18 @@ applydefs( FDefs *chgdef, int ndefs, const char *path ) } #ifdef XDMCP -static FDefs kdmdefs_all[] = { -{ "Xdmcp", "Xaccess", "%s/kdm/Xaccess", 0 }, +static FDefs tdmdefs_all[] = { +{ "Xdmcp", "Xaccess", "%s/tdm/Xaccess", 0 }, { "Xdmcp", "Willing", "", 0 }, }; #endif -static FDefs kdmdefs_eq_22[] = { +static FDefs tdmdefs_eq_22[] = { { "General", "PidFile", "/var/run/xdm.pid", 0 }, -{ "X-*-Core", "Setup", "%s/kdm/Xsetup", 0 }, -{ "X-*-Core", "Startup", "%s/kdm/Xstartup", 0 }, -{ "X-*-Core", "Reset", "%s/kdm/Xreset", 0 }, -{ "X-*-Core", "Session", "%s/kdm/Xsession", 0 }, +{ "X-*-Core", "Setup", "%s/tdm/Xsetup", 0 }, +{ "X-*-Core", "Startup", "%s/tdm/Xstartup", 0 }, +{ "X-*-Core", "Reset", "%s/tdm/Xreset", 0 }, +{ "X-*-Core", "Session", "%s/tdm/Xsession", 0 }, }; #ifdef XDMCP @@ -2104,13 +2104,13 @@ if_xdmcp (void) return isTrue( getfqval( "Xdmcp", "Enable", "true" ) ); } -static FDefs kdmdefs_le_30[] = { -{ "Xdmcp", "KeyFile", "%s/kdm/kdmkeys", if_xdmcp }, +static FDefs tdmdefs_le_30[] = { +{ "Xdmcp", "KeyFile", "%s/tdm/tdmkeys", if_xdmcp }, }; #endif /* HACK: misused by is22conf() below */ -static FDefs kdmdefs_ge_30[] = { +static FDefs tdmdefs_ge_30[] = { { "X-*-Core", "Setup", "", 0 }, { "X-*-Core", "Startup", "", 0 }, { "X-*-Core", "Reset", "", 0 }, @@ -2123,8 +2123,8 @@ if_usebg (void) return isTrue( getfqval( "X-*-Greeter", "UseBackground", "true" ) ); } -static FDefs kdmdefs_ge_31[] = { -{ "X-*-Greeter","BackgroundCfg","%s/kdm/backgroundrc", if_usebg }, +static FDefs tdmdefs_ge_31[] = { +{ "X-*-Greeter","BackgroundCfg","%s/tdm/backgroundrc", if_usebg }, }; static int @@ -2134,10 +2134,10 @@ is22conf( const char *path ) const char *val; int i, sl; - sl = ASPrintf( &p, "%s/kdm/", path ); + sl = ASPrintf( &p, "%s/tdm/", path ); /* safe bet, i guess ... */ 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 )) { free( p ); return 0; @@ -2184,12 +2184,12 @@ mergeKdmRcNewer( const char *path ) int i, j; static char sname[64]; - ASPrintf( &p, "%s/kdm/kdmrc", path ); + ASPrintf( &p, "%s/tdm/tdmrc", path ); if (!(rootsect = ReadConf( p ))) { free( p ); 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 ); for (cs = rootsect; cs; cs = cs->next) { @@ -2241,29 +2241,29 @@ mergeKdmRcNewer( const char *path ) } #ifdef XDMCP - applydefs( kdmdefs_all, as(kdmdefs_all), path ); + applydefs( tdmdefs_all, as(tdmdefs_all), path ); #endif if (!*(cp = getfqval( "General", "ConfigVersion", "" ))) { /* < 3.1 */ mod_usebg = 1; if (is22conf( path )) { /* work around 2.2.x defaults borkedness */ - applydefs( kdmdefs_eq_22, as(kdmdefs_eq_22), path ); - printf( "Information: current kdmrc is from kde 2.2\n" ); + applydefs( tdmdefs_eq_22, as(tdmdefs_eq_22), path ); + printf( "Information: current tdmrc is from kde 2.2\n" ); } else { - applydefs( kdmdefs_ge_30, as(kdmdefs_ge_30), path ); - printf( "Information: current kdmrc is from kde 3.0\n" ); + applydefs( tdmdefs_ge_30, as(tdmdefs_ge_30), path ); + printf( "Information: current tdmrc is from kde 3.0\n" ); } #ifdef XDMCP /* 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 } else { int ma, mi; sscanf( cp, "%d.%d", &ma, &mi ); oldver = (ma << 8) | mi; - printf( "Information: current kdmrc is from kde >= 3.1 (config version %d.%d)\n", ma, mi ); - applydefs( kdmdefs_ge_30, as(kdmdefs_ge_30), path ); - applydefs( kdmdefs_ge_31, as(kdmdefs_ge_31), path ); + printf( "Information: current tdmrc is from kde >= 3.1 (config version %d.%d)\n", ma, mi ); + applydefs( tdmdefs_ge_30, as(tdmdefs_ge_30), path ); + applydefs( tdmdefs_ge_31, as(tdmdefs_ge_31), path ); } return 1; @@ -2384,12 +2384,12 @@ P_requestPort( const char *sect, char **value ) } #endif -static int kdmrcmode = 0644; +static int tdmrcmode = 0644; static void P_autoPass( const char *sect ATTR_UNUSED, char **value ATTR_UNUSED ) { - kdmrcmode = 0600; + tdmrcmode = 0600; } CONF_GEN_XMERGE @@ -2547,7 +2547,7 @@ static const char *oldxdms[] = { int main( int argc, char **argv ) { const char **where; - char *newkdmrc; + char *newtdmrc; FILE *f; StrList *fp; Section *cs; @@ -2560,41 +2560,41 @@ int main( int argc, char **argv ) for (ap = 1; ap < argc; ap++) { if (!strcmp( argv[ap], "--help" )) { printf( -"genkdmconf - generate configuration files for kdm\n" +"gentdmconf - generate configuration files for tdm\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" "modified) as well, otherwise the scripts are ignored and default scripts are\n" "installed.\n" "\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" " to support a $(DESTDIR), but not to change the final location of\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" -" Where to look for the config files of an xdm/older kdm.\n" -" Default is to scan /etc/X11/kdm, $XLIBDIR/kdm, /etc/X11/xdm,\n" -" $XLIBDIR/xdm; there in turn look for kdm-config and xdm-config.\n" +" Where to look for the config files of an xdm/older tdm.\n" +" Default is to scan /etc/X11/tdm, $XLIBDIR/tdm, /etc/X11/xdm,\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" " --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" " {/usr,/usr/local,{/opt,/usr/local}/{trinity,kde,kde2,kde1}}/share/config.\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" " Don't look at older xdm configurations.\n" " --no-old-kde\n" -" Don't look at older kdm configurations.\n" +" Don't look at older tdm configurations.\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" -" 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" " --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" " --no-backup\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]; } - if (memcmp( newdir, KDMCONF, sizeof(KDMCONF) )) + if (memcmp( newdir, TDMCONF, sizeof(TDMCONF) )) use_destdir = 1; if (!mkdirp( newdir, 0755, "target", 1 )) @@ -2685,7 +2685,7 @@ int main( int argc, char **argv ) if (oldkde) { if (!(newer = mergeKdmRcNewer( oldkde )) && !mergeKdmRcOld( oldkde )) fprintf( stderr, - "Cannot read old kdmrc at specified location\n" ); + "Cannot read old tdmrc at specified location\n" ); } else if (!no_old_kde) { for (i = 0; i < as(oldkdes); i++) { if ((newer = mergeKdmRcNewer( oldkdes[i] )) || @@ -2701,7 +2701,7 @@ int main( int argc, char **argv ) if (oldxdm) { if (!mergeXdmCfg( oldxdm )) 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 for (i = 0; i < as(oldxdms); i++) if (mergeXdmCfg( oldxdms[i] )) { @@ -2791,8 +2791,8 @@ int main( int argc, char **argv ) for (ce = cs->ents; ce; ce = ce->next) if (ce->spec->func && i == ce->spec->prio) ce->spec->func( ce, cs ); - ASPrintf( &newkdmrc, "%s/kdmrc", newdir ); - f = Create( newkdmrc, kdmrcmode ); + ASPrintf( &newtdmrc, "%s/tdmrc", newdir ); + f = Create( newtdmrc, tdmrcmode ); wrconf( f ); fclose( f ); @@ -2800,12 +2800,12 @@ int main( int argc, char **argv ) f = Create( nname, 0644 ); fprintf( f, "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) fprintf( f, "- %s\n", fp->str ); if (use_destdir && !no_in_notice) 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 ); if (uflist || eflist || cflist || lflist) { 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" ); } 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" ); fclose( f ); diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp index 9f8f5064d..00b08cd35 100644 --- a/kdm/kfrontend/kchooser.cpp +++ b/kdm/kfrontend/kchooser.cpp @@ -1,6 +1,6 @@ /* -chooser widget for KDM +chooser widget for TDM Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> 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 "kconsole.h" -#include "kdmconfig.h" -#include "kdm_greet.h" +#include "tdmconfig.h" +#include "tdm_greet.h" #include <klocale.h> @@ -101,7 +101,7 @@ ChooserDlg::ChooserDlg() // TQPushButton *helpButton = new TQPushButton( i18n("&Help"), this ); // hbox->addWidget( helpButton ); -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE if (consoleView) vbox->addWidget( consoleView ); #endif diff --git a/kdm/kfrontend/kchooser.h b/kdm/kfrontend/kchooser.h index da5b83d89..fcf14b1e1 100644 --- a/kdm/kfrontend/kchooser.h +++ b/kdm/kfrontend/kchooser.h @@ -1,6 +1,6 @@ /* -chooser widget for KDM +chooser widget for TDM Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> based on the chooser (C) 1999 by Harald Hoyer <Harald.Hoyer@RedHat.de> diff --git a/kdm/kfrontend/kconsole.cpp b/kdm/kfrontend/kconsole.cpp index 6c2ab09ab..834507bdb 100644 --- a/kdm/kfrontend/kconsole.cpp +++ b/kdm/kfrontend/kconsole.cpp @@ -1,6 +1,6 @@ /* -xconsole widget for KDM +xconsole widget for TDM 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> -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE #include <stdlib.h> #include <stdio.h> @@ -53,8 +53,8 @@ extern "C" { #include "kconsole.h" -#include "kdmconfig.h" -#include "kdm_greet.h" +#include "tdmconfig.h" +#include "tdm_greet.h" #include <klocale.h> #include <kpty.h> diff --git a/kdm/kfrontend/kconsole.h b/kdm/kfrontend/kconsole.h index 73d13912e..2b3e2aac3 100644 --- a/kdm/kfrontend/kconsole.h +++ b/kdm/kfrontend/kconsole.h @@ -1,6 +1,6 @@ /* -xconsole widget for KDM +xconsole widget for TDM Copyright (C) 2002-2003 Oswald Buddenhagen <ossi@kde.org> diff --git a/kdm/kfrontend/kdm_config.c b/kdm/kfrontend/kdm_config.c index d8dba0412..48f316320 100644 --- a/kdm/kfrontend/kdm_config.c +++ b/kdm/kfrontend/kdm_config.c @@ -1,6 +1,6 @@ /* -Read options from kdmrc +Read options from tdmrc 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 ); #define PRINT_QUOTES -#define LOG_NAME "kdm_config" +#define LOG_NAME "tdm_config" #define LOG_DEBUG_MASK DEBUG_CONFIG #define LOG_PANIC_EXIT 1 #define STATIC static @@ -381,8 +381,8 @@ PautoLoginX( Value *retval ) CONF_READ_ENTRIES -static const char *kdmrc = KDMCONF "/kdmrc"; -static const char *kdmrc_dist = KDMCONF "/kdmdistrc"; +static const char *tdmrc = TDMCONF "/tdmrc"; +static const char *tdmrc_dist = TDMCONF "/tdmdistrc"; static Section *rootsec; @@ -403,14 +403,14 @@ ReadConf() return; confread = 1; - Debug( "reading config %s ...\n", kdmrc_dist ); - if (!readFile( &file, kdmrc_dist, "master configuration" )) { - Debug( "reading config %s ...\n", kdmrc ); - if (!readFile( &file, kdmrc, "master configuration" )) + Debug( "reading config %s ...\n", tdmrc_dist ); + if (!readFile( &file, tdmrc_dist, "master configuration" )) { + Debug( "reading config %s ...\n", tdmrc ); + if (!readFile( &file, tdmrc, "master configuration" )) return; } else { - kdmrc = kdmrc_dist; + tdmrc = tdmrc_dist; } for (s = file.buf, line = 0, cursec = 0, sectmoan = 1; s < file.eof; s++) { @@ -436,7 +436,7 @@ ReadConf() e--; if (*e != ']') { cursec = 0; - LogError( "Invalid section header at %s:%d\n", kdmrc, line ); + LogError( "Invalid section header at %s:%d\n", tdmrc, line ); continue; } nstr = sl + 1; @@ -446,7 +446,7 @@ ReadConf() !memcmp( nstr, cursec->name, nlen )) { LogInfo( "Multiple occurrences of section [%.*s] in %s. " - "Consider merging them.\n", nlen, nstr, kdmrc ); + "Consider merging them.\n", nlen, nstr, tdmrc ); goto secfnd; } if (nstr[0] == 'X' && nstr[1] == '-') { @@ -502,7 +502,7 @@ ReadConf() illsec: cursec = 0; LogError( "Unrecognized section name [%.*s] at %s:%d\n", - nlen, nstr, kdmrc, line ); + nlen, nstr, tdmrc, line ); continue; newsec: if (!(cursec = Malloc( sizeof(*cursec) ))) @@ -530,7 +530,7 @@ ReadConf() if (!cursec) { if (sectmoan) { sectmoan = 0; - LogError( "Entry outside any section at %s:%d", kdmrc, line ); + LogError( "Entry outside any section at %s:%d", tdmrc, line ); } goto sktoeol; } @@ -538,13 +538,13 @@ ReadConf() for (; (s < file.eof) && (*s != '\n'); s++) if (*s == '=') goto haveeq; - LogError( "Invalid entry (missing '=') at %s:%d\n", kdmrc, line ); + LogError( "Invalid entry (missing '=') at %s:%d\n", tdmrc, line ); continue; haveeq: for (ek = s - 1; ; ek--) { 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; } if (!isspace( *ek )) @@ -558,7 +558,7 @@ ReadConf() if (*s == '\\') { s++; 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; } switch (*s) { @@ -587,14 +587,14 @@ ReadConf() goto keyok; } 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; keyok: for (curent = cursec->entries; curent; curent = curent->next) if (ce == curent->ent) { LogError( "Multiple occurrences of key '%s' in section [%.*s]" " of %s\n", - ce->name, cursec->nlen, cursec->name, kdmrc ); + ce->name, cursec->nlen, cursec->name, tdmrc ); goto keyfnd; } 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 ))) return; 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 ); 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; 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; } 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");*/ if (**++argv) - kdmrc_dist = kdmrc = *argv; + tdmrc_dist = tdmrc = *argv; /* while (*++argv) { } @@ -1402,7 +1402,7 @@ int main( int argc ATTR_UNUSED, char **argv ) #else GSendInt( 1 ); #endif - GSendStr( kdmrc ); + GSendStr( tdmrc ); GSendInt( -1 ); #ifdef XDMCP GSendNStr( VXaccess.ptr, VXaccess.len - 1 ); diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c index b7841e6a3..f74c2410d 100644 --- a/kdm/kfrontend/kdm_greet.c +++ b/kdm/kfrontend/kdm_greet.c @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <config.h> -#include "kdm_greet.h" -#include "kdmconfig.h" +#include "tdm_greet.h" +#include "tdmconfig.h" #include <stdio.h> #include <stdlib.h> @@ -71,7 +71,7 @@ Realloc( void *ptr, size_t size ) #define PRINT_QUOTES #define PRINT_ARRAYS -#define LOG_NAME "kdm_greet" +#define LOG_NAME "tdm_greet" #define LOG_DEBUG_MASK DEBUG_GREET #define LOG_PANIC_EXIT 1 #define STATIC @@ -742,7 +742,7 @@ main( int argc ATTR_UNUSED, char **argv ) char qtrc[40]; 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; } if (sscanf( ci, "%d %d %d %d", &srfd, &swfd, &mrfd, &mwfd ) != 4) diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h index df325c28d..9f7e3bd6a 100644 --- a/kdm/kfrontend/kdm_greet.h +++ b/kdm/kfrontend/kdm_greet.h @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KDM_GREET_H_ -#define _KDM_GREET_H_ +#ifndef _TDM_GREET_H_ +#define _TDM_GREET_H_ #include <greet.h> /* for the ATTR_ defines */ #include <config.ci> /* for the HAVE_VTS define */ @@ -88,4 +88,4 @@ extern char *dname; /* d->name */ } #endif -#endif /* _KDM_GREET_H_ */ +#endif /* _TDM_GREET_H_ */ diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp index 637d6dd90..6486eb3dc 100644 --- a/kdm/kfrontend/kdmadmindialog.cpp +++ b/kdm/kfrontend/kdmadmindialog.cpp @@ -22,10 +22,10 @@ */ -#include "kdmadmindialog.h" -#include "kdmconfig.h" +#include "tdmadmindialog.h" +#include "tdmconfig.h" #include "kgdialog.h" -#include "kdm_greet.h" +#include "tdm_greet.h" #include <stdlib.h> #include <kapplication.h> @@ -41,10 +41,10 @@ #include <tqaccel.h> #include <tqpopupmenu.h> -int KDMAdmin::curPlugin = -1; -PluginList KDMAdmin::pluginList; +int TDMAdmin::curPlugin = -1; +PluginList TDMAdmin::pluginList; -KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent ) +TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent ) : inherited( _parent ) , verify( 0 ), curUser(user) { @@ -93,14 +93,14 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent ) slotWhenChanged(); } -KDMAdmin::~KDMAdmin() +TDMAdmin::~TDMAdmin() { hide(); delete verify; } void -KDMAdmin::slotActivatePlugMenu() +TDMAdmin::slotActivatePlugMenu() { TQPopupMenu *cmnu = verify->getPlugMenu(); TQSize sh( cmnu->sizeHint() / 2 ); @@ -108,13 +108,13 @@ KDMAdmin::slotActivatePlugMenu() } void -KDMAdmin::accept() +TDMAdmin::accept() { verify->accept(); } void -KDMAdmin::slotWhenChanged() +TDMAdmin::slotWhenChanged() { verify->abort(); verify->setEnabled( 1 ); @@ -122,7 +122,7 @@ KDMAdmin::slotWhenChanged() } void -KDMAdmin::bye_bye() +TDMAdmin::bye_bye() { GSendInt( G_GetDmrc ); GSendStr( "Session" ); @@ -141,36 +141,36 @@ KDMAdmin::bye_bye() } void -KDMAdmin::verifyPluginChanged( int id ) +TDMAdmin::verifyPluginChanged( int id ) { curPlugin = id; adjustSize(); } void -KDMAdmin::verifyOk() +TDMAdmin::verifyOk() { bye_bye(); } void -KDMAdmin::verifyFailed() +TDMAdmin::verifyFailed() { okButton->setEnabled( false ); cancelButton->setEnabled( false ); } void -KDMAdmin::verifyRetry() +TDMAdmin::verifyRetry() { okButton->setEnabled( true ); cancelButton->setEnabled( true ); } void -KDMAdmin::verifySetUser( const TQString & ) +TDMAdmin::verifySetUser( const TQString & ) { } -#include "kdmadmindialog.moc" +#include "tdmadmindialog.moc" diff --git a/kdm/kfrontend/kdmadmindialog.h b/kdm/kfrontend/kdmadmindialog.h index 91f1ed3a6..e5a68fbb9 100644 --- a/kdm/kfrontend/kdmadmindialog.h +++ b/kdm/kfrontend/kdmadmindialog.h @@ -23,8 +23,8 @@ */ -#ifndef KDMADMIN_H -#define KDMADMIN_H +#ifndef TDMADMIN_H +#define TDMADMIN_H #include "kgverify.h" @@ -36,13 +36,13 @@ class KPushButton; class TQButtonGroup; class TQComboBox; -class KDMAdmin : public FDialog, public KGVerifyHandler { +class TDMAdmin : public FDialog, public KGVerifyHandler { Q_OBJECT typedef FDialog inherited; public: - KDMAdmin( const TQString &user, TQWidget *_parent = 0 ); - ~KDMAdmin(); + TDMAdmin( const TQString &user, TQWidget *_parent = 0 ); + ~TDMAdmin(); public slots: void accept(); diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp index 88cd53970..2b2a99cea 100644 --- a/kdm/kfrontend/kdmclock.cpp +++ b/kdm/kfrontend/kdmclock.cpp @@ -1,6 +1,6 @@ /* -clock module for kdm +clock module for tdm Copyright (C) 2000 Espen Sand, espen@kde.org 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 <kconfig.h> @@ -173,4 +173,4 @@ void KdmClock::paintEvent( TQPaintEvent * ) bitBlt( this, contentsRect().topLeft(), &pm ); } -#include "kdmclock.moc" +#include "tdmclock.moc" diff --git a/kdm/kfrontend/kdmclock.h b/kdm/kfrontend/kdmclock.h index 91fa181ea..89a48eb8e 100644 --- a/kdm/kfrontend/kdmclock.h +++ b/kdm/kfrontend/kdmclock.h @@ -1,6 +1,6 @@ /* -clock module for kdm +clock module for tdm Copyright (C) 2000 Espen Sand, espen@kde.org 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_ -#define _KDM_CLOCK_H_ +#ifndef _TDM_CLOCK_H_ +#define _TDM_CLOCK_H_ #include <tqframe.h> diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp index c12345323..5b57a6375 100644 --- a/kdm/kfrontend/kdmconfig.cpp +++ b/kdm/kfrontend/kdmconfig.cpp @@ -1,6 +1,6 @@ /* -Config for kdm +Config for tdm Copyright (C) 1997, 1998 Steffen Hansen <hansen@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 "kdm_greet.h" +#include "tdmconfig.h" +#include "tdm_greet.h" #include <kapplication.h> #include <klocale.h> @@ -110,7 +110,7 @@ void init_config( void ) _hasConsole = _hasConsole && _isLocal && GetCfgInt( C_hasConsole ); _authorized = GetCfgInt( C_isAuthorized ); - _stsFile = _dataDir + "/kdmsts"; + _stsFile = _dataDir + "/tdmsts"; // Greet String char hostname[256], *ptr; @@ -138,7 +138,7 @@ void init_config( void ) case 's': ptr = tuname.sysname; break; case 'r': ptr = tuname.release; break; case 'm': ptr = tuname.machine; break; - default: _greetString += i18n("[fix kdmrc!]"); continue; + default: _greetString += i18n("[fix tdmrc!]"); continue; } _greetString += TQString::fromLocal8Bit( ptr ); } else diff --git a/kdm/kfrontend/kdmconfig.h b/kdm/kfrontend/kdmconfig.h index 52e054af6..275cafa1b 100644 --- a/kdm/kfrontend/kdmconfig.h +++ b/kdm/kfrontend/kdmconfig.h @@ -1,6 +1,6 @@ /* -Configuration for kdm +Configuration for tdm Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@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 -#define KDMCONFIG_H +#ifndef TDMCONFIG_H +#define TDMCONFIG_H #include <config.h> @@ -66,4 +66,4 @@ void init_config( void ); CONF_GREET_C_DECLS -#endif /* KDMCONFIG_H */ +#endif /* TDMCONFIG_H */ diff --git a/kdm/kfrontend/kdmctl.c b/kdm/kfrontend/kdmctl.c index 7f70a4ddc..d6abe959a 100644 --- a/kdm/kfrontend/kdmctl.c +++ b/kdm/kfrontend/kdmctl.c @@ -1,6 +1,6 @@ /* -KDM remote control application +TDM remote control application Copyright (C) 2004 Oswald Buddenhagen <ossi@kde.org> @@ -59,7 +59,7 @@ readcfg( const char *cfg ) if (!(fp = fopen( cfg, "r" ))) { fprintf( stderr, - "Cannot open kdm config file '%s'.\n", + "Cannot open tdm config file '%s'.\n", cfg ); return 0; } @@ -148,7 +148,7 @@ main( int argc, char **argv ) { char *dpy = getenv( "DISPLAY" ); const char *ctl = getenv( "DM_CONTROL" ); - const char *cfg = KDE_CONFDIR "/kdm/kdmrc"; + const char *cfg = KDE_CONFDIR "/tdm/tdmrc"; char *ptr; int fd; @@ -162,19 +162,19 @@ main( int argc, char **argv ) ptr++; if (!strcmp( ptr, "h" ) || !strcmp( ptr, "help" )) { puts( -"Usage: kdmctl [options] [command [command arguments]]\n" +"Usage: tdmctl [options] [command [command arguments]]\n" "\n" "Options are:\n" " -h -help This help message.\n" " -g -global Use global control socket even if $DISPLAY is set\n" " -d -display Override $DISPLAY\n" " -s -sockets Override $DM_CONTROL\n" -" -c -config Use alternative kdm config file\n" +" -c -config Use alternative tdm config file\n" "\n" "The directory in which the sockets are located is determined this way:\n" "- the -s option 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" "\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" "in which case they are simply concatenated with tabs in between.\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" ); return 0; diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index 96f80e9a7..e546f62b6 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.cpp @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmshutdown.h" -#include "kdm_greet.h" +#include "tdmshutdown.h" +#include "tdm_greet.h" #include <kapplication.h> #include <kseparator.h> @@ -59,10 +59,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. extern bool has_twin; -int KDMShutdownBase::curPlugin = -1; -PluginList KDMShutdownBase::pluginList; +int TDMShutdownBase::curPlugin = -1; +PluginList TDMShutdownBase::pluginList; -KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent ) +TDMShutdownBase::TDMShutdownBase( int _uid, TQWidget *_parent ) : inherited( _parent ) , box( new TQVBoxLayout( this, KDmh, KDsh ) ) #ifdef HAVE_VTS @@ -79,14 +79,14 @@ KDMShutdownBase::KDMShutdownBase( int _uid, TQWidget *_parent ) { } -KDMShutdownBase::~KDMShutdownBase() +TDMShutdownBase::~TDMShutdownBase() { hide(); delete verify; } void -KDMShutdownBase::complete( TQWidget *prevWidget ) +TDMShutdownBase::complete( TQWidget *prevWidget ) { TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); @@ -143,7 +143,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget ) } void -KDMShutdownBase::slotActivatePlugMenu() +TDMShutdownBase::slotActivatePlugMenu() { if (needRoot) { TQPopupMenu *cmnu = verify->getPlugMenu(); @@ -155,7 +155,7 @@ KDMShutdownBase::slotActivatePlugMenu() } void -KDMShutdownBase::accept() +TDMShutdownBase::accept() { if (needRoot == 1) verify->accept(); @@ -164,13 +164,13 @@ KDMShutdownBase::accept() } void -KDMShutdownBase::slotSched() +TDMShutdownBase::slotSched() { done( Schedule ); } void -KDMShutdownBase::updateNeedRoot() +TDMShutdownBase::updateNeedRoot() { int nNeedRoot = uid && (((willShut && _allowShutdown == SHUT_ROOT) || @@ -187,40 +187,40 @@ KDMShutdownBase::updateNeedRoot() } void -KDMShutdownBase::accepted() +TDMShutdownBase::accepted() { inherited::done( needRoot ? (int)Authed : (int)Accepted ); } void -KDMShutdownBase::verifyPluginChanged( int id ) +TDMShutdownBase::verifyPluginChanged( int id ) { curPlugin = id; adjustSize(); } void -KDMShutdownBase::verifyOk() +TDMShutdownBase::verifyOk() { accepted(); } void -KDMShutdownBase::verifyFailed() +TDMShutdownBase::verifyFailed() { okButton->setEnabled( false ); cancelButton->setEnabled( false ); } void -KDMShutdownBase::verifyRetry() +TDMShutdownBase::verifyRetry() { okButton->setEnabled( true ); cancelButton->setEnabled( true ); } 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 ) { setCaption(i18n("Shutdown TDE")); @@ -254,11 +254,11 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) hlay->addWidget( howGroup, 0, AlignTop ); TQRadioButton *rb; - rb = new KDMRadioButton( i18n("&Turn off computer"), howGroup ); + rb = new TDMRadioButton( i18n("&Turn off computer"), howGroup ); rb->setChecked( true ); 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( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); @@ -337,7 +337,7 @@ get_date( const char *str ) } void -KDMShutdown::accept() +TDMShutdown::accept() { if (le_start->text() == "0" || le_start->text() == "now") sch_st = time( 0 ); @@ -362,20 +362,20 @@ KDMShutdown::accept() } void -KDMShutdown::slotTargetChanged() +TDMShutdown::slotTargetChanged() { restart_rb->setChecked( true ); } void -KDMShutdown::slotWhenChanged() +TDMShutdown::slotWhenChanged() { doesNuke = cb_force->isChecked(); updateNeedRoot(); } void -KDMShutdown::accepted() +TDMShutdown::accepted() { GSet( 1 ); GSendInt( G_Shutdown ); @@ -392,7 +392,7 @@ KDMShutdown::accepted() } void -KDMShutdown::scheduleShutdown( TQWidget *_parent ) +TDMShutdown::scheduleShutdown( TQWidget *_parent ) { GSet( 1 ); GSendInt( G_QueryShutdown ); @@ -405,7 +405,7 @@ KDMShutdown::scheduleShutdown( TQWidget *_parent ) GSet( 0 ); if (how) { int ret = - KDMCancelShutdown( how, start, timeout, force, uid, os, + TDMCancelShutdown( how, start, timeout, force, uid, os, _parent ).exec(); if (!ret) return; @@ -415,23 +415,23 @@ KDMShutdown::scheduleShutdown( TQWidget *_parent ) uid = -1; if (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 ) { } void -KDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * ) +TDMRadioButton::mouseDoubleClickEvent( TQMouseEvent * ) { emit doubleClicked(); } -KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item, +TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item, TQWidget *parent, const char *name ) : inherited( item, parent, name ) @@ -442,31 +442,31 @@ KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item, connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); } -void KDMDelayedPushButton::setPopup( TQPopupMenu *p ) +void TDMDelayedPushButton::setPopup( TQPopupMenu *p ) { pop = p; setIsMenuButton( p != 0 ); } -void KDMDelayedPushButton::slotPressed() +void TDMDelayedPushButton::slotPressed() { if (pop) popt.start( TQApplication::startDragTime() ); } -void KDMDelayedPushButton::slotReleased() +void TDMDelayedPushButton::slotReleased() { popt.stop(); } -void KDMDelayedPushButton::slotTimeout() +void TDMDelayedPushButton::slotTimeout() { popt.stop(); pop->popup( mapToGlobal( rect().bottomLeft() ) ); setDown( false ); } -KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) +TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) : inherited( _parent ) , targetList( 0 ) { @@ -540,7 +540,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); hbuttonbox2->setAlignment( Qt::AlignRight ); - // Back to kdm + // Back to tdm KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); hbuttonbox2->addWidget( btnBack ); 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 // gets too small if there all options are not available 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 ); iconlay->addWidget( icon ); @@ -571,8 +571,8 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) buttonlay->addSpacing( KDialog::spacingHint() ); - KDMDelayedPushButton *btnReboot = new - KDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); + TDMDelayedPushButton *btnReboot = new + TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); buttonlay->addWidget( btnReboot ); connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) ); @@ -619,63 +619,63 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) } -KDMSlimShutdown::~KDMSlimShutdown() +TDMSlimShutdown::~TDMSlimShutdown() { freeStrArr( targetList ); } void -KDMSlimShutdown::slotSched() +TDMSlimShutdown::slotSched() { reject(); - KDMShutdown::scheduleShutdown(); + TDMShutdown::scheduleShutdown(); } void -KDMSlimShutdown::slotHalt() +TDMSlimShutdown::slotHalt() { if (checkShutdown( SHUT_HALT, 0 )) doShutdown( SHUT_HALT, 0 ); } void -KDMSlimShutdown::slotReboot() +TDMSlimShutdown::slotReboot() { if (checkShutdown( SHUT_REBOOT, 0 )) doShutdown( SHUT_REBOOT, 0 ); } void -KDMSlimShutdown::slotReboot( int opt ) +TDMSlimShutdown::slotReboot( int opt ) { if (checkShutdown( SHUT_REBOOT, targetList[opt] )) doShutdown( SHUT_REBOOT, targetList[opt] ); } bool -KDMSlimShutdown::checkShutdown( int type, const char *os ) +TDMSlimShutdown::checkShutdown( int type, const char *os ) { reject(); dpySpec *sess = fetchSessions( lstRemote | lstTTY ); if (!sess && _allowShutdown != SHUT_ROOT) return true; - int ret = KDMConfShutdown( -1, sess, type, os ).exec(); + int ret = TDMConfShutdown( -1, sess, type, os ).exec(); disposeSessions( sess ); if (ret == Schedule) { - KDMShutdown::scheduleShutdown(); + TDMShutdown::scheduleShutdown(); return false; } return ret; } void -KDMSlimShutdown::externShutdown( int type, const char *os, int uid ) +TDMSlimShutdown::externShutdown( int type, const char *os, int uid ) { dpySpec *sess = fetchSessions( lstRemote | lstTTY ); - int ret = KDMConfShutdown( uid, sess, type, os ).exec(); + int ret = TDMConfShutdown( uid, sess, type, os ).exec(); disposeSessions( sess ); if (ret == Schedule) - KDMShutdown( uid ).exec(); + TDMShutdown( uid ).exec(); else if (ret) 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 ) : 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, TQWidget *_parent ) : inherited( -1, _parent ) @@ -922,4 +922,4 @@ KDMCancelShutdown::KDMCancelShutdown( int how, int start, int timeout, complete( 0 ); } -#include "kdmshutdown.moc" +#include "tdmshutdown.moc" diff --git a/kdm/kfrontend/kdmshutdown.h b/kdm/kfrontend/kdmshutdown.h index 18fda2e9a..6a2ee3a70 100644 --- a/kdm/kfrontend/kdmshutdown.h +++ b/kdm/kfrontend/kdmshutdown.h @@ -23,10 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMSHUTDOWN_H -#define KDMSHUTDOWN_H +#ifndef TDMSHUTDOWN_H +#define TDMSHUTDOWN_H -#include "kdmconfig.h" // for HAVE_VTS +#include "tdmconfig.h" // for HAVE_VTS #include "kgverify.h" #include <kpushbutton.h> @@ -45,13 +45,13 @@ class TQLineEdit; enum { Authed = TQDialog::Accepted + 1, Schedule }; -class KDMShutdownBase : public FDialog, public KGVerifyHandler { +class TDMShutdownBase : public FDialog, public KGVerifyHandler { Q_OBJECT typedef FDialog inherited; public: - KDMShutdownBase( int _uid, TQWidget *_parent ); - virtual ~KDMShutdownBase(); + TDMShutdownBase( int _uid, TQWidget *_parent ); + virtual ~TDMShutdownBase(); protected slots: virtual void accept(); @@ -93,12 +93,12 @@ class KDMShutdownBase : public FDialog, public KGVerifyHandler { }; -class KDMShutdown : public KDMShutdownBase { +class TDMShutdown : public TDMShutdownBase { Q_OBJECT - typedef KDMShutdownBase inherited; + typedef TDMShutdownBase inherited; public: - KDMShutdown( int _uid, TQWidget *_parent = 0 ); + TDMShutdown( int _uid, TQWidget *_parent = 0 ); static void scheduleShutdown( TQWidget *_parent = 0 ); protected slots: @@ -123,12 +123,12 @@ class KDMShutdown : public KDMShutdownBase { }; -class KDMRadioButton : public TQRadioButton { +class TDMRadioButton : public TQRadioButton { Q_OBJECT typedef TQRadioButton inherited; public: - KDMRadioButton( const TQString &label, TQWidget *parent ); + TDMRadioButton( const TQString &label, TQWidget *parent ); private: virtual void mouseDoubleClickEvent( TQMouseEvent * ); @@ -138,12 +138,12 @@ class KDMRadioButton : public TQRadioButton { }; -class KDMDelayedPushButton : public KPushButton { +class TDMDelayedPushButton : public KPushButton { Q_OBJECT typedef KPushButton inherited; 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 ); private slots: @@ -156,13 +156,13 @@ class KDMDelayedPushButton : public KPushButton { TQTimer popt; }; -class KDMSlimShutdown : public FDialog { +class TDMSlimShutdown : public FDialog { Q_OBJECT typedef FDialog inherited; public: - KDMSlimShutdown( TQWidget *_parent = 0 ); - ~KDMSlimShutdown(); + TDMSlimShutdown( TQWidget *_parent = 0 ); + ~TDMSlimShutdown(); static void externShutdown( int type, const char *os, int uid ); private slots: @@ -177,21 +177,21 @@ class KDMSlimShutdown : public FDialog { }; -class KDMConfShutdown : public KDMShutdownBase { +class TDMConfShutdown : public TDMShutdownBase { Q_OBJECT - typedef KDMShutdownBase inherited; + typedef TDMShutdownBase inherited; 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 ); }; -class KDMCancelShutdown : public KDMShutdownBase { +class TDMCancelShutdown : public TDMShutdownBase { Q_OBJECT - typedef KDMShutdownBase inherited; + typedef TDMShutdownBase inherited; 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 ); }; @@ -237,4 +237,4 @@ class FlatButton : public TQToolButton }; -#endif /* KDMSHUTDOWN_H */ +#endif /* TDMSHUTDOWN_H */ diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp index f662ae1c2..98b5773c2 100644 --- a/kdm/kfrontend/kfdialog.cpp +++ b/kdm/kfrontend/kfdialog.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "kfdialog.h" -#include "kdmconfig.h" +#include "tdmconfig.h" #include <klocale.h> #include <kpushbutton.h> @@ -61,7 +61,7 @@ FDialog::FDialog( TQWidget *parent, bool framed ) } else winFrame = 0; - setCaption(KDM_LOGIN_SCREEN_BASE_TITLE); + setCaption(TDM_LOGIN_SCREEN_BASE_TITLE); if (framed) { 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 ) : inherited( parent, !is_themed ) { - if (type == TQMessageBox::NoIcon) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE); - if (type == TQMessageBox::Question) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Question")); - if (type == TQMessageBox::Information) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Information")); - if (type == TQMessageBox::Warning) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Warning")); - if (type == TQMessageBox::Critical) setCaption(KDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Error")); + if (type == TQMessageBox::NoIcon) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE); + if (type == TQMessageBox::Question) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Question")); + if (type == TQMessageBox::Information) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Information")); + if (type == TQMessageBox::Warning) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Warning")); + if (type == TQMessageBox::Critical) setCaption(TDM_LOGIN_SCREEN_BASE_TITLE + " - " + i18n("Error")); TQLabel *label1 = new TQLabel( this ); label1->setPixmap( TQMessageBox::standardIcon( type ) ); diff --git a/kdm/kfrontend/kfdialog.h b/kdm/kfrontend/kfdialog.h index 3537c7b57..851d9a2db 100644 --- a/kdm/kfrontend/kfdialog.h +++ b/kdm/kfrontend/kfdialog.h @@ -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 #define FDIALOG_H diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index f21741805..5ad52dda6 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <config.h> -#include "kdm_greet.h" -#include "kdmshutdown.h" -#include "kdmconfig.h" +#include "tdm_greet.h" +#include "tdmshutdown.h" +#include "tdmconfig.h" #include "kgapp.h" #include "kgreeter.h" #ifdef XDMCP @@ -179,7 +179,7 @@ checkSAK(GreeterApp* app) void 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 ); kdDebug() << timestamp() << "start" << endl; @@ -327,7 +327,7 @@ kg_main( const char *argv0 ) if (cmd == G_ConfShutdown) { int how = GRecvInt(), uid = GRecvInt(); char *os = GRecvStr(); - KDMSlimShutdown::externShutdown( how, os, uid ); + TDMSlimShutdown::externShutdown( how, os, uid ); if (os) free( os ); GSendInt( G_Ready ); diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp index f4ed918c6..667eca8e1 100644 --- a/kdm/kfrontend/kgdialog.cpp +++ b/kdm/kfrontend/kgdialog.cpp @@ -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) 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 "kgverify.h" #include "kconsole.h" -#include "kdmshutdown.h" -#include "kdm_greet.h" +#include "tdmshutdown.h" +#include "tdm_greet.h" #include <klocale.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 ) { -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE consoleView = _showLog ? new KConsole( this ) : 0; #endif @@ -171,7 +171,7 @@ KGDialog::slotConsole() if (sess) { if (verify) verify->suspend(); - int ret = KDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec(); + int ret = TDMConfShutdown( -1, sess, SHUT_CONSOLE, 0 ).exec(); if (verify) verify->resume(); disposeSessions( sess ); @@ -194,11 +194,11 @@ KGDialog::slotShutdown( int id ) verify->suspend(); if (id < 0) { if (_scheduledSd == SHUT_ALWAYS) - KDMShutdown::scheduleShutdown( this ); + TDMShutdown::scheduleShutdown( this ); else - KDMSlimShutdown( this ).exec(); + TDMSlimShutdown( this ).exec(); } else - KDMSlimShutdown::externShutdown( id, 0, -1 ); + TDMSlimShutdown::externShutdown( id, 0, -1 ); if (verify) verify->resume(); } diff --git a/kdm/kfrontend/kgdialog.h b/kdm/kfrontend/kgdialog.h index 2c683760e..a902b6ff0 100644 --- a/kdm/kfrontend/kgdialog.h +++ b/kdm/kfrontend/kgdialog.h @@ -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) 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 #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" class TQPopupMenu; @@ -67,7 +67,7 @@ class KGDialog : public FDialog { bool needSep; TQPopupMenu *optMenu; KGVerify *verify; -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE KConsole *consoleView; #endif diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index 5877cb6c7..ee1bf3e72 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/kdm/kfrontend/kgreeter.cpp @@ -1,6 +1,6 @@ /* -Greeter widget for kdm +Greeter widget for tdm Copyright (C) 1997, 1998, 2000 Steffen Hansen <hansen@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 "kconsole.h" -#include "kdmconfig.h" -#include "kdmclock.h" -#include "kdm_greet.h" -#include "kdmadmindialog.h" -#include "themer/kdmthemer.h" -#include "themer/kdmitem.h" -#include "themer/kdmlabel.h" +#include "tdmconfig.h" +#include "tdmclock.h" +#include "tdm_greet.h" +#include "tdmadmindialog.h" +#include "themer/tdmthemer.h" +#include "themer/tdmitem.h" +#include "themer/tdmlabel.h" #include <kapplication.h> #include <klocale.h> @@ -86,9 +86,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <X11/Xlib.h> -#define FIFO_DIR "/tmp/ksocket-global/kdm" -#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1" -#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1" +#define FIFO_DIR "/tmp/ksocket-global/tdm" +#define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1" +#define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1" class UserListView : public KListView { public: @@ -872,7 +872,7 @@ KStdGreeter::KStdGreeter() , pixLabel( 0 ) { TQBoxLayout *main_box; -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE if (consoleView) { TQBoxLayout *ex_box = new TQVBoxLayout( this, 10, 10 ); main_box = new TQHBoxLayout( ex_box, 10 ); @@ -952,7 +952,7 @@ KStdGreeter::KStdGreeter() TQWidget *prec; if (userView) prec = userView; -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE else if (consoleView) prec = consoleView; #endif @@ -1060,10 +1060,10 @@ KThemedGreeter::KThemedGreeter() connect( themer, TQT_SIGNAL(activated( 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" ); 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" ); timed_label = themer->findNode( "timed-label" ); if (pam_error && pam_error->isA( "KdmLabel" )) @@ -1075,7 +1075,7 @@ KThemedGreeter::KThemedGreeter() if ((itm = themer->findNode( "language_button" ))) // not implemented yet itm->hide( true ); -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE if (console_rect) { if (consoleView) console_rect->setWidget( consoleView ); @@ -1097,7 +1097,7 @@ KThemedGreeter::KThemedGreeter() TQWidget *prec; if (userView) prec = userView; -#ifdef WITH_KDM_XCONSOLE +#ifdef WITH_TDM_XCONSOLE else if (consoleView) prec = consoleView; #endif @@ -1268,7 +1268,7 @@ KThemedGreeter::keyPressEvent( TQKeyEvent *e ) void KThemedGreeter::slotAskAdminPassword() { - KDMAdmin k(curUser, this); + TDMAdmin k(curUser, this); if (k.exec()) { GSendInt(G_Ready); hide(); diff --git a/kdm/kfrontend/kgreeter.h b/kdm/kfrontend/kgreeter.h index 8ec8dd9c1..0de48a21d 100644 --- a/kdm/kfrontend/kgreeter.h +++ b/kdm/kfrontend/kgreeter.h @@ -1,6 +1,6 @@ /* -Greeter widget for kdm +Greeter widget for tdm Copyright (C) 1997, 1998 Steffen Hansen <hansen@kde.org> Copyright (C) 2000-2004 Oswald Buddenhagen <ossi@kde.org> diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp index 73ec34456..ec0bfae6c 100644 --- a/kdm/kfrontend/kgverify.cpp +++ b/kdm/kfrontend/kgverify.cpp @@ -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) 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 "kgverify.h" -#include "kdmconfig.h" -#include "kdm_greet.h" +#include "tdmconfig.h" +#include "tdm_greet.h" -#include "themer/kdmthemer.h" -#include "themer/kdmitem.h" +#include "themer/tdmthemer.h" +#include "themer/tdmitem.h" #include <kapplication.h> #include <klocale.h> @@ -461,7 +461,7 @@ KGVerify::VErrBox( TQWidget *parent, const TQString &user, const char *msg ) if (!msg) { 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."); icon = errorbox; } else { diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h index 41451d800..44fab973a 100644 --- a/kdm/kfrontend/kgverify.h +++ b/kdm/kfrontend/kgverify.h @@ -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) 2000-2004 Oswald Buddenhagen <ossi@kde.org> diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp index 7d231948f..b51367485 100644 --- a/kdm/kfrontend/krootimage.cpp +++ b/kdm/kfrontend/krootimage.cpp @@ -35,7 +35,7 @@ Boston, MA 02110-1301, USA. #include <stdlib.h> static const char description[] = - I18N_NOOP( "Fancy desktop background for kdm" ); + I18N_NOOP( "Fancy desktop background for tdm" ); static const char version[] = "v2.0"; diff --git a/kdm/kfrontend/krootimage.h b/kdm/kfrontend/krootimage.h index 3168994ba..e46190116 100644 --- a/kdm/kfrontend/krootimage.h +++ b/kdm/kfrontend/krootimage.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KDMDESKTOP_H__ -#define __KDMDESKTOP_H__ +#ifndef __TDMDESKTOP_H__ +#define __TDMDESKTOP_H__ #include <kapplication.h> diff --git a/kdm/kfrontend/pics/CMakeLists.txt b/kdm/kfrontend/pics/CMakeLists.txt index 790dc06ce..e1b61b4f8 100644 --- a/kdm/kfrontend/pics/CMakeLists.txt +++ b/kdm/kfrontend/pics/CMakeLists.txt @@ -11,8 +11,8 @@ install( FILES kdelogo.png kdelogo-crystal.png shutdown.jpg - DESTINATION ${DATA_INSTALL_DIR}/kdm/pics ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/pics ) install( FILES default1.png default2.png default3.png root1.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/pics/users ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/pics/users ) diff --git a/kdm/kfrontend/pics/Makefile.am b/kdm/kfrontend/pics/Makefile.am index d6b8957e8..9ba04536e 100644 --- a/kdm/kfrontend/pics/Makefile.am +++ b/kdm/kfrontend/pics/Makefile.am @@ -1,5 +1,5 @@ -picsdir = $(kde_datadir)/kdm/pics +picsdir = $(kde_datadir)/tdm/pics pics_DATA = kdelogo.png kdelogo-crystal.png shutdown.jpg usersdir = $(picsdir)/users diff --git a/kdm/kfrontend/sakdlg.cc b/kdm/kfrontend/sakdlg.cc index edf346229..396fa1627 100644 --- a/kdm/kfrontend/sakdlg.cc +++ b/kdm/kfrontend/sakdlg.cc @@ -73,9 +73,9 @@ # define AF_LOCAL AF_UNIX #endif -#define FIFO_DIR "/tmp/ksocket-global/kdm" -#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1" -#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1" +#define FIFO_DIR "/tmp/ksocket-global/tdm" +#define FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1" +#define FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1" bool trinity_desktop_lock_use_system_modal_dialogs = TRUE; 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); 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 ); if (trinity_desktop_lock_use_system_modal_dialogs) @@ -125,7 +125,7 @@ SAKDlg::SAKDlg(TQWidget *parent) installEventFilter(this); mSAKProcess = new KProcess; - *mSAKProcess << "kdmtsak" << "dm"; + *mSAKProcess << "tdmtsak" << "dm"; connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited())); mSAKProcess->start(); diff --git a/kdm/kfrontend/sessions/CMakeLists.txt b/kdm/kfrontend/sessions/CMakeLists.txt index 9979d3a96..780963bd4 100644 --- a/kdm/kfrontend/sessions/CMakeLists.txt +++ b/kdm/kfrontend/sessions/CMakeLists.txt @@ -26,4 +26,4 @@ install( FILES twm.desktop ude.desktop vtwm.desktop w9wm.desktop waimea.desktop wm2.desktop wmaker.desktop xfce.desktop xfce4.desktop - DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/sessions ) diff --git a/kdm/kfrontend/sessions/Makefile.am b/kdm/kfrontend/sessions/Makefile.am index 490d9e37e..a29872441 100644 --- a/kdm/kfrontend/sessions/Makefile.am +++ b/kdm/kfrontend/sessions/Makefile.am @@ -1,4 +1,4 @@ -sessionsdir = $(kde_datadir)/kdm/sessions +sessionsdir = $(kde_datadir)/tdm/sessions sessions_DATA = \ admin.desktop tde.desktop gnome.desktop \ 9wm.desktop \ diff --git a/kdm/kfrontend/themer/CMakeLists.txt b/kdm/kfrontend/themer/CMakeLists.txt index ff65734af..fc0b80fc3 100644 --- a/kdm/kfrontend/themer/CMakeLists.txt +++ b/kdm/kfrontend/themer/CMakeLists.txt @@ -12,8 +12,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdm/kfrontend - ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/tdm/kfrontend + ${CMAKE_SOURCE_DIR}/tdmlib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -27,15 +27,15 @@ link_directories( ##### config.ci (generated) ##################### add_custom_command( OUTPUT config.ci - COMMAND perl -w ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def config.ci - DEPENDS ${CMAKE_SOURCE_DIR}/kdm/confproc.pl ${CMAKE_SOURCE_DIR}/kdm/config.def ) -set_property( SOURCE kdmthemer.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.ci ) + COMMAND perl -w ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def config.ci + DEPENDS ${CMAKE_SOURCE_DIR}/tdm/confproc.pl ${CMAKE_SOURCE_DIR}/tdm/config.def ) +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 - kdmthemer.cpp kdmitem.cpp kdmpixmap.cpp - kdmrect.cpp kdmlabel.cpp kdmlayout.cpp + tdmthemer.cpp tdmitem.cpp tdmpixmap.cpp + tdmrect.cpp tdmlabel.cpp tdmlayout.cpp ) diff --git a/kdm/kfrontend/themer/Makefile.am b/kdm/kfrontend/themer/Makefile.am index 7f6eb5701..f736795d6 100644 --- a/kdm/kfrontend/themer/Makefile.am +++ b/kdm/kfrontend/themer/Makefile.am @@ -1,16 +1,16 @@ AM_CPPFLAGS = -I$(srcdir)/../../backend -I$(srcdir)/.. -I../.. \ - -I$(top_srcdir)/kdmlib \ + -I$(top_srcdir)/tdmlib \ $(all_includes) -noinst_LIBRARIES = libkdmthemer.a -libkdmthemer_a_SOURCES = \ - kdmthemer.cpp \ - kdmitem.cpp \ - kdmpixmap.cpp \ - kdmrect.cpp \ - kdmlabel.cpp \ - kdmlayout.cpp +noinst_LIBRARIES = libtdmthemer.a +libtdmthemer_a_SOURCES = \ + tdmthemer.cpp \ + tdmitem.cpp \ + tdmpixmap.cpp \ + tdmrect.cpp \ + tdmlabel.cpp \ + tdmlayout.cpp METASOURCES = AUTO -libkdmthemer_a_COMPILE_FIRST = ../../config.ci +libtdmthemer_a_COMPILE_FIRST = ../../config.ci diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 1c859d101..8cf126b66 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -25,9 +25,9 @@ // #define DRAW_OUTLINE 1 // for debugging only -#include "kdmitem.h" -#include "kdmlayout.h" -#include "kdmconfig.h" +#include "tdmitem.h" +#include "tdmlayout.h" +#include "tdmconfig.h" #include <kglobal.h> #include <kdebug.h> @@ -654,4 +654,4 @@ KdmItem::parentWidget() const return ((KdmItem*)parent())->parentWidget(); } -#include "kdmitem.moc" +#include "tdmitem.moc" diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index 230ed71c4..27158a7fd 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMITEM_H -#define KDMITEM_H +#ifndef TDMITEM_H +#define TDMITEM_H #include <tqobject.h> #include <tqvaluelist.h> @@ -35,7 +35,7 @@ class TQPainter; class TQLayoutItem; /** 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 * screen (see note below), painting the whole area or a sub-region using diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index 0eab99c30..5239d48dc 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -20,8 +20,8 @@ */ #include <config.h> -#include "kdmlabel.h" -#include "kdmconfig.h" +#include "tdmlabel.h" +#include "tdmconfig.h" #include "../kgreeter.h" #include <kglobal.h> @@ -273,4 +273,4 @@ KdmLabel::lookupText( const TQString &t ) return KMacroExpander::expandMacros( text, m ); } -#include "kdmlabel.moc" +#include "tdmlabel.moc" diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h index 1ec2f88ec..8b955fca5 100644 --- a/kdm/kfrontend/themer/kdmlabel.h +++ b/kdm/kfrontend/themer/kdmlabel.h @@ -22,7 +22,7 @@ #ifndef KDELABEL_H #define KDELABEL_H -#include "kdmitem.h" +#include "tdmitem.h" #include <tqcolor.h> #include <tqfont.h> diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp index 093d450fc..9a277a7a3 100644 --- a/kdm/kfrontend/themer/kdmlayout.cpp +++ b/kdm/kfrontend/themer/kdmlayout.cpp @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmlayout.h" -#include "kdmconfig.h" -#include "kdmitem.h" +#include "tdmlayout.h" +#include "tdmconfig.h" +#include "tdmitem.h" #include <kdebug.h> diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h index 4c73e9a1b..c147fd329 100644 --- a/kdm/kfrontend/themer/kdmlayout.h +++ b/kdm/kfrontend/themer/kdmlayout.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMLAYOUT_H -#define KDMLAYOUT_H +#ifndef TDMLAYOUT_H +#define TDMLAYOUT_H /** * this is a container for a lot of other stuff diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp index 8020bd1e1..7a8d1a3d2 100644 --- a/kdm/kfrontend/themer/kdmpixmap.cpp +++ b/kdm/kfrontend/themer/kdmpixmap.cpp @@ -21,8 +21,8 @@ #include <config.h> -#include "kdmpixmap.h" -#include <kdmconfig.h> +#include "tdmpixmap.h" +#include <tdmconfig.h> #include <kimageeffect.h> #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 ); 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)) { // Software blend only (no compositing support) - // Use the preset KDM background... + // Use the preset TDM background... KStandardDirs *m_pDirs = KGlobal::dirs(); KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) ); config->setGroup("Desktop0"); @@ -337,4 +337,4 @@ KdmPixmap::statusChanged() needUpdate(); } -#include "kdmpixmap.moc" +#include "tdmpixmap.moc" diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h index a12c9fea4..faa71a034 100644 --- a/kdm/kfrontend/themer/kdmpixmap.h +++ b/kdm/kfrontend/themer/kdmpixmap.h @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMPIXMAP_H -#define KDMPIXMAP_H +#ifndef TDMPIXMAP_H +#define TDMPIXMAP_H -#include "kdmitem.h" +#include "tdmitem.h" //#include <tqrect.h> #include <tqpixmap.h> diff --git a/kdm/kfrontend/themer/kdmrect.cpp b/kdm/kfrontend/themer/kdmrect.cpp index 1db128da0..9056a513c 100644 --- a/kdm/kfrontend/themer/kdmrect.cpp +++ b/kdm/kfrontend/themer/kdmrect.cpp @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmrect.h" -#include "kdmthemer.h" -#include "kdmconfig.h" +#include "tdmrect.h" +#include "tdmthemer.h" +#include "tdmconfig.h" #include <kimageeffect.h> #include <kdebug.h> @@ -178,4 +178,4 @@ KdmRect::setWidget( TQWidget *widget ) //setAttribs( widget ); } -#include "kdmrect.moc" +#include "tdmrect.moc" diff --git a/kdm/kfrontend/themer/kdmrect.h b/kdm/kfrontend/themer/kdmrect.h index a505e1921..6dfdc126a 100644 --- a/kdm/kfrontend/themer/kdmrect.h +++ b/kdm/kfrontend/themer/kdmrect.h @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMRECT_H -#define KDMRECT_H +#ifndef TDMRECT_H +#define TDMRECT_H -#include "kdmitem.h" +#include "tdmitem.h" #include <tqcolor.h> #include <tqfont.h> diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp index 39a1abe81..d2dc77935 100644 --- a/kdm/kfrontend/themer/kdmthemer.cpp +++ b/kdm/kfrontend/themer/kdmthemer.cpp @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdmthemer.h" -#include "kdmitem.h" -#include "kdmpixmap.h" -#include "kdmrect.h" -#include "kdmlabel.h" +#include "tdmthemer.h" +#include "tdmitem.h" +#include "tdmpixmap.h" +#include "tdmrect.h" +#include "tdmlabel.h" -#include <kdmconfig.h> +#include <tdmconfig.h> #include <kfdialog.h> #include <kiconloader.h> @@ -76,7 +76,7 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget return; } // 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 )), widget(), TQT_SLOT(update( int, int, int, int )) ); @@ -401,4 +401,4 @@ KdmThemer::slotPaintRoot() TQT_TQWIDGET(TQApplication::desktop()->screen())->erase(); } -#include "kdmthemer.moc" +#include "tdmthemer.moc" diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h index f9a0b1b6f..2b8865b4d 100644 --- a/kdm/kfrontend/themer/kdmthemer.h +++ b/kdm/kfrontend/themer/kdmthemer.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDMTHEMER_H -#define KDMTHEMER_H +#ifndef TDMTHEMER_H +#define TDMTHEMER_H #include <tqobject.h> #include <tqdom.h> diff --git a/kdm/kfrontend/themes/circles/CMakeLists.txt b/kdm/kfrontend/themes/circles/CMakeLists.txt index 91396000b..9122c13ea 100644 --- a/kdm/kfrontend/themes/circles/CMakeLists.txt +++ b/kdm/kfrontend/themes/circles/CMakeLists.txt @@ -12,4 +12,4 @@ install( FILES GdmGreeterTheme.desktop circles.xml background.svg flower.png help.png options.png screenshot.png - DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/circles ) + DESTINATION ${DATA_INSTALL_DIR}/tdm/themes/circles ) diff --git a/kdm/kfrontend/themes/circles/Makefile.am b/kdm/kfrontend/themes/circles/Makefile.am index 97ad04b6a..d88c407c2 100644 --- a/kdm/kfrontend/themes/circles/Makefile.am +++ b/kdm/kfrontend/themes/circles/Makefile.am @@ -1,4 +1,4 @@ -circlesdir = $(kde_datadir)/kdm/themes/circles +circlesdir = $(kde_datadir)/tdm/themes/circles circles_DATA = \ GdmGreeterTheme.desktop \ circles.xml \ diff --git a/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt b/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt index 81b5fe7de..bf9f738a0 100644 --- a/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt +++ b/kdm/kfrontend/themes/o2_enterprise/CMakeLists.txt @@ -13,4 +13,4 @@ install( FILES Dialog.png enter_normal.png enter_over.png enter_pressed.png enterprise.xml GdmGreeterTheme.desktop preview.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 ) diff --git a/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop b/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop index d50678db4..10ce5cc52 100644 --- a/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop +++ b/kdm/kfrontend/themes/o2_enterprise/GdmGreeterTheme.desktop @@ -5,6 +5,6 @@ Encoding=UTF-8 Greeter=enterprise.xml 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) Screenshot=preview.png diff --git a/kdm/kfrontend/themes/o2_enterprise/Makefile.am b/kdm/kfrontend/themes/o2_enterprise/Makefile.am index 02b0dee99..078e370a5 100644 --- a/kdm/kfrontend/themes/o2_enterprise/Makefile.am +++ b/kdm/kfrontend/themes/o2_enterprise/Makefile.am @@ -1,4 +1,4 @@ -o2_enterprisedir = $(kde_datadir)/kdm/themes/o2_enterprise +o2_enterprisedir = $(kde_datadir)/tdm/themes/o2_enterprise o2_enterprise_DATA = \ Dialog.png \ enter_normal.png \ diff --git a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml index 42e37f890..cf8aecd32 100644 --- a/kdm/kfrontend/themes/o2_enterprise/enterprise.xml +++ b/kdm/kfrontend/themes/o2_enterprise/enterprise.xml @@ -2,7 +2,7 @@ <!DOCTYPE greeter SYSTEM "greeter.dtd"> <greeter> <item type="pixmap" > - <normal file="@@@KDMBACKGROUND@@@" /> + <normal file="@@@TDMBACKGROUND@@@" /> <pos width="100%" x="0" y="0" height="100%" /> </item> <item type="pixmap" > diff --git a/kdmlib/CMakeLists.txt b/kdmlib/CMakeLists.txt index 671fd73b7..a2565fe1d 100644 --- a/kdmlib/CMakeLists.txt +++ b/kdmlib/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdm/kfrontend + ${CMAKE_SOURCE_DIR}/tdm/kfrontend ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} @@ -21,7 +21,7 @@ link_directories( ${TQT_LIBRARY_DIRS} ) -if( BUILD_KDM ) +if( BUILD_TDM ) ##### headers ################################### @@ -57,12 +57,12 @@ tde_add_kpart( kgreet_winbind AUTOMOC -endif( BUILD_KDM ) +endif( BUILD_TDM ) ##### 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 SOURCES dmctl.cpp @@ -71,15 +71,15 @@ if( BUILD_KICKER OR BUILD_KDESKTOP OR BUILD_KDM OR BUILD_KSMSERVER ) endif( ) -##### kdmtsak (executable) ####################### +##### tdmtsak (executable) ####################### if( BUILD_TSAK ) - tde_add_executable( kdmtsak - SOURCES kdmtsak.cpp + tde_add_executable( tdmtsak + SOURCES tdmtsak.cpp LINK ${TQT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} SETUID - DESCRIPTION "Secure Attention Key interface for KDM" + DESCRIPTION "Secure Attention Key interface for TDM" AUTHORS "Timothy Pearson" ) endif( BUILD_TSAK ) diff --git a/kdmlib/Makefile.am b/kdmlib/Makefile.am index 7183a8889..f21f59bd5 100644 --- a/kdmlib/Makefile.am +++ b/kdmlib/Makefile.am @@ -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 diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp index 255a7b2ea..41a5cb206 100644 --- a/kdmlib/dmctl.cpp +++ b/kdmlib/dmctl.cpp @@ -37,7 +37,7 @@ #include <fcntl.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; DM::DM() : fd( -1 ) @@ -49,9 +49,9 @@ DM::DM() : fd( -1 ) if (!(dpy = ::getenv( "DISPLAY" ))) DMType = NoDM; else if ((ctl = ::getenv( "DM_CONTROL" ))) - DMType = NewKDM; + DMType = NewTDM; else if ((ctl = ::getenv( "XDM_MANAGED" )) && ctl[0] == '/') - DMType = OldKDM; + DMType = OldTDM; else if (::getenv( "GDMSESSION" )) DMType = GDM; else @@ -60,7 +60,7 @@ DM::DM() : fd( -1 ) switch (DMType) { default: return; - case NewKDM: + case NewTDM: case GDM: if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0) return; @@ -88,7 +88,7 @@ DM::DM() : fd( -1 ) } } break; - case OldKDM: + case OldTDM: { TQString tf( ctl ); 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 buf the result buffer. * @return result: * @li If true, the command was successfully executed. * @p ret might contain addional results. * @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 - * from KDM. + * from TDM. */ bool DM::exec( const char *cmd, TQCString &buf ) @@ -143,7 +143,7 @@ DM::exec( const char *cmd, TQCString &buf ) buf.resize( 0 ); return false; } - if (DMType == OldKDM) { + if (DMType == OldTDM) { buf.resize( 0 ); return true; } @@ -172,7 +172,7 @@ DM::exec( const char *cmd, TQCString &buf ) bool DM::canShutdown() { - if (DMType == OldKDM) + if (DMType == OldTDM) return strstr( ctl, ",maysd" ) != 0; TQCString re; @@ -192,7 +192,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType, return; bool cap_ask; - if (DMType == NewKDM) { + if (DMType == NewTDM) { TQCString re; cap_ask = exec( "caps\n", re ) && re.find( "\tshutdown ask" ) >= 0; } else { @@ -228,7 +228,7 @@ DM::shutdown( KApplication::ShutdownType shutdownType, bool DM::bootOptions( TQStringList &opts, int &defopt, int ¤t ) { - if (DMType != NewKDM) + if (DMType != NewTDM) return false; TQCString re; @@ -264,7 +264,7 @@ DM::setLock( bool on ) bool DM::isSwitchable() { - if (DMType == OldKDM) + if (DMType == OldTDM) return dpy[0] == ':'; if (DMType == GDM) @@ -281,7 +281,7 @@ DM::numReserve() if (DMType == GDM) return 1; /* Bleh */ - if (DMType == OldKDM) + if (DMType == OldTDM) return strstr( ctl, ",rsvd" ) ? 1 : -1; TQCString re; @@ -304,7 +304,7 @@ DM::startReserve() bool DM::localSessions( SessList &list ) { - if (DMType == OldKDM) + if (DMType == OldTDM) return false; TQCString re; diff --git a/kdmlib/kdmtsak.cpp b/kdmlib/kdmtsak.cpp index 22f8a0b9a..18acd05d2 100644 --- a/kdmlib/kdmtsak.cpp +++ b/kdmlib/kdmtsak.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include "kdmtsak.h" +#include "tdmtsak.h" #include <tqstringlist.h> @@ -45,7 +45,7 @@ bool is_vt_local() { } else { TQString cvtName = ""; - TQString output = exec("kdmctl list"); + TQString output = exec("tdmctl list"); TQStringList sessionList = TQStringList::split('\t', output, false); // See if the current session is local for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) { @@ -69,7 +69,7 @@ bool is_vt_active() { } else { TQString cvtName = ""; - TQString output = exec("kdmctl list"); + TQString output = exec("tdmctl list"); TQString curConsole = exec("fgconsole"); bool intFound; int curConsoleNum = curConsole.toInt(&intFound); diff --git a/kdmlib/kdmtsak.h b/kdmlib/kdmtsak.h index 9c512a59b..1987a8218 100644 --- a/kdmlib/kdmtsak.h +++ b/kdmlib/kdmtsak.h @@ -77,7 +77,7 @@ inline int tde_sak_verify_calling_process() #ifdef DEBUG printf("Parent executable name is: %s\n\r", procparent.ascii()); #endif - if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "kdm")) { + if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "tdm")) { authorized = true; } else if (procparent == "tdeinit") { diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp index af6d80172..b37f2bab7 100644 --- a/kdmlib/kgreet_classic.cpp +++ b/kdmlib/kgreet_classic.cpp @@ -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) 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 "themer/kdmthemer.h" -#include "themer/kdmitem.h" +#include "themer/tdmthemer.h" +#include "themer/tdmitem.h" #include <klocale.h> #include <klineedit.h> @@ -35,10 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tqlayout.h> #include <tqlabel.h> -class KDMPasswordEdit : public KPasswordEdit { +class TDMPasswordEdit : public KPasswordEdit { public: - KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} - KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} + TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} + TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} protected: virtual void contextMenuEvent( TQContextMenuEvent * ) {} }; @@ -105,9 +105,9 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 ); } if (echoMode == -1) - passwdEdit = new KDMPasswordEdit( parent ); + passwdEdit = new TDMPasswordEdit( parent ); else - passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, + passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) ); @@ -135,11 +135,11 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, } if (func != Authenticate) { if (echoMode == -1) { - passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); - passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); + passwd1Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); + passwd2Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); } else { - passwd1Edit = new KDMPasswordEdit( parent ); - passwd2Edit = new KDMPasswordEdit( parent ); + passwd1Edit = new TDMPasswordEdit( parent ); + passwd2Edit = new TDMPasswordEdit( parent ); } passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent ); passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent ); diff --git a/kdmlib/kgreet_classic.h b/kdmlib/kgreet_classic.h index 07bf35957..1f467a528 100644 --- a/kdmlib/kgreet_classic.h +++ b/kdmlib/kgreet_classic.h @@ -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) 2000-2003 Oswald Buddenhagen <ossi@kde.org> diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp index 41c7b2439..82506fb43 100644 --- a/kdmlib/kgreet_pam.cpp +++ b/kdmlib/kgreet_pam.cpp @@ -1,10 +1,10 @@ /* -Conversation widget for kdm greeter +Conversation widget for tdm greeter 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) 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 "themer/kdmthemer.h" -#include "themer/kdmlabel.h" +#include "themer/tdmthemer.h" +#include "themer/tdmlabel.h" #include <klocale.h> #include <klineedit.h> @@ -47,10 +47,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //#define PAM_GREETER_DEBUG -class KDMPasswordEdit : public KPasswordEdit { +class TDMPasswordEdit : public KPasswordEdit { public: - KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} - KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} + TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} + TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} protected: virtual void contextMenuEvent( TQContextMenuEvent * ) {} }; @@ -148,9 +148,9 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, } #if 0 if (echoMode == -1) - passwdEdit = new KDMPasswordEdit( parent ); + passwdEdit = new TDMPasswordEdit( parent ); else - passwdEdit = new KDMPasswordEdit( echoMode, + passwdEdit = new TDMPasswordEdit( echoMode, parent ); connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) ); @@ -177,11 +177,11 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, } if (func != Authenticate) { if (echoMode == -1) { - authEdit << new KDMPasswordEdit( echoMode, parent ); - authEdit << new KDMPasswordEdit( echoMode, parent ); + authEdit << new TDMPasswordEdit( echoMode, parent ); + authEdit << new TDMPasswordEdit( echoMode, parent ); } else { - authEdit << new KDMPasswordEdit( parent ); - authEdit << new KDMPasswordEdit( parent ); + authEdit << new TDMPasswordEdit( parent ); + authEdit << new TDMPasswordEdit( parent ); } authLabel << new TQLabel( authEdit[0], i18n("&New 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) loginLabel->setText(TQString::fromUtf8(prompt)); else if (m_themer) { - KdmLabel *kdmlabel = static_cast<KdmLabel*>(m_themer->findNode("user-label")); - if (kdmlabel) { + KdmLabel *tdmlabel = static_cast<KdmLabel*>(m_themer->findNode("user-label")); + if (tdmlabel) { //userLabel->setText(TQString::fromUtf8(prompt)); - kdmlabel->label.text = TQString::fromUtf8(prompt); - TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update())); + tdmlabel->label.text = TQString::fromUtf8(prompt); + TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update())); } } } @@ -356,21 +356,21 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) kg_debug("themer found!"); KdmItem *pw_label = 0; - KdmLabel *kdmlabel = static_cast<KdmLabel*>(m_themer->findNode("pw-label")); - if (kdmlabel) { + KdmLabel *tdmlabel = static_cast<KdmLabel*>(m_themer->findNode("pw-label")); + if (tdmlabel) { //userLabel->setText(TQString::fromUtf8(prompt)); TQString str = TQString::fromUtf8(prompt); - kdmlabel->label.text = str; - TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update())); + tdmlabel->label.text = str; + TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update())); } } - KDMPasswordEdit* passwdEdit; + TDMPasswordEdit* passwdEdit; if (echoMode == -1) - passwdEdit = new KDMPasswordEdit( m_parentWidget ); + passwdEdit = new TDMPasswordEdit( m_parentWidget ); else - passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget); + passwdEdit = new TDMPasswordEdit( echoMode, m_parentWidget); connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), 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) { //userLabel->setText(TQString::fromUtf8(prompt)); - //kdmlabel->label.text = TQString::fromUtf8(prompt); - //TQTimer::singleShot(0, kdmlabel, TQT_SLOT(update())); + //tdmlabel->label.text = TQString::fromUtf8(prompt); + //TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update())); } } else diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h index 2c1e3f252..03c404c1e 100644 --- a/kdmlib/kgreet_pam.h +++ b/kdmlib/kgreet_pam.h @@ -1,6 +1,6 @@ /* -Conversation widget for kdm greeter +Conversation widget for tdm greeter Copyright (C) 2008 Dirk Mueller <mueller@kde.org> diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp index 3ab5bbaa8..d5626a3fd 100644 --- a/kdmlib/kgreet_winbind.cpp +++ b/kdmlib/kgreet_winbind.cpp @@ -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) 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 "themer/kdmthemer.h" -#include "themer/kdmitem.h" +#include "themer/tdmthemer.h" +#include "themer/tdmitem.h" #include <klocale.h> #include <kdebug.h> @@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <stdlib.h> -class KDMPasswordEdit : public KPasswordEdit { +class TDMPasswordEdit : public KPasswordEdit { public: - KDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} - KDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} + TDMPasswordEdit( TQWidget *parent ) : KPasswordEdit( parent, 0 ) {} + TDMPasswordEdit( KPasswordEdit::EchoModes echoMode, TQWidget *parent ) : KPasswordEdit( echoMode, parent, 0 ) {} protected: virtual void contextMenuEvent( TQContextMenuEvent * ) {} }; @@ -148,9 +148,9 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, grid->addWidget( new TQLabel( fixedUser, parent ), line++, 1 ); } if (echoMode == -1) - passwdEdit = new KDMPasswordEdit( parent ); + passwdEdit = new TDMPasswordEdit( parent ); else - passwdEdit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, + passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) ); @@ -180,11 +180,11 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, } if (func != Authenticate) { if (echoMode == -1) { - passwd1Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); - passwd2Edit = new KDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); + passwd1Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); + passwd2Edit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); } else { - passwd1Edit = new KDMPasswordEdit( parent ); - passwd2Edit = new KDMPasswordEdit( parent ); + passwd1Edit = new TDMPasswordEdit( parent ); + passwd2Edit = new TDMPasswordEdit( parent ); } passwd1Label = new TQLabel( passwd1Edit, i18n("&New password:"), parent ); passwd2Label = new TQLabel( passwd2Edit, i18n("Con&firm password:"), parent ); diff --git a/kdmlib/kgreet_winbind.h b/kdmlib/kgreet_winbind.h index 055296e34..54f2653fc 100644 --- a/kdmlib/kgreet_winbind.h +++ b/kdmlib/kgreet_winbind.h @@ -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) 2000-2003 Oswald Buddenhagen <ossi@kde.org> diff --git a/kdmlib/kgreeterplugin.h b/kdmlib/kgreeterplugin.h index 61d9b519a..edf67f141 100644 --- a/kdmlib/kgreeterplugin.h +++ b/kdmlib/kgreeterplugin.h @@ -81,7 +81,7 @@ public: /** * 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 * may be configurable, but the instance must handle exactly one method, * 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: - * - Login: kdm login dialog - * - Shutdown: kdm shutdown dialog - * - Unlock: kdm unlock dialog (TODO) - * - ChangeTok: kdm password change dialog (TODO) + * - Login: tdm login dialog + * - Shutdown: tdm shutdown dialog + * - Unlock: tdm unlock dialog (TODO) + * - ChangeTok: tdm password change dialog (TODO) * - ExUnlock: kdesktop_lock unlock dialog * - ExChangeTok: kdepasswd password change dialog (TODO) * @@ -343,9 +343,9 @@ struct KDE_EXPORT kgreeterplugin_info { * above, it can ignore this parameter. * @param getConf can be used to obtain configuration items from the * 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). - * Other keys are obtained from the PluginOptions option; see kdmrc + * Other keys are obtained from the PluginOptions option; see tdmrc * for details. * If the key is unknown, dflt is returned. * @param ctx context pointer for @p getConf diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 61a73c41b..c55531234 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -108,7 +108,7 @@ Kicker::Kicker() KGlobal::iconLoader()->addExtraDesktopThemes(); - KGlobal::locale()->insertCatalogue("kdmgreet"); + KGlobal::locale()->insertCatalogue("tdmgreet"); KGlobal::locale()->insertCatalogue("libkonq"); KGlobal::locale()->insertCatalogue("libdmctl"); KGlobal::locale()->insertCatalogue("libtaskbar"); diff --git a/kicker/kicker/ui/CMakeLists.txt b/kicker/kicker/ui/CMakeLists.txt index 04de9d867..2631f3bc3 100644 --- a/kicker/kicker/ui/CMakeLists.txt +++ b/kicker/kicker/ui/CMakeLists.txt @@ -17,7 +17,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/kicker/libkicker ${CMAKE_SOURCE_DIR}/kicker/kicker/core ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons - ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/tdmlib ${CMAKE_SOURCE_DIR}/libkonq ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/kicker/kicker/ui/Makefile.am b/kicker/kicker/ui/Makefile.am index 9384c28f5..04b951d31 100644 --- a/kicker/kicker/ui/Makefile.am +++ b/kicker/kicker/ui/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(srcdir)/../core -I../core -I$(srcdir)/../buttons \ -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 @@ -16,7 +16,7 @@ libkicker_ui_la_SOURCES = addbutton_mnu.cpp appletitem.ui appletview.ui addapple addappletvisualfeedback.cpp clicklineedit.cpp flipscrollview.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 libkicker_ui_la_METASOURCES = AUTO diff --git a/kioslave/finger/finger.protocol b/kioslave/finger/finger.protocol index 71d1b8e93..d11553c41 100644 --- a/kioslave/finger/finger.protocol +++ b/kioslave/finger/finger.protocol @@ -6,4 +6,4 @@ output=stream reading=true defaultMimetype=text/html DocPath=kioslave/finger.html -Icon=kdmconfig +Icon=tdmconfig diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 0a0a4f5ca..d0e82ec82 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -16,7 +16,7 @@ endif() include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdmlib + ${CMAKE_SOURCE_DIR}/tdmlib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${DBUS_TQT_INCLUDE_DIRS} diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am index 1f1d1d817..66a51e762 100644 --- a/ksmserver/Makefile.am +++ b/ksmserver/Makefile.am @@ -17,7 +17,7 @@ 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 = lib_LTLIBRARIES = @@ -31,7 +31,7 @@ ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \ KSMServerInterface.skel server.skel timed.ui 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 pics_DATA = shutdownkonq.png @@ -44,7 +44,7 @@ updatedir = $(kde_datadir)/kconf_update EXTRA_PROGRAMS = testsh testsh_SOURCES = test.cpp timed.ui 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: $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index d7275d467..8f5610bd3 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -898,7 +898,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, btnHalt->setFont( btnFont ); buttonlay->addWidget( btnHalt ); connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); - if ( sdtype == KApplication::ShutdownTypeHalt || getenv("KDM_AUTOLOGIN") ) + if ( sdtype == KApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") ) btnHalt->setFocus(); // Reboot diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 5c7118441..5992d1e0a 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -185,7 +185,7 @@ void ThemeRedmond::_initUi() 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 ) { const TQString defSys( ".default.face.icon" ); // The system-wide default image @@ -195,10 +195,10 @@ void ThemeRedmond::_initUi() const int fUserOnly = fUserFirst+1; int faceSource = fAdminOnly; - KConfig *kdmconfig = new KConfig("kdm/kdmrc", true); - kdmconfig->setGroup("X-*-Greeter"); - TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; - TQString fs = kdmconfig->readEntry( "FaceSource" ); + KConfig *tdmconfig = new KConfig("tdm/tdmrc", true); + tdmconfig->setGroup("X-*-Greeter"); + TQString userPicsDir = tdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/'; + TQString fs = tdmconfig->readEntry( "FaceSource" ); if (fs == TQString::fromLatin1("UserOnly")) faceSource = fUserOnly; else if (fs == TQString::fromLatin1("PreferUser")) @@ -207,7 +207,7 @@ void ThemeRedmond::_initUi() faceSource = fAdminFirst; else faceSource = fAdminOnly; // Admin Only - delete kdmconfig; + delete tdmconfig; TQPixmap userp; if ( faceSource == fAdminFirst ) @@ -341,7 +341,7 @@ void ThemeRedmond::_readSettings() mShowUsernameText = cfg->readBoolEntry( "Show Username", true ); mShowActionText = cfg->readBoolEntry( "Show Action", 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 // straightforward. diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index d1cff84d1..e0b5f79c2 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -183,7 +183,7 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) aliases.insert("tdeinit", new TQString("kdeapp")); aliases.insert("kdesktop", 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("kio_file", new TQString("kdeapp")); aliases.insert("kio_uiserver", new TQString("kdeapp")); diff --git a/pics/wallpapers/isadora.png b/pics/wallpapers/isadora.png Binary files differindex 4b1f883f4..646dd7d15 100644 --- a/pics/wallpapers/isadora.png +++ b/pics/wallpapers/isadora.png diff --git a/tdeprint/tdeprintfax/configdlg.cpp b/tdeprint/tdeprintfax/configdlg.cpp index 526b767ff..57f5ac64e 100644 --- a/tdeprint/tdeprintfax/configdlg.cpp +++ b/tdeprint/tdeprintfax/configdlg.cpp @@ -31,7 +31,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name) : 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"); TQVBox *page2 = addVBoxPage(i18n("Page setup"), i18n("Page Setup"), DesktopIcon("editcopy")); |
