diff --git a/client/config/configdialog.ui b/client/config/configdialog.ui index 5699b3a..1c8833f 100644 --- a/client/config/configdialog.ui +++ b/client/config/configdialog.ui @@ -145,7 +145,7 @@ - tqrepaintMode + repaintMode @@ -156,7 +156,7 @@ - Moving &tqrepaints window + Moving &repaints window @@ -2256,7 +2256,7 @@ enableTransparency toggled(bool) - tqrepaintMode + repaintMode setEnabled(bool) diff --git a/client/config/crystalconfig.cc b/client/config/crystalconfig.cc index 9ccf5f5..50d21e6 100644 --- a/client/config/crystalconfig.cc +++ b/client/config/crystalconfig.cc @@ -106,7 +106,7 @@ CrystalConfig::CrystalConfig(KConfig*, TQWidget* tqparent) connect(dialog_->tintButtons, TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(boolChanged(bool))); connect(dialog_->menuimage, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->tqrepaintMode, TQT_SIGNAL(clicked(int)),this, TQT_SLOT(selectionChanged(int))); + connect(dialog_->repaintMode, TQT_SIGNAL(clicked(int)),this, TQT_SLOT(selectionChanged(int))); connect(dialog_->updateTime, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(selectionChanged(int))); @@ -222,7 +222,7 @@ void CrystalConfig::load(KConfig*) dialog_->buttonTheme->setCurrentItem(config_->readNumEntry("ButtonTheme",8)); dialog_->updateTime->setValue(config_->readNumEntry("RepaintTime",200)); - button=(TQRadioButton*)dialog_->tqrepaintMode->tqfind(config_->readNumEntry("RepaintMode",1)); + button=(TQRadioButton*)dialog_->repaintMode->tqfind(config_->readNumEntry("RepaintMode",1)); if (button)button->setChecked(true); dialog_->active_blur->setValue(config_->readNumEntry("ActiveBlur",0)); @@ -308,7 +308,7 @@ void CrystalConfig::save(KConfig*) config_->writeEntry("MenuImage",dialog_->menuimage->isChecked()); config_->writeEntry("ButtonTheme",dialog_->buttonTheme->currentItem()); - config_->writeEntry("RepaintMode",dialog_->tqrepaintMode->selectedId()); + config_->writeEntry("RepaintMode",dialog_->repaintMode->selectedId()); config_->writeEntry("RepaintTime",dialog_->updateTime->value()); config_->writeEntry("ActiveBlur",dialog_->active_blur->value()); diff --git a/client/crystalclient.cc b/client/crystalclient.cc index e8780aa..6b3ac65 100644 --- a/client/crystalclient.cc +++ b/client/crystalclient.cc @@ -257,8 +257,8 @@ bool CrystalFactory::readConfig() animateHover=config.readBoolEntry("AnimateHover",true); tintButtons=config.readBoolEntry("TintButtons",false); menuImage=config.readBoolEntry("MenuImage",true); - tqrepaintMode=config.readNumEntry("RepaintMode",1); - tqrepaintTime=config.readNumEntry("RepaintTime",200); + repaintMode=config.readNumEntry("RepaintMode",1); + repaintTime=config.readNumEntry("RepaintTime",200); buttontheme=config.readNumEntry("ButtonTheme",8); @@ -801,7 +801,7 @@ void CrystalClient::init() connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool ))); connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool ))); - if (::factory->transparency)connect ( ::factory->image_holder,TQT_SIGNAL(tqrepaintNeeded()),this,TQT_SLOT(Repaint())); + if (::factory->transparency)connect ( ::factory->image_holder,TQT_SIGNAL(repaintNeeded()),this,TQT_SLOT(Repaint())); if (::factory->transparency)connect ( &timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(Repaint())); updateLayout(); @@ -1457,18 +1457,18 @@ void CrystalClient::resizeEvent(TQResizeEvent *e) if (widget()->isShown()) { if (!::factory->transparency) ; - else if (::factory->tqrepaintMode==1) + else if (::factory->repaintMode==1) { if (!timer.isActive())timer.start(0,true); // Repaint(); } // tqrepaint only every xxx ms - else if (::factory->tqrepaintMode==3 || !timer.isActive()) + else if (::factory->repaintMode==3 || !timer.isActive()) { // Repaint only, when mode!=fade || amount<100 WND_CONFIG* wnd=isActive()?&::factory->active:&::factory->inactive; if (wnd->mode!=0 || wnd->amount<100) - timer.start(::factory->tqrepaintTime,true); + timer.start(::factory->repaintTime,true); } } if (e->size()!=e->oldSize()) @@ -1482,17 +1482,17 @@ void CrystalClient::moveEvent(TQMoveEvent *) if (widget()->isShown()) { if (!::factory->transparency) return; - else if (::factory->tqrepaintMode==1) + else if (::factory->repaintMode==1) { Repaint(); } // tqrepaint every xxx ms, so constant moving does not take too much CPU - else if (::factory->tqrepaintMode==3 || !timer.isActive()) + else if (::factory->repaintMode==3 || !timer.isActive()) { // Repaint only, when mode!=fade || value<100, because otherwise it is a plain color WND_CONFIG* wnd=isActive()?&::factory->active:&::factory->inactive; if (wnd->mode!=0 || wnd->amount<100) - timer.start(::factory->tqrepaintTime,true); + timer.start(::factory->repaintTime,true); } } } diff --git a/client/crystalclient.h b/client/crystalclient.h index 0385c2d..cc5784e 100644 --- a/client/crystalclient.h +++ b/client/crystalclient.h @@ -127,7 +127,7 @@ public: bool drawcaption,textshadow,captiontooltip; bool trackdesktop,transparency; int roundCorners; - int tqrepaintMode,tqrepaintTime; + int repaintMode,repaintTime; WND_CONFIG active,inactive; int buttontheme; diff --git a/client/imageholder.cpp b/client/imageholder.cpp index 8897646..4d026cf 100644 --- a/client/imageholder.cpp +++ b/client/imageholder.cpp @@ -35,7 +35,7 @@ QImageHolder::QImageHolder(TQImage act,TQImage inact) setUserdefinedPictures( act,inact); initialized=userdefinedActive && userdefinedInactive; - emit tqrepaintNeeded(); + emit repaintNeeded(); } QImageHolder::~QImageHolder() @@ -167,5 +167,5 @@ void QImageHolder::BackgroundUpdated(const TQImage *src) img_active=ApplyEffect(tmp,&::factory->active,factory->options()->tqcolorGroup(KDecoration::ColorTitleBar, true)); } - emit tqrepaintNeeded(); + emit repaintNeeded(); } diff --git a/client/imageholder.h b/client/imageholder.h index 790b20d..d43009f 100644 --- a/client/imageholder.h +++ b/client/imageholder.h @@ -56,7 +56,7 @@ public slots: void CheckSanity(); signals: - void tqrepaintNeeded(); + void repaintNeeded(); };