summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/core/container_extension.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/kicker/core/container_extension.cpp')
-rw-r--r--kicker/kicker/core/container_extension.cpp222
1 files changed, 111 insertions, 111 deletions
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 6a1455f3e..52e85bd7e 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -139,11 +139,11 @@ void ExtensionContainer::init()
_popupWidgetFilter = new PopupWidgetFilter( this );
connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer()));
- // tqlayout
- _tqlayout = new TQGridLayout(this, 3, 3, 0, 0);
- _tqlayout->setResizeMode(TQLayout::FreeResize);
- _tqlayout->setRowStretch(1,10);
- _tqlayout->setColStretch(1,10);
+ // layout
+ _layout = new TQGridLayout(this, 3, 3, 0, 0);
+ _layout->setResizeMode(TQLayout::FreeResize);
+ _layout->setRowStretch(1,10);
+ _layout->setColStretch(1,10);
// instantiate the autohide timer
_autohideTimer = new TQTimer(this, "_autohideTimer");
@@ -198,7 +198,7 @@ void ExtensionContainer::init()
connect(m_extension, TQT_SIGNAL(maintainFocus(bool)),
TQT_SLOT(maintainFocus(bool)));
- _tqlayout->addWidget(m_extension, 1, 1);
+ _layout->addWidget(m_extension, 1, 1);
}
if (!m_settings.iExist())
@@ -212,7 +212,7 @@ ExtensionContainer::~ExtensionContainer()
{
}
-TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize &maxSize) const
+TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const
{
int width = 0;
int height = 0;
@@ -234,7 +234,7 @@ TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize
}
// don't forget we might have a border!
- width += _tqlayout->colSpacing(0) + _tqlayout->colSpacing(2);
+ width += _layout->colSpacing(0) + _layout->colSpacing(2);
}
else
{
@@ -254,7 +254,7 @@ TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize
}
// don't forget we might have a border!
- height += _tqlayout->rowSpacing(0) + _tqlayout->rowSpacing(2);
+ height += _layout->rowSpacing(0) + _layout->rowSpacing(2);
}
TQSize size(width, height);
@@ -262,7 +262,7 @@ TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize
if (m_extension)
{
- size = m_extension->tqsizeHint(p, maxSize - size) + size;
+ size = m_extension->sizeHint(p, maxSize - size) + size;
}
return size.boundedTo(maxSize);
@@ -293,7 +293,7 @@ void ExtensionContainer::readConfig()
}
positionChange(position());
- tqalignmentChange(tqalignment());
+ alignmentChange(alignment());
setSize(static_cast<KPanelExtension::Size>(m_settings.size()),
m_settings.customSize());
@@ -471,7 +471,7 @@ void ExtensionContainer::moveMe()
KPanelExtension::Right,
KPanelExtension::Top,
KPanelExtension::Bottom };
- KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop,
+ KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop,
KPanelExtension::Center,
KPanelExtension::RightBottom };
@@ -482,26 +482,26 @@ void ExtensionContainer::moveMe()
for (int j = 0; j < 3; j++)
{
// FIXME:
- // asking for initial tqgeometry here passes bogus heightForWidth
+ // asking for initial geometry here passes bogus heightForWidth
// and widthForHeight requests to applets and buttons. if they
- // need to make tqlayout adjustments or need to calculate based
+ // need to make layout adjustments or need to calculate based
// on other parameters this can lead to Bad Things(tm)
//
// we need to find a way to do this that doesn't result in
- // tqsizeHint's getting called on the extension =/
+ // sizeHint's getting called on the extension =/
//
// or else we need to change the semantics for applets so that
// they don't get their "you're changing position" signals through
// heightForWidth/widthForHeight
rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i],
- tqalignments[j], s),
- s, positions[i], tqalignments[j]));
+ alignments[j], s),
+ s, positions[i], alignments[j]));
}
}
}
UserRectSel::PanelStrut newStrut = UserRectSel::select(rects, rect().center(), m_highlightColor);
- arrange(newStrut.m_pos, newStrut.m_tqalignment, newStrut.m_screen);
+ arrange(newStrut.m_pos, newStrut.m_alignment, newStrut.m_screen);
_is_lmb_down = false;
@@ -532,7 +532,7 @@ void ExtensionContainer::updateLayout()
return;
}
- // don't update our tqlayout more than once every half a second...
+ // don't update our layout more than once every half a second...
if (_in_autohide)
{
// ... unless we are autohiding
@@ -556,12 +556,12 @@ void ExtensionContainer::enableMouseOverEffects()
KickerTip::enableTipping(true);
TQPoint globalPos = TQCursor::pos();
TQPoint localPos = mapFromGlobal(globalPos);
- TQWidget* child = tqchildAt(localPos);
+ TQWidget* child = childAt(localPos);
if (child)
{
TQMouseEvent* e = new TQMouseEvent(TQEvent::Enter, localPos, globalPos, 0, 0);
- tqApp->sendEvent(child, e);
+ qApp->sendEvent(child, e);
}
}
@@ -657,16 +657,16 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama
// Otherwise hide mode is automatic. The code below is slightly
// complex so as to keep the same behavior as it has always had:
- // only unhide when the cursor position is within the widget tqgeometry.
- // We can't just do tqgeometry().tqcontains(TQCursor::pos()) because
+ // only unhide when the cursor position is within the widget geometry.
+ // We can't just do geometry().contains(TQCursor::pos()) because
// now we hide the panel completely off screen.
int x = TQCursor::pos().x();
int y = TQCursor::pos().y();
- int t = tqgeometry().top();
- int b = tqgeometry().bottom();
- int r = tqgeometry().right();
- int l = tqgeometry().left();
+ int t = geometry().top();
+ int b = geometry().bottom();
+ int r = geometry().right();
+ int l = geometry().left();
if (((tr == UnhideTrigger::Top ||
tr == UnhideTrigger::TopLeft ||
tr == UnhideTrigger::TopRight) &&
@@ -730,9 +730,9 @@ void ExtensionContainer::autoHideTimeout()
return;
}
- TQRect r = tqgeometry();
+ TQRect r = geometry();
TQPoint p = TQCursor::pos();
- if (!r.tqcontains(p) &&
+ if (!r.contains(p) &&
(m_settings.unhideLocation() == UnhideTrigger::None ||
!shouldUnhideForTrigger(m_unhideTriggeredAt)))
{
@@ -766,7 +766,7 @@ void ExtensionContainer::autoHide(bool hide)
blockUserInput(true);
TQPoint oldpos = pos();
- TQRect newextent = initialGeometry( position(), tqalignment(), xineramaScreen(), hide, Unhidden );
+ TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden );
TQPoint newpos = newextent.topLeft();
if (hide)
@@ -781,7 +781,7 @@ void ExtensionContainer::autoHide(bool hide)
* letting them show reveal buttons onscreen */
TQRect desktopGeom = TQApplication::desktop()->screenGeometry(s);
if (desktopGeom.intersects(newextent) &&
- !desktopGeom.intersects(tqgeometry()))
+ !desktopGeom.intersects(geometry()))
{
blockUserInput( false );
return;
@@ -821,8 +821,8 @@ void ExtensionContainer::autoHide(bool hide)
move(oldpos.x() - i, newpos.y());
}
- tqApp->syncX();
- tqApp->processEvents();
+ qApp->syncX();
+ qApp->processEvents();
}
}
else
@@ -839,8 +839,8 @@ void ExtensionContainer::autoHide(bool hide)
move(newpos.x(), oldpos.y() - i);
}
- tqApp->syncX();
- tqApp->processEvents();
+ qApp->syncX();
+ qApp->processEvents();
}
}
}
@@ -878,7 +878,7 @@ void ExtensionContainer::animatedHide(bool left)
}
TQPoint oldpos = pos();
- TQRect newextent = initialGeometry(position(), tqalignment(), xineramaScreen(), false, newState);
+ TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState);
TQPoint newpos(newextent.topLeft());
if (newState != Unhidden)
@@ -891,7 +891,7 @@ void ExtensionContainer::animatedHide(bool left)
* panels from hiding by sliding onto other screens, while still
* letting them show reveal buttons onscreen */
if (TQApplication::desktop()->screenGeometry(s).intersects(newextent) &&
- !TQApplication::desktop()->screenGeometry(s).intersects(tqgeometry()))
+ !TQApplication::desktop()->screenGeometry(s).intersects(geometry()))
{
blockUserInput(false);
TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
@@ -920,8 +920,8 @@ void ExtensionContainer::animatedHide(bool left)
{
move(newpos.x(), oldpos.y() - i);
}
- tqApp->syncX();
- tqApp->processEvents();
+ qApp->syncX();
+ qApp->processEvents();
}
}
else
@@ -937,8 +937,8 @@ void ExtensionContainer::animatedHide(bool left)
{
move(oldpos.x() - i, newpos.y());
}
- tqApp->syncX();
- tqApp->processEvents();
+ qApp->syncX();
+ qApp->processEvents();
}
}
}
@@ -948,8 +948,8 @@ void ExtensionContainer::animatedHide(bool left)
_userHidden = newState;
actuallyUpdateLayout();
- tqApp->syncX();
- tqApp->processEvents();
+ qApp->syncX();
+ qApp->processEvents();
// save our hidden status so that when kicker starts up again
// we'll come back in the same state
@@ -965,11 +965,11 @@ bool ExtensionContainer::reserveStrut() const
return !m_extension || m_extension->reserveStrut();
}
-KPanelExtension::Alignment ExtensionContainer::tqalignment() const
+KPanelExtension::Alignment ExtensionContainer::alignment() const
{
// KConfigXT really needs to get support for vars that are enums that
// are defined in other classes
- return static_cast<KPanelExtension::Alignment>(m_settings.tqalignment());
+ return static_cast<KPanelExtension::Alignment>(m_settings.alignment());
}
void ExtensionContainer::updateWindowManager()
@@ -983,8 +983,8 @@ void ExtensionContainer::updateWindowManager()
int w = 0;
int h = 0;
- TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen());
- TQRect virtRect(TQApplication::desktop()->tqgeometry());
+ TQRect geom = initialGeometry(position(), alignment(), xineramaScreen());
+ TQRect virtRect(TQApplication::desktop()->geometry());
TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen()));
if (m_hideMode == ManualHide && !userHidden())
@@ -1087,7 +1087,7 @@ void ExtensionContainer::strutChanged()
//kdDebug(1210) << "PanelContainer::strutChanged()" << endl;
TQRect ig = currentGeometry();
- if (ig != tqgeometry())
+ if (ig != geometry())
{
setGeometry(ig);
updateLayout();
@@ -1106,11 +1106,11 @@ void ExtensionContainer::blockUserInput( bool block )
// eventfilter discard those events.
if ( block )
{
- tqApp->installEventFilter( this );
+ qApp->installEventFilter( this );
}
else
{
- tqApp->removeEventFilter( this );
+ qApp->removeEventFilter( this );
}
_block_user_input = block;
@@ -1170,11 +1170,11 @@ void ExtensionContainer::maintainFocus(bool maintain)
int ExtensionContainer::arrangeHideButtons()
{
- bool tqlayoutEnabled = _tqlayout->isEnabled();
+ bool layoutEnabled = _layout->isEnabled();
- if (tqlayoutEnabled)
+ if (layoutEnabled)
{
- _tqlayout->setEnabled(false);
+ _layout->setEnabled(false);
}
if (orientation() == Vertical)
@@ -1190,16 +1190,16 @@ int ExtensionContainer::arrangeHideButtons()
{
_ltHB->setMaximumWidth(maxWidth);
_ltHB->setMaximumHeight(14);
- _tqlayout->remove(_ltHB);
- _tqlayout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft);
+ _layout->remove(_ltHB);
+ _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft);
}
if (_rbHB)
{
_rbHB->setMaximumWidth(maxWidth);
_rbHB->setMaximumHeight(14);
- _tqlayout->remove(_rbHB);
- _tqlayout->addWidget(_rbHB, 2, 1);
+ _layout->remove(_rbHB);
+ _layout->addWidget(_rbHB, 2, 1);
}
}
else
@@ -1218,14 +1218,14 @@ int ExtensionContainer::arrangeHideButtons()
{
_ltHB->setMaximumHeight(maxHeight);
_ltHB->setMaximumWidth(14);
- _tqlayout->remove(_ltHB);
+ _layout->remove(_ltHB);
if (kapp->reverseLayout())
{
- _tqlayout->addWidget(_ltHB, 1, 2, vertAlignment);
+ _layout->addWidget(_ltHB, 1, 2, vertAlignment);
}
else
{
- _tqlayout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment);
+ _layout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment);
}
}
@@ -1233,57 +1233,57 @@ int ExtensionContainer::arrangeHideButtons()
{
_rbHB->setMaximumHeight(maxHeight);
_rbHB->setMaximumWidth(14);
- _tqlayout->remove(_rbHB);
+ _layout->remove(_rbHB);
if (kapp->reverseLayout())
{
- _tqlayout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment);
+ _layout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment);
}
else
{
- _tqlayout->addWidget(_rbHB, 1, 2, vertAlignment);
+ _layout->addWidget(_rbHB, 1, 2, vertAlignment);
}
}
}
- int tqlayoutOffset = setupBorderSpace();
- if (tqlayoutEnabled)
+ int layoutOffset = setupBorderSpace();
+ if (layoutEnabled)
{
- _tqlayout->setEnabled(true);
+ _layout->setEnabled(true);
}
- return tqlayoutOffset;
+ return layoutOffset;
}
int ExtensionContainer::setupBorderSpace()
{
- _tqlayout->setRowSpacing(0, 0);
- _tqlayout->setRowSpacing(2, 0);
- _tqlayout->setColSpacing(0, 0);
- _tqlayout->setColSpacing(2, 0);
+ _layout->setRowSpacing(0, 0);
+ _layout->setRowSpacing(2, 0);
+ _layout->setColSpacing(0, 0);
+ _layout->setColSpacing(2, 0);
if (!needsBorder())
{
return 0;
}
- int tqlayoutOffset = 0;
+ int layoutOffset = 0;
TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen());
- TQRect h = tqgeometry();
+ TQRect h = geometry();
if (orientation() == Vertical)
{
if (h.top() > 0)
{
int topHeight = (_ltHB && _ltHB->isVisibleTo(this)) ? _ltHB->height() + 1 : 1;
- _tqlayout->setRowSpacing(0, topHeight);
- ++tqlayoutOffset;
+ _layout->setRowSpacing(0, topHeight);
+ ++layoutOffset;
}
if (h.bottom() < r.bottom())
{
int bottomHeight = (_rbHB && _rbHB->isVisibleTo(this)) ? _rbHB->height() + 1 : 1;
- _tqlayout->setRowSpacing(1, bottomHeight);
- ++tqlayoutOffset;
+ _layout->setRowSpacing(1, bottomHeight);
+ ++layoutOffset;
}
}
else
@@ -1291,39 +1291,39 @@ int ExtensionContainer::setupBorderSpace()
if (h.left() > 0)
{
int leftWidth = (_ltHB && _ltHB->isVisibleTo(this)) ? _ltHB->width() + 1 : 1;
- _tqlayout->setColSpacing(0, leftWidth);
- ++tqlayoutOffset;
+ _layout->setColSpacing(0, leftWidth);
+ ++layoutOffset;
}
if (h.right() < r.right())
{
int rightWidth = (_rbHB && _rbHB->isVisibleTo(this)) ? _rbHB->width() + 1 : 1;
- _tqlayout->setColSpacing(1, rightWidth);
- ++tqlayoutOffset;
+ _layout->setColSpacing(1, rightWidth);
+ ++layoutOffset;
}
}
switch (position())
{
case KPanelExtension::Left:
- _tqlayout->setColSpacing(2, 1);
+ _layout->setColSpacing(2, 1);
break;
case KPanelExtension::Right:
- _tqlayout->setColSpacing(0, 1);
+ _layout->setColSpacing(0, 1);
break;
case KPanelExtension::Top:
- _tqlayout->setRowSpacing(2, 1);
+ _layout->setRowSpacing(2, 1);
break;
case KPanelExtension::Bottom:
default:
- _tqlayout->setRowSpacing(0, 1);
+ _layout->setRowSpacing(0, 1);
break;
}
- return tqlayoutOffset;
+ return layoutOffset;
}
void ExtensionContainer::positionChange(KPanelExtension::Position p)
@@ -1368,14 +1368,14 @@ void ExtensionContainer::leaveEvent(TQEvent*)
maybeStartAutoHideTimer();
}
-void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a)
+void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a)
{
if (!m_extension)
{
return;
}
- m_extension->tqsetAlignment(a);
+ m_extension->setAlignment(a);
}
void ExtensionContainer::setSize(KPanelExtension::Size size, int custom)
@@ -1437,8 +1437,8 @@ void ExtensionContainer::setHideButtons(bool showLeft, bool showRight)
bool ExtensionContainer::event(TQEvent* e)
{
- // Update the tqlayout when we receive a LayoutHint. This way we can adjust
- // to changes of the tqlayout of the main widget.
+ // Update the layout when we receive a LayoutHint. This way we can adjust
+ // to changes of the layout of the main widget.
if (e->type() == TQEvent::LayoutHint)
{
updateLayout();
@@ -1458,7 +1458,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p,
int XineramaScreen)
{
if (p == m_settings.position() &&
- a == m_settings.tqalignment() &&
+ a == m_settings.alignment() &&
XineramaScreen == xineramaScreen())
{
return;
@@ -1471,18 +1471,18 @@ void ExtensionContainer::arrange(KPanelExtension::Position p,
}
else if (!needsBorder())
{
- // this ensures that the tqlayout gets rejigged
+ // this ensures that the layout gets rejigged
// even if position doesn't change
- _tqlayout->setRowSpacing(0, 0);
- _tqlayout->setRowSpacing(2, 0);
- _tqlayout->setColSpacing(0, 0);
- _tqlayout->setColSpacing(2, 0);
+ _layout->setRowSpacing(0, 0);
+ _layout->setRowSpacing(2, 0);
+ _layout->setColSpacing(0, 0);
+ _layout->setColSpacing(2, 0);
}
- if (a != m_settings.tqalignment())
+ if (a != m_settings.alignment())
{
- m_settings.tqsetAlignment(a);
- tqsetAlignment(a);
+ m_settings.setAlignment(a);
+ setAlignment(a);
}
if (XineramaScreen != xineramaScreen())
@@ -1521,22 +1521,22 @@ KPanelExtension::Position ExtensionContainer::position() const
void ExtensionContainer::resetLayout()
{
- TQRect g = initialGeometry(position(), tqalignment(), xineramaScreen(),
+ TQRect g = initialGeometry(position(), alignment(), xineramaScreen(),
autoHidden(), userHidden());
- // Disable the tqlayout while we rearrange the panel.
+ // Disable the layout while we rearrange the panel.
// Necessary because the children may be
- // retqlayouted with the wrong size.
+ // relayouted with the wrong size.
- _tqlayout->setEnabled(false);
+ _layout->setEnabled(false);
- if (tqgeometry() != g)
+ if (geometry() != g)
{
setGeometry(g);
ExtensionManager::the()->extensionSizeChanged(this);
}
- // tqlayout
+ // layout
bool haveToArrangeButtons = false;
bool showLeftHideButton = m_settings.showLeftHideButton() || userHidden() == RightBottom;
bool showRightHideButton = m_settings.showRightHideButton() || userHidden() == LeftTop;
@@ -1685,7 +1685,7 @@ void ExtensionContainer::resetLayout()
}
}
- _tqlayout->setEnabled(true);
+ _layout->setEnabled(true);
}
bool ExtensionContainer::needsBorder() const
@@ -1700,7 +1700,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA
", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() <<
", " << workArea.bottomRight().y() << ")" << endl;*/
- TQSize hint = tqsizeHint(p, workArea.size()).boundedTo(workArea.size());
+ TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size());
int width = 0;
int height = 0;
@@ -1739,7 +1739,7 @@ TQPoint ExtensionContainer::initialLocation(KPanelExtension::Position p,
TQRect wholeScreen;
if (XineramaScreen == XineramaAllScreens)
{
- wholeScreen = TQApplication::desktop()->tqgeometry();
+ wholeScreen = TQApplication::desktop()->geometry();
}
else
{
@@ -1920,12 +1920,12 @@ void ExtensionContainer::setXineramaScreen(int screen)
return;
}
- arrange(position(),tqalignment(), screen);
+ arrange(position(),alignment(), screen);
}
TQRect ExtensionContainer::currentGeometry() const
{
- return initialGeometry(position(), tqalignment(), xineramaScreen(),
+ return initialGeometry(position(), alignment(), xineramaScreen(),
autoHidden(), userHidden());
}
@@ -1937,7 +1937,7 @@ TQRect ExtensionContainer::initialGeometry(KPanelExtension::Position p,
{
//RESEARCH: is there someway to cache the results of the repeated calls to this method?
- /*kdDebug(1210) << "initialGeometry() Computing tqgeometry for " << name() <<
+ /*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() <<
" on screen " << XineramaScreen << endl;*/
TQRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this);
TQSize size = initialSize(p, workArea);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 03:32:27 +0000