diff options
Diffstat (limited to 'kcontrol/style/kcmstyle.cpp')
| -rw-r--r-- | kcontrol/style/kcmstyle.cpp | 124 |
1 files changed, 60 insertions, 64 deletions
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index a51a63e6b..d72467364 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -51,9 +51,9 @@ #include <klibloader.h> #include <tdelistview.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestyle.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "../krdb/krdb.h" @@ -73,13 +73,13 @@ // Danimo: Why do we use the old interface?! extern "C" { - KDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*) + TDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*) { TDEGlobal::locale()->insertCatalogue("kcmstyle"); return new KCMStyle(parent, "kcmstyle"); } - KDE_EXPORT void init_style() + TDE_EXPORT void init_style() { uint flags = KRdbExportQtSettings | KRdbExportQtColors | KRdbExportXftSettings; TDEConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/); @@ -92,11 +92,10 @@ extern "C" runRdb( flags ); // Write some Qt root property. -#ifndef __osf__ // this crashes under Tru64 randomly -- will fix later TQByteArray properties; TQDataStream d(properties, IO_WriteOnly); d.setVersion( 3 ); // Qt2 apps need this. - d << kapp->palette() << TDEGlobalSettings::generalFont(); + d << tdeApp->palette() << TDEGlobalSettings::generalFont(); Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false); // do it for all root windows - multihead support @@ -105,7 +104,6 @@ extern "C" XChangeProperty(tqt_xdisplay(), RootWindow(tqt_xdisplay(), i), a, a, 8, PropModeReplace, (unsigned char*) properties.data(), properties.size()); -#endif } } @@ -156,21 +154,21 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) // Add Page1 (Style) // ----------------- gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" ); - gbWidgetStyle->setColumnLayout( 0, Qt::Vertical ); + gbWidgetStyle->setColumnLayout( 0, TQt::Vertical ); gbWidgetStyle->layout()->setMargin( KDialog::marginHint() ); gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() ); - gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); + gbWidgetStyleLayout->setAlignment( TQt::AlignTop ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); - cbStyle->setEditable( FALSE ); + cbStyle->setEditable( false ); hbLayout->addWidget( cbStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); - pbConfigStyle->setEnabled( FALSE ); + pbConfigStyle->setEnabled( false ); hbLayout->addWidget( pbConfigStyle ); gbWidgetStyleLayout->addLayout( hbLayout ); @@ -197,7 +195,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) m_popupMenuDelay = new KIntNumInput(250, gbWidgetStyle); m_popupMenuDelay->setLabel(i18n("Menu popup delay:")); - m_popupMenuDelay->setRange(0, 5000, 50); + m_popupMenuDelay->setRange(0, 5000, 10); m_popupMenuDelay->setSuffix(i18n(" msec")); m_popupMenuDelay->setSteps(50, 50); gbWidgetStyleLayout->addWidget(m_popupMenuDelay); @@ -205,7 +203,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) gbWidgetStyleLayout->addSpacing(10); TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); - gbPreview->setColumnLayout( 0, Qt::Vertical ); + gbPreview->setColumnLayout( 0, TQt::Vertical ); gbPreview->layout()->setMargin( 0 ); gbPreview->layout()->setSpacing( KDialog::spacingHint() ); gbPreview->setFlat( true ); @@ -216,9 +214,9 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) page1Layout->addWidget( gbPreview ); // Connect all required stuff - connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) ); - connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton())); - connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig())); + connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(styleChanged()) ); + connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateConfigButton())); + connect( pbConfigStyle, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleSpecificConfig())); // Add Page2 (Effects) // ------------------- @@ -229,7 +227,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout = new TQGridLayout( containerFrame, 1, 1, // rows, columns KDialog::marginHint(), KDialog::spacingHint() ); - comboComboEffect = new TQComboBox( FALSE, containerFrame ); + comboComboEffect = new TQComboBox( false, containerFrame ); comboComboEffect->insertItem( i18n("Disable") ); comboComboEffect->insertItem( i18n("Animate") ); lblComboEffect = new TQLabel( i18n("Combobo&x effect:"), containerFrame ); @@ -237,7 +235,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblComboEffect, 0, 0 ); containerLayout->addWidget( comboComboEffect, 0, 1 ); - comboTooltipEffect = new TQComboBox( FALSE, containerFrame ); + comboTooltipEffect = new TQComboBox( false, containerFrame ); comboTooltipEffect->insertItem( i18n("Disable") ); comboTooltipEffect->insertItem( i18n("Animate") ); comboTooltipEffect->insertItem( i18n("Fade") ); @@ -246,7 +244,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblTooltipEffect, 1, 0 ); containerLayout->addWidget( comboTooltipEffect, 1, 1 ); - comboRubberbandEffect = new TQComboBox( FALSE, containerFrame ); + comboRubberbandEffect = new TQComboBox( false, containerFrame ); comboRubberbandEffect->insertItem( i18n("Disable") ); comboRubberbandEffect->insertItem( i18n("Make translucent") ); lblRubberbandEffect = new TQLabel( i18n("&Rubberband effect:"), containerFrame ); @@ -254,7 +252,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblRubberbandEffect, 2, 0 ); containerLayout->addWidget( comboRubberbandEffect, 2, 1 ); - comboMenuEffect = new TQComboBox( FALSE, containerFrame ); + comboMenuEffect = new TQComboBox( false, containerFrame ); comboMenuEffect->insertItem( i18n("Disable") ); comboMenuEffect->insertItem( i18n("Animate") ); comboMenuEffect->insertItem( i18n("Fade") ); @@ -264,7 +262,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) containerLayout->addWidget( lblMenuEffect, 3, 0 ); containerLayout->addWidget( comboMenuEffect, 3, 1 ); - comboMenuHandle = new TQComboBox( FALSE, containerFrame ); + comboMenuHandle = new TQComboBox( false, containerFrame ); comboMenuHandle->insertItem( i18n("Disable") ); comboMenuHandle->insertItem( i18n("Application Level") ); // comboMenuHandle->insertItem( i18n("Enable") ); @@ -293,7 +291,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) menuPreview = new MenuPreview( menuContainer, /* opacity */ 90, MenuPreview::Blend ); - comboMenuEffectType = new TQComboBox( FALSE, menuContainer ); + comboMenuEffectType = new TQComboBox( false, menuContainer ); comboMenuEffectType->insertItem( i18n("Software Tint") ); comboMenuEffectType->insertItem( i18n("Software Blend") ); #ifdef HAVE_XRENDER @@ -304,7 +302,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) sliderBox = new TQVBox( menuContainer ); sliderBox->setSpacing( KDialog::spacingHint() ); sliderBox->setMargin( 0 ); - slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox ); + slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, TQt::Horizontal, sliderBox ); slOpacity->setTickmarks( TQSlider::Below ); slOpacity->setTickInterval( 10 ); TQHBox* box1 = new TQHBox( sliderBox ); @@ -338,13 +336,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) page2Layout->addItem( sp1 ); // Data flow stuff. - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) ); - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) ); - connect( slOpacity, TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) ); - connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) ); - connect( comboMenuEffect, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) ); - connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); - connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), containerFrame, TQ_SLOT(setEnabled(bool)) ); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(menuEffectChanged(bool)) ); + connect( slOpacity, TQ_SIGNAL(valueChanged(int)),menuPreview, TQ_SLOT(setOpacity(int)) ); + connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectChanged()) ); + connect( comboMenuEffect, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectChanged()) ); + connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectTypeChanged()) ); + connect( comboMenuEffectType, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectTypeChanged()) ); // Add Page3 (Miscellaneous) // ------------------------- @@ -355,7 +353,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) TQHBoxLayout* box2 = new TQHBoxLayout( dummy, 0, KDialog::spacingHint() ); lbl = new TQLabel( i18n("Text pos&ition:"), dummy ); - comboToolbarIcons = new TQComboBox( FALSE, dummy ); + comboToolbarIcons = new TQComboBox( false, dummy ); comboToolbarIcons->insertItem( i18n("Icons Only") ); comboToolbarIcons->insertItem( i18n("Text Only") ); comboToolbarIcons->insertItem( i18n("Text Alongside Icons") ); @@ -379,29 +377,29 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) load(); // Do all the setDirty connections. - connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); + connect(cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); // Page2 - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); - connect( comboTooltipEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); - connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboComboEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); - connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboMenuHandle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( slOpacity, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); - connect( cbMenuShadow, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty())); + connect( comboTooltipEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty())); + connect( comboRubberbandEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboComboEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty())); + connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboMenuHandle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( slOpacity, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty())); + connect( cbMenuShadow, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty())); // Page1 & Page3 - connect( cbHoverButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); - connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); - connect( cbEnableTooltips, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbIconsOnButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbScrollablePopupMenus,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbAutoHideAccelerators,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbMenuAltKeyNavigation,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbTearOffHandles, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( comboToolbarIcons, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty())); - connect( m_popupMenuDelay, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); + connect( cbHoverButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty())); + connect( cbTransparentToolbars, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty())); + connect( cbEnableTooltips, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbIconsOnButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbScrollablePopupMenus,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbAutoHideAccelerators,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbMenuAltKeyNavigation,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbTearOffHandles, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( comboToolbarIcons, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setToolbarsDirty())); + connect( m_popupMenuDelay, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty())); addWhatsThis(); @@ -479,9 +477,9 @@ void KCMStyle::styleSpecificConfig() dial->setMainWidget( pluginConfig ); //..and connect it to the wrapper - connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool))); - connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults())); - connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save())); + connect(pluginConfig, TQ_SIGNAL(changed(bool)), dial, TQ_SLOT(setDirty(bool))); + connect(dial, TQ_SIGNAL(defaults()), pluginConfig, TQ_SLOT(defaults())); + connect(dial, TQ_SIGNAL(save()), pluginConfig, TQ_SLOT(save())); if (dial->exec() == TQDialog::Accepted && dial->isDirty() ) { // Force re-rendering of the preview, to apply settings @@ -670,12 +668,12 @@ void KCMStyle::save() if (m_bEffectsDirty) { KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); + tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } //update kicker to re-used tooltips kicker parameter otherwise, it overwritted //by style tooltips parameters. TQByteArray data; - kapp->dcopClient()->send( "kicker", "kicker", "configure()", data ); + tdeApp->dcopClient()->send( "kicker", "kicker", "configure()", data ); // Clean up m_bEffectsDirty = false; @@ -699,11 +697,11 @@ bool KCMStyle::findStyle( const TQString& str, int& combobox_item ) if ( cbStyle->text(i) == name ) { combobox_item = i; - return TRUE; + return true; } } - return FALSE; + return false; } @@ -747,7 +745,7 @@ void KCMStyle::loadStyle( TDEConfig& config ) TQStringList list = TDEGlobal::dirs()->findAllResources("themes", "*.themerc", true, true); for (TQStringList::iterator it = list.begin(); it != list.end(); ++it) { - KSimpleConfig config( *it, true ); + TDESimpleConfig config( *it, true ); if ( !(config.hasGroup("KDE") && config.hasGroup("Misc")) ) continue; @@ -813,7 +811,7 @@ void KCMStyle::loadStyle( TDEConfig& config ) // they use QPopupMenus for the drop-down list! // ##### Since Trolltech likes to seemingly copy & paste code, - // TQStringList::findItem() doesn't have a Qt::StringComparisonMode field. + // TQStringList::findItem() doesn't have a TQt::StringComparisonMode field. // We roll our own (yuck) cfgStyle = cfgStyle.lower(); int item = 0; @@ -851,7 +849,7 @@ void KCMStyle::styleChanged() void KCMStyle::switchStyle(const TQString& styleName, bool force) { // Don't flicker the preview if the same style is chosen in the cb - if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName) + if (!force && appliedStyle && appliedStyle->name() == styleName) return; // Create an instance of the new style... @@ -1157,5 +1155,3 @@ TQString KCMStyle::handbookSection() const } #include "kcmstyle.moc" - -// vim: set noet ts=4: |