diff options
Diffstat (limited to 'kcontrol/kcontrol')
34 files changed, 206 insertions, 373 deletions
diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt index 16e2d84b6..ac62c8176 100644 --- a/kcontrol/kcontrol/CMakeLists.txt +++ b/kcontrol/kcontrol/CMakeLists.txt @@ -26,7 +26,10 @@ link_directories( tde_install_icons() install( FILES kcontrolui.rc DESTINATION ${DATA_INSTALL_DIR}/kcontrol ) -install( FILES KControl.desktop tde-kcontrol.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE KControl.desktop tde-kcontrol.desktop + PO_DIR kcontrol-desktops +) ##### kcontrol (tdeinit) ######################## diff --git a/kcontrol/kcontrol/KControl.desktop b/kcontrol/kcontrol/KControl.desktop index 8a1385583..abf2b50a0 100644 --- a/kcontrol/kcontrol/KControl.desktop +++ b/kcontrol/kcontrol/KControl.desktop @@ -6,88 +6,6 @@ X-DocPath=kcontrol/index.html X-TDE-StartupNotify=true Name=Trinity Control Center -Name[af]=Beheer Sentrum -Name[ar]=مركز التحكم -Name[az]=İdarə Mərkəzi -Name[be]=Цэнтр кіравання -Name[bg]=Контролен център -Name[bn]=নিয়ন্ত্রণ কেন্দ্র -Name[br]=Kreizenn ren -Name[bs]=Kontrolni centar -Name[ca]=Centre de control -Name[cs]=Ovládací centrum -Name[csb]=Centróm kòntrolë -Name[cy]=Canolfan Rheoli -Name[da]=Kontrolcenter -Name[de]=Kontrollzentrum -Name[el]=Κέντρο ελέγχου -Name[en_GB]=Control Centre -Name[eo]=Stircentro -Name[es]=Centro de control -Name[et]=Juhtimiskeskus -Name[eu]=Kontrol gunea -Name[fa]=مرکز کنترل -Name[fi]=Ohjauskeskus -Name[fr]=Centre de configuration de Trinity -Name[fy]=Konfiguraasjesintrum -Name[ga]=Lárionad Rialaithe -Name[gl]=Centro de Control -Name[he]=מרכז הבקרה -Name[hi]=नियंत्रण केंद्र -Name[hr]=Upravljačko središte -Name[hu]=Vezérlőpult -Name[id]=Pusat Kontrol -Name[is]=Stjórnborð -Name[it]=Centro di controllo di Trinity -Name[ja]=コントロールセンター -Name[ka]=საკონტროლო ცენტრი -Name[kk]=Басқару орталығы -Name[km]=មជ្ឈមណ្ឌលបញ្ជា -Name[ko]=제어판 모듈 -Name[lo]=ສູນຄວບຄຸມ -Name[lt]=Valdymo centras -Name[lv]=Vadības Centrs -Name[mk]=Контролен центар -Name[mn]=Удирдах төв -Name[ms]=Pusat Kawalan -Name[mt]=Ċentru tal-Kontroll -Name[nb]=Kontrollpanel -Name[nds]=Kuntrullzentrum -Name[ne]=नियन्त्रण केन्द्र -Name[nl]=Configuratiecentrum -Name[nn]=Kontrollsenter -Name[nso]=Bogare bja Taolo -Name[oc]=Centre de control -Name[pa]=ਕੰਟਰੋਲ ਕੇਂਦਰ -Name[pl]=Centrum sterowania -Name[pt]=Centro de Controlo -Name[pt_BR]=Centro de Controle -Name[ro]=Centrul de control -Name[ru]=Центр управления -Name[rw]=Kugenzura Hagati -Name[se]=Stivrenguovddáš -Name[sk]=Ovládacie Centrum -Name[sl]=Nadzorno središče -Name[sr]=Контролни центар -Name[sr@Latn]=Kontrolni centar -Name[ss]=Sikhungo sekulawula -Name[sv]=Inställningscentralen -Name[ta]=கட்டுப்பாட்டு மையம் -Name[te]=అధికార కేంద్రం -Name[tg]=Маркази контрол -Name[th]=ศูนย์ควบคุม -Name[tr]=Kontrol Merkezi -Name[tt]=İdärä Üzäge -Name[uk]=Центр керування -Name[uz]=Boshqaruv markazi -Name[uz@cyrillic]=Бошқарув маркази -Name[ven]=Senthara ya vhulanguli -Name[vi]=Trung tâm Điều khiển -Name[wa]=Cinte di contrôle -Name[xh]=Umbindi Wolawulo -Name[zh_CN]=控制中心 -Name[zh_TW]=控制中心 -Name[zu]=Indawo Yokulawula X-DCOP-ServiceType=Unique Categories=Qt;TDE;Settings; diff --git a/kcontrol/kcontrol/KControl_NoDisplay.desktop b/kcontrol/kcontrol/KControl_NoDisplay.desktop index 333971c26..0be1919b6 100644 --- a/kcontrol/kcontrol/KControl_NoDisplay.desktop +++ b/kcontrol/kcontrol/KControl_NoDisplay.desktop @@ -6,88 +6,6 @@ X-DocPath=kcontrol/index.html X-TDE-StartupNotify=true Name=Trinity Control Center -Name[af]=Beheer Sentrum -Name[ar]=مركز التحكم -Name[az]=İdarə Mərkəzi -Name[be]=Цэнтр кіравання -Name[bg]=Контролен център -Name[bn]=নিয়ন্ত্রণ কেন্দ্র -Name[br]=Kreizenn ren -Name[bs]=Kontrolni centar -Name[ca]=Centre de control -Name[cs]=Ovládací centrum -Name[csb]=Centróm kòntrolë -Name[cy]=Canolfan Rheoli -Name[da]=Kontrolcenter -Name[de]=Kontrollzentrum -Name[el]=Κέντρο ελέγχου -Name[en_GB]=Control Centre -Name[eo]=Stircentro -Name[es]=Centro de control -Name[et]=Juhtimiskeskus -Name[eu]=Kontrol gunea -Name[fa]=مرکز کنترل -Name[fi]=Ohjauskeskus -Name[fr]=Centre de configuration de Trinity -Name[fy]=Konfiguraasjesintrum -Name[ga]=Lárionad Rialaithe -Name[gl]=Centro de Control -Name[he]=מרכז הבקרה -Name[hi]=नियंत्रण केंद्र -Name[hr]=Upravljačko središte -Name[hu]=Vezérlőpult -Name[id]=Pusat Kontrol -Name[is]=Stjórnborð -Name[it]=Centro di controllo di Trinity -Name[ja]=コントロールセンター -Name[ka]=საკონტროლო ცენტრი -Name[kk]=Басқару орталығы -Name[km]=មជ្ឈមណ្ឌលបញ្ជា -Name[ko]=제어판 모듈 -Name[lo]=ສູນຄວບຄຸມ -Name[lt]=Valdymo centras -Name[lv]=Vadības Centrs -Name[mk]=Контролен центар -Name[mn]=Удирдах төв -Name[ms]=Pusat Kawalan -Name[mt]=Ċentru tal-Kontroll -Name[nb]=Kontrollpanel -Name[nds]=Kuntrullzentrum -Name[ne]=नियन्त्रण केन्द्र -Name[nl]=Configuratiecentrum -Name[nn]=Kontrollsenter -Name[nso]=Bogare bja Taolo -Name[oc]=Centre de control -Name[pa]=ਕੰਟਰੋਲ ਕੇਂਦਰ -Name[pl]=Centrum sterowania -Name[pt]=Centro de Controlo -Name[pt_BR]=Centro de Controle -Name[ro]=Centrul de control -Name[ru]=Центр управления -Name[rw]=Kugenzura Hagati -Name[se]=Stivrenguovddáš -Name[sk]=Ovládacie Centrum -Name[sl]=Nadzorno središče -Name[sr]=Контролни центар -Name[sr@Latn]=Kontrolni centar -Name[ss]=Sikhungo sekulawula -Name[sv]=Inställningscentralen -Name[ta]=கட்டுப்பாட்டு மையம் -Name[te]=అధికార కేంద్రం -Name[tg]=Маркази контрол -Name[th]=ศูนย์ควบคุม -Name[tr]=Kontrol Merkezi -Name[tt]=İdärä Üzäge -Name[uk]=Центр керування -Name[uz]=Boshqaruv markazi -Name[uz@cyrillic]=Бошқарув маркази -Name[ven]=Senthara ya vhulanguli -Name[vi]=Trung tâm Điều khiển -Name[wa]=Cinte di contrôle -Name[xh]=Umbindi Wolawulo -Name[zh_CN]=控制中心 -Name[zh_TW]=控制中心 -Name[zu]=Indawo Yokulawula X-DCOP-ServiceType=Unique NoDisplay=true diff --git a/kcontrol/kcontrol/about/kcontrol.css b/kcontrol/kcontrol/about/kcontrol.css index dac9f05bf..9f888528e 100644 --- a/kcontrol/kcontrol/about/kcontrol.css +++ b/kcontrol/kcontrol/about/kcontrol.css @@ -48,6 +48,3 @@ .kcm_link { color: #000; } - -/* vim:set sw=2 et nocindent smartindent: */ - diff --git a/kcontrol/kcontrol/about/main.html b/kcontrol/kcontrol/about/main.html index 23343ddda..90e88570f 100644 --- a/kcontrol/kcontrol/about/main.html +++ b/kcontrol/kcontrol/about/main.html @@ -62,4 +62,3 @@ <div id="footer"><div id="footerL"/><div id="footerR"/></div> </body> </html> -<!-- vim:set sw=2 et nocindent smartindent: --> diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index c1ba4fecf..cd3859124 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <kpixmap.h> @@ -84,8 +84,8 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca _viewer = new TDEHTMLPart( this, "_viewer" ); _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); connect( _viewer->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), - this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + this, TQ_SLOT(slotModuleLinkClicked(const KURL&)) ); updatePixmap(); } @@ -112,7 +112,7 @@ void AboutWidget::updatePixmap() TQString res = t.read(); res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) res = res.arg( "@import \"%1\";" ).arg( locate( "data", "tdeui/about/kde_infopage_rtl.css" ) ); else res = res.arg( "" ); diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h index 97ba32ffd..5d4543b39 100644 --- a/kcontrol/kcontrol/aboutwidget.h +++ b/kcontrol/kcontrol/aboutwidget.h @@ -33,7 +33,7 @@ class KURL; class AboutWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: AboutWidget(TQWidget *parent, const char *name=0, TQListViewItem* category=0, const TQString &caption=TQString::null); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index dd1835e9d..f59b95624 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -95,7 +95,7 @@ void ModuleTitle::clear() { m_icon->setPixmap( TQPixmap() ); m_name->setText( TQString::null ); - kapp->processEvents(); + tdeApp->processEvents(); } ModuleWidget::ModuleWidget( TQWidget *parent, const char *name ) @@ -105,7 +105,7 @@ ModuleWidget::ModuleWidget( TQWidget *parent, const char *name ) m_title = new ModuleTitle( titleLine, "m_title" ); TQPushButton *helpButton = new TQPushButton( titleLine ); helpButton->setIconSet( SmallIconSet("help") ); - connect (helpButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpRequest() ) ); + connect (helpButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpRequest() ) ); m_body = new TQVBox( this, "m_body" ); setStretchFactor( m_body, 10 ); } @@ -137,7 +137,7 @@ DockContainer::DockContainer(TQWidget *parent) addWidget( _busyw ); _modulew = new ModuleWidget( this, "_modulew" ); - connect (_modulew, TQT_SIGNAL( helpRequest() ), TQT_SLOT( slotHelpRequest() ) ); + connect (_modulew, TQ_SIGNAL( helpRequest() ), TQ_SLOT( slotHelpRequest() ) ); addWidget( _modulew ); } @@ -163,17 +163,17 @@ void DockContainer::setBaseWidget(TQWidget *widget) ProxyWidget* DockContainer::loadModule( ConfigModule *module ) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); ProxyWidget *widget = _modulew->load( module ); if (widget) { _module = module; - connect(_module, TQT_SIGNAL(childClosed()), TQT_SLOT(removeModule())); - connect(_module, TQT_SIGNAL(changed(ConfigModule *)), - TQT_SIGNAL(changedModule(ConfigModule *))); - connect(widget, TQT_SIGNAL(quickHelpChanged()), TQT_SLOT(quickHelpChanged())); + connect(_module, TQ_SIGNAL(childClosed()), TQ_SLOT(removeModule())); + connect(_module, TQ_SIGNAL(changed(ConfigModule *)), + TQ_SIGNAL(changedModule(ConfigModule *))); + connect(widget, TQ_SIGNAL(quickHelpChanged()), TQ_SLOT(quickHelpChanged())); raiseWidget( _modulew ); emit newModule(widget->caption(), module->docPath(), widget->quickHelp()); @@ -214,7 +214,7 @@ i18n("There are unsaved changes in the active module.\n" } raiseWidget( _busyw ); - kapp->processEvents(); + tdeApp->processEvents(); deleteModule(); if (!module) return true; diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h index ea62495bd..7246691e6 100644 --- a/kcontrol/kcontrol/dockcontainer.h +++ b/kcontrol/kcontrol/dockcontainer.h @@ -30,7 +30,7 @@ class TQLabel; class ModuleWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: ModuleWidget( TQWidget *parent, const char *name ); @@ -48,7 +48,7 @@ class ModuleWidget : public TQVBox class DockContainer : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: DockContainer(TQWidget *parent=0); diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index ca80619e5..c78de0071 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -43,6 +43,7 @@ TQString KCGlobal::_iversion = ""; TQString KCGlobal::_imachine = ""; IndexViewMode KCGlobal::_viewmode = Icon; TDEIcon::StdSizes KCGlobal::_iconsize = TDEIcon::SizeMedium; +bool KCGlobal::_showhidden = false; TQString KCGlobal::_baseGroup = ""; void KCGlobal::init() @@ -105,7 +106,7 @@ TQString KCGlobal::baseGroup() void KCGlobal::repairAccels( TQWidget * tw ) { - TQObjectList * l = tw->queryList( TQACCEL_OBJECT_NAME_STRING ); + TQObjectList * l = tw->queryList( "TQAccel" ); TQObjectListIt it( *l ); // iterate over the buttons TQObject * obj; while ( (obj=it.current()) != 0 ) { // for each found object... diff --git a/kcontrol/kcontrol/global.h b/kcontrol/kcontrol/global.h index 0fbc1d9b7..a0b44c0b7 100644 --- a/kcontrol/kcontrol/global.h +++ b/kcontrol/kcontrol/global.h @@ -46,6 +46,7 @@ public: static TQString systemMachine() { return _imachine; } static IndexViewMode viewMode() { return _viewmode; } static TDEIcon::StdSizes iconSize() { return _iconsize; } + static bool showHiddenModules() { return _showhidden; } static TQString baseGroup(); static void setIsInfoCenter(bool b) { _infocenter = b; } @@ -60,6 +61,7 @@ public: static void setSystemMachine(const TQString& n){ _imachine = n; } static void setViewMode(IndexViewMode m) { _viewmode = m; } static void setIconSize(TDEIcon::StdSizes s) { _iconsize = s; } + static void setShowHiddenModules(bool o) { _showhidden = o; } static void repairAccels( TQWidget * tw ); @@ -71,6 +73,7 @@ private: static IndexViewMode _viewmode; static TDEIcon::StdSizes _iconsize; static TQString _baseGroup; + static bool _showhidden; }; #endif diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index f21c03c71..af20e8870 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -21,7 +21,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeapplication.h> #include <krun.h> @@ -80,7 +80,7 @@ bool HelpWidget::clicked(const TQString & _url) } if ( textUrl.find('@') > -1 ) { - kapp->invokeMailer(textUrl); + tdeApp->invokeMailer(textUrl); return true; } diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp index 92b9cf0a0..ed8e8ca03 100644 --- a/kcontrol/kcontrol/indexwidget.cpp +++ b/kcontrol/kcontrol/indexwidget.cpp @@ -42,6 +42,8 @@ void IndexWidget::reload() { if (_icon) _icon->fill(); + if (_tree) + _tree->fill(); } TQListViewItem *IndexWidget::firstTreeViewItem() @@ -60,7 +62,7 @@ void IndexWidget::resizeEvent(TQResizeEvent *e) void IndexWidget::moduleSelected(ConfigModule *m) { - const TQObject *obj = TQT_TQOBJECT_CONST(sender()); + const TQObject *obj = sender(); if(!m) return; emit moduleActivated(m); @@ -69,19 +71,19 @@ void IndexWidget::moduleSelected(ConfigModule *m) { _tree->makeVisible(m); - _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(m); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } else if (obj->inherits("ModuleTreeView") && _icon) { _icon->makeVisible(m); - _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(m); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } } @@ -89,17 +91,17 @@ void IndexWidget::makeSelected(ConfigModule *module) { if (_icon) { - _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(module); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } if (_tree) { - _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(module); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } } @@ -121,8 +123,8 @@ void IndexWidget::activateView(IndexViewMode mode) { _icon=new ModuleIconView(_modules, this); _icon->fill(); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } raiseWidget( _icon ); } @@ -132,10 +134,10 @@ void IndexWidget::activateView(IndexViewMode mode) { _tree=new ModuleTreeView(_modules, this); _tree->fill(); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); - connect(_tree, TQT_SIGNAL(categorySelected(TQListViewItem*)), - this, TQT_SIGNAL(categorySelected(TQListViewItem*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(categorySelected(TQListViewItem*)), + this, TQ_SIGNAL(categorySelected(TQListViewItem*))); } raiseWidget( _tree ); } diff --git a/kcontrol/kcontrol/indexwidget.h b/kcontrol/kcontrol/indexwidget.h index 6471e0ec3..a373aafce 100644 --- a/kcontrol/kcontrol/indexwidget.h +++ b/kcontrol/kcontrol/indexwidget.h @@ -31,7 +31,7 @@ class ModuleIconView; class IndexWidget : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: IndexWidget(ConfigModuleList *list, TQWidget *parent, const char *name=0); diff --git a/kcontrol/kcontrol/kcontrolui.rc b/kcontrol/kcontrol/kcontrolui.rc index 92867beb3..c9e4c48aa 100644 --- a/kcontrol/kcontrol/kcontrolui.rc +++ b/kcontrol/kcontrol/kcontrolui.rc @@ -12,6 +12,8 @@ <Action name="activate_largeicons"/> <Action name="activate_hugeicons"/> </Menu> + <Separator/> + <Action name="show_hidden_modules"/> </Menu> <Menu name="help"> <Action name="help_about_module" append="about_merge"/> diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 25ab4fc4a..ec824396b 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -50,7 +50,7 @@ #include "version.h" KControlApp::KControlApp() - : KUniqueApplication() + : TDEUniqueApplication() , toplevel(0) { toplevel = new TopLevel(); @@ -58,11 +58,11 @@ KControlApp::KControlApp() setMainWidget(toplevel); TDEGlobal::setActiveInstance(this); - // KUniqueApplication does dcop regitration for us - ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface"); + // TDEUniqueApplication does dcop regitration for us + ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface"); - connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest())); - connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); + connect (modIface, TQ_SIGNAL(helpClicked()), toplevel, TQ_SLOT(slotHelpRequest())); + connect (modIface, TQ_SIGNAL(handbookClicked()), toplevel, TQ_SLOT(slotHandbookRequest())); TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel); TDEConfig *config = TDEGlobal::config(); @@ -90,7 +90,7 @@ KControlApp::~KControlApp() { TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); - TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget *desk = TQApplication::desktop(); config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->sync(); @@ -98,12 +98,12 @@ KControlApp::~KControlApp() delete toplevel; } -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDELocale::setMainCatalogue("kcontrol"); TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL, - I18N_NOOP("(c) 1998-2004, The Trinity Control Center Developers")); + I18N_NOOP("(c) 1998-2024, The Trinity Control Center Developers")); TQCString argv_0 = argv[0]; TDEAboutData *aboutData; @@ -121,7 +121,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData->addAuthor("Waldo Bastian",0, "bastian@kde.org"); TDECmdLineArgs::init( argc, argv, aboutData ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); KCGlobal::init(); diff --git a/kcontrol/kcontrol/main.h b/kcontrol/kcontrol/main.h index 783e10001..e39a7f7cc 100644 --- a/kcontrol/kcontrol/main.h +++ b/kcontrol/kcontrol/main.h @@ -21,13 +21,13 @@ #ifndef __main_h__ #define __main_h__ -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> class TopLevel; -class KControlApp : public KUniqueApplication +class KControlApp : public TDEUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KControlApp(); diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp index dbaba9054..5cc43c82d 100644 --- a/kcontrol/kcontrol/moduleIface.cpp +++ b/kcontrol/kcontrol/moduleIface.cpp @@ -26,7 +26,7 @@ ModuleIface::ModuleIface(TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject(name) { - _parent = TQT_TQWIDGET(parent); + _parent = static_cast<TQWidget*>(parent); } diff --git a/kcontrol/kcontrol/moduleIface.h b/kcontrol/kcontrol/moduleIface.h index 17b4b07ad..00f2d0d39 100644 --- a/kcontrol/kcontrol/moduleIface.h +++ b/kcontrol/kcontrol/moduleIface.h @@ -28,7 +28,7 @@ class ModuleIface : public TQObject, public DCOPObject { -Q_OBJECT +TQ_OBJECT K_DCOP public: diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp index 45be8a1ac..13b1aa366 100644 --- a/kcontrol/kcontrol/moduleiconview.cpp +++ b/kcontrol/kcontrol/moduleiconview.cpp @@ -22,9 +22,10 @@ #include <tqcursor.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kiconloader.h> +#include <tdecmoduleloader.h> #include <kdebug.h> @@ -51,8 +52,8 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const // This is intentionally _not_ connected with executed(), since // honoring doubleclick doesn't make any sense here (changed by // large user demand) - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleIconView::makeSelected(ConfigModule *m) @@ -168,3 +169,14 @@ TQPixmap ModuleIconView::loadIcon( const TQString &name ) return icon; } + +ModuleIconItem::ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m) + : TDEListViewItem(parent, text) + , _tag(TQString::null) + , _module(m) +{ + setPixmap(0, pm); + + if (!_module) return; + setVisible(KCGlobal::showHiddenModules() || !_module->needsTest() || TDECModuleLoader::testModule(*_module)); +}
\ No newline at end of file diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h index 12cb14d73..ff76ebce2 100644 --- a/kcontrol/kcontrol/moduleiconview.h +++ b/kcontrol/kcontrol/moduleiconview.h @@ -29,13 +29,7 @@ class ModuleIconItem : public TDEListViewItem { public: - ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0) - : TDEListViewItem(parent, text) - , _tag(TQString::null) - , _module(m) - { - setPixmap(0, pm); - } + ModuleIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, ConfigModule *m = 0); void setConfigModule(ConfigModule* m) { _module = m; } void setTag(const TQString& t) { _tag = t; } @@ -56,7 +50,7 @@ private: class ModuleIconView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ModuleIconView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index f203e6b57..1c1a874ce 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -29,7 +29,7 @@ that is intentional :-] #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kservicegroup.h> #include <kdebug.h> @@ -49,7 +49,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n fill(this, KCGlobal::baseGroup()); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int))); } void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) @@ -65,7 +65,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) // create new menu TDEPopupMenu *menu = new TDEPopupMenu(parentMenu); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int))); // Item names may contain ampersands. To avoid them being converted to // accelators, replace them with two ampersands. diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h index 9ce39b584..890a2d857 100644 --- a/kcontrol/kcontrol/modulemenu.h +++ b/kcontrol/kcontrol/modulemenu.h @@ -40,7 +40,7 @@ class ConfigModuleList; class ModuleMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: ModuleMenu(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index e40d62568..c6d9f73ee 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -27,10 +27,10 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kservicegroup.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <qxembed.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "modules.h" @@ -75,11 +75,11 @@ ProxyWidget *ConfigModule::module() { _module = new ProxyWidget(modWidget, moduleName(), "", run_as_root); - connect(_module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); - connect(_module, TQT_SIGNAL(closed()), this, TQT_SLOT(clientClosed())); - connect(_module, TQT_SIGNAL(handbookRequest()), this, TQT_SIGNAL(handbookRequest())); - connect(_module, TQT_SIGNAL(helpRequest()), this, TQT_SIGNAL(helpRequest())); - connect(_module, TQT_SIGNAL(runAsRoot()), this, TQT_SLOT(runAsRoot())); + connect(_module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); + connect(_module, TQ_SIGNAL(closed()), this, TQ_SLOT(clientClosed())); + connect(_module, TQ_SIGNAL(handbookRequest()), this, TQ_SIGNAL(handbookRequest())); + connect(_module, TQ_SIGNAL(helpRequest()), this, TQ_SIGNAL(helpRequest())); + connect(_module, TQ_SIGNAL(runAsRoot()), this, TQ_SLOT(runAsRoot())); return _module; } @@ -101,7 +101,7 @@ void ConfigModule::deleteClient() _embedStack = 0; delete _embedFrame; _embedFrame = 0; - kapp->syncX(); + tdeApp->syncX(); if(_module) _module->close(true); @@ -157,7 +157,7 @@ void ConfigModule::runAsRoot() _busy->setGeometry(0,0, _module->width(), _module->height()); _busy->show(); _embedStack->raiseWidget(_busy); - connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded())); + connect(_embedWidget, TQ_SIGNAL( windowEmbedded(WId)), TQ_SLOT( embedded())); // prepare the process to run the tdecmshell TQString cmd = service()->exec().stripWhiteSpace(); @@ -198,7 +198,7 @@ void ConfigModule::runAsRoot() *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); } - connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*))); + connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(rootExited(TDEProcess*))); if ( !_rootProcess->start(TDEProcess::NotifyOnExit) ) { @@ -282,9 +282,9 @@ bool ConfigModuleList::readDesktopEntriesRecursive(const TQString &path) if (p->isType(KST_KService)) { KService *s = static_cast<KService*>(p); - if (!kapp->authorizeControlModule(s->menuId())) + if (!tdeApp->authorizeControlModule(s->menuId())) continue; - + ConfigModule *module = new ConfigModule(s); if (module->library().isEmpty()) { diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index 63ddee668..16751831e 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -38,7 +38,7 @@ class TQWidgetStack; class ConfigModule : public TQObject, public TDECModuleInfo { - Q_OBJECT + TQ_OBJECT public: @@ -124,7 +124,7 @@ protected: class KControlEmbed : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: KControlEmbed( TQWidget* w ) : QXEmbed( w ) {} virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); } diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index fd0bda8aa..15f5cb9eb 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -26,6 +26,7 @@ #include <tdelocale.h> #include <kiconloader.h> #include <kservicegroup.h> +#include <tdecmoduleloader.h> #include <kdebug.h> #include <tqwhatsthis.h> #include <tqbitmap.h> @@ -85,12 +86,20 @@ ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const new ModuleTreeWhatsThis( this ); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleTreeView::fill() { + // If we have a currently selected module, preserve selection + ConfigModule *currentModule = nullptr; + if (currentItem()) + { + currentModule = static_cast<ModuleTreeItem*>(currentItem())->module(); + } + + // (Re)fill the tree view clear(); TQStringList subMenus = _modules->submenus(KCGlobal::baseGroup()); @@ -107,7 +116,14 @@ void ModuleTreeView::fill() TQPtrList<ConfigModule> moduleList = _modules->modules(KCGlobal::baseGroup()); for (module=moduleList.first(); module != 0; module=moduleList.next()) { - new ModuleTreeItem(this, module); + new ModuleTreeItem(this, module); + } + + // Restore selection + if (currentModule) + { + makeSelected(currentModule); + makeVisible(currentModule); } } @@ -131,8 +147,6 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath) } } - - TQSize ModuleTreeView::sizeHint() const { return TQListView::sizeHint().boundedTo( @@ -272,12 +286,7 @@ ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, ConfigModule *module) , _tag(TQString::null) , _maxChildIconWidth(0) { - if (_module) - { - setText(0, " " + module->moduleName()); - _icon = module->icon(); - setPixmap(0, appIcon(_icon)); - } + init(); } ModuleTreeItem::ModuleTreeItem(TQListView *parent, ConfigModule *module) @@ -286,12 +295,7 @@ ModuleTreeItem::ModuleTreeItem(TQListView *parent, ConfigModule *module) , _tag(TQString::null) , _maxChildIconWidth(0) { - if (_module) - { - setText(0, " " + module->moduleName()); - _icon = module->icon(); - setPixmap(0, appIcon(_icon)); - } + init(); } ModuleTreeItem::ModuleTreeItem(TQListViewItem *parent, const TQString& text) @@ -308,6 +312,18 @@ ModuleTreeItem::ModuleTreeItem(TQListView *parent, const TQString& text) , _maxChildIconWidth(0) {} +void ModuleTreeItem::init() +{ + if (!_module) return; + + setText(0, " " + _module->moduleName()); + _icon = _module->icon(); + setPixmap(0, appIcon(_icon)); + + + setVisible(KCGlobal::showHiddenModules() || !_module->needsTest() || TDECModuleLoader::testModule(*_module)); +} + void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm) { if (!pm.isNull()) @@ -340,7 +356,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu if (offset > 0) { TQPixmap pixmap(offset, offset); - pixmap.fill(Qt::color0); + pixmap.fill(TQt::color0); pixmap.setMask(pixmap.createHeuristicMask()); TQBitmap mask( pixmap.size(), true ); pixmap.setMask( mask ); diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index 271214c98..bf0a12f72 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/kcontrol/kcontrol/moduletreeview.h @@ -57,6 +57,9 @@ protected: void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); private: + void init(); + +private: ConfigModule *_module; TQString _tag; TQString _caption; @@ -66,7 +69,7 @@ private: class ModuleTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ModuleTreeView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index b00741751..159f93a01 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -169,7 +169,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, TQCString replyType; TQByteArray replyData; - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getPalette()", TQByteArray(), replyType, replyData)) if ( replyType == "TQPalette") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -178,7 +178,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, setPalette(pal); } /* // Doesn't work ... - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getStyle()", TQByteArray(), replyType, replyData)) if ( replyType == "TQString") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -187,7 +187,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, setStyle(style); } */ - if (kapp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(), + if (tdeApp->dcopClient()->call("kcontrol", "moduleIface", "getFont()", TQByteArray(), replyType, replyData)) if ( replyType == "TQFont") { TQDataStream reply( replyData, IO_ReadOnly ); @@ -200,8 +200,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, view = new ProxyView(client, title, this, run_as_root, "proxyview"); (void) new WhatsThis( this ); - connect(_client, TQT_SIGNAL(changed(bool)), TQT_SLOT(clientChanged(bool))); - connect(_client, TQT_SIGNAL(quickHelpChanged()), TQT_SIGNAL(quickHelpChanged())); + connect(_client, TQ_SIGNAL(changed(bool)), TQ_SLOT(clientChanged(bool))); + connect(_client, TQ_SIGNAL(quickHelpChanged()), TQ_SIGNAL(quickHelpChanged())); _sep = new KSeparator(KSeparator::HLine, this); @@ -225,11 +225,11 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, _apply->setEnabled( false ); _reset->setEnabled( false ); - connect(_handbook, TQT_SIGNAL(clicked()), TQT_SLOT(handbookClicked())); - connect(_default, TQT_SIGNAL(clicked()), TQT_SLOT(defaultClicked())); - connect(_apply, TQT_SIGNAL(clicked()), TQT_SLOT(applyClicked())); - connect(_reset, TQT_SIGNAL(clicked()), TQT_SLOT(resetClicked())); - connect(_root, TQT_SIGNAL(clicked()), TQT_SLOT(rootClicked())); + connect(_handbook, TQ_SIGNAL(clicked()), TQ_SLOT(handbookClicked())); + connect(_default, TQ_SIGNAL(clicked()), TQ_SLOT(defaultClicked())); + connect(_apply, TQ_SIGNAL(clicked()), TQ_SLOT(applyClicked())); + connect(_reset, TQ_SIGNAL(clicked()), TQ_SLOT(resetClicked())); + connect(_root, TQ_SIGNAL(clicked()), TQ_SLOT(rootClicked())); TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -256,12 +256,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, ProxyWidget::~ProxyWidget() { -#ifdef USE_QT4 - #warning Possible memory leak in ProxyWidget::~ProxyWidget() -#else // USE_QT4 if (_client) delete _client; _client = 0; -#endif // USE_QT4 } TQString ProxyWidget::quickHelp() const @@ -277,7 +273,7 @@ void ProxyWidget::handbookClicked() if (getuid()!=0) emit handbookRequest(); else - kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray()); + tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHandbook()", TQByteArray()); } void ProxyWidget::helpClicked() @@ -285,7 +281,7 @@ void ProxyWidget::helpClicked() if (getuid()!=0) emit helpRequest(); else - kapp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray()); + tdeApp->dcopClient()->send("kcontrol", "moduleIface", "invokeHelp()", TQByteArray()); } void ProxyWidget::defaultClicked() @@ -340,5 +336,3 @@ const TDEAboutData *ProxyWidget::aboutData() const { return _client->aboutData(); } - -// vim: sw=2 sts=2 et diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h index 804803c51..95d8a597d 100644 --- a/kcontrol/kcontrol/proxywidget.h +++ b/kcontrol/kcontrol/proxywidget.h @@ -38,7 +38,7 @@ class ProxyView; class ProxyWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index 995d162e3..663a8744c 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -20,7 +20,6 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <tqsortedlist.h> #include <tqregexp.h> #include <klineedit.h> @@ -88,13 +87,13 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name) l->addWidget(_resultList); - connect(_keyList, TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT(slotKeywordSelected(const TQString&))); + connect(_keyList, TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT(slotKeywordSelected(const TQString&))); - connect(_resultList, TQT_SIGNAL(selected(TQListBoxItem*)), - this, TQT_SLOT(slotModuleSelected(TQListBoxItem *))); - connect(_resultList, TQT_SIGNAL(clicked(TQListBoxItem *)), - this, TQT_SLOT(slotModuleClicked(TQListBoxItem *))); + connect(_resultList, TQ_SIGNAL(selected(TQListBoxItem*)), + this, TQ_SLOT(slotModuleSelected(TQListBoxItem *))); + connect(_resultList, TQ_SIGNAL(clicked(TQListBoxItem *)), + this, TQ_SLOT(slotModuleClicked(TQListBoxItem *))); } void SearchWidget::populateKeywordList(ConfigModuleList *list) diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h index 2e6306bbc..d0f850218 100644 --- a/kcontrol/kcontrol/searchwidget.h +++ b/kcontrol/kcontrol/searchwidget.h @@ -50,7 +50,7 @@ class KeywordListEntry class SearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchWidget(TQWidget *parent, const char *name=0); diff --git a/kcontrol/kcontrol/tde-kcontrol.desktop b/kcontrol/kcontrol/tde-kcontrol.desktop index 122d4fdce..3f044bf46 100644 --- a/kcontrol/kcontrol/tde-kcontrol.desktop +++ b/kcontrol/kcontrol/tde-kcontrol.desktop @@ -6,46 +6,6 @@ X-DocPath=kcontrol/index.html X-TDE-StartupNotify=true Name=Trinity Control Center -Name[ca]=Centre de control del TDE -Name[cs]=Ovládací centrum TDE -Name[da]=TDE Kontrolcenter -Name[de]=TDE Kontrollzentrum -Name[en_GB]=TDE Control Centre -Name[es]=Centro de control de TDE -Name[et]=TDE Juhtimiskeskus -Name[eu]=TDE Kontrol gunea -Name[fa]=مرکز کنترل -Name[fi]=TDE:Ohjauskeskus -Name[fr]=Centre de configuration de TDE -Name[fy]=Konfiguraasjesintrum -Name[ga]=Lárionad Rialaithe TDE -Name[gl]=Centro de Control TDE -Name[he]=מרכז הבקרה TDE -Name[hu]=TDE Vezérlőpult -Name[it]=Centro di controllo TDE -Name[kk]=TDE Басқару орталығы -Name[km]=មជ្ឈមណ្ឌលបញ្ជា TDE -Name[ko]=TDE 제어판 모듈 -Name[lt]=TDE Valdymo centras -Name[lv]=TDE Vadības Centrs -Name[nb]=TDE Kontrollpanel -Name[nds]=TDE-Kuntrullzentrum -Name[nl]=TDE-Configuratiecentrum -Name[pa]=TDE ਕੰਟਰੋਲ ਕੇਂਦਰ -Name[pl]=Centrum sterowania TDE -Name[pt]=Centro de Controlo TDE -Name[pt_BR]=Centro de Controle TDE -Name[ro]=TDE Centrul de control -Name[ru]=Центр управления TDE -Name[sk]=Ovládacie Centrum TDE -Name[sl]=TDE-Nadzorno središče -Name[sr@Latn]=TDE Kontrolni centar -Name[sv]=TDE:Inställningscentralen -Name[tr]=TDE Kontrol Merkezi -Name[uk]=Центр керування TDE -Name[vi]=Trung tâm Điều khiển TDE -Name[zh_CN]=TDE 控制中心 -Name[zh_TW]=TDE 控制中心 X-DCOP-ServiceType=Unique Categories=Qt;TDE;Settings; diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 519ec91df..12c9a37b8 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -19,12 +19,12 @@ */ #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kbugreport.h> #include <tdeaboutapplication.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <twin.h> #include <kiconloader.h> @@ -81,12 +81,12 @@ TopLevel::TopLevel(const char* name) _modules->readDesktopEntries(); for ( ConfigModule* m = _modules->first(); m; m = _modules->next() ) { - connect( m, TQT_SIGNAL( handbookRequest() ), this, TQT_SLOT( slotHandbookRequest() ) ); - connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) ); + connect( m, TQ_SIGNAL( handbookRequest() ), this, TQ_SLOT( slotHandbookRequest() ) ); + connect( m, TQ_SIGNAL( helpRequest() ), this, TQ_SLOT( slotHelpRequest() ) ); } // create the layout box - _splitter = new TQSplitter( Qt::Horizontal, this ); + _splitter = new TQSplitter( TQt::Horizontal, this ); TQFrame* leftFrame = new TQFrame ( _splitter ); TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame ); @@ -109,11 +109,11 @@ TopLevel::TopLevel(const char* name) KLineEdit *searchEdit = new KLineEdit( mSearchFrame ); clearButton->setFixedHeight( searchEdit->height() ); - connect( clearButton, TQT_SIGNAL( clicked() ), searchEdit, TQT_SLOT( clear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), searchEdit, TQ_SLOT( clear() ) ); label->setBuddy( searchEdit ); searchLayout->addWidget( searchEdit ); - connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotSearchChanged(const TQString &) ) ); + connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotSearchChanged(const TQString &) ) ); // create the left hand side under search _stack = new TQWidgetStack( leftFrame ); @@ -121,18 +121,18 @@ TopLevel::TopLevel(const char* name) // index tab _index = new IndexWidget(_modules, this); - connect(_index, TQT_SIGNAL(moduleActivated(ConfigModule*)), - this, TQT_SLOT(activateModule(ConfigModule*))); + connect(_index, TQ_SIGNAL(moduleActivated(ConfigModule*)), + this, TQ_SLOT(activateModule(ConfigModule*))); _stack->addWidget( _index ); - connect(_index, TQT_SIGNAL(categorySelected(TQListViewItem*)), - this, TQT_SLOT(categorySelected(TQListViewItem*))); + connect(_index, TQ_SIGNAL(categorySelected(TQListViewItem*)), + this, TQ_SLOT(categorySelected(TQListViewItem*))); // search tab _search = new SearchWidget(this); _search->populateKeywordList(_modules); - connect(_search, TQT_SIGNAL(moduleSelected(ConfigModule *)), - this, TQT_SLOT(activateModule(ConfigModule *))); + connect(_search, TQ_SIGNAL(moduleSelected(ConfigModule *)), + this, TQ_SLOT(activateModule(ConfigModule *))); _stack->addWidget( _search ); @@ -153,10 +153,10 @@ TopLevel::TopLevel(const char* name) // That one does the trick ... _splitter->setResizeMode( leftFrame, TQSplitter::KeepSize ); - connect(_dock, TQT_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(newModule(const TQString&, const TQString&, const TQString&))); - connect(_dock, TQT_SIGNAL(changedModule(ConfigModule*)), - TQT_SLOT(changedModule(ConfigModule*))); + connect(_dock, TQ_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(newModule(const TQString&, const TQString&, const TQString&))); + connect(_dock, TQ_SIGNAL(changedModule(ConfigModule*)), + TQ_SLOT(changedModule(ConfigModule*))); // set the main view setCentralWidget( _splitter ); @@ -178,8 +178,8 @@ TopLevel::TopLevel(const char* name) if (KCGlobal::isInfoCenter()) { AboutWidget *aw = new AboutWidget( this, 0, _index->firstTreeViewItem()); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); KWin::setIcons( winId(), TDEGlobal::iconLoader()->loadIcon("hwinfo", TDEIcon::NoGroup, 32 ), @@ -188,8 +188,8 @@ TopLevel::TopLevel(const char* name) else { AboutWidget *aw = new AboutWidget(this); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget(aw); } } @@ -234,40 +234,44 @@ bool TopLevel::queryClose() void TopLevel::setupActions() { - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); icon_view = new TDERadioAction - (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()), + (i18n("&Icon View"), 0, this, TQ_SLOT(activateIconView()), actionCollection(), "activate_iconview"); icon_view->setExclusiveGroup( "viewmode" ); tree_view = new TDERadioAction - (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()), + (i18n("&Tree View"), 0, this, TQ_SLOT(activateTreeView()), actionCollection(), "activate_treeview"); tree_view->setExclusiveGroup( "viewmode" ); icon_small = new TDERadioAction - (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()), + (i18n("&Small"), 0, this, TQ_SLOT(activateSmallIcons()), actionCollection(), "activate_smallicons"); icon_small->setExclusiveGroup( "iconsize" ); icon_medium = new TDERadioAction - (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()), + (i18n("&Medium"), 0, this, TQ_SLOT(activateMediumIcons()), actionCollection(), "activate_mediumicons"); icon_medium->setExclusiveGroup( "iconsize" ); icon_large = new TDERadioAction - (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()), + (i18n("&Large"), 0, this, TQ_SLOT(activateLargeIcons()), actionCollection(), "activate_largeicons"); icon_large->setExclusiveGroup( "iconsize" ); icon_huge = new TDERadioAction - (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()), + (i18n("&Huge"), 0, this, TQ_SLOT(activateHugeIcons()), actionCollection(), "activate_hugeicons"); icon_huge->setExclusiveGroup( "iconsize" ); - about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); + show_hidden_modules = new TDEToggleAction + (i18n("Show hidden modules"), 0, this, TQ_SLOT(toggleHiddenModules()), + actionCollection(), "show_hidden_modules"); + + about_module = new TDEAction(i18n("About Current Module"), 0, this, TQ_SLOT(aboutModule()), actionCollection(), "help_about_module"); about_module->setEnabled(false); createGUI("kcontrolui.rc"); @@ -275,7 +279,7 @@ actionCollection()); report_bug = actionCollection()->action("help_report_bug"); report_bug->setText(i18n("&Report Bug...")); report_bug->disconnect(); - connect(report_bug, TQT_SIGNAL(activated()), TQT_SLOT(reportBug())); + connect(report_bug, TQ_SIGNAL(activated()), TQ_SLOT(reportBug())); } void TopLevel::activateIconView() @@ -340,6 +344,12 @@ void TopLevel::activateHugeIcons() _index->reload(); } +void TopLevel::toggleHiddenModules() +{ + KCGlobal::setShowHiddenModules(show_hidden_modules->isChecked()); + _index->reload(); +} + void TopLevel::newModule(const TQString &name, const TQString& docPath, const TQString &quickhelp) { setCaption(name, false); @@ -399,8 +409,8 @@ void TopLevel::categorySelected(TQListViewItem *category) else { AboutWidget *aw = new AboutWidget( this, 0, firstItem, caption ); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); } } @@ -495,7 +505,7 @@ void TopLevel::reportBug() } KBugReport *br = new KBugReport(this, false, dummyAbout); if (deleteit) - connect(br, TQT_SIGNAL(finished()), TQT_SLOT(deleteDummyAbout())); + connect(br, TQ_SIGNAL(finished()), TQ_SLOT(deleteDummyAbout())); else dummyAbout = 0; br->show(); diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h index 39aa25090..0abf4e0e5 100644 --- a/kcontrol/kcontrol/toplevel.h +++ b/kcontrol/kcontrol/toplevel.h @@ -41,7 +41,7 @@ class ModuleTitle; class TopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: TopLevel( const char* name=0 ); @@ -64,6 +64,7 @@ protected slots: void activateMediumIcons(); void activateLargeIcons(); void activateHugeIcons(); + void toggleHiddenModules(); void deleteDummyAbout(); @@ -86,6 +87,7 @@ private: TDEToggleAction *tree_view, *icon_view; TDEToggleAction *icon_small, *icon_medium, *icon_large, *icon_huge; + TDEToggleAction *show_hidden_modules; TDEAction *report_bug, *about_module; IndexWidget *_index; |