summaryrefslogtreecommitdiffstats
path: root/kexi/formeditor
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/formeditor')
-rw-r--r--kexi/formeditor/commands.cpp20
-rw-r--r--kexi/formeditor/commands.h4
-rw-r--r--kexi/formeditor/connectiondialog.cpp12
-rw-r--r--kexi/formeditor/container.cpp24
-rw-r--r--kexi/formeditor/container.h16
-rw-r--r--kexi/formeditor/editlistviewdialog.cpp18
-rw-r--r--kexi/formeditor/factories/containerfactory.cpp6
-rw-r--r--kexi/formeditor/factories/stdwidgetfactory.cpp12
-rw-r--r--kexi/formeditor/form.cpp2
-rw-r--r--kexi/formeditor/form.h6
-rw-r--r--kexi/formeditor/formIO.cpp108
-rw-r--r--kexi/formeditor/formmanager.cpp18
-rw-r--r--kexi/formeditor/formmanager.h14
-rw-r--r--kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp2
-rw-r--r--kexi/formeditor/test/kfd_part.cpp2
-rw-r--r--kexi/formeditor/widgetlibrary.cpp2
-rw-r--r--kexi/formeditor/widgetpropertyset.cpp24
-rw-r--r--kexi/formeditor/widgetpropertyset.h4
18 files changed, 147 insertions, 147 deletions
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index a2cddd89..1d782a20 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -437,7 +437,7 @@ AdjustSizeCommand::execute()
ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
if(item && !item->children()->isEmpty()) { // container
TQSize s;
- if(item->container() && item->container()->tqlayout())
+ if(item->container() && item->container()->layout())
s = w->sizeHint();
else
s = getSizeFromChildren(item);
@@ -614,7 +614,7 @@ AdjustSizeCommand::debug()
LayoutPropertyCommand::LayoutPropertyCommand(WidgetPropertySet *buf, const TQCString &wname,
const TQVariant &oldValue, const TQVariant &value)
- : PropertyCommand(buf, wname, oldValue, value, "tqlayout")
+ : PropertyCommand(buf, wname, oldValue, value, "layout")
{
m_form = FormManager::self()->activeForm();
ObjectTreeItem* titem = m_form->objectTree()->lookup(wname);
@@ -655,7 +655,7 @@ LayoutPropertyCommand::unexecute()
TQString
LayoutPropertyCommand::name() const
{
- return i18n("Change tqlayout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
+ return i18n("Change layout of widget \"%1\"").arg(TQString(m_oldvalues.begin().key()));
}
void
@@ -775,7 +775,7 @@ InsertWidgetCommand::execute()
}
w->move(m_insertRect.x(), m_insertRect.y());
w->resize(m_insertRect.width()-1, m_insertRect.height()-1); // -1 is not to hide dots
- w->setStyle(&(m_container->widget()->tqstyle()));
+ w->setStyle(&(m_container->widget()->style()));
w->setBackgroundOrigin(TQWidget::ParentOrigin);
w->show();
@@ -802,7 +802,7 @@ InsertWidgetCommand::execute()
for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it)
item->addModifiedProperty(*it, w->property(*it));
- m_container->reloadLayout(); // reload the tqlayout to take the new wigdet into account
+ m_container->reloadLayout(); // reload the layout to take the new wigdet into account
m_container->setSelectedWidget(w, false);
if (m_container->form()->library()->internalProperty(w->className(),
@@ -864,7 +864,7 @@ CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form
}
for(TQWidget *w = list.first(); w; w = list.next())
m_list->append(w);
- m_list->sort(); // we sort them now, before creating the tqlayout
+ m_list->sort(); // we sort them now, before creating the layout
for(TQWidget *w = m_list->first(); w; w = m_list->next())
m_pos.insert(w->name(), w->geometry());
@@ -911,7 +911,7 @@ CreateLayoutCommand::execute()
return;
container->setSelectedWidget(0, false);
- w->move(m_pos.begin().data().topLeft()); // we move the tqlayout at the position of the topleft widget
+ w->move(m_pos.begin().data().topLeft()); // we move the layout at the position of the topleft widget
// sizeHint of these widgets depends on geometry, so give them appropriate geometry
if(m_type == Container::HFlow)
w->resize( TQSize(700, 20) );
@@ -938,7 +938,7 @@ CreateLayoutCommand::execute()
((TQSplitter*)w)->setOrientation(Qt::Vertical);
else if(tree->container()) {
tree->container()->setLayout((Container::LayoutType)m_type);
- w->resize(tree->container()->tqlayout()->sizeHint()); // the tqlayout doesn't have its own size
+ w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size
}
container->setSelectedWidget(w, false);
@@ -952,7 +952,7 @@ CreateLayoutCommand::unexecute()
if(!parent)
parent = m_form->objectTree();
- // We reparent every widget to the Container and take them out of the tqlayout
+ // We reparent every widget to the Container and take them out of the layout
TQMap<TQCString,TQRect>::ConstIterator endIt = m_pos.constEnd();
for(TQMap<TQCString,TQRect>::ConstIterator it = m_pos.constBegin(); it != endIt; ++it)
{
@@ -973,7 +973,7 @@ CreateLayoutCommand::unexecute()
if (!titem)
return; //better this than a crash
TQWidget *w = titem->widget();
- parent->container()->deleteWidget(w); // delete the tqlayout widget
+ parent->container()->deleteWidget(w); // delete the layout widget
FormManager::self()->windowChanged(m_form->widget()); // to reload ObjectTreeView
}
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index ad468261..41da4b60 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -150,7 +150,7 @@ class KFORMEDITOR_EXPORT AdjustSizeCommand : public Command
TQMap<TQCString, TQSize> m_sizes;
};
-/*! This command is used when switching the tqlayout of a Container. It remembers the old pos
+/*! This command is used when switching the layout of a Container. It remembers the old pos
of every widget inside the Container. */
class KFORMEDITOR_EXPORT LayoutPropertyCommand : public PropertyCommand
{
@@ -203,7 +203,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
TQRect m_insertRect;
};
-/*! This command is used when creating a tqlayout from some widgets using "Lay out in..." menu item.
+/*! This command is used when creating a layout from some widgets using "Lay out in..." menu item.
It remembers the old pos of every widget, and takes care of updating ObjectTree too. You need
to supply a WidgetList of the selected widgets. */
class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index e1dcf1be..5bbbde38 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -51,7 +51,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
, m_buffer(0)
{
TQFrame *frame = makeMainWidget();
- TQHBoxLayout *tqlayout = new TQHBoxLayout(frame, 0, 6);
+ TQHBoxLayout *layout = new TQHBoxLayout(frame, 0, 6);
// Setup the details widget /////////
TQHBox *details = new TQHBox(frame);
@@ -74,21 +74,21 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
initTable();
m_table->setData(m_data, false);
m_table->adjustColumnWidthToContents(0);
- tqlayout->addWidget(m_table);
+ layout->addWidget(m_table);
//// Setup the icon toolbar /////////////////
- TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3);
+ TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3);
KPushButton *newItem = new KPushButton(SmallIconSet("filenew"), i18n("&New Connection"), frame);
- vtqlayout->addWidget(newItem);
+ vlayout->addWidget(newItem);
m_buttons.insert(BAdd, newItem);
connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem()));
KPushButton *delItem = new KPushButton(SmallIconSet("editdelete"), i18n("&Remove Connection"), frame);
- vtqlayout->addWidget(delItem);
+ vlayout->addWidget(delItem);
m_buttons.insert(BRemove, delItem);
connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
- vtqlayout->addStretch();
+ vlayout->addStretch();
setInitialSize(TQSize(600, 300));
//setWFlags(WDestructiveClose);
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 706ef69b..246940c7 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -333,7 +333,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
return false;
}
- case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the tqlayout will be reloaded when releasing mouse
+ case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the layout will be reloaded when releasing mouse
{
if(m_form->interactiveMode())
m_state = MovingWidget;
@@ -525,7 +525,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev)
//m_initialPos = TQPoint();
}
- else if(m_state == MovingWidget) // one widget has been moved, so we need to update the tqlayout
+ else if(m_state == MovingWidget) // one widget has been moved, so we need to update the layout
reloadLayout();
// cancel copying as user released Ctrl before releasing mouse button
@@ -639,7 +639,7 @@ Container::setLayout(LayoutType type)
return;
}
}
- m_container->setGeometry(m_container->geometry()); // just update tqlayout
+ m_container->setGeometry(m_container->geometry()); // just update layout
m_layout->activate();
}
@@ -654,14 +654,14 @@ Container::reloadLayout()
void
Container::createBoxLayout(WidgetList *list)
{
- TQBoxLayout *tqlayout = static_cast<TQBoxLayout*>(m_layout);
+ TQBoxLayout *layout = static_cast<TQBoxLayout*>(m_layout);
for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
list->append( tree->widget());
list->sort();
for(TQWidget *obj = list->first(); obj; obj = list->next())
- tqlayout->addWidget(obj);
+ layout->addWidget(obj);
delete list;
}
@@ -776,7 +776,7 @@ Container::createGridLayout(bool testOnly)
}
}
- // Then we count the number of rows in the tqlayout, and set their beginnings
+ // Then we count the number of rows in the layout, and set their beginnings
for(WidgetListIterator it(*vlist); it.current() != 0; ++it)
{
TQWidget *w = it.current();
@@ -830,11 +830,11 @@ Container::createGridLayout(bool testOnly)
}
kdDebug() << "the new grid will have n columns: n == " << cols.size() << endl;
- // We create the tqlayout ..
- TQGridLayout *tqlayout=0;
+ // We create the layout ..
+ TQGridLayout *layout=0;
if(!testOnly) {
- tqlayout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
- m_layout = (TQLayout*)tqlayout;
+ layout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
+ m_layout = (TQLayout*)layout;
}
// .. and we fill it with widgets
@@ -901,14 +901,14 @@ Container::createGridLayout(bool testOnly)
ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
if(!endrow && !endcol) {
if(!testOnly)
- tqlayout->addWidget(w, wrow, wcol);
+ layout->addWidget(w, wrow, wcol);
item->setGridPos(wrow, wcol, 0, 0);
}
else {
if(!endcol) endcol = wcol;
if(!endrow) endrow = wrow;
if(!testOnly)
- tqlayout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
+ layout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
item->setGridPos(wrow, wcol, endrow-wrow+1, endcol-wcol+1);
}
}
diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h
index 36f35e82..bd46c7a1 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -104,9 +104,9 @@ class KFORMEDITOR_EXPORT Container : public TQObject
void setObjectTree(ObjectTreeItem *t) { m_tree = t; }
//! \return a pointer to the TQLayout of this Container, or 0 if there is not.
- TQLayout* tqlayout() const { return m_layout; }
+ TQLayout* layout() const { return m_layout; }
- //! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum).
+ //! \return the type of the layout associated to this Container's widget (see LayoutType enum).
LayoutType layoutType() const { return m_layType; }
//! \return the margin of this Container.
@@ -115,8 +115,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
//! \return the spacing of this Container.
int layoutSpacing() { return m_spacing; }
- /*! Sets this Container to use \a type of tqlayout. The widget are inserted
- automatically in the tqlayout following their positions.
+ /*! Sets this Container to use \a type of layout. The widget are inserted
+ automatically in the layout following their positions.
\sa createBoxLayout(), createGridLayout() */
void setLayout(LayoutType type);
@@ -129,7 +129,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
//! \return the string representing the layoutType \a type.
static TQString layoutTypeToString(int type);
- //! \return the LayoutType (an int) for a given tqlayout name.
+ //! \return the LayoutType (an int) for a given layout name.
static LayoutType stringToLayoutType(const TQString &name);
/*! Stops the inline editing of the current widget (as when you click
@@ -161,8 +161,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
to Container's widget. */
void deleteWidget(TQWidget *w);
- /*! Recreates the Container tqlayout. Calls this when a widget has been moved
- or added to update the tqlayout. */
+ /*! Recreates the Container layout. Calls this when a widget has been moved
+ or added to update the layout. */
void reloadLayout();
protected slots:
@@ -178,7 +178,7 @@ class KFORMEDITOR_EXPORT Container : public TQObject
/*! Internal function to create a KexiFlowLayout. */
void createFlowLayout();
- /*! Internal function to create a GridLayout. if \a testOnly is true, the tqlayout
+ /*! Internal function to create a GridLayout. if \a testOnly is true, the layout
is simulated, and only the widget's grid info aris filled. */
void createGridLayout(bool testOnly=false);
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index d073b43d..281e5604 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -46,45 +46,45 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
m_contents = addPage(i18n("Contents"));
///////// Setup the "Contents" page /////////////////////////////
- TQHBoxLayout *tqlayout = new TQHBoxLayout(m_contents, 0, 6);
+ TQHBoxLayout *layout = new TQHBoxLayout(m_contents, 0, 6);
//// Setup the icon toolbar /////////////////
- TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3);
+ TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3);
TQToolButton *newRow = new TQToolButton(m_contents);
newRow->setIconSet(BarIconSet("edit_add"));
newRow->setTextLabel(i18n("&Add Item"), true);
- vtqlayout->addWidget(newRow);
+ vlayout->addWidget(newRow);
m_buttons.insert(BNewRow, newRow);
connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow()));
TQToolButton *newChild = new TQToolButton(m_contents);
newChild->setIconSet(BarIconSet("1rightarrow"));
newChild->setTextLabel(i18n("New &Subitem"), true);
- vtqlayout->addWidget(newChild);
+ vlayout->addWidget(newChild);
m_buttons.insert(BNewChild, newChild);
connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow()));
TQToolButton *delRow = new TQToolButton(m_contents);
delRow->setIconSet(BarIconSet("edit_remove"));
delRow->setTextLabel(i18n("&Remove Item"), true);
- vtqlayout->addWidget(delRow);
+ vlayout->addWidget(delRow);
m_buttons.insert(BRemRow, delRow);
connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow()));
TQToolButton *rowUp = new TQToolButton(m_contents);
rowUp->setIconSet(BarIconSet("1uparrow"));
rowUp->setTextLabel(i18n("Move Item &Up"), true);
- vtqlayout->addWidget(rowUp);
+ vlayout->addWidget(rowUp);
m_buttons.insert(BRowUp, rowUp);
connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp()));
TQToolButton *rowDown = new TQToolButton(m_contents);
rowDown->setIconSet(BarIconSet("1downarrow"));
rowDown->setTextLabel(i18n("Move Item &Down"), true);
- vtqlayout->addWidget(rowDown);
+ vlayout->addWidget(rowDown);
m_buttons.insert(BRowDown, rowDown);
connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown()));
- vtqlayout->addStretch();
+ vlayout->addStretch();
//// The listview ///////////
m_listview = new KListView(m_contents, "editlistview_listview");
@@ -96,7 +96,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
m_listview->setDropVisualizer(true);
m_listview->setAcceptDrops(true);
m_listview->setSorting(-1);
- tqlayout->addWidget(m_listview);
+ layout->addWidget(m_listview);
m_listview->setFocus();
connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index e41e5613..e87c300e 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -150,7 +150,7 @@ void KFDTabWidget::dropEvent( TQDropEvent *e )
emit handleDropEvent(e);
}
-/// Various tqlayout widgets /////////////////:
+/// Various layout widgets /////////////////:
HBox::HBox(TQWidget *parent, const char *name)
: TQFrame(parent, name), m_preview(false)
@@ -220,8 +220,8 @@ VFlow::paintEvent(TQPaintEvent *)
TQSize
VFlow::sizeHint() const
{
- if(tqlayout())
- return tqlayout()->sizeHint();
+ if(layout())
+ return layout()->sizeHint();
else
return TQSize(700, 50); // default
}
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 2607fcca..e6b13f0e 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -511,7 +511,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
else if(classname == "KPushButton")
{
KPushButton *push = static_cast<KPushButton*>(w);
- TQRect r = w->tqstyle().subRect(TQStyle::SR_PushButtonContents, w);
+ TQRect r = w->style().subRect(TQStyle::SR_PushButtonContents, w);
TQRect editorRect = TQRect(push->x() + r.x(), push->y() + r.y(), r.width(), r.height());
//r.setX(r.x() + 5);
//r.setY(r.y() + 5);
@@ -523,7 +523,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
else if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING)
{
TQRadioButton *radio = static_cast<TQRadioButton*>(w);
- TQRect r = w->tqstyle().subRect(TQStyle::SR_RadioButtonContents, w);
+ TQRect r = w->style().subRect(TQStyle::SR_RadioButtonContents, w);
TQRect editorRect = TQRect(radio->x() + r.x(), radio->y() + r.y(), r.width(), r.height());
createEditor(classname, radio->text(), radio, container, editorRect, TQt::AlignAuto);
return true;
@@ -533,7 +533,7 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
TQCheckBox *check = static_cast<TQCheckBox*>(w);
//TQRect r(check->geometry());
//r.setX(r.x() + 20);
- TQRect r = w->tqstyle().subRect(TQStyle::SR_CheckBoxContents, w);
+ TQRect r = w->style().subRect(TQStyle::SR_CheckBoxContents, w);
TQRect editorRect = TQRect(check->x() + r.x(), check->y() + r.y(), r.width(), r.height());
createEditor(classname, check->text(), check, container, editorRect, TQt::AlignAuto);
return true;
@@ -645,19 +645,19 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri
if(classname == TQRADIOBUTTON_OBJECT_NAME_STRING)
{
- r = widget->tqstyle().subRect(TQStyle::SR_RadioButtonContents, widget);
+ r = widget->style().subRect(TQStyle::SR_RadioButtonContents, widget);
p += r.topLeft();
s.setWidth(r.width());
}
else if(classname == TQCHECKBOX_OBJECT_NAME_STRING)
{
- r = widget->tqstyle().subRect(TQStyle::SR_CheckBoxContents, widget);
+ r = widget->style().subRect(TQStyle::SR_CheckBoxContents, widget);
p += r.topLeft();
s.setWidth(r.width());
}
else if(classname == "KPushButton")
{
- r = widget->tqstyle().subRect(TQStyle::SR_PushButtonContents, widget);
+ r = widget->style().subRect(TQStyle::SR_PushButtonContents, widget);
p += r.topLeft();
s = r.size();
}
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 6ed3e570..52d44966 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -528,7 +528,7 @@ Form::autoAssignTabStops()
d->tabstops.clear();
/// We automatically sort widget from the top-left to bottom-right corner
- //! \todo Handle RTL tqlayout (ie from top-right to bottom-left)
+ //! \todo Handle RTL layout (ie from top-right to bottom-left)
foreach_list(WidgetListIterator, it, list) {
TQWidget *w = it.current();
hlist.append(w);
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index 9bb68925..a8bd6dc0 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -231,10 +231,10 @@ class KFORMEDITOR_EXPORT Form : public TQObject
//! @todo make gridSize configurable at global level
int gridSize() { return 10; }
- //! \return the default margin for all the tqlayout inside this Form.
+ //! \return the default margin for all the layout inside this Form.
int defaultMargin() { return 11;}
- //! \return the default spacing for all the tqlayout inside this Form.
+ //! \return the default spacing for all the layout inside this Form.
int defaultSpacing() { return 6;}
/*! This function is used by ObjectTree to emit childAdded() signal (as it is not a TQObject). */
@@ -285,7 +285,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
(which are by default in order of creation).*/
void setAutoTabStops(bool autoTab) { d->autoTabstops = autoTab;}
- /*! Tells the Form to reassign the tab stops because the widget tqlayout has changed
+ /*! Tells the Form to reassign the tab stops because the widget layout has changed
(called for example before saving or displaying the tab order dialog).
Automatically sorts widget from the top-left to bottom-right corner.
Widget can be grouped with containers. In paticular, for tab widgets,
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 9161049d..bf3b9d08 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -66,7 +66,7 @@ void
CustomWidget::paintEvent(TQPaintEvent *)
{
TQPainter p(this);
- p.setPen(tqpalette().active().text());
+ p.setPen(palette().active().text());
TQRect r(rect());
r.setX(r.x()+2);
p.drawText(r, TQt::AlignTop, m_className);
@@ -971,7 +971,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
// if (-1 != item->widget()->metaObject()->findProperty("dataSource"))
// savePropertyValue(tclass, domDoc, "dataSource", item->widget()->property("dataSource"), item->widget());
- // We don't want to save the geometry if the widget is inside a tqlayout (so parent.tagName() == "grid" for example)
+ // We don't want to save the geometry if the widget is inside a layout (so parent.tagName() == "grid" for example)
if(item && !item->parent()) {
// save form widget size, but not its position
savePropertyValue(tclass, domDoc, "geometry",
@@ -999,7 +999,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
savedAlignment = true;
}
}
- else if(name == "name" || name == "geometry" || name == "tqlayout") {
+ else if(name == "name" || name == "geometry" || name == "layout") {
// these have already been saved
}
else {
@@ -1017,42 +1017,42 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
}
}
- // Saving container 's tqlayout if there is one
- TQDomElement tqlayout;
+ // Saving container 's layout if there is one
+ TQDomElement layout;
if(item->container() && item->container()->layoutType() != Container::NoLayout)
{
- if(item->container()->tqlayout()) // there is a tqlayout
+ if(item->container()->layout()) // there is a layout
{
- tqlayout = domDoc.createElement("temp");
- savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget());
+ layout = domDoc.createElement("temp");
+ savePropertyValue(layout, domDoc, "name", "unnamed", item->widget());
if(item->modifiedProperties()->contains("layoutMargin"))
- savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin());
+ savePropertyElement(layout, domDoc, "property", "margin", item->container()->layoutMargin());
if(item->modifiedProperties()->contains("layoutSpacing"))
- savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing());
- tclass.appendChild(tqlayout);
+ savePropertyElement(layout, domDoc, "property", "spacing", item->container()->layoutSpacing());
+ tclass.appendChild(layout);
}
}
int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout;
switch(layoutType) {
- case Container::Grid: // grid tqlayout
+ case Container::Grid: // grid layout
{
- tqlayout.setTagName("grid");
+ layout.setTagName("grid");
for(ObjectTreeItem *objIt = item->children()->first(); objIt; objIt = item->children()->next())
- saveWidget(objIt, tqlayout, domDoc, true);
+ saveWidget(objIt, layout, domDoc, true);
break;
}
case Container::HBox: case Container::VBox:
{
// as we don't save geometry, we need to sort widgets in the right order, not creation order
WidgetList *list;
- if(tqlayout.tagName() == "hbox") {
+ if(layout.tagName() == "hbox") {
list = new HorWidgetList(item->container()->form()->toplevelContainer()->widget());
- tqlayout.setTagName("hbox");
+ layout.setTagName("hbox");
}
else {
list = new VerWidgetList(item->container()->form()->toplevelContainer()->widget());
- tqlayout.setTagName("vbox");
+ layout.setTagName("vbox");
}
for(ObjectTreeItem *objTree = item->children()->first(); objTree; objTree = item->children()->next())
@@ -1062,28 +1062,28 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &parent, TQDomDocument &do
for(TQWidget *obj = list->first(); obj; obj = list->next()) {
ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name());
if(item)
- saveWidget(titem, tqlayout, domDoc);
+ saveWidget(titem, layout, domDoc);
}
delete list;
break;
}
case Container::HFlow: case Container::VFlow:
{
- tqlayout.setTagName("grid");
- KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout());
+ layout.setTagName("grid");
+ KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
if(!flow) break;
WidgetList *list = (WidgetList*)flow->widgetList();
// save some special properties
- savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
- savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) );
+ savePropertyElement(layout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
+ savePropertyElement(layout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->layout())->isJustified(), 3) );
- // fill the widget's grid info, ie just simulate grid tqlayout
+ // fill the widget's grid info, ie just simulate grid layout
item->container()->createGridLayout(true);
for(TQWidget *obj = list->first(); obj; obj = list->next()) {
ObjectTreeItem *titem = item->container()->form()->objectTree()->lookup(obj->name());
if(item)
- saveWidget(titem, tqlayout, domDoc, true); // save grid info for compatibility with TQtDesigner
+ saveWidget(titem, layout, domDoc, true); // save grid info for compatibility with TQtDesigner
}
delete list;
break;
@@ -1153,7 +1153,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
else if(tagName == "vbox")
classname = "VBox";
else if(tagName == "grid") {
- // first, see if it is flow tqlayout
+ // first, see if it is flow layout
for(TQDomNode child = n.firstChild(); !child.isNull(); child = child.nextSibling()) {
if((child.toElement().tagName() == "property")
&& (child.toElement().attribute("name") == "customLayout"))
@@ -1204,7 +1204,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
KAcceleratorManager::setNoAccel(w);
}
#endif
- w->setStyle(&(container->widget()->tqstyle()));
+ w->setStyle(&(container->widget()->style()));
w->show();
// We create and insert the ObjectTreeItem at the good place in the ObjectTree
@@ -1232,27 +1232,27 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
m_currentItem = item;
// if we are inside a Grid, we need to insert the widget in the good cell
if(container->layoutType() == Container::Grid) {
- TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout();
+ TQGridLayout *layout = (TQGridLayout*)container->layout();
if(el.hasAttribute("rowspan")) { // widget spans multiple cells
- if(tqlayout)
- tqlayout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1,
+ if(layout)
+ layout->addMultiCellWidget(w, el.attribute("row").toInt(), el.attribute("row").toInt() + el.attribute("rowspan").toInt()-1,
el.attribute("column").toInt(), el.attribute("column").toInt() + el.attribute("colspan").toInt()-1);
item->setGridPos(el.attribute("row").toInt(), el.attribute("column").toInt(), el.attribute("rowspan").toInt(),
el.attribute("colspan").toInt());
}
else {
- if(tqlayout)
- tqlayout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt());
+ if(layout)
+ layout->addWidget(w, el.attribute("row").toInt(), el.attribute("column").toInt());
item->setGridPos(el.attribute("row").toInt(), el.attribute("column").toInt(), 0, 0);
}
}
- else if(container->tqlayout())
- container->tqlayout()->add(w);
+ else if(container->layout())
+ container->layout()->add(w);
readChildNodes(item, container, el, w);
- if(item->container() && item->container()->tqlayout())
- item->container()->tqlayout()->activate();
+ if(item->container() && item->container()->layout())
+ item->container()->layout()->activate();
// We add the autoSaveProperties in the modifProp list of the ObjectTreeItem, so that they are saved later
TQValueList<TQCString> list(container->form()->library()->autoSaveProperties(w->className()));
@@ -1337,7 +1337,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
//if(name == "geometry")
// hasGeometryProp = true;
if( ((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
- (name == "name")) // we don't care about tqlayout names
+ (name == "name")) // we don't care about layout names
continue;
if (node.attribute("subwidget")=="true") {
@@ -1355,22 +1355,22 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
if(name == "buddy")
m_buddies->insert(readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toString(), (TQLabel*)w);
else if(((eltag == "grid") || (eltag == "hbox") || (eltag == "vbox")) &&
- item->container() && item->container()->tqlayout()) {
+ item->container() && item->container()->layout()) {
// We load the margin of a Layout
if(name == "margin") {
int margin = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
item->container()->setLayoutMargin(margin);
- item->container()->tqlayout()->setMargin(margin);
+ item->container()->layout()->setMargin(margin);
}
// We load the spacing of a Layout
else if(name == "spacing") {
int spacing = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
item->container()->setLayoutSpacing(spacing);
- item->container()->tqlayout()->setSpacing(spacing);
+ item->container()->layout()->setSpacing(spacing);
}
else if((name == "justify")){
bool justify = readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toBool();
- KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->tqlayout());
+ KexiFlowLayout *flow = static_cast<KexiFlowLayout*>(item->container()->layout());
if(flow)
flow->setJustified(justify);
}
@@ -1419,7 +1419,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
loadWidget(container, node, w);
}
else if(tag == "grid") {
- // first, see if it is flow tqlayout
+ // first, see if it is flow layout
TQString layoutName;
for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling()) {
if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout")) {
@@ -1430,33 +1430,33 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
if(layoutName == "HFlow") {
item->container()->m_layType = Container::HFlow;
- KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
- tqlayout->setOrientation(Qt::Horizontal);
- item->container()->m_layout = (TQLayout*)tqlayout;
+ KexiFlowLayout *layout = new KexiFlowLayout(item->widget());
+ layout->setOrientation(Qt::Horizontal);
+ item->container()->m_layout = (TQLayout*)layout;
}
else if(layoutName == "VFlow") {
item->container()->m_layType = Container::VFlow;
- KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
- tqlayout->setOrientation(Qt::Vertical);
- item->container()->m_layout = (TQLayout*)tqlayout;
+ KexiFlowLayout *layout = new KexiFlowLayout(item->widget());
+ layout->setOrientation(Qt::Vertical);
+ item->container()->m_layout = (TQLayout*)layout;
}
- else { // grid tqlayout
+ else { // grid layout
item->container()->m_layType = Container::Grid;
- TQGridLayout *tqlayout = new TQGridLayout(item->widget(), 1, 1);
- item->container()->m_layout = (TQLayout*)tqlayout;
+ TQGridLayout *layout = new TQGridLayout(item->widget(), 1, 1);
+ item->container()->m_layout = (TQLayout*)layout;
}
readChildNodes(item, container, node, w);
}
else if(tag == "vbox") {
item->container()->m_layType = Container::VBox;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(item->widget());
- item->container()->m_layout = (TQLayout*)tqlayout;
+ TQVBoxLayout *layout = new TQVBoxLayout(item->widget());
+ item->container()->m_layout = (TQLayout*)layout;
readChildNodes(item, container, node, w);
}
else if(tag == "hbox") {
item->container()->m_layType = Container::HBox;
- TQHBoxLayout *tqlayout = new TQHBoxLayout(item->widget());
- item->container()->m_layout = (TQLayout*)tqlayout;
+ TQHBoxLayout *layout = new TQHBoxLayout(item->widget());
+ item->container()->m_layout = (TQLayout*)layout;
readChildNodes(item, container, node, w);
}
else {// unknown tag, we let the Factory handle it
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index f75a4232..b212f00e 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX
m_style->setEditable(false);
KGlobal::config()->setGroup("General");
- TQString currentStyle = TQString::fromLatin1(kapp->tqstyle().name()).lower();
+ TQString currentStyle = TQString::fromLatin1(kapp->style().name()).lower();
const TQStringList styles = TQStyleFactory::keys();
m_style->setItems(styles);
m_style->setCurrentItem(0);
@@ -660,7 +660,7 @@ FormManager::previewForm(Form *form, TQWidget *container, Form *toForm)
else
myform = toForm;
myform->createToplevel(container);
- container->setStyle( &(form->widget()->tqstyle()) );
+ container->setStyle( &(form->widget()->style()) );
if (!FormIO::loadFormFromDom(myform, container, domDoc)) {
delete myform;
@@ -845,7 +845,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
const uint widgetsCount = container->form()->selectedWidgets()->count();
const bool multiple = widgetsCount > 1;
//const bool enableRemove = w != m_active->widget();
- // We only enabletqlayout creation if more than one widget with the same parent are selected
+ // We only enablelayout creation if more than one widget with the same parent are selected
const bool enableLayout = multiple || w == container->widget();
m_menuWidget = w;
@@ -1095,7 +1095,7 @@ void
FormManager::createLayout(int layoutType)
{
WidgetList *list = m_active->selectedWidgets();
- // if only one widget is selected (a container), we modify its tqlayout
+ // if only one widget is selected (a container), we modify its layout
if (list->isEmpty()) {//sanity check
kdWarning() << "FormManager::createLayout(): list is empty!" << endl;
return;
@@ -1103,9 +1103,9 @@ FormManager::createLayout(int layoutType)
if(list->count() == 1)
{
ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name());
- if(!item || !item->container() || !m_propSet->contains("tqlayout"))
+ if(!item || !item->container() || !m_propSet->contains("layout"))
return;
- (*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType);
+ (*m_propSet)["layout"] = Container::layoutTypeToString(layoutType);
return;
}
@@ -1115,7 +1115,7 @@ FormManager::createLayout(int layoutType)
kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl;
if(w->parentWidget() != parent)
{
- KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
+ KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the layout.</b>\n"
"All selected widgets must have the same parent."));
kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl;
return;
@@ -1143,7 +1143,7 @@ FormManager::breakLayout()
else // normal container
{
if(activeForm()->selectedWidgets()->count() == 1)
- (*m_propSet)["tqlayout"] = "NoLayout";
+ (*m_propSet)["layout"] = "NoLayout";
else
container->setLayout(Container::NoLayout);
}
@@ -1500,7 +1500,7 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple )
}
enableAction("format_font", fontEnabled);
- // If the widgets selected is a container, we enable tqlayout actions
+ // If the widgets selected is a container, we enable layout actions
bool containerSelected = false;
if(!multiple)
{
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index f5c72d73..677a3e7b 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -258,22 +258,22 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
/*! Creates a dialog to edit the Connection of \ref activeForm(). */
void editConnections();
- //! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand).
+ //! Lay out selected widgets using HBox layout (calls \ref CreateLayoutCommand).
void layoutHBox();
- //! Lay out selected widgets using VBox tqlayout.
+ //! Lay out selected widgets using VBox layout.
void layoutVBox();
- //! Lay out selected widgets using Grid tqlayout.
+ //! Lay out selected widgets using Grid layout.
void layoutGrid();
//! Lay out selected widgets in an horizontal splitter
void layoutHSplitter();
//! Lay out selected widgets in a verticak splitter
void layoutVSplitter();
- //! Lay out selected widgets using HFlow tqlayout
+ //! Lay out selected widgets using HFlow layout
void layoutHFlow();
- //! Lay out selected widgets using VFlow tqlayout.
+ //! Lay out selected widgets using VFlow layout.
void layoutVFlow();
- //! Breaks selected tqlayout(calls \ref BreakLayoutCommand).
+ //! Breaks selected layout(calls \ref BreakLayoutCommand).
void breakLayout();
void alignWidgetsToLeft();
@@ -418,7 +418,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
Change this if you need to handle, eg. custom UI XML tags, as in Kexi's Form Designer. */
virtual bool saveFormToStringInternal(Form *form, TQString &dest, int indent = 0);
#endif
- /*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
+ /*! Function called by the "Lay out in..." menu items. It creates a layout from the
currently selected widgets (that must have the same parent).
Calls \ref CreateLayoutCommand. */
void createLayout(int layoutType);
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 1a7b7dda..79f1b05f 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -397,7 +397,7 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple)
ENABLE_ACTION("format_raise", true);
ENABLE_ACTION("format_lower", true);
- // If the widgets selected is a container, we enable tqlayout actions
+ // If the widgets selected is a container, we enable layout actions
if(!multiple)
{
KFormDesigner::ObjectTreeItem *item = form->objectTree()->lookup( form->selectedWidgets()->first()->name() );
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 07e7edfd..02996580 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -423,7 +423,7 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple)
ENABLE_ACTION("format_raise", true);
ENABLE_ACTION("format_lower", true);
- // If the widgets selected is a container, we enable tqlayout actions
+ // If the widgets selected is a container, we enable layout actions
bool containerSelected = false;
if(!multiple)
{
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index 953b220b..55f8cde6 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -79,7 +79,7 @@ class WidgetLibraryPrivate
/*! @todo: reenable */ advancedProperties.insert("palette", (char*)1);
advancedProperties.insert("backgroundOrigin", (char*)1);
advancedProperties.insert("backgroundMode", (char*)1);//this is rather useless
- advancedProperties.insert("tqlayout", (char*)1);// too large risk to break things
+ advancedProperties.insert("layout", (char*)1);// too large risk to break things
// by providing this in propeditor
advancedProperties.insert("minimumSize", (char*)1);
advancedProperties.insert("maximumSize", (char*)1);
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 8d7d7daf..73c79c30 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -403,7 +403,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w)
));
}*/
- if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> tqlayout property
+ if(KFormDesigner::FormManager::self()->activeForm() && tree->container()) // we are a container -> layout property
createLayoutProperty(tree);
}
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
saveAlignProperty(property);
return;
}
- else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
+ else if((property == "layout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
saveLayoutProperty(property, value);
return;
}
@@ -895,7 +895,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
if (!container || !KFormDesigner::FormManager::self()->activeForm() ||
!KFormDesigner::FormManager::self()->activeForm()->objectTree() || !container->widget())
return;
- // special containers have no 'tqlayout' property, as it should not be changed
+ // special containers have no 'layout' property, as it should not be changed
TQCString className = container->widget()->className();
if((className == "HBox") || (className == "VBox") || (className == "Grid"))
return;
@@ -905,12 +905,12 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
- KoProperty::Property *p = new KoProperty::Property("tqlayout", createValueList(0, list), value,
+ KoProperty::Property *p = new KoProperty::Property("layout", createValueList(0, list), value,
i18n("Container's Layout"), i18n("Container's Layout"));
p->setVisible( container->form()->library()->advancedPropertiesVisible() );
d->set.addProperty(p);
- updatePropertyValue(item, "tqlayout");
+ updatePropertyValue(item, "layout");
p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
d->set.addProperty(p);
@@ -938,14 +938,14 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
return;
container = item->container();
- if(prop == "tqlayout") {
+ if(prop == "layout") {
Container::LayoutType type = Container::stringToLayoutType(value.toString());
- if(d->lastCommand && d->lastCommand->property() == "tqlayout" && !d->isUndoing)
+ if(d->lastCommand && d->lastCommand->property() == "layout" && !d->isUndoing)
d->lastCommand->setValue(value);
else if(!d->isUndoing) {
d->lastCommand = new LayoutPropertyCommand(this, d->widgets.first()->name(),
- d->set["tqlayout"].oldValue(), value);
+ d->set["layout"].oldValue(), value);
KFormDesigner::FormManager::self()->activeForm()->addCommand(d->lastCommand, false);
}
@@ -959,13 +959,13 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
return;
}
- if(prop == "layoutMargin" && container->tqlayout()) {
+ if(prop == "layoutMargin" && container->layout()) {
container->setLayoutMargin(value.toInt());
- container->tqlayout()->setMargin(value.toInt());
+ container->layout()->setMargin(value.toInt());
}
- else if(prop == "layoutSpacing" && container->tqlayout()) {
+ else if(prop == "layoutSpacing" && container->layout()) {
container->setLayoutSpacing(value.toInt());
- container->tqlayout()->setSpacing(value.toInt());
+ container->layout()->setSpacing(value.toInt());
}
ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(d->widgets.first()->name());
diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h
index f1f96a99..896d309c 100644
--- a/kexi/formeditor/widgetpropertyset.h
+++ b/kexi/formeditor/widgetpropertyset.h
@@ -168,10 +168,10 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject
and modifies the "alignment" property of the widget.*/
void saveAlignProperty(const TQString &property);
- /*! Creates the "tqlayout" property, for the Container representing \a item. */
+ /*! Creates the "layout" property, for the Container representing \a item. */
void createLayoutProperty(ObjectTreeItem *item);
- /*! Saves the "tqlayout" property and changes the Container 's tqlayout (
+ /*! Saves the "layout" property and changes the Container 's layout (
using Container::setLayout() ).*/
void saveLayoutProperty(const TQString &property, const TQVariant &value);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 19:52:36 +0000