diff options
Diffstat (limited to 'kexi/widget/pixmapcollection.cpp')
| -rw-r--r-- | kexi/widget/pixmapcollection.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index 0aeddca4..eade3cdd 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -18,7 +18,7 @@ */ #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqstringlist.h> #include <tqtoolbutton.h> @@ -159,7 +159,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent) // Name input TQLabel *name = new TQLabel(i18n("&Name:"), frame); l->addWidget(name, 0, 0); - name->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter); + name->setAlignment(TQt::AlignRight|TQt::AlignVCenter); m_nameInput = new KLineEdit("kexi", frame); l->addWidget(m_nameInput, 0, 1); name->setBuddy(m_nameInput); @@ -167,7 +167,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent) // Choose size TQLabel *size = new TQLabel(i18n("&Size:"), frame); l->addWidget(size, 1, 0); - size->tqsetAlignment(TQt::AlignRight|TQt::AlignVCenter); + size->setAlignment(TQt::AlignRight|TQt::AlignVCenter); KComboBox *combo = new KComboBox(frame); l->addWidget(combo, 1, 1); @@ -232,7 +232,7 @@ TQString LoadIconDialog::iconName() /// Pixmap Collection Editor Dialog PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent) : KDialogBase(parent, "pixcollection_dialog", true, - i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false) + i18n("Edit Pixmap Collection: %1").arg(collection->collectionName()), Close, Close, false) { m_collection = collection; TQFrame *frame = makeMainWidget(); @@ -240,28 +240,28 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW setInitialSize(TQSize(400, 200), true); //// Setup the icon toolbar ///////////////// - TQVBoxLayout *vtqlayout = new TQVBoxLayout(l, 3); + TQVBoxLayout *vlayout = new TQVBoxLayout(l, 3); TQToolButton *newItemPath = new TQToolButton(frame); newItemPath->setIconSet(BarIconSet("fileopen")); newItemPath->setTextLabel(i18n("&Add File"), true); - vtqlayout->addWidget(newItemPath); + vlayout->addWidget(newItemPath); m_buttons.insert(BNewItemPath, newItemPath); connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath())); TQToolButton *newItemName = new TQToolButton(frame); newItemName->setIconSet(BarIconSet("icons")); newItemName->setTextLabel(i18n("&Add an Icon"), true); - vtqlayout->addWidget(newItemName); + vlayout->addWidget(newItemName); m_buttons.insert(BNewItemName, newItemName); connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName())); TQToolButton *delItem = new TQToolButton(frame); delItem->setIconSet(BarIconSet("edit_remove")); delItem->setTextLabel(i18n("&Remove Selected Item"), true); - vtqlayout->addWidget(delItem); + vlayout->addWidget(delItem); m_buttons.insert(BDelItem, delItem); connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); - vtqlayout->addStretch(); + vlayout->addStretch(); // Setup the iconView m_iconView = new KIconView(frame, "pixcollection_iconView"); @@ -312,7 +312,7 @@ PixmapCollectionEditor::removeItem() int confirm = KMessageBox::questionYesNo(parentWidget(), TQString("<qt>")+ i18n("Do you want to remove item \"%1\" from collection \"%2\"?") - .tqarg(item->text()).tqarg(m_collection->collectionName()) + "</qt>"); + .arg(item->text()).arg(m_collection->collectionName()) + "</qt>"); if(confirm == KMessageBox::No) return; @@ -373,7 +373,7 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p) //// A Dialog to choose a pixmap from the PixmapCollection PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent) -: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()), +: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").arg(collection->collectionName()), User1|Ok|Cancel, Ok, false, KGuiItem(i18n("Edit Collection..."))) { m_collection = collection; |