summaryrefslogtreecommitdiffstats
path: root/kexi/widget
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/widget')
-rw-r--r--kexi/widget/kexibrowser.h2
-rw-r--r--kexi/widget/kexifieldcombobox.cpp2
-rw-r--r--kexi/widget/kexifieldlistview.cpp2
-rw-r--r--kexi/widget/kexiprjtypeselector.cpp2
-rw-r--r--kexi/widget/kexipropertyeditorview.cpp6
-rw-r--r--kexi/widget/kexismalltoolbutton.cpp4
-rw-r--r--kexi/widget/pixmapcollection.cpp26
-rw-r--r--kexi/widget/pixmapcollection.h20
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp2
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp36
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.h8
-rw-r--r--kexi/widget/tableview/kexicelleditorfactory.cpp2
-rw-r--r--kexi/widget/tableview/kexitableview.cpp2
13 files changed, 57 insertions, 57 deletions
diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h
index 3da16500..e351508e 100644
--- a/kexi/widget/kexibrowser.h
+++ b/kexi/widget/kexibrowser.h
@@ -26,7 +26,7 @@
#include <tqintdict.h>
class TQListViewItem;
-class KIconLoader;
+class TDEIconLoader;
class TDEPopupMenu;
class TDEAction;
class TDEActionMenu;
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 404bc746..1c1f929b 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -51,7 +51,7 @@ class KexiFieldComboBox::Private
Private()
// : schema(0)
: keyIcon( SmallIcon("key") )
- , noIcon( KexiUtils::emptyIcon(KIcon::Small) )
+ , noIcon( KexiUtils::emptyIcon(TDEIcon::Small) )
, table(true)
{
}
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index fe81b9eb..f688fa64 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -46,7 +46,7 @@ KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int opt
: TDEListView(parent, name)
, m_schema(0)
, m_keyIcon(SmallIcon("key"))
- , m_noIcon(KexiUtils::emptyIcon(KIcon::Small))
+ , m_noIcon(KexiUtils::emptyIcon(TDEIcon::Small))
, m_options(options)
, m_allColumnsItem(0)
{
diff --git a/kexi/widget/kexiprjtypeselector.cpp b/kexi/widget/kexiprjtypeselector.cpp
index aea9b22f..1a036304 100644
--- a/kexi/widget/kexiprjtypeselector.cpp
+++ b/kexi/widget/kexiprjtypeselector.cpp
@@ -29,7 +29,7 @@ KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* parent )
TQString none;
icon_file->setPixmap(
TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
- KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop, 48
+ KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), TDEIcon::Desktop, 48
)
);
icon_file->setFixedSize(icon_file->pixmap()->size()/2);
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index e2a5ac31..bf5c6491 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -36,7 +36,7 @@ KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
TQHBoxLayout *hlyr = new TQHBoxLayout(this);
m_objectIconLabel = new TQLabel(this);
m_objectIconLabel->setMargin(2);
- setFixedHeight( IconSize(KIcon::Small) + 2 + 2 );
+ setFixedHeight( IconSize(TDEIcon::Small) + 2 + 2 );
hlyr->addWidget(m_objectIconLabel);
m_objectNameLabel = new TQLabel(this);
m_objectNameLabel->setMargin(2);
@@ -54,7 +54,7 @@ void KexiObjectInfoLabel::setObjectClassIcon(const TQString& name)
if (m_classIcon.isEmpty())
m_objectIconLabel->setFixedWidth( 0 );
else
- m_objectIconLabel->setFixedWidth( IconSize(KIcon::Small) + 2 + 2 );
+ m_objectIconLabel->setFixedWidth( IconSize(TDEIcon::Small) + 2 + 2 );
m_objectIconLabel->setPixmap( SmallIcon(name) );
}
@@ -121,7 +121,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget
TQHBoxLayout *vlyr = new TQHBoxLayout(lyr);
d->objectIcon = new TQLabel(this);
d->objectIcon->setMargin(2);
- d->objectIcon->setFixedHeight( IconSize(KIcon::Small) + 2 + 2 );
+ d->objectIcon->setFixedHeight( IconSize(TDEIcon::Small) + 2 + 2 );
vlyr->addWidget(d->objectIcon);
d->objectClassName = new TQLabel(this);
d->objectClassName->setMargin(2);
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 8852f81c..27f89395 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -62,7 +62,7 @@ void KexiSmallToolButton::updateAction()
{
if (!m_action)
return;
- update(m_action->text(), m_action->iconSet(KIcon::Small));
+ update(m_action->text(), m_action->iconSet(TDEIcon::Small));
setAccel(m_action->shortcut());
TQToolTip::add(this, m_action->toolTip());
TQWhatsThis::add(this, m_action->whatsThis());
@@ -92,7 +92,7 @@ void KexiSmallToolButton::update(const TQString& text, const TQIconSet& iconSet,
TQToolButton::setTextLabel(text, tipToo);
}
if (!iconSet.isNull()) {
- width += IconSize(KIcon::Small);
+ width += IconSize(TDEIcon::Small);
TQToolButton::setIconSet(iconSet);
}
setFixedWidth( width );
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index ef94b5d2..6adfc94a 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -99,7 +99,7 @@ PixmapCollection::getPixmap(const TQString &name)
if(m_pixmaps[name].second != 0)
{
- return kapp->iconLoader()->loadIcon(m_pixmaps[name].first, KIcon::NoGroup, m_pixmaps[name].second);
+ return kapp->iconLoader()->loadIcon(m_pixmaps[name].first, TDEIcon::NoGroup, m_pixmaps[name].second);
}
else
return TQPixmap(m_pixmaps[name].first);
@@ -180,9 +180,9 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
// Icon chooser button
- m_button = new KIconButton(frame);
+ m_button = new TDEIconButton(frame);
m_button->setIcon("kexi");
- m_button->setIconSize(KIcon::SizeMedium);
+ m_button->setIconSize(TDEIcon::SizeMedium);
l->addMultiCellWidget(m_button, 0, 1, 2, 2);
connect(m_button, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(updateIconName(TQString)));
connect(m_nameInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setIcon(const TQString &)));
@@ -203,15 +203,15 @@ LoadIconDialog::setIcon(const TQString &icon)
void
LoadIconDialog::changeIconSize(int index)
{
- int size = KIcon::SizeMedium;
+ int size = TDEIcon::SizeMedium;
switch(index)
{
- case 0: size = KIcon::SizeSmall; break;
- //case 1: size = KIcon::SizeSmallMedium; break;
- case 1: size = KIcon::SizeMedium; break;
- case 2: size = KIcon::SizeLarge; break;
+ case 0: size = TDEIcon::SizeSmall; break;
+ //case 1: size = TDEIcon::SizeSmallMedium; break;
+ case 1: size = TDEIcon::SizeMedium; break;
+ case 2: size = TDEIcon::SizeLarge; break;
#if !defined(TQ_WS_WIN) && KDE_IS_VERSION(3,1,9)
- case 3: size = KIcon::SizeHuge; break;
+ case 3: size = TDEIcon::SizeHuge; break;
#endif
default:;
}
@@ -264,11 +264,11 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
vlayout->addStretch();
// Setup the iconView
- m_iconView = new KIconView(frame, "pixcollection_iconView");
+ m_iconView = new TDEIconView(frame, "pixcollection_iconView");
m_iconView->resize(100,100);
m_iconView->setArrangement(TQIconView::LeftToRight);
m_iconView->setAutoArrange(true);
- m_iconView->setMode(KIconView::Select);
+ m_iconView->setMode(TDEIconView::Select);
l->addWidget(m_iconView);
connect(m_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(displayMenu(TQIconViewItem*, const TQPoint&)));
connect(m_iconView, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQT_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&)));
@@ -379,11 +379,11 @@ PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, c
m_collection = collection;
setInitialSize(TQSize(400, 200), true);
- m_iconView = new KIconView(this, "pixchooser_iconView");
+ m_iconView = new TDEIconView(this, "pixchooser_iconView");
setMainWidget(m_iconView);
m_iconView->setArrangement(TQIconView::LeftToRight);
m_iconView->setAutoArrange(true);
- m_iconView->setMode(KIconView::Select);
+ m_iconView->setMode(TDEIconView::Select);
PixmapMap::ConstIterator it;
PixmapMap::ConstIterator endIt = collection->m_pixmaps.constEnd();
diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h
index 7f900866..28629be1 100644
--- a/kexi/widget/pixmapcollection.h
+++ b/kexi/widget/pixmapcollection.h
@@ -32,8 +32,8 @@
#include <kurl.h>
class TQPixmap;
-class KIconView;
-class KIconButton;
+class TDEIconView;
+class TDEIconButton;
class KLineEdit;
class TQDomNode;
@@ -50,7 +50,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject
~PixmapCollection() {;}
TQString addPixmapPath(const KURL &url);
- TQString addPixmapName(const TQString &name, int size = KIcon::SizeMedium);
+ TQString addPixmapName(const TQString &name, int size = TDEIcon::SizeMedium);
void removePixmap(const TQString &name);
bool contains(const TQString &name);
@@ -97,7 +97,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionEditor : public KDialogBase
private:
enum { BNewItemPath = 101, BNewItemName, BDelItem};
- KIconView *m_iconView;
+ TDEIconView *m_iconView;
TQIntDict<TQToolButton> m_buttons;
PixmapCollection *m_collection;
};
@@ -122,7 +122,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionChooser : public KDialogBase
private:
PixmapCollection *m_collection;
- KIconView *m_iconView;
+ TDEIconView *m_iconView;
};
//! A simple dialog to choose a KDE icon
@@ -145,15 +145,15 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase
private:
KLineEdit *m_nameInput;
- KIconButton *m_button;
+ TDEIconButton *m_button;
};
-//! A Special KIconViewItem that holds the name of its associated pixmap (to allow renaming)
-class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public KIconViewItem
+//! A Special TDEIconViewItem that holds the name of its associated pixmap (to allow renaming)
+class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public TDEIconViewItem
{
public:
- PixmapIconViewItem(KIconView *parent, const TQString &text, const TQPixmap &icon)
- : KIconViewItem(parent, text, icon) { m_name = text; }
+ PixmapIconViewItem(TDEIconView *parent, const TQString &text, const TQPixmap &icon)
+ : TDEIconViewItem(parent, text, icon) { m_name = text; }
~PixmapIconViewItem() {;}
void setName(const TQString &name) { m_name = name; }
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index cba19483..b9420f67 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -315,7 +315,7 @@ TQSize KexiRelationViewTable::sizeHint() const
// << ", " << fm.width(schema()->name()+" ") << endl;
int maxWidth = -1;
- const int iconWidth = IconSize(KIcon::Small) + fm.width("i")+20;
+ const int iconWidth = IconSize(TDEIcon::Small) + fm.width("i")+20;
for (TQListViewItem *item = firstChild(); item; item = item->nextSibling())
maxWidth = TQMAX(maxWidth, iconWidth + fm.width(item->text(0)));
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 91523cb7..4982fffa 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -474,10 +474,10 @@ bool KexiBlobTableEdit::eventFilter( TQObject *o, TQEvent *e )
KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiBlobEditorFactoryItem, KexiBlobTableEdit)
//=======================
-// KexiKIconTableEdit class is temporarily here:
+// KexiTDEIconTableEdit class is temporarily here:
//! @internal
-class KexiKIconTableEdit::Private
+class KexiTDEIconTableEdit::Private
{
public:
Private()
@@ -490,61 +490,61 @@ public:
TQCache<TQPixmap> pixmapCache;
};
-KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+KexiTDEIconTableEdit::KexiTDEIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
: KexiTableEdit(column, parent)
, d( new Private() )
{
- setName("KexiKIconTableEdit");
+ setName("KexiTDEIconTableEdit");
init();
}
-KexiKIconTableEdit::~KexiKIconTableEdit()
+KexiTDEIconTableEdit::~KexiTDEIconTableEdit()
{
delete d;
}
-void KexiKIconTableEdit::init()
+void KexiTDEIconTableEdit::init()
{
m_hasFocusableWidget = false;
d->pixmapCache.setAutoDelete(true);
}
-void KexiKIconTableEdit::setValueInternal(const TQVariant& /*add*/, bool /*removeOld*/)
+void KexiTDEIconTableEdit::setValueInternal(const TQVariant& /*add*/, bool /*removeOld*/)
{
d->currentValue = m_origValue;
}
-bool KexiKIconTableEdit::valueIsNull()
+bool KexiTDEIconTableEdit::valueIsNull()
{
return d->currentValue.isNull();
}
-bool KexiKIconTableEdit::valueIsEmpty()
+bool KexiTDEIconTableEdit::valueIsEmpty()
{
return d->currentValue.isNull();
}
-TQVariant KexiKIconTableEdit::value()
+TQVariant KexiTDEIconTableEdit::value()
{
return d->currentValue;
}
-void KexiKIconTableEdit::clear()
+void KexiTDEIconTableEdit::clear()
{
d->currentValue = TQVariant();
}
-bool KexiKIconTableEdit::cursorAtStart()
+bool KexiTDEIconTableEdit::cursorAtStart()
{
return true;
}
-bool KexiKIconTableEdit::cursorAtEnd()
+bool KexiTDEIconTableEdit::cursorAtEnd()
{
return true;
}
-void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQVariant& val,
+void KexiTDEIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQVariant& val,
TQString &/*txt*/, int &/*align*/, int &/*x*/, int &y_offset, int &w, int &h )
{
Q_UNUSED( y_offset );
@@ -571,8 +571,8 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
TQPixmap *pix = 0;
if (!key.isEmpty() && !(pix = d->pixmapCache[ key ])) {
//cache pixmap
- TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, KIcon::Small,
- 0, KIcon::DefaultState, 0L, true/*canReturnNull*/ );
+ TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, TDEIcon::Small,
+ 0, TDEIcon::DefaultState, 0L, true/*canReturnNull*/ );
if (!pm.isNull()) {
pix = new TQPixmap(pm);
d->pixmapCache.insert(key, pix);
@@ -584,12 +584,12 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
}
}
-void KexiKIconTableEdit::handleCopyAction(const TQVariant& value, const TQVariant& visibleValue)
+void KexiTDEIconTableEdit::handleCopyAction(const TQVariant& value, const TQVariant& visibleValue)
{
Q_UNUSED(value);
Q_UNUSED(visibleValue);
}
-KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiKIconTableEditorFactoryItem, KexiKIconTableEdit)
+KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiTDEIconTableEditorFactoryItem, KexiTDEIconTableEdit)
#include "kexiblobtableedit.moc"
diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h
index 4d17b3b9..fb7f6049 100644
--- a/kexi/widget/tableview/kexiblobtableedit.h
+++ b/kexi/widget/tableview/kexiblobtableedit.h
@@ -126,12 +126,12 @@ KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem)
/*! @short Cell editor for displaying kde icon (using icon name provided as string).
Read only.
*/
-class KexiKIconTableEdit : public KexiTableEdit
+class KexiTDEIconTableEdit : public KexiTableEdit
{
public:
- KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
+ KexiTDEIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
- virtual ~KexiKIconTableEdit();
+ virtual ~KexiTDEIconTableEdit();
//! \return true if editor's value is null (not empty)
virtual bool valueIsNull();
@@ -166,6 +166,6 @@ class KexiKIconTableEdit : public KexiTableEdit
Private *d;
};
-KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiKIconTableEditorFactoryItem)
+KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiTDEIconTableEditorFactoryItem)
#endif
diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp
index 9cfcfe27..11664e54 100644
--- a/kexi/widget/tableview/kexicelleditorfactory.cpp
+++ b/kexi/widget/tableview/kexicelleditorfactory.cpp
@@ -119,7 +119,7 @@ void KexiCellEditorFactory::init()
KexiCellEditorFactory_static->registerItem( *new KexiDateTimeEditorFactoryItem(), KexiDB::Field::DateTime );
KexiCellEditorFactory_static->registerItem( *new KexiComboBoxEditorFactoryItem(), KexiDB::Field::Enum );
KexiCellEditorFactory_static->registerItem( *new KexiBoolEditorFactoryItem(), KexiDB::Field::Boolean );
- KexiCellEditorFactory_static->registerItem( *new KexiKIconTableEditorFactoryItem(), KexiDB::Field::Text, "KIcon" );
+ KexiCellEditorFactory_static->registerItem( *new KexiTDEIconTableEditorFactoryItem(), KexiDB::Field::Text, "TDEIcon" );
//default type
KexiCellEditorFactory_static->registerItem( *new KexiInputEditorFactoryItem(), KexiDB::Field::InvalidType );
}
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index b975fcdf..8fdac680 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -221,7 +221,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
#if 0 //moved to mainwindow's actions
d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
d->menu_id_removeRecord = m_popupMenu->insertItem(
- kapp->iconLoader()->loadIcon("button_cancel", KIcon::Small),
+ kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 14:47:28 +0000