diff options
Diffstat (limited to 'kcontrol/smserver')
| -rw-r--r-- | kcontrol/smserver/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | kcontrol/smserver/kcmsmserver.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/smserver/kcmsmserver.desktop | 218 | ||||
| -rw-r--r-- | kcontrol/smserver/kcmsmserver.h | 2 | ||||
| -rw-r--r-- | kcontrol/smserver/smserverconfigdlg.ui | 57 | ||||
| -rw-r--r-- | kcontrol/smserver/smserverconfigimpl.cpp | 18 | ||||
| -rw-r--r-- | kcontrol/smserver/smserverconfigimpl.h | 3 |
7 files changed, 52 insertions, 257 deletions
diff --git a/kcontrol/smserver/CMakeLists.txt b/kcontrol/smserver/CMakeLists.txt index a4d0b4df8..83f14e3d7 100644 --- a/kcontrol/smserver/CMakeLists.txt +++ b/kcontrol/smserver/CMakeLists.txt @@ -21,7 +21,10 @@ link_directories( ##### other data ################################ -install( FILES kcmsmserver.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kcmsmserver.desktop + PO_DIR kcontrol-desktops +) ##### kcm_smserver (module) ##################### diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 99f1b729a..c5e0ad784 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/kcontrol/smserver/kcmsmserver.cpp @@ -48,7 +48,7 @@ SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStri TQVBoxLayout *topLayout = new TQVBoxLayout(this); dialog = new SMServerConfigImpl(this); - connect(dialog, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(dialog, TQ_SIGNAL(changed()), TQ_SLOT(changed())); dialog->show(); topLayout->add(dialog); @@ -94,6 +94,7 @@ void SMServerConfig::load(bool useDefaults ) c->setGroup("Logout"); dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true)); + dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false)); dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true)); dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true)); dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()), @@ -126,6 +127,7 @@ void SMServerConfig::save() c->writeEntry("excludeApps", dialog->excludeLineedit->text()); c->setGroup("Logout"); c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked()); + c->writeEntry( "doUbuntuLogout", dialog->showUbuntuStyleDialog->isChecked()); c->writeEntry( "doFadeaway", dialog->showFadeAway->isChecked()); c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked()); c->sync(); @@ -133,7 +135,7 @@ void SMServerConfig::save() // update the k menu if necessary TQByteArray data; - kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data ); } void SMServerConfig::defaults() diff --git a/kcontrol/smserver/kcmsmserver.desktop b/kcontrol/smserver/kcmsmserver.desktop index a07952fbc..7c79543ce 100644 --- a/kcontrol/smserver/kcmsmserver.desktop +++ b/kcontrol/smserver/kcmsmserver.desktop @@ -10,227 +10,9 @@ X-TDE-FactoryName=smserver X-TDE-ParentApp=kcontrol Name=Session Manager -Name[af]=Sessie Bestuurder -Name[ar]=مسيير الجلسات -Name[az]=İclas İdarəcisi -Name[be]=Кіраўнік сесіяў -Name[bg]=Системни сесии -Name[bn]=সেশন ম্যানেজার -Name[br]=Merour an dalc'hioù -Name[bs]=Upravljanje sesijama -Name[ca]=Gestor de la sessió -Name[cs]=Správce relace -Name[csb]=Menedżer sesëji -Name[cy]=Rheolydd Sesiwn -Name[da]=Sessionshåndtering -Name[de]=Sitzungsverwaltung -Name[el]=Διαχειριστής συνεδρίας -Name[eo]=Seancokonservilo -Name[es]=Gestor de sesiones -Name[et]=Seansihaldur -Name[eu]=Saio kudeatzailea -Name[fa]=مدیر نشست -Name[fi]=Istunnonhallinta -Name[fr]=Gestionnaire de session -Name[fy]=Sesjebehear -Name[ga]=Bainisteoir Seisiúin -Name[gl]=Xestor de Sesións -Name[he]=מנהל ההפעלה -Name[hi]=सत्र प्रबंधक -Name[hr]=Upravitelj sesijama -Name[hu]=Munkafolyamatok -Name[id]=Manajer Sesi -Name[is]=Setustjóri -Name[it]=Gestione della sessione -Name[ja]=セッションマネージャ -Name[ka]=სეანსების მენეჯერი -Name[kk]=Сеанс менеджері -Name[km]=កម្មវិធីគ្រប់គ្រងសម័យ -Name[ko]=세션 관리자 -Name[lo]=ເຄື່ອງມືຈັດການເຊສຊັນ -Name[lt]=Sesijos valdyklė -Name[lv]=Sesiju Menedžeris -Name[mk]=Менаџер на сесии -Name[mn]=Суулт удирдлага -Name[ms]=Pengurus Sesi -Name[mt]=Manager tas-sessjoni -Name[nb]=Øktbehandler -Name[nds]=Törnpleger -Name[ne]=सत्र प्रबन्धक -Name[nl]=Sessiebeheer -Name[nn]=Økthandsamar -Name[nso]=Molaodi wa Tiragalo -Name[pa]=ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ -Name[pl]=Menedżer sesji -Name[pt]=Gestor de Sessões -Name[pt_BR]=Gerenciador de Sessão -Name[ro]=Managerul de sesiune -Name[ru]=Диспетчер сеансов -Name[rw]=Mugenga Mukoro -Name[se]=Bargovuorrogieđahalli -Name[sk]=Správca relácie -Name[sl]=Upravitelj sej -Name[sr]=Менаџер сесија -Name[sr@Latn]=Menadžer sesija -Name[sv]=Sessionshanterare -Name[ta]=அமர்வு மேலாளர் -Name[tg]=Мудири нишаст -Name[th]=ตัวจัดการวาระ -Name[tr]=Oturum Yöneticisi -Name[tt]=Sessi İdäräçe -Name[uk]=Менеджер сеансів -Name[uz]=Seans boshqaruvchisi -Name[uz@cyrillic]=Сеанс бошқарувчиси -Name[ven]=Mulanguli wa tshitenwa -Name[vi]=Trình quản lí Phiên đăng nhập -Name[wa]=Manaedjeu di sessions -Name[xh]=Umphathi wesiqendu -Name[zh_CN]=会话管理器 -Name[zh_TW]=工作階段管理程式 -Name[zu]=Imenenja yesiqendu Comment=Configure the session manager and logout settings -Comment[af]=Konfigureer die sessie bestuurder en teken af instellings -Comment[ar]=إعداد مسيير الجلسات و تعيينات تسجيل الخروج -Comment[be]=Настаўленні кіраўніка сеансаў і параметраў выхаду -Comment[bg]=Настройване сесиите на системата и поведението при изход -Comment[bn]=সেশন ম্যানেজার এবং লগ-আউট সেটিংস কনফিগার করুন -Comment[br]=Kefluniañ ar merour an dalc'hioù hag an doare mont kuit -Comment[bs]=Podesite menadžer sesija i postavke odjave -Comment[ca]=Aquí podeu configurar el gestor de la sessió i la sortida -Comment[cs]=Nastavení správce relace a odhlašování -Comment[csb]=Kònfigùracëjô menedżera sesëji ë nastôwów wëlogòwaniô -Comment[cy]=Ffurfweddu'r rheolydd sesiwn a gosodiadau allgofnodi -Comment[da]=Indstil sessionshåndterigen og opsætning for at logge af -Comment[de]=Einstellungen für Sitzungsverwaltung und Abmeldung vornehmen -Comment[el]=Ρυθμίστε το διαχειριστή συνεδρίας και τις επιλογές αποσύνδεσης -Comment[eo]=Agordo de la seancokonservilo kaj la adiaŭa maniero -Comment[es]=Configura el gestor de sesiones y las opciones de salida -Comment[et]=Seansihalduri ja väljalogimise seadistamine -Comment[eu]=Konfiguratu saio kudeatzailea eta saio amaieraren ezarpenak -Comment[fa]=پیکربندی مدیر نشست و تنظیمات خروج -Comment[fi]=Istunnonhallinnan ja uloskirjautumisen asetukset -Comment[fr]=Configuration du gestionnaire de session et réglages de la sortie -Comment[fy]=Hjir kinne jo it sesjebehear en ôfmeld-ynstellings fêststelle -Comment[gl]=Configurar o xestor de sesións e as opcións de saída -Comment[he]=שינוי הגדרות מנהל ההפעלה והיציאה מהמערכת -Comment[hi]=सत्र प्रबंधक तथा लॉगआउट विन्यास कॉन्फ़िगर करें -Comment[hr]=Konfiguriranje upravitelja sesijama i postavkama odjavljivanja -Comment[hu]=A TDE munkafolyamat és a kijelentkezési mód beállításai -Comment[is]=Stilla setustjóra og aðgerðir við útstimplun -Comment[it]=Configura il gestore della sessione e le impostazioni di fine sessione -Comment[ja]=セッションマネージャとログアウト時の設定 -Comment[ka]=სეანსების მენეჯერის და სისტემიდან გამოსვლის კონფიგურაცია -Comment[kk]=Сеанс менеджерді және жүйеден шығу параметрлерін баптау -Comment[km]=កំណត់រចនាសម្ព័ន្ធកម្មវិធីគ្រប់គ្រងសម័យ និងការកំណត់ពេលចេញ -Comment[ko]=세션 관리자와 로그아웃 설정 관리 -Comment[lo]=ທ່ານສາມາດປັບແຕ່ງການທຳງານຂອງເຄື່ອງ ມືຈັດການເຊສຊັນໄດ້ທີ່ນີ້ -Comment[lt]=Čia galite konfigūruoti sesijos tvarkyklę ir išsiregistravimo nustatymus -Comment[lv]=Šeit jūs varat konfigurēt sesiju menedžeri un pieteikšanās parametrus -Comment[mk]=Конфигурирајте го менаџерот на сесии и поставувањата за одјавување -Comment[mn]=Суулт удирдлага ба гаралтын тохиргоо хийх -Comment[ms]=Konfigur seting pengurus sesi dan bentangan -Comment[mt]=Ikkonfigura l-manager tas-sessjoni u tal-logout -Comment[nb]=Her kan du tilpasse øktbehandleren og utlogginga -Comment[nds]=Dat Afmellen un den Törnpleger instellen -Comment[ne]=सत्र प्रबन्धक र लगआउट सेटिङ कन्फिगर गर्नुहोस् -Comment[nl]=Hier kunt u het sessiebeheer en de afmeld-instellingen bepalen -Comment[nn]=Oppsett av økthandsamar og utlogging -Comment[nso]=Beakanya molaodi wa tiragalo le dipeakanyo tsa gotswa -Comment[pa]=ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਅਤੇ ਲਾਗਆਉਟ ਸੈਟਿੰਗ ਦੀ ਸਥਾਪਨ -Comment[pl]=Konfiguracja menedżera sesji i ustawień wylogowania -Comment[pt]=Configuração do gestor de sessões e das opções de encerramento -Comment[pt_BR]=Configura o gerenciador de sessão e definições de logout -Comment[ro]=Configurează managerul de sesiune și setările de ieșire -Comment[ru]=Настройка диспетчера сеансов -Comment[rw]=Umukoro Muyobozi no Gufunga Igenamiterere -Comment[se]=Heivet bargovuorrogieđahalli ja olggosčáliheami -Comment[sk]=Nastavenie správcu relácií a odhlásenia -Comment[sl]=Tu lahko nastavite upravljalnik sej in nastavitve odjav -Comment[sr]=Подешавање менаџера сесија и поставки одјављивања -Comment[sr@Latn]=Podešavanje menadžera sesija i postavki odjavljivanja -Comment[sv]=Anpassa sessionshanteraren och utloggningsinställningar -Comment[ta]=அமர்வு மேளாலர் மற்றும் வெளிச்செல் அமைப்புகளை வடிவமை -Comment[tg]= Метавонед мудири нишаст ва танзимоти хурӯҷро дар инҷо пахш кунед -Comment[th]=ปรับแต่งการทำงานของเครื่องมือจัดการวาระและการล็อกเอาต์ -Comment[tr]=Oturum yöneticisi ve çıkış ayarlarını yapılandır -Comment[tt]=Sessi idäräçen belän kerü/çığu tärtiben caylaw -Comment[uk]=Налаштування менеджеру сеансів та параметри виходу з системи -Comment[uz]=Seans boshqaruvchisini va chiqish moslamalarini moslash -Comment[uz@cyrillic]=Сеанс бошқарувчисини ва чиқиш мосламаларини мослаш -Comment[ven]=Dzudzanyani mulanguli wa ntshitenwa ni dovhe ni vale mavhekanyele -Comment[vi]=Cấu hình trình quản lý phiên đăng nhập và các thiết lập đăng xuất -Comment[wa]=Apontiaedje do manaedjeu si sessions eyet apontiaedjes do dislodjaedje -Comment[xh]=Qwalasela umphathi wesiqendu nezicwangciso zokuphuma ngaphandle -Comment[zh_CN]=配置会话管理器和注销设置 -Comment[zh_TW]=設定工作階段管理程式與登出設定值 -Comment[zu]=Hlanganisela imenenja yesiqendu kanye nezilungiselelo zokuphuma ngaphandle Keywords=ksmserver;session;logout;confirmation;save;restore; -Keywords[ar]=ksmserver;جلسة;خروج;تأكيد;حفظ;استعادة; -Keywords[az]=ksmserver;iclas;çıxış;qeyd et; -Keywords[be]=Сесія;Выхад;Канец сесіі;Пацверджанне;Захаванне;Захаваць;Аднавіць;Аднаўленне;ksmserver;session;logout;confirmation;save;restore; -Keywords[bg]=сесия; сесии; изход; запис; възстановяване; ksmserver; session; logout; confirmation; save; restore; -Keywords[ca]=ksmserver;sessió;sortida;confirmació;desa;restaura; -Keywords[cs]=Správce relace;Relace;Odhlášení;Potvrzení;Uložení;Obnovení; -Keywords[csb]=ksmserver;sesëjô;wëlogòwanié;pòcwierdzenié;zachòwanié stónu;òdtwòrzenié;kùńc robòtë;kùńc pracë; -Keywords[cy]=ksmserver;sesiwn;allgofnodi;cadarnhau;cadw;adfer; -Keywords[da]=ksmserver;session;log af;bekræftelse;gem;genopret; -Keywords[de]=Ksmserver;Sitzung;Abmelden;Logout;Bestätigung;Speichern;Wiederherstellen; -Keywords[el]=ksmserver;συνεδρία;αποσύνδεση;επιβεβαίωση;αποθήκευση;αποκατάσταση; -Keywords[eo]=seancokonservilo;seanco;adaiŭo;konfirmo;sekurigo;restarigo; -Keywords[es]=ksmserver;sesión;salida;confirmación;guardar;restaurar; -Keywords[et]=ksmserver;seanss;väljalogimine;kinnitus;salvestamine;taastamine; -Keywords[eu]=ksmserver;saioa;saio amaiera;berrespena;gorde;berrezarri; -Keywords[fa]=ksmserver، نشست، خروج، تأیید، ذخیره، بازنشانی; -Keywords[fi]=ksmserver;istunto;lopetus;vahvistus;tallenna;palauta; -Keywords[fr]=ksmserver;session;arrêt;logout;confirmation;enregistrement;enregistrer;restaurer;restauration;connexion;déconnexion; -Keywords[fy]=ksmserver;sesje;logout;ôfmelde;befêstiging;herstelle;opslaan;bewarje; -Keywords[ga]=ksmserver;seisiún;logáil amach;dearbhú;sábháil;athchóiriú; -Keywords[gl]=ksmserver;sesión;saída;confirmación;guardar;restaurar; -Keywords[he]=הפעלה;יציאה;אישור;שמירה;שיחזור;ksmserver; session;logout;confirmation;save;restore; -Keywords[hi]=केएसएम-सर्वर;सत्र;लॉगआउट;पुष्टि;सहेजें;बहाल करें; -Keywords[hr]=ksmserver;session;logout;confirmation;save;restore;sesija;odjava;potvrda;spremanje;obnavljanje; -Keywords[hu]=ksmserver;munkafolyamat;kijelentkezés;megerősítés;mentés;visszatöltés; -Keywords[is]=ksmserver;seta;stimpla út;innskráning;staðfesting;vista;endurheimta; -Keywords[it]=ksmserver;sessione;uscita;conferma;salva;ripristina; -Keywords[ja]=ksmserver;セッション;ログアウト;確認;保存;復旧; -Keywords[km]=ksmserver;សម័យ;ចេញ;ការអះអាង;រក្សាទុក;ស្ដារឡើងវិញ; -Keywords[lt]=ksmserver;sesija;išsiregistravimas;patvirtinimas;išsaugoti;atstatyti; -Keywords[lv]=ksmserveris;sesija;atteikšanās;apstiprinājums;saglabāt;atjaunot; -Keywords[mk]=ksmserver;session;logout;confirmation;save;restore; сесија;одјави се;потврда;сними;реконструирај; -Keywords[mn]=Ksmсервер;Суулт;Гарах;Logout;Бататгах;Хадгалах;Сэргээх; -Keywords[mt]=ksmserver;session;logout;temm is-sessjoni;confirmation;save;restore; -Keywords[nb]=ksmserver;økt;utlogging;lagre;gjenopprette; -Keywords[nds]=ksmserver;Törn;afmellen;nafragen;Nafraag;sekern;wedderherstellen; -Keywords[ne]=ksmserver;सत्र; लग आउट; यकीन; बचत गर्नुहोस्; पूर्वावस्थामा फर्काउनुहोस्; -Keywords[nl]=ksmserver;sessie;logout;uitloggen;afmelden;bevestiging;herstellen;opslaan; -Keywords[nn]=ksmserver;økt;utlogging;stadfesting;lagra;gjenopprett; -Keywords[nso]=ksmseabi;tiragalo;etswa;kgonthisiso;boloka;bolokaleswa; -Keywords[pa]=ksmserver;session;logout;confirmation;save;restore;ਸੰਭਾਲੋ;ਲਾਗਆਉਟ;ਪੁਸ਼ਟੀ; -Keywords[pl]=ksmserver;sesja;wylogowanie;potwierdzenie;zachowanie stanu;odtworzenie;kończenie pracy; -Keywords[pt]=ksmserver;sessão;terminar;confirmar;gravar;restaurar; -Keywords[pt_BR]=ksmserver;sessão;finalizar;sair;confirmação;salvar;restaurar; -Keywords[ro]=ksmserver;sesiune;ieșire;confirmare;salvare;refacere; -Keywords[rw]=ksm-seriveri;umukoro;gufunga;iyemeza;kubika;kugarura; -Keywords[se]=ksmserver;bargovuorru;olggosčáliheapmi;nannen;vurket;máhcahit; -Keywords[sk]=ksmserver;relácia;odhlásenie;potvrdenie;uloženie;obnovenie; -Keywords[sl]=ksmserver;seja;odjava;potrditev;shrani;obnovi; -Keywords[sr]=ksmserver;session;logout;confirmation;save;restore;сесија;одјављивање; потврда;снимање;обнављање; -Keywords[sr@Latn]=ksmserver;session;logout;confirmation;save;restore;sesija;odjavljivanje; potvrda;snimanje;obnavljanje; -Keywords[sv]=ksmserver;session;logga ut;bekräftelse;spara;återställa; -Keywords[ta]=ksmசேவகன்;அமர்வு;வெளிசெல்;உறுதி செய்;சேமி;திரும்ப பெறு; -Keywords[th]=ksmserver;วาระ;ล็อกเอาต์;การยืนยัน;บันทึก;เรียกค่าคืน; -Keywords[tr]=ksmserver;oturum;çıkış;kaydet; -Keywords[uk]=ksmserver;сеанс;кінець сеансу;підтвердження;збереження;відновлення; -Keywords[uz]=ksmserver;seans;chiqish;tasdiqlash;saqlash;tiklash; -Keywords[uz@cyrillic]=ksmserver;сеанс;чиқиш;тасдиқлаш;сақлаш;тиклаш; -Keywords[ven]=siva ya ksm;tshitenwa;tsimani;khwathisedzani;vhulunga;vhekanyani hafhu; -Keywords[vi]=ksmserver;phiên đăng nhập;đăng xuất;xác nhận;sao lưu;phục hồi; -Keywords[wa]=ksmserver;session;dislodjî;acertiner;schaper;ristorer; -Keywords[xh]=ksmserver;isiqendu;phuma ngaphandle;uqinisekiso;gcina;gcina kwakhona; -Keywords[zh_CN]=ksmserver;会话;注消;确认;保存;恢复; -Keywords[zh_TW]=ksmserver;session;logout;confirmation;save;restore;工作階段;登出;確認;儲存;回復; -Keywords[zu]=ksmserver;isiqendu;ukuphuma ngaphandle;ukuqiniseka;gcina;vuselela; Categories=Qt;TDE;X-TDE-settings-components; diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h index c346033c6..31ea4d360 100644 --- a/kcontrol/smserver/kcmsmserver.h +++ b/kcontrol/smserver/kcmsmserver.h @@ -28,7 +28,7 @@ class SMServerConfigImpl; class SMServerConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: SMServerConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() ); diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index 1449e9d6f..9179722c7 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -62,10 +62,10 @@ <bool>false</bool> </property> <property name="text"> - <string>Show &logout fadeaway</string> + <string>Fadeaway screen during &logout</string> </property> <property name="whatsThis" stdset="0"> - <string>Check this option if you want to see a fadeaway when displaying a logout confirmation dialog box.</string> + <string>Check this option if you want screen to be faded when displaying a logout confirmation dialog box.</string> </property> </widget> <widget class="TQCheckBox"> @@ -76,10 +76,10 @@ <bool>false</bool> </property> <property name="text"> - <string>Sho&w fancy logout fadeaway</string> + <string>Use effects for logout fadea&way</string> </property> <property name="whatsThis" stdset="0"> - <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string> + <string>Check this option if you want to enable additional graphical effects for fadeaway during logout process. Namely the fadeaway will be smoothly animated and semitransparent.</string> </property> </widget> <widget class="TQCheckBox"> @@ -104,6 +104,17 @@ <string>Check this option if you want to see a dialog box showing the logout status.</string> </property> </widget> + <widget class="TQCheckBox"> + <property name="name"> + <cstring>showUbuntuStyleDialog</cstring> + </property> + <property name="text"> + <string>Use &alternative shutdown dialog layout</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Check this option if you want to use an alternative shutdown dialog, where buttons are arranged in rows rathen then columns. This layout is popular in Ubuntu and therefore it is also known as 'Ubuntu style' shutdown dialog.</string> + </property> + </widget> </vbox> </widget> <widget class="TQButtonGroup"> @@ -243,40 +254,22 @@ </widget> <connections> <connection> - <sender>confirmLogoutCheck</sender> - <signal>toggled(bool)</signal> - <receiver>SMServerConfigDlg</receiver> - <slot>configChanged()</slot> - </connection> - <connection> <sender>confirmLogoutCheck</sender> <signal>toggled(bool)</signal> - <receiver>showFadeAway</receiver> - <slot>setEnabled(bool)</slot> - </connection> - <connection> - <sender>confirmLogoutCheck</sender> - <signal>toggled(bool)</signal> - <receiver>showFancyFadeAway</receiver> - <slot>setEnabled(bool)</slot> - </connection> - <connection> - <sender>showFadeAway</sender> - <signal>toggled(bool)</signal> - <receiver>showFancyFadeAway</receiver> - <slot>setEnabled(bool)</slot> + <receiver>SMServerConfigDlg</receiver> + <slot>fadeAwayConfigChanged()</slot> </connection> <connection> <sender>showFadeAway</sender> <signal>toggled(bool)</signal> <receiver>SMServerConfigDlg</receiver> - <slot>configChanged()</slot> + <slot>fadeAwayConfigChanged()</slot> </connection> <connection> <sender>showFancyFadeAway</sender> <signal>toggled(bool)</signal> <receiver>SMServerConfigDlg</receiver> - <slot>configChanged()</slot> + <slot>fadeAwayConfigChanged()</slot> </connection> <connection> <sender>showLogoutStatusDialog</sender> @@ -285,6 +278,12 @@ <slot>configChanged()</slot> </connection> <connection> + <sender>showUbuntuStyleDialog</sender> + <signal>toggled(bool)</signal> + <receiver>SMServerConfigDlg</receiver> + <slot>configChanged()</slot> + </connection> + <connection> <sender>loginGroup</sender> <signal>clicked(int)</signal> <receiver>SMServerConfigDlg</receiver> @@ -316,12 +315,14 @@ </connection> </connections> <includes> + <include location="global" impldecl="in declaration">tqcheckbox.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<Q_SLOTS> +<slots> <slot>configChanged()</slot> -</Q_SLOTS> + <slot>fadeAwayConfigChanged()</slot> +</slots> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/smserver/smserverconfigimpl.cpp b/kcontrol/smserver/smserverconfigimpl.cpp index d9507a9d8..af04d774a 100644 --- a/kcontrol/smserver/smserverconfigimpl.cpp +++ b/kcontrol/smserver/smserverconfigimpl.cpp @@ -18,14 +18,20 @@ #include "smserverconfigimpl.h" #include "smserverconfigimpl.moc" -SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) { +SMServerConfigImpl::SMServerConfigImpl(TQWidget *parent, const char *name ) : SMServerConfigDlg(parent,name) {} +SMServerConfigImpl::~SMServerConfigImpl() {} + +void SMServerConfigImpl::configChanged() +{ + emit changed(); } -SMServerConfigImpl::~SMServerConfigImpl(){ -} -/** No descriptions */ -void SMServerConfigImpl::configChanged(){ - emit changed(); +void SMServerConfigImpl::fadeAwayConfigChanged() +{ + // Update showFadeAway and showFancyFadeAway status correctly + showFadeAway->setEnabled(confirmLogoutCheck->isChecked()); + showFancyFadeAway->setEnabled(confirmLogoutCheck->isChecked() && showFadeAway->isChecked()); + configChanged(); } diff --git a/kcontrol/smserver/smserverconfigimpl.h b/kcontrol/smserver/smserverconfigimpl.h index b516617cf..2e1186936 100644 --- a/kcontrol/smserver/smserverconfigimpl.h +++ b/kcontrol/smserver/smserverconfigimpl.h @@ -26,13 +26,14 @@ */ class SMServerConfigImpl : public SMServerConfigDlg { - Q_OBJECT + TQ_OBJECT public: SMServerConfigImpl(TQWidget *parent=0, const char *name=0); ~SMServerConfigImpl(); public slots: // Public slots /** No descriptions */ void configChanged(); + void fadeAwayConfigChanged(); signals: // Signals /** No descriptions */ void changed(); |