TDE
/
twin-style-crystal
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-crystal
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent ed6f377136
commit cb4818cf88
9 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

8
client/config/configdialog.ui
Unescape View File

@ -90,7 +90,7 @@
<string></string>
</property>
<property name="whatsThis" stdset="0">
<string>Use these buttons to set the tqalignment of the window title</string>
<string>Use these buttons to set the alignment of the window title</string>
</property>
<vbox>
<property name="name">
@ -236,7 +236,7 @@
<property name="title">
<string>Round &amp;Corners</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignHCenter</set>
</property>
<grid>
@ -2047,7 +2047,7 @@
<property name="text">
<string>Lets you put an transparent image on top of the title bar.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@ -2066,7 +2066,7 @@
<property name="text">
<string>User defined should be a transparent png file, i.e. 1x64px</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

8
client/config/infodialog.ui
Unescape View File

@ -78,7 +78,7 @@
<property name="title">
<string>About:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="flat">
@ -109,7 +109,7 @@ You may look for the most recent version at kde-look.org:</string>
<property name="textFormat">
<enum>PlainText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignLeft</set>
</property>
</widget>
@ -182,7 +182,7 @@ You may look for the most recent version at kde-look.org:</string>
<property name="title">
<string>Usage:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="flat">
@ -216,7 +216,7 @@ You may look for the most recent version at kde-look.org:</string>
<property name="textFormat">
<enum>PlainText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
</widget>

8
client/crystalbutton.cpp
Unescape View File

@ -59,7 +59,7 @@ void CrystalButton::resetSize(bool FullSize)
void CrystalButton::setBitmap(ButtonImage *newimage)
{
image=newimage;
tqrepaint(false);
repaint(false);
}
TQSize CrystalButton::sizeHint() const
@ -88,7 +88,7 @@ int CrystalButton::buttonSizeV() const
void CrystalButton::enterEvent(TQEvent *e)
{
hover=true;
if (factory->hovereffect)tqrepaint(false);
if (factory->hovereffect)repaint(false);
if (factory->animateHover)animation_timer.start(60);
TQButton::enterEvent(e);
}
@ -96,7 +96,7 @@ void CrystalButton::enterEvent(TQEvent *e)
void CrystalButton::leaveEvent(TQEvent *e)
{
hover=false;
if (factory->hovereffect)tqrepaint(false);
if (factory->hovereffect)repaint(false);
if (factory->animateHover)animation_timer.start(80);
TQButton::leaveEvent(e);
}
@ -331,7 +331,7 @@ void CrystalButton::animate()
animation_timer.stop();
}
}
tqrepaint(false);
repaint(false);
}
#include "crystalbutton.moc"

2
client/crystalbutton.h
Unescape View File

@ -43,7 +43,7 @@ public:
void setBitmap(ButtonImage *newimage);
TQSize sizeHint() const;
int lastMousePress() const { return lastmouse_; }
void reset() { tqrepaint(false); }
void reset() { repaint(false); }
void setFirstLast(bool vfirst,bool vlast) { first|=vfirst; last|=vlast; }
void resetSize(bool FullSize);
private:

48
client/crystalclient.cc
Unescape View File

@ -71,9 +71,9 @@ public:
CCrystalTooltip(TQWidget *widget,CrystalClient *vc):TQToolTip(widget),client(vc) {}
virtual void maybeTip(const TQPoint& p)
{
if (client->titlebar_->tqgeometry().contains(p))
if (client->titlebar_->geometry().contains(p))
{
tip(client->titlebar_->tqgeometry(),client->caption());
tip(client->titlebar_->geometry(),client->caption());
}
}
};
@ -122,7 +122,7 @@ bool CrystalFactory::reset(unsigned long /*changed*/)
{
if (!image_holder)image_holder=new QImageHolder(active.userdefinedPicture,inactive.userdefinedPicture);
image_holder->setUserdefinedPictures(active.userdefinedPicture,inactive.userdefinedPicture);
image_holder->tqrepaint(true);
image_holder->repaint(true);
}else{
if (image_holder)delete image_holder;
image_holder=NULL;
@ -1000,7 +1000,7 @@ void CrystalClient::activeChange()
void CrystalClient::captionChange()
{
if (::factory->drawcaption) widget()->tqrepaint(titlebar_->tqgeometry(), false);
if (::factory->drawcaption) widget()->repaint(titlebar_->geometry(), false);
}
void CrystalClient::desktopChange()
@ -1170,34 +1170,34 @@ bool CrystalClient::eventFilter(TQObject *obj, TQEvent *e)
void CrystalClient::ClientWindows(Window* v_frame,Window* v_wrapper,Window *v_client)
{
Window root=0,frame=0,wrapper=0,client=0,parent=0,*tqchildren=NULL;
Window root=0,frame=0,wrapper=0,client=0,parent=0,*children=NULL;
uint numc;
if (v_frame) *v_frame=0;
if (v_wrapper) *v_wrapper=0;
if (v_client) *v_client=0;
// Our Deco is the child of a frame, get our parent
if (XQueryTree(qt_xdisplay(),widget()->winId(),&root,&frame,&tqchildren,&numc) == 0)
if (XQueryTree(qt_xdisplay(),widget()->winId(),&root,&frame,&children,&numc) == 0)
return;
if (tqchildren!=NULL)XFree(tqchildren);
tqchildren=NULL;
if (children!=NULL)XFree(children);
children=NULL;
// frame has two tqchildren, us and a wrapper, get the wrapper
if (XQueryTree(qt_xdisplay(),frame,&root,&parent,&tqchildren,&numc)==0)
// frame has two children, us and a wrapper, get the wrapper
if (XQueryTree(qt_xdisplay(),frame,&root,&parent,&children,&numc)==0)
return;
for (uint i=0;i<numc;i++)
{
if (tqchildren[i]!=widget()->winId())wrapper=tqchildren[i];
if (children[i]!=widget()->winId())wrapper=children[i];
}
if (tqchildren!=NULL)XFree(tqchildren);
tqchildren=NULL;
if (children!=NULL)XFree(children);
children=NULL;
// wrapper has only one child, which is the client. We want this!!
if (XQueryTree(qt_xdisplay(),wrapper,&root,&parent,&tqchildren,&numc)==0)
if (XQueryTree(qt_xdisplay(),wrapper,&root,&parent,&children,&numc)==0)
return;
if (numc==1)client=tqchildren[0];
if (tqchildren!=NULL)XFree(tqchildren);
tqchildren=NULL;
if (numc==1)client=children[0];
if (children!=NULL)XFree(children);
children=NULL;
if (v_client) *v_client=client;
if (v_wrapper) *v_wrapper=wrapper;
if (v_frame) *v_frame=frame;
@ -1205,7 +1205,7 @@ void CrystalClient::ClientWindows(Window* v_frame,Window* v_wrapper,Window *v_cl
void CrystalClient::mouseDoubleClickEvent(TQMouseEvent *e)
{
if (/*(titlebar_->tqgeometry().contains(e->pos()))&&*/(e->button()==Qt::LeftButton)) titlebarDblClickOperation();
if (/*(titlebar_->geometry().contains(e->pos()))&&*/(e->button()==Qt::LeftButton)) titlebarDblClickOperation();
else {
TQMouseEvent me(TQEvent::MouseButtonPress,e->pos(),e->button(),e->state());
processMousePressEvent(&me);
@ -1264,7 +1264,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
WND_CONFIG* wndcfg=(isActive()?&::factory->active:&::factory->inactive);
if (::factory->transparency && ::factory->trackdesktop)
::factory->image_holder->tqrepaint(false); // If other desktop than the last, regrab the root image
::factory->image_holder->repaint(false); // If other desktop than the last, regrab the root image
TQPixmap *background=::factory->transparency?::factory->image_holder->image(isActive()):NULL;
int drawFrame;
@ -1295,7 +1295,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
pufferPainter.setFont(options()->font(isActive(), false));
TQColor color=options()->color(KDecoration::ColorFont, isActive());
r=titlebar_->tqgeometry();
r=titlebar_->geometry();
r.moveBy(0,-1);
int logowidth=::factory->logo.width()+::factory->logoDistance;
if (::factory->logoEnabled!=1 && (isActive()||!::factory->logoActive))
@ -1336,7 +1336,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
}
}else if (::factory->logoEnabled!=1 && (isActive()||!::factory->logoActive)) {
int x=0;
r=titlebar_->tqgeometry();
r=titlebar_->geometry();
if (::factory->logoEnabled==0) x=r.left();
if (::factory->logoEnabled==2) x=r.right()-::factory->logo.width();
pufferPainter.drawPixmap(x,(::factory->titlesize-::factory->logo.height())/2,::factory->logo);
@ -1485,7 +1485,7 @@ void CrystalClient::resizeEvent(TQResizeEvent *e)
if (!timer.isActive())timer.start(0,true);
// Repaint();
}
// tqrepaint only every xxx ms
// repaint only every xxx ms
else if (::factory->repaintMode==3 || !timer.isActive())
{
// Repaint only, when mode!=fade || amount<100
@ -1509,7 +1509,7 @@ void CrystalClient::moveEvent(TQMoveEvent *)
{
Repaint();
}
// tqrepaint every xxx ms, so constant moving does not take too much CPU
// repaint every xxx ms, so constant moving does not take too much CPU
else if (::factory->repaintMode==3 || !timer.isActive())
{
// Repaint only, when mode!=fade || value<100, because otherwise it is a plain color
@ -1528,7 +1528,7 @@ void CrystalClient::showEvent(TQShowEvent *)
void CrystalClient::Repaint()
{
widget()->tqrepaint(false);
widget()->repaint(false);
for (int n=0; n<ButtonTypeCount; n++)
if (button[n]) button[n]->reset();
}

8
client/imageholder.cpp
Unescape View File

@ -83,22 +83,22 @@ void QImageHolder::Init()
rootpixmap=new KMyRootPixmap(NULL/*,this*/);
rootpixmap->start();
rootpixmap->tqrepaint(true);
rootpixmap->repaint(true);
connect( rootpixmap,TQT_SIGNAL(backgroundUpdated(const TQImage*)),this, TQT_SLOT(BackgroundUpdated(const TQImage*)));
connect(kapp, TQT_SIGNAL(backgroundChanged(int)),TQT_SLOT(handleDesktopChanged(int)));
initialized=true;
}
void QImageHolder::tqrepaint(bool force)
void QImageHolder::repaint(bool force)
{
Init();
if (rootpixmap)rootpixmap->tqrepaint(force);
if (rootpixmap)rootpixmap->repaint(force);
}
void QImageHolder::handleDesktopChanged(int)
{
tqrepaint(true);
repaint(true);
}
void QImageHolder::CheckSanity()

2
client/imageholder.h
Unescape View File

@ -38,7 +38,7 @@ public:
void Init();
TQPixmap *image(bool active) { Init(); return active?img_active:img_inactive; }
void tqrepaint(bool force);
void repaint(bool force);
void setUserdefinedPictures(TQImage act,TQImage inact);

16
client/myrootpixmap.cc
Unescape View File

@ -57,7 +57,7 @@ void KMyRootPixmap::init()
// connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
// connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint()));
// connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint()));
// d->toplevel = m_pWidget->topLevelWidget();
// d->toplevel->installEventFilter(this);
@ -85,7 +85,7 @@ void KMyRootPixmap::start()
enableExports();
return;
// if (m_bInit)
// tqrepaint(true);
// repaint(true);
}
void KMyRootPixmap::stop()
@ -95,14 +95,14 @@ void KMyRootPixmap::stop()
}
void KMyRootPixmap::tqrepaint()
void KMyRootPixmap::repaint()
{
tqrepaint(false);
repaint(false);
}
void KMyRootPixmap::tqrepaint(bool force)
void KMyRootPixmap::repaint(bool force)
{
// printf("KMyRootPixmap::tqrepaint(%s)\n",force?"true":"false");
// printf("KMyRootPixmap::repaint(%s)\n",force?"true":"false");
if ((!force) && (m_Desk==currentDesktop()))return;
m_Desk = currentDesktop();
@ -127,9 +127,9 @@ TQString KMyRootPixmap::pixmapName(int desk)
TQString pattern = TQString("DESKTOP%1");
int screen_number = DefaultScreen(qt_xdisplay());
if (screen_number) {
pattern = TQString("SCREEN%1-DESKTOP").tqarg(screen_number) + "%1";
pattern = TQString("SCREEN%1-DESKTOP").arg(screen_number) + "%1";
}
return pattern.tqarg( desk );
return pattern.arg( desk );
}

4
client/myrootpixmap.h
Unescape View File

@ -57,9 +57,9 @@ public slots:
// void setFadeEffect(double strength, const TQColor &color);
void tqrepaint( bool force );
void repaint( bool force );
void tqrepaint();
void repaint();
// void setCustomPainting( bool enable ) { m_bCustomPaint = enable; }

Write Preview
Loading…
Cancel
Save