summaryrefslogtreecommitdiffstats
path: root/kexi/plugins/forms/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/plugins/forms/widgets')
-rw-r--r--kexi/plugins/forms/widgets/kexidbautofield.cpp36
-rw-r--r--kexi/plugins/forms/widgets/kexidbcombobox.cpp18
-rw-r--r--kexi/plugins/forms/widgets/kexidbdateedit.cpp6
-rw-r--r--kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp10
-rw-r--r--kexi/plugins/forms/widgets/kexidbimagebox.cpp12
-rw-r--r--kexi/plugins/forms/widgets/kexidblabel.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexiframe.cpp2
7 files changed, 43 insertions, 43 deletions
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 3a8e8453..9437faca 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -57,7 +57,7 @@ class KexiDBAutoField::Private
//!< of widgetTypeForFieldType() if widgetTypeForFieldType is Auto
WidgetType widgetType_property; //!< provides widget type or Auto
LabelPosition lblPosition;
- TQBoxLayout *tqlayout;
+ TQBoxLayout *layout;
TQLabel *label;
TQString caption;
KexiDB::Field::Type fieldTypeInternal;
@@ -104,7 +104,7 @@ void
KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
{
d->fieldTypeInternal = KexiDB::Field::InvalidType;
- d->tqlayout = 0;
+ d->layout = 0;
m_subwidget = 0;
d->label = new TQLabel(text, this);
d->label->installEventFilter( this );
@@ -116,8 +116,8 @@ KexiDBAutoField::init(const TQString &text, WidgetType type, LabelPosition pos)
d->widgetType_property = (type==Auto ? Text : type); //to force "differ" to be true in setWidgetType()
setLabelPosition(pos);
setWidgetType(type);
- d->baseColor = tqpalette().active().base();
- d->textColor = tqpalette().active().text();
+ d->baseColor = palette().active().base();
+ d->textColor = palette().active().text();
}
void
@@ -222,25 +222,25 @@ void
KexiDBAutoField::setLabelPosition(LabelPosition position)
{
d->lblPosition = position;
- if(d->tqlayout) {
- TQBoxLayout *lyr = d->tqlayout;
- d->tqlayout = 0;
+ if(d->layout) {
+ TQBoxLayout *lyr = d->layout;
+ d->layout = 0;
delete lyr;
}
if(m_subwidget)
m_subwidget->show();
- //! \todo support right-to-left tqlayout where positions are inverted
+ //! \todo support right-to-left layout where positions are inverted
if (position==Top || position==Left) {
int align = d->label->alignment();
if(position == Top) {
- d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this);
+ d->layout = (TQBoxLayout*) new TQVBoxLayout(this);
align |= AlignVertical_Mask;
align ^= AlignVertical_Mask;
align |= AlignTop;
}
else {
- d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
+ d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
align |= AlignVertical_Mask;
align ^= AlignVertical_Mask;
align |= AlignVCenter;
@@ -254,14 +254,14 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
else {
d->label->show();
}
- d->tqlayout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
+ d->layout->addWidget(d->label, 0, position == Top ? int(TQt::AlignLeft) : 0);
if(position == Left && d->widgetType != Boolean)
- d->tqlayout->addSpacing(KexiDBAutoField_SPACING);
- d->tqlayout->addWidget(m_subwidget, 1);
+ d->layout->addSpacing(KexiDBAutoField_SPACING);
+ d->layout->addWidget(m_subwidget, 1);
KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget);
if (subwidgetInterface) {
if (subwidgetInterface->appendStretchRequired(this))
- d->tqlayout->addStretch(0);
+ d->layout->addStretch(0);
if (subwidgetInterface->subwidgetStretchRequired(this)) {
TQSizePolicy sizePolicy( m_subwidget->sizePolicy() );
if(position == Left) {
@@ -279,11 +279,11 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
// m_subwidget->setSizePolicy(...);
}
else {
- d->tqlayout = (TQBoxLayout*) new TQHBoxLayout(this);
+ d->layout = (TQBoxLayout*) new TQHBoxLayout(this);
d->label->hide();
- d->tqlayout->addWidget(m_subwidget);
+ d->layout->addWidget(m_subwidget);
}
- //a hack to force tqlayout to be refreshed (any better idea for this?)
+ //a hack to force layout to be refreshed (any better idea for this?)
resize(size()+TQSize(1,0));
resize(size()-TQSize(1,0));
if (dynamic_cast<KexiDBAutoField*>((TQWidget*)m_subwidget)) {
@@ -584,7 +584,7 @@ KexiDBAutoField::changeText(const TQString &text, bool beautify)
realText = text[0].upper() + text.mid(1);
if (d->widgetType!=Boolean) {
//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label
-//! @todo support right-to-left tqlayout where position of ":" is inverted
+//! @todo support right-to-left layout where position of ":" is inverted
realText += ": ";
}
}
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index db56b550..5d2a24fd 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -124,7 +124,7 @@ bool KexiDBComboBox::isEditable() const
void KexiDBComboBox::paintEvent( TQPaintEvent * )
{
TQPainter p( this );
- TQColorGroup cg( tqpalette().active() );
+ TQColorGroup cg( palette().active() );
// if ( hasFocus() )
// cg.setColor(TQColorGroup::Base, cg.highlight());
// else
@@ -144,9 +144,9 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
return;
}
-//! @todo support reverse tqlayout
+//! @todo support reverse layout
//bool reverse = TQApplication::reverseLayout();
- tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
+ style().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
flags, (uint)TQStyle::SC_All,
(d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None )
);
@@ -157,11 +157,11 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
else { //not editable: we need to paint the current item
TQRect editorGeometry( this->editorGeometry() );
if ( hasFocus() ) {
- if (0==qstrcmp(tqstyle().name(), "windows")) //a hack
+ if (0==qstrcmp(style().name(), "windows")) //a hack
p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) );
- TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
+ TQRect r( TQStyle::visualRect( style().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+ style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight()));
}
//todo
@@ -171,7 +171,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
TQRect KexiDBComboBox::editorGeometry() const
{
TQRect r( TQStyle::visualRect(
- tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
+ style().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
TQStyle::SC_ComboBoxEditField), d->paintedCombo ) );
//if ((height()-r.bottom())<6)
@@ -232,7 +232,7 @@ void KexiDBComboBox::setLabelPosition(LabelPosition position)
TQRect KexiDBComboBox::buttonGeometry() const
{
TQRect arrowRect(
- tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
+ style().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo);
arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style
return arrowRect;
@@ -509,7 +509,7 @@ TQSize KexiDBComboBox::sizeHint() const
const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18;
const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2;
- d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
+ d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut()));
return d->sizeHint;
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index 3058f02c..daff9ef9 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -64,9 +64,9 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
m_datePickerPopupMenu->insertItem(m_datePicker);
btn->setPopup(m_datePickerPopupMenu);
- TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
- tqlayout->addWidget(m_edit, 1);
- tqlayout->addWidget(btn, 0);
+ TQHBoxLayout* layout = new TQHBoxLayout(this);
+ layout->addWidget(m_edit, 1);
+ layout->addWidget(btn, 0);
setFocusProxy(m_edit);
}
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 629a4bca..627e1172 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -71,11 +71,11 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
m_datePickerPopupMenu->insertItem(m_datePicker);
btn->setPopup(m_datePickerPopupMenu);
- TQHBoxLayout* tqlayout = new TQHBoxLayout(this);
- tqlayout->addWidget(m_dateEdit, 0);
- tqlayout->addWidget(btn, 0);
- tqlayout->addWidget(m_timeEdit, 0);
- //tqlayout->addStretch(1);
+ TQHBoxLayout* layout = new TQHBoxLayout(this);
+ layout->addWidget(m_dateEdit, 0);
+ layout->addWidget(btn, 0);
+ layout->addWidget(m_timeEdit, 0);
+ //layout->addStretch(1);
setFocusProxy(m_dateEdit);
}
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 5b8b2939..dd52f9f5 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -401,14 +401,14 @@ void KexiDBImageBox::handleCutAction()
void KexiDBImageBox::handleCopyAction()
{
- tqApp->tqclipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
+ tqApp->clipboard()->setPixmap(pixmap(), TQClipboard::Clipboard);
}
void KexiDBImageBox::handlePasteAction()
{
if (isReadOnly() || (!m_designMode && !hasFocus()))
return;
- TQPixmap pm( tqApp->tqclipboard()->pixmap(TQClipboard::Clipboard) );
+ TQPixmap pm( tqApp->clipboard()->pixmap(TQClipboard::Clipboard) );
// if (!pm.isNull())
// setValueInternal(pm, true);
if (dataSource().isEmpty()) {
@@ -610,7 +610,7 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
}
if (!m_paletteBackgroundColorChanged && parentWidget()) {
KexiFrame::setPaletteBackgroundColor(
- dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
+ dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : palette().active().base() );
}
}
@@ -685,9 +685,9 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
// if the widget is focused, draw focus indicator rect _if_ there is no chooser button
if (!m_designMode && !dataSource().isEmpty() && hasFocus() && (!m_chooser || !m_chooser->isVisible())) {
- tqstyle().tqdrawPrimitive(
- TQStyle::PE_FocusRect, &p, tqstyle().subRect(TQStyle::SR_PushButtonContents, this),
- tqpalette().active() );
+ style().tqdrawPrimitive(
+ TQStyle::PE_FocusRect, &p, style().subRect(TQStyle::SR_PushButtonContents, this),
+ palette().active() );
}
}
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index adb833fa..93f35027 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -424,7 +424,7 @@ void KexiDBLabel::init()
m_hasFocusableWidget = false;
d->internalLabel = new KexiDBInternalLabel( this );
d->internalLabel->hide();
- d->frameColor = tqpalette().active().foreground();
+ d->frameColor = palette().active().foreground();
setAlignment( d->internalLabel->alignment() );
}
diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp
index 09266ae4..b64d6edf 100644
--- a/kexi/plugins/forms/widgets/kexiframe.cpp
+++ b/kexi/plugins/forms/widgets/kexiframe.cpp
@@ -48,7 +48,7 @@ KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f )
, d( new Private() )
{
//defaults
- d->frameColor = tqpalette().active().foreground();
+ d->frameColor = palette().active().foreground();
//! @todo obtain these defaults from current template's style...
setLineWidth(2);
setFrameStyle(TQFrame::StyledPanel|TQFrame::Raised);
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-01 01:40:48 +0000