Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

pull/16/head
Timothy Pearson 10 years ago
parent 43022555c0
commit bab4f22f92

@ -525,7 +525,7 @@ TQPixmap KateDocument::configPagePixmap (uint number, int size) const
return BarIcon("rightjust", size); return BarIcon("rightjust", size);
case 5: case 5:
return BarIcon("filesave", size); return BarIcon("document-save", size);
case 6: case 6:
return BarIcon("source", size); return BarIcon("source", size);

@ -221,7 +221,7 @@ void KateView::setupActions()
m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac); m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac);
a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html"); m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
if (!m_doc->readOnly()) if (!m_doc->readOnly())
@ -889,7 +889,7 @@ bool KateView::checkOverwrite( KURL u )
( this, ( this,
i18n( "A file named \"%1\" already exists. Are you sure you want to overwrite it?" ).arg( info.fileName() ), i18n( "A file named \"%1\" already exists. Are you sure you want to overwrite it?" ).arg( info.fileName() ),
i18n( "Overwrite File?" ), i18n( "Overwrite File?" ),
KGuiItem( i18n( "&Overwrite" ), "filesave", i18n( "Overwrite the file" ) ) KGuiItem( i18n( "&Overwrite" ), "document-save", i18n( "Overwrite the file" ) )
); );
} }

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Before

Width:  |  Height:  |  Size: 686 B

After

Width:  |  Height:  |  Size: 686 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 684 B

After

Width:  |  Height:  |  Size: 684 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 277 B

After

Width:  |  Height:  |  Size: 277 B

Before

Width:  |  Height:  |  Size: 777 B

After

Width:  |  Height:  |  Size: 777 B

Before

Width:  |  Height:  |  Size: 804 B

After

Width:  |  Height:  |  Size: 804 B

Before

Width:  |  Height:  |  Size: 892 B

After

Width:  |  Height:  |  Size: 892 B

Before

Width:  |  Height:  |  Size: 979 B

After

Width:  |  Height:  |  Size: 979 B

Before

Width:  |  Height:  |  Size: 649 B

After

Width:  |  Height:  |  Size: 649 B

Before

Width:  |  Height:  |  Size: 410 B

After

Width:  |  Height:  |  Size: 410 B

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 825 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 1003 B

After

Width:  |  Height:  |  Size: 1003 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 203 B

Before

Width:  |  Height:  |  Size: 507 B

After

Width:  |  Height:  |  Size: 507 B

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 951 B

After

Width:  |  Height:  |  Size: 951 B

Before

Width:  |  Height:  |  Size: 881 B

After

Width:  |  Height:  |  Size: 881 B

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 205 B

Before

Width:  |  Height:  |  Size: 879 B

After

Width:  |  Height:  |  Size: 879 B

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

@ -648,7 +648,7 @@ public slots:
* If the widget with focus provides a clear() slot, call that slot. Thus for a * If the widget with focus provides a clear() slot, call that slot. Thus for a
* simple application clear() can be implemented as: * simple application clear() can be implemented as:
* \code * \code
* new TDEAction( i18n( "Clear" ), "editclear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" ); * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
* \endcode * \endcode
* *
* Note that for some widgets, this may not provide the intended bahavior. For * Note that for some widgets, this may not provide the intended bahavior. For

@ -1088,7 +1088,7 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() {
d->m_jsedlg->setURL(m_url.prettyURL()); d->m_jsedlg->setURL(m_url.prettyURL());
if (TDEGlobalSettings::showIconsOnPushButtons()) { if (TDEGlobalSettings::showIconsOnPushButtons()) {
d->m_jsedlg->_clear->setIconSet(SmallIconSet("locationbar_erase")); d->m_jsedlg->_clear->setIconSet(SmallIconSet("locationbar_erase"));
d->m_jsedlg->_close->setIconSet(SmallIconSet("fileclose")); d->m_jsedlg->_close->setIconSet(SmallIconSet("window-close"));
} }
} }
return d->m_jsedlg; return d->m_jsedlg;

@ -109,7 +109,7 @@ int main(int argc, char *argv[])
(void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" ); TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
kprint->setEnabled(true); kprint->setEnabled(true);
TDEToggleAction *ta = new TDEToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" ); TDEToggleAction *ta = new TDEToggleAction( "Navigable", "edit-clear", 0, doc->actionCollection(), "navigable" );
ta->setChecked(doc->isCaretMode()); ta->setChecked(doc->isCaretMode());
TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) )); TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) ));
ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" ); ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );

@ -276,7 +276,7 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address,
id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) ); id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) );
contextMenu->setItemParameter( id, val ); contextMenu->setItemParameter( id, val );
contextMenu->insertSeparator(); contextMenu->insertSeparator();
id = contextMenu->insertItem( SmallIcon("editdelete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
contextMenu->setItemParameter( id, val ); contextMenu->setItemParameter( id, val );
contextMenu->insertSeparator(); contextMenu->insertSeparator();
id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) );
@ -287,7 +287,7 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address,
id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) ); id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) );
contextMenu->setItemParameter( id, val ); contextMenu->setItemParameter( id, val );
contextMenu->insertSeparator(); contextMenu->insertSeparator();
id = contextMenu->insertItem( SmallIcon("editdelete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
contextMenu->setItemParameter( id, val ); contextMenu->setItemParameter( id, val );
contextMenu->insertSeparator(); contextMenu->insertSeparator();
id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) );
@ -541,7 +541,7 @@ void KBookmarkMenu::addNewFolder()
title.remove( p, 1 ); title.remove( p, 1 );
TDEAction * paNewFolder = new TDEAction( title, TDEAction * paNewFolder = new TDEAction( title,
"folder_new", //"folder", "folder-new", //"folder",
0, 0,
this, this,
TQT_SLOT( slotNewFolder() ), TQT_SLOT( slotNewFolder() ),
@ -828,7 +828,7 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString&
{ {
setButtonOK( (editType == InsertionMode) ? KGuiItem( i18n( "&Add" ), "bookmark_add") : i18n( "&Update" ) ); setButtonOK( (editType == InsertionMode) ? KGuiItem( i18n( "&Add" ), "bookmark_add") : i18n( "&Update" ) );
if (editType == InsertionMode) { if (editType == InsertionMode) {
setButtonGuiItem( User1, KGuiItem( i18n( "&New Folder..." ), "folder_new") ); setButtonGuiItem( User1, KGuiItem( i18n( "&New Folder..." ), "folder-new") );
} }
bool folder = url.isNull(); bool folder = url.isNull();

@ -440,7 +440,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>'. Please enter the password for this wallet below.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet))); kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>'. Please enter the password for this wallet below.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet)));
} }
brandNew = false; brandNew = false;
kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen")); kpd->setButtonOK(KGuiItem(i18n("&Open"),"document-open"));
} else { } else {
emptyPass = true; emptyPass = true;
} }
@ -454,7 +454,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to open the TDE wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.").arg(TQStyleSheet::escape(appid))); kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to open the TDE wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)));
} }
brandNew = true; brandNew = true;
kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen")); kpd->setButtonOK(KGuiItem(i18n("&Open"),"document-open"));
} else { } else {
kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0); kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0);
if (appid.length() == 0) { if (appid.length() == 0) {
@ -463,7 +463,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>%2</b>'. Please choose a password for this wallet, or cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet))); kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>%2</b>'. Please choose a password for this wallet, or cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet)));
} }
brandNew = true; brandNew = true;
kpd->setButtonOK(KGuiItem(i18n("C&reate"),"filenew")); kpd->setButtonOK(KGuiItem(i18n("C&reate"),"document-new"));
} }
if (kpd) { if (kpd) {

@ -97,7 +97,7 @@ class UIServerSystemTray:public KSystemTray
TDEPopupMenu* pop= contextMenu(); TDEPopupMenu* pop= contextMenu();
pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure())); pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
setPixmap(loadIcon("filesave")); setPixmap(loadIcon("document-save"));
//actionCollection()->action("file_quit")->setEnabled(true); //actionCollection()->action("file_quit")->setEnabled(true);
KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection()); KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection());
} }
@ -595,7 +595,7 @@ UIServer::UIServer()
readSettings(); readSettings();
// setup toolbar // setup toolbar
toolBar()->insertButton("editdelete", TOOL_CANCEL, toolBar()->insertButton("edit-delete", TOOL_CANCEL,
TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
toolBar()->insertButton("configure", TOOL_CONFIGURE, toolBar()->insertButton("configure", TOOL_CONFIGURE,

@ -89,7 +89,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
bool modal) bool modal)
: KDialogBase( parent, name, modal, i18n("Select Folder"), : KDialogBase( parent, name, modal, i18n("Select Folder"),
Ok|Cancel|User1, Ok, false, Ok|Cancel|User1, Ok, false,
KGuiItem( i18n("New Folder..."), "folder_new" ) ), KGuiItem( i18n("New Folder..."), "folder-new" ) ),
m_localOnly( localOnly ) m_localOnly( localOnly )
{ {
d = new KDirSelectDialogPrivate; d = new KDirSelectDialogPrivate;
@ -122,7 +122,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
TQT_SLOT( slotComboTextChanged( const TQString& ) )); TQT_SLOT( slotComboTextChanged( const TQString& ) ));
m_contextMenu = new TQPopupMenu( this ); m_contextMenu = new TQPopupMenu( this );
TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
newFolder->plug(m_contextMenu); newFolder->plug(m_contextMenu);
m_contextMenu->insertSeparator(); m_contextMenu->insertSeparator();
m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),

@ -752,11 +752,11 @@ void KURLBar::slotContextMenuRequested( TQListBoxItem *_item, const TQPoint& pos
popup->insertSeparator(); popup->insertSeparator();
} }
popup->insertItem(SmallIconSet("filenew"), i18n("&Add Entry..."), AddItem); popup->insertItem(SmallIconSet("document-new"), i18n("&Add Entry..."), AddItem);
if (item != 0L && item->isPersistent()) if (item != 0L && item->isPersistent())
{ {
popup->insertItem( SmallIconSet("editdelete"), i18n("&Remove Entry"), popup->insertItem( SmallIconSet("edit-delete"), i18n("&Remove Entry"),
RemoveItem ); RemoveItem );
} }

@ -206,7 +206,7 @@ void KURLRequester::init()
d->edit = new KLineEdit( this, "line edit" ); d->edit = new KLineEdit( this, "line edit" );
myButton = new KURLDragPushButton( this, "tdefile button"); myButton = new KURLDragPushButton( this, "tdefile button");
TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("document-open"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
myButton->setIconSet( iconSet ); myButton->setIconSet( iconSet );
myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );

@ -1271,9 +1271,9 @@ void KDirOperator::setupActions()
TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
new TDEAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
mkdirAction->setIcon( TQString::fromLatin1("folder_new") ); mkdirAction->setIcon( TQString::fromLatin1("folder-new") );
reloadAction->setText( i18n("Reload") ); reloadAction->setText( i18n("Reload") );
reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload )); reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload ));

@ -1838,7 +1838,7 @@ void KFileDialog::setOperationMode( OperationMode mode )
d->keepLocation = (mode == Saving); d->keepLocation = (mode == Saving);
filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving ); filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving );
if ( mode == Opening ) if ( mode == Opening )
d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "fileopen") ); d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "document-open") );
else if ( mode == Saving ) { else if ( mode == Saving ) {
d->okButton->setGuiItem( KStdGuiItem::save() ); d->okButton->setGuiItem( KStdGuiItem::save() );
setNonExtSelection(); setNonExtSelection();

@ -89,8 +89,8 @@ void DefaultProgress::init()
#ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
// Set a useful icon for this window! // Set a useful icon for this window!
KWin::setIcons( winId(), KWin::setIcons( winId(),
TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 32 ), TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ),
TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 16 ) ); TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 16 ) );
#endif #endif
TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),

@ -143,7 +143,7 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) ); TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) );
TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) ); TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) );
m_pIconButtonPixmap = new TQPixmap( SmallIcon( "filenew" ) ); m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) );
if ( m_pIconButtonPixmap->isNull() ) if ( m_pIconButtonPixmap->isNull() )
* m_pIconButtonPixmap = TQPixmap( filenew ); * m_pIconButtonPixmap = TQPixmap( filenew );

@ -350,7 +350,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
int choice = KMessageBox::questionYesNoCancel( int choice = KMessageBox::questionYesNoCancel(
0L, question, url.host(), 0L, question, url.host(),
KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "fileopen"), KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "document-open"),
TQString::fromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!! TQString::fromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel ); return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel );
// SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC

@ -20,7 +20,7 @@ Shell::Shell()
{ {
setXMLFile( "ghostviewtest_shell.rc" ); setXMLFile( "ghostviewtest_shell.rc" );
TDEAction * paOpen = new TDEAction( "&Open file" , "fileopen", 0, this, TDEAction * paOpen = new TDEAction( "&Open file" , "document-open", 0, this,
TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" );
TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" ); TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );

@ -33,7 +33,7 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
{ {
setPageLabel(i18n("Jobs")); setPageLabel(i18n("Jobs"));
setHeader(i18n("Print Jobs Settings")); setHeader(i18n("Print Jobs Settings"));
setPixmap("fileprint"); setPixmap("document-print");
keepjobhistory_ = new TQCheckBox(i18n("Preserve job history"), this); keepjobhistory_ = new TQCheckBox(i18n("Preserve job history"), this);
keepjobfiles_ = new TQCheckBox(i18n("Preserve job files"), this); keepjobfiles_ = new TQCheckBox(i18n("Preserve job files"), this);

@ -30,9 +30,9 @@ EditList::EditList(TQWidget *parent, const char *name)
: TQWidget(parent, name) : TQWidget(parent, name)
{ {
list_ = new TDEListBox(this); list_ = new TDEListBox(this);
addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "filenew"), this); addbtn_ = new KPushButton(KGuiItem(i18n("Add..."), "document-new"), this);
editbtn_ = new KPushButton(KGuiItem(i18n("Edit..."), "edit"), this); editbtn_ = new KPushButton(KGuiItem(i18n("Edit..."), "edit"), this);
delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "editdelete"), this); delbtn_ = new KPushButton(KGuiItem(i18n("Delete"), "edit-delete"), this);
defbtn_ = new KPushButton(KGuiItem(i18n("Default List"), "history"), this); defbtn_ = new KPushButton(KGuiItem(i18n("Default List"), "history"), this);
TQGridLayout *m1 = new TQGridLayout(this, 4, 2, 0, 0); TQGridLayout *m1 = new TQGridLayout(this, 4, 2, 0, 0);

@ -30,7 +30,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name)
{ {
edit_ = new TQLineEdit(this); edit_ = new TQLineEdit(this);
button_ = new KPushButton(this); button_ = new KPushButton(this);
button_->setPixmap(SmallIcon("fileopen")); button_->setPixmap(SmallIcon("document-open"));
connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked())); connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked()));
TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3);

@ -37,10 +37,10 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*))); connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*)));
m_add = new TQPushButton(this); m_add = new TQPushButton(this);
m_add->setPixmap(SmallIcon("folder_new")); m_add->setPixmap(SmallIcon("folder-new"));
connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked()));
m_remove = new TQPushButton(this); m_remove = new TQPushButton(this);
m_remove->setPixmap(SmallIcon("editdelete")); m_remove->setPixmap(SmallIcon("edit-delete"));
connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
m_remove->setEnabled(false); m_remove->setEnabled(false);

@ -31,14 +31,14 @@
#include <tqpaintdevicemetrics.h> #include <tqpaintdevicemetrics.h>
IppReportDlg::IppReportDlg(TQWidget *parent, const char *name) IppReportDlg::IppReportDlg(TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n("IPP Report"), Close|User1, Close, false, KGuiItem(i18n("&Print"), "fileprint")) : KDialogBase(parent, name, true, i18n("IPP Report"), Close|User1, Close, false, KGuiItem(i18n("&Print"), "document-print"))
{ {
m_edit = new KTextEdit(this); m_edit = new KTextEdit(this);
m_edit->setReadOnly(true); m_edit->setReadOnly(true);
setMainWidget(m_edit); setMainWidget(m_edit);
resize(540, 500); resize(540, 500);
setFocusProxy(m_edit); setFocusProxy(m_edit);
setButtonGuiItem(User1, KGuiItem(i18n("&Print"),"fileprint")); setButtonGuiItem(User1, KGuiItem(i18n("&Print"),"document-print"));
} }
void IppReportDlg::slotUser1() void IppReportDlg::slotUser1()

@ -48,7 +48,7 @@ KMPropBanners::KMPropBanners(TQWidget *parent, const char *name)
m_title = i18n("Banners"); m_title = i18n("Banners");
m_header = i18n("Banner Settings"); m_header = i18n("Banner Settings");
m_pixmap = "editcopy"; m_pixmap = "edit-copy";
} }
KMPropBanners::~KMPropBanners() KMPropBanners::~KMPropBanners()

@ -28,7 +28,7 @@ DriverItem::DriverItem(TQListView *parent, DrBase *item)
: TQListViewItem(parent), m_item(item), m_conflict(false) : TQListViewItem(parent), m_item(item), m_conflict(false)
{ {
setOpen(depth() < 3); setOpen(depth() < 3);
setPixmap(0,SmallIcon("fileprint")); setPixmap(0,SmallIcon("document-print"));
updateText(); updateText();
} }

@ -304,7 +304,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
d->m_wizard->setMinimumSize(TQSize(d->m_printers->minimumHeight(),d->m_printers->minimumHeight())); d->m_wizard->setMinimumSize(TQSize(d->m_printers->minimumHeight(),d->m_printers->minimumHeight()));
TQToolTip::add(d->m_wizard, i18n("Add printer...")); TQToolTip::add(d->m_wizard, i18n("Add printer..."));
TQWhatsThis::add(d->m_wizard, whatsThisAddPrinterWizard); TQWhatsThis::add(d->m_wizard, whatsThisAddPrinterWizard);
d->m_ok = new KPushButton(KGuiItem(i18n("&Print"), "fileprint"), this); d->m_ok = new KPushButton(KGuiItem(i18n("&Print"), "document-print"), this);
TQWhatsThis::add( d->m_ok, whatsThisPrintButton); TQWhatsThis::add( d->m_ok, whatsThisPrintButton);
d->m_ok->setDefault(true); d->m_ok->setDefault(true);
d->m_ok->setEnabled( false ); d->m_ok->setEnabled( false );

@ -138,7 +138,7 @@ static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOn
else else
{ {
msg.append(" ").append(i18n("Do you want to continue printing anyway?")); msg.append(" ").append(i18n("Do you want to continue printing anyway?"));
return (KMessageBox::warningContinueCancel(parent, msg, TQString::null, KGuiItem(i18n("Print"),"fileprint")) == KMessageBox::Continue); return (KMessageBox::warningContinueCancel(parent, msg, TQString::null, KGuiItem(i18n("Print"),"document-print")) == KMessageBox::Continue);
} }
} }
@ -157,7 +157,7 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print"); KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print");
else else
{ {
new TDEAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); new TDEAction(i18n("Print"), "document-print", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
} }
@ -319,7 +319,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
} }
else if (!previewOnly) else if (!previewOnly)
{ {
return (KMessageBox::questionYesNo(parentW, i18n("Do you want to continue printing?"), TQString::null, KGuiItem(i18n("Print"),"fileprint"), KStdGuiItem::cancel(), "continuePrinting") == KMessageBox::Yes); return (KMessageBox::questionYesNo(parentW, i18n("Do you want to continue printing?"), TQString::null, KGuiItem(i18n("Print"),"document-print"), KStdGuiItem::cancel(), "continuePrinting") == KMessageBox::Yes);
} }
else else
return false; return false;

@ -75,7 +75,7 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
TQListViewItem *root = new TQListViewItem(m_view, entry->name), *item = 0; TQListViewItem *root = new TQListViewItem(m_view, entry->name), *item = 0;
root->setSelectable(false); root->setSelectable(false);
root->setOpen(true); root->setOpen(true);
root->setPixmap(0, SmallIcon("fileprint")); root->setPixmap(0, SmallIcon("document-print"));
for (TQMap<TQString,Field>::ConstIterator it=m_fields.begin(); it!=m_fields.end(); ++it) for (TQMap<TQString,Field>::ConstIterator it=m_fields.begin(); it!=m_fields.end(); ++it)
item = new TQListViewItem(root, item, (*it).toString(), it.key()); item = new TQListViewItem(root, item, (*it).toString(), it.key());
} }

@ -57,7 +57,7 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
m_up = new KPushButton(KGuiItem(i18n("&Up"), "go-up"), box2); m_up = new KPushButton(KGuiItem(i18n("&Up"), "go-up"), box2);
m_down = new KPushButton(KGuiItem(i18n("&Down"), "go-down"), box2); m_down = new KPushButton(KGuiItem(i18n("&Down"), "go-down"), box2);
m_add = new KPushButton(KGuiItem(i18n("&Add"), "add"), box2); m_add = new KPushButton(KGuiItem(i18n("&Add"), "add"), box2);
m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "editdelete"), box2); m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "edit-delete"), box2);
TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2);
lab0->setBuddy(m_addpath); lab0->setBuddy(m_addpath);

@ -43,7 +43,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
{ {
setPageName(i18n("General")); setPageName(i18n("General"));
setPageHeader(i18n("General Settings")); setPageHeader(i18n("General Settings"));
setPagePixmap("fileprint"); setPagePixmap("document-print");
TQGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); TQGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this);
m_timer = new KIntNumInput(m_timerbox,"Timer"); m_timer = new KIntNumInput(m_timerbox,"Timer");

@ -52,7 +52,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
m_raw = new TQCheckBox(i18n("&Raw printer (no driver needed)"),this); m_raw = new TQCheckBox(i18n("&Raw printer (no driver needed)"),this);
m_postscript->setCursor(KCursor::handCursor()); m_postscript->setCursor(KCursor::handCursor());
m_raw->setCursor(KCursor::handCursor()); m_raw->setCursor(KCursor::handCursor());
m_other = new KPushButton(KGuiItem(i18n("&Other..."), "fileopen"), this); m_other = new KPushButton(KGuiItem(i18n("&Other..."), "document-open"), this);
TQLabel *l1 = new TQLabel(i18n("&Manufacturer:"), this); TQLabel *l1 = new TQLabel(i18n("&Manufacturer:"), this);
TQLabel *l2 = new TQLabel(i18n("Mo&del:"), this); TQLabel *l2 = new TQLabel(i18n("Mo&del:"), this);
l1->setBuddy(m_manu); l1->setBuddy(m_manu);

@ -84,14 +84,14 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons
void KMInstancePage::initActions() void KMInstancePage::initActions()
{ {
addButton(i18n("New..."), "filenew", TQT_SLOT(slotNew())); addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew()));
addButton(i18n("Copy..."), "editcopy", TQT_SLOT(slotCopy())); addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy()));
addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove())); addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove()));
m_buttons.append(0); m_buttons.append(0);
addButton(i18n("Set as Default"), "exec", TQT_SLOT(slotDefault())); addButton(i18n("Set as Default"), "exec", TQT_SLOT(slotDefault()));
addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings())); addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings()));
m_buttons.append(0); m_buttons.append(0);
addButton(i18n("Test..."), "fileprint", TQT_SLOT(slotTest())); addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest()));
} }
void KMInstancePage::setPrinter(KMPrinter *p) void KMInstancePage::setPrinter(KMPrinter *p)
@ -110,7 +110,7 @@ void KMInstancePage::setPrinter(KMPrinter *p)
for (;it.current();++it) for (;it.current();++it)
{ {
TQStringList pair = TQStringList::split('/',it.current()->name(),false); TQStringList pair = TQStringList::split('/',it.current()->name(),false);
m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "fileprint")),(pair.count() > 1 ? pair[1] : i18n("(Default)"))); m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "document-print")),(pair.count() > 1 ? pair[1] : i18n("(Default)")));
} }
m_view->sort(); m_view->sort();
} }

@ -145,7 +145,7 @@ void KMJobViewer::updateCaption()
if (!m_standalone) if (!m_standalone)
return; return;
TQString pixname("fileprint"); TQString pixname("document-print");
if (!m_prname.isEmpty()) if (!m_prname.isEmpty())
{ {
setCaption(i18n("Print Jobs for %1").arg(m_prname)); setCaption(i18n("Print Jobs for %1").arg(m_prname));
@ -263,7 +263,7 @@ void KMJobViewer::initActions()
TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move"); TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move");
mact->setDelayed(false); mact->setDelayed(false);
connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
@ -353,7 +353,7 @@ void KMJobViewer::buildPrinterMenu(TQPopupMenu *menu, bool use_all, bool use_spe
int i(0); int i(0);
if (use_all) if (use_all)
{ {
menu->insertItem(SmallIcon("fileprint"), i18n("All Printers"), i++); menu->insertItem(SmallIcon("document-print"), i18n("All Printers"), i++);
menu->insertSeparator(); menu->insertSeparator();
} }
for (; it.current(); ++it, i++) for (; it.current(); ++it, i++)

@ -66,7 +66,7 @@ void KMPages::initialize()
// Instance page // Instance page
KMInstancePage *instpage = new KMInstancePage(this, "Instance"); KMInstancePage *instpage = new KMInstancePage(this, "Instance");
addTab(instpage, SmallIcon("fileprint"), i18n("Instances")); addTab(instpage, SmallIcon("document-print"), i18n("Instances"));
m_pages.append(instpage); m_pages.append(instpage);
// initialize pages // initialize pages

@ -89,7 +89,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
m_extensionlabel->setBuddy(m_extension); m_extensionlabel->setBuddy(m_extension);
m_icon = new TDEIconButton(dummy); m_icon = new TDEIconButton(dummy);
m_icon->setIcon("fileprint"); m_icon->setIcon("document-print");
m_icon->setFixedSize(TQSize(48,48)); m_icon->setFixedSize(TQSize(48,48));
connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) ); connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) );

@ -95,7 +95,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
m_addopt = new TQToolButton(this); m_addopt = new TQToolButton(this);
m_addopt->setIconSet(SmallIconSet("document")); m_addopt->setIconSet(SmallIconSet("document"));
m_delopt = new TQToolButton(this); m_delopt = new TQToolButton(this);
m_delopt->setIconSet(SmallIconSet("editdelete")); m_delopt->setIconSet(SmallIconSet("edit-delete"));
m_up = new TQToolButton(this); m_up = new TQToolButton(this);
m_up->setIconSet(SmallIconSet("go-up")); m_up->setIconSet(SmallIconSet("go-up"));
m_down = new TQToolButton(this); m_down = new TQToolButton(this);
@ -144,9 +144,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
m_values->setSorting(-1); m_values->setSorting(-1);
m_values->setMaximumHeight(110); m_values->setMaximumHeight(110);
m_addval = new TQToolButton(w2); m_addval = new TQToolButton(w2);
m_addval->setIconSet(SmallIconSet("editcopy")); m_addval->setIconSet(SmallIconSet("edit-copy"));
m_delval = new TQToolButton(w2); m_delval = new TQToolButton(w2);
m_delval->setIconSet(SmallIconSet("editdelete")); m_delval->setIconSet(SmallIconSet("edit-delete"));
TQToolTip::add(m_addval, i18n("Add value")); TQToolTip::add(m_addval, i18n("Add value"));
TQToolTip::add(m_delval, i18n("Delete value")); TQToolTip::add(m_delval, i18n("Delete value"));
@ -370,7 +370,7 @@ void KXmlCommandAdvancedDlg::parseXmlCommand(KXmlCommand *xmlcmd)
TQListViewItem *root = new TQListViewItem(m_view, xmlcmd->name(), xmlcmd->name()); TQListViewItem *root = new TQListViewItem(m_view, xmlcmd->name(), xmlcmd->name());
DrMain *driver = xmlcmd->driver(); DrMain *driver = xmlcmd->driver();
root->setPixmap(0, SmallIcon("fileprint")); root->setPixmap(0, SmallIcon("document-print"));
root->setOpen(true); root->setOpen(true);
if (driver) if (driver)
{ {
@ -845,9 +845,9 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
m_requirements->addColumn(""); m_requirements->addColumn("");
m_requirements->header()->hide(); m_requirements->header()->hide();
m_addreq = new TQToolButton(m_gb2); m_addreq = new TQToolButton(m_gb2);
m_addreq->setIconSet(SmallIconSet("filenew")); m_addreq->setIconSet(SmallIconSet("document-new"));
m_removereq = new TQToolButton(m_gb2); m_removereq = new TQToolButton(m_gb2);
m_removereq->setIconSet(SmallIconSet("editdelete")); m_removereq->setIconSet(SmallIconSet("edit-delete"));
TQPushButton *m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain); TQPushButton *m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain);
m_mimetype = new TQComboBox(dummy); m_mimetype = new TQComboBox(dummy);
m_availablemime = new TDEListBox(m_gb1); m_availablemime = new TDEListBox(m_gb1);

@ -47,7 +47,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int))); connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int)));
TQPushButton *m_add = new KPushButton(this); TQPushButton *m_add = new KPushButton(this);
TQPushButton *m_edit = new KPushButton(this); TQPushButton *m_edit = new KPushButton(this);
m_add->setPixmap(SmallIcon("filenew")); m_add->setPixmap(SmallIcon("document-new"));
m_edit->setPixmap(SmallIcon("configure")); m_edit->setPixmap(SmallIcon("configure"));
connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand())); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand()));
connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand()));
@ -69,7 +69,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
if (canBeNull) if (canBeNull)
{ {
m_line = new TQLineEdit(this); m_line = new TQLineEdit(this);
m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "fileopen"), this); m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this);
m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this); m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this);
connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse()));
connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool))); connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool)));

@ -110,7 +110,7 @@ KFileList::KFileList(TQWidget *parent, const char *name)
connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
m_add = new TQToolButton(this); m_add = new TQToolButton(this);
m_add->setIconSet(SmallIconSet("fileopen")); m_add->setIconSet(SmallIconSet("document-open"));
connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile())); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile()));
TQToolTip::add(m_add, i18n("Add file")); TQToolTip::add(m_add, i18n("Add file"));
TQWhatsThis::add(m_add, whatsThisAddFileButton); TQWhatsThis::add(m_add, whatsThisAddFileButton);

@ -69,9 +69,9 @@ StatusWindow::StatusWindow(int pid)
m_label->setAlignment(AlignCenter); m_label->setAlignment(AlignCenter);
m_button = new KPushButton(KStdGuiItem::close(), this); m_button = new KPushButton(KStdGuiItem::close(), this);
m_icon = new TQLabel(this); m_icon = new TQLabel(this);
m_icon->setPixmap(DesktopIcon("fileprint")); m_icon->setPixmap(DesktopIcon("document-print"));
m_icon->setAlignment(AlignCenter); m_icon->setAlignment(AlignCenter);
KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("fileprint")); KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("document-print"));
TQGridLayout *l0 = new TQGridLayout(this, 2, 3, 10, 10); TQGridLayout *l0 = new TQGridLayout(this, 2, 3, 10, 10);
l0->setRowStretch(0, 1); l0->setRowStretch(0, 1);
l0->setColStretch(1, 1); l0->setColStretch(1, 1);

@ -729,7 +729,7 @@ void KHistoryComboEditor::virtual_hook( int id, void* data )
KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget *parent ) KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget *parent )
: KDialogBase( parent, "khistorycomboeditor", true, i18n( "History Editor" ), : KDialogBase( parent, "khistorycomboeditor", true, i18n( "History Editor" ),
KDialogBase::Close | KDialogBase::User1, KDialogBase::User1, true, KDialogBase::Close | KDialogBase::User1, KDialogBase::User1, true,
KGuiItem( i18n( "&Delete Entry" ), "editdelete") ), d(0) KGuiItem( i18n( "&Delete Entry" ), "edit-delete") ), d(0)
{ {
TQVBox* box = new TQVBox( this ); TQVBox* box = new TQVBox( this );
box->setSpacing( KDialog::spacingHint() ); box->setSpacing( KDialog::spacingHint() );

@ -1112,15 +1112,15 @@ TQPopupMenu *KEdit::createPopupMenu( const TQPoint& pos )
TQPopupMenu *menu = TQMultiLineEdit::createPopupMenu( pos ); TQPopupMenu *menu = TQMultiLineEdit::createPopupMenu( pos );
if ( isReadOnly() ) if ( isReadOnly() )
menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) ); menu->changeItem( menu->idAt(0), SmallIconSet("edit-copy"), menu->text( menu->idAt(0) ) );
else { else {
int id = menu->idAt(0); int id = menu->idAt(0);
menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) ); menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) );
menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) ); menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) );
menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) ); menu->changeItem( id - IdCut, SmallIconSet("edit-cut"), menu->text( id - IdCut) );
menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) ); menu->changeItem( id - IdCopy, SmallIconSet("edit-copy"), menu->text( id - IdCopy) );
menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) ); menu->changeItem( id - IdPaste, SmallIconSet("edit-paste"), menu->text( id - IdPaste) );
menu->changeItem( id - IdClear, SmallIconSet("editclear"), menu->text( id - IdClear) ); menu->changeItem( id - IdClear, SmallIconSet("edit-clear"), menu->text( id - IdClear) );
} }
return menu; return menu;

@ -767,10 +767,10 @@ void KEditToolbarWidget::setupLayout()
this, TQT_SLOT(slotToolbarSelected(const TQString&))); this, TQT_SLOT(slotToolbarSelected(const TQString&)));
// TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this); // TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this);
// new_toolbar->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall)); // new_toolbar->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall));
// new_toolbar->setEnabled(false); // disabled until implemented // new_toolbar->setEnabled(false); // disabled until implemented
// TQPushButton *del_toolbar = new TQPushButton(i18n("&Delete"), this); // TQPushButton *del_toolbar = new TQPushButton(i18n("&Delete"), this);
// del_toolbar->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall)); // del_toolbar->setPixmap(BarIcon("edit-delete", TDEIcon::SizeSmall));
// del_toolbar->setEnabled(false); // disabled until implemented // del_toolbar->setEnabled(false); // disabled until implemented
// our list of inactive actions // our list of inactive actions

@ -868,10 +868,10 @@ TQPopupMenu *KLineEdit::createPopupMenu()
int id = popup->idAt(0); int id = popup->idAt(0);
popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) ); popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) );
popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) ); popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) );
popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) ); popup->changeItem( id - IdCut, SmallIconSet("edit-cut"), popup->text( id - IdCut) );
popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) ); popup->changeItem( id - IdCopy, SmallIconSet("edit-copy"), popup->text( id - IdCopy) );
popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) ); popup->changeItem( id - IdPaste, SmallIconSet("edit-paste"), popup->text( id - IdPaste) );
popup->changeItem( id - IdClear, SmallIconSet("editclear"), popup->text( id - IdClear) ); popup->changeItem( id - IdClear, SmallIconSet("edit-clear"), popup->text( id - IdClear) );
// If a completion object is present and the input // If a completion object is present and the input
// widget is not read-only, show the Text Completion // widget is not read-only, show the Text Completion

@ -50,7 +50,7 @@ class TDEToggleFullScreenAction;
* for regular actions. For example, if you previously had: * for regular actions. For example, if you previously had:
* *
* \code * \code
* TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("filenew")), * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("document-new")),
* TDEStdAccel::shortcut(TDEStdAccel::New), this, * TDEStdAccel::shortcut(TDEStdAccel::New), this,
* TQT_SLOT(fileNew()), actionCollection()); * TQT_SLOT(fileNew()), actionCollection());
* \endcode * \endcode

@ -37,25 +37,25 @@ struct KStdActionInfo
static const KStdActionInfo g_rgActionInfo[] = static const KStdActionInfo g_rgActionInfo[] =
{ {
{ New, TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "filenew" }, { New, TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "document-new" },
{ Open, TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "fileopen" }, { Open, TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "document-open" },
{ OpenRecent, TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "fileopen" }, { OpenRecent, TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "document-open" },
{ Save, TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "filesave" }, { Save, TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "document-save" },
{ SaveAs, TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" }, { SaveAs, TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "document-save-as" },
{ Revert, TDEStdAccel::AccelNone, "file_revert", I18N_NOOP("Re&vert"), 0, "revert" }, { Revert, TDEStdAccel::AccelNone, "file_revert", I18N_NOOP("Re&vert"), 0, "revert" },
{ Close, TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "fileclose" }, { Close, TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "window-close" },
{ Print, TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "fileprint" }, { Print, TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "document-print" },
{ PrintPreview, TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "filequickprint" }, { PrintPreview, TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "document-print-preview" },
{ Mail, TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" }, { Mail, TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" },
{ Quit, TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" }, { Quit, TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" },
{ Undo, TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "edit-undo" }, { Undo, TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "edit-undo" },
{ Redo, TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "edit-redo" }, { Redo, TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "edit-redo" },
{ Cut, TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "editcut" }, { Cut, TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "edit-cut" },
{ Copy, TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "editcopy" }, { Copy, TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "edit-copy" },
{ Paste, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" }, { Paste, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "edit-paste" },
{ PasteText, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" }, { PasteText, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "edit-paste" },
{ Clear, TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" }, { Clear, TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "edit-clear" },
{ SelectAll, TDEStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 }, { SelectAll, TDEStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 },
{ Deselect, TDEStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 }, { Deselect, TDEStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 },
{ Find, TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "edit-find" }, { Find, TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "edit-find" },
@ -78,7 +78,7 @@ static const KStdActionInfo g_rgActionInfo[] =
// The following three have special i18n() needs for sLabel // The following three have special i18n() needs for sLabel
{ Back, TDEStdAccel::Back, "go_back", 0, 0, "back" }, { Back, TDEStdAccel::Back, "go_back", 0, 0, "back" },
{ Forward, TDEStdAccel::Forward, "go_forward", 0, 0, "forward" }, { Forward, TDEStdAccel::Forward, "go_forward", 0, 0, "forward" },
{ Home, TDEStdAccel::Home, "go_home", 0, 0, "gohome" }, { Home, TDEStdAccel::Home, "go_home", 0, 0, "go-home" },
{ Prior, TDEStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "back" }, { Prior, TDEStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "back" },
{ Next, TDEStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "forward" }, { Next, TDEStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "forward" },
{ Goto, TDEStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 }, { Goto, TDEStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 },

@ -124,7 +124,7 @@ KGuiItem KStdGuiItem::discard()
KGuiItem KStdGuiItem::save() KGuiItem KStdGuiItem::save()
{ {
return KGuiItem( i18n( "&Save" ), "filesave", i18n( "Save data" ) ); return KGuiItem( i18n( "&Save" ), "document-save", i18n( "Save data" ) );
} }
KGuiItem KStdGuiItem::dontSave() KGuiItem KStdGuiItem::dontSave()
@ -135,7 +135,7 @@ KGuiItem KStdGuiItem::dontSave()
KGuiItem KStdGuiItem::saveAs() KGuiItem KStdGuiItem::saveAs()
{ {
return KGuiItem( i18n( "Save &As..." ), "filesaveas", return KGuiItem( i18n( "Save &As..." ), "document-save-as",
i18n( "Save file with another name" ) ); i18n( "Save file with another name" ) );
} }
@ -171,7 +171,7 @@ KGuiItem KStdGuiItem::help()
KGuiItem KStdGuiItem::close() KGuiItem KStdGuiItem::close()
{ {
return KGuiItem( i18n( "&Close" ), "fileclose", return KGuiItem( i18n( "&Close" ), "window-close",
i18n( "Close the current window or document" ) ); i18n( "Close the current window or document" ) );
} }
@ -204,7 +204,7 @@ TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward()
KGuiItem KStdGuiItem::print() KGuiItem KStdGuiItem::print()
{ {
return KGuiItem( i18n( "&Print..." ), "fileprint", return KGuiItem( i18n( "&Print..." ), "document-print",
i18n( "Opens the print dialog to print " i18n( "Opens the print dialog to print "
"the current document" ) ); "the current document" ) );
} }
@ -217,13 +217,13 @@ KGuiItem KStdGuiItem::cont()
KGuiItem KStdGuiItem::del() KGuiItem KStdGuiItem::del()
{ {
return KGuiItem( i18n( "&Delete" ), "editdelete", return KGuiItem( i18n( "&Delete" ), "edit-delete",
i18n( "Delete item(s)" ) ); i18n( "Delete item(s)" ) );
} }
KGuiItem KStdGuiItem::open() KGuiItem KStdGuiItem::open()
{ {
return KGuiItem( i18n( "&Open..." ), "fileopen", return KGuiItem( i18n( "&Open..." ), "document-open",
i18n( "Open file" ) ); i18n( "Open file" ) );
} }

@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
} }
mHoverCloseButton = new TQPushButton( this ); mHoverCloseButton = new TQPushButton( this );
mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, TDEIcon::SizeSmall) );
mHoverCloseButton->setGeometry( rect ); mHoverCloseButton->setGeometry( rect );
TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); TQToolTip::add(mHoverCloseButton,i18n("Close this tab"));
mHoverCloseButton->setFlat(true); mHoverCloseButton->setFlat(true);

@ -125,15 +125,15 @@ TQPopupMenu *KTextBrowser::createPopupMenu( const TQPoint & pos )
TQPopupMenu *popup = TQTextBrowser::createPopupMenu( pos ); TQPopupMenu *popup = TQTextBrowser::createPopupMenu( pos );
if ( isReadOnly() ) if ( isReadOnly() )
popup->changeItem( popup->idAt(0), SmallIconSet("editcopy"), popup->text( popup->idAt(0) ) ); popup->changeItem( popup->idAt(0), SmallIconSet("edit-copy"), popup->text( popup->idAt(0) ) );
else { else {
int id = popup->idAt(0); int id = popup->idAt(0);
popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) ); popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) );
popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) ); popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) );
popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) ); popup->changeItem( id - IdCut, SmallIconSet("edit-cut"), popup->text( id - IdCut) );
popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) ); popup->changeItem( id - IdCopy, SmallIconSet("edit-copy"), popup->text( id - IdCopy) );
popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) ); popup->changeItem( id - IdPaste, SmallIconSet("edit-paste"), popup->text( id - IdPaste) );
popup->changeItem( id - IdClear, SmallIconSet("editclear"), popup->text( id - IdClear) ); popup->changeItem( id - IdClear, SmallIconSet("edit-clear"), popup->text( id - IdClear) );
} }
return popup; return popup;

@ -217,15 +217,15 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos )
TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos ); TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos );
if ( isReadOnly() ) if ( isReadOnly() )
menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) ); menu->changeItem( menu->idAt(0), SmallIconSet("edit-copy"), menu->text( menu->idAt(0) ) );
else { else {
int id = menu->idAt(0); int id = menu->idAt(0);
menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) ); menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) );
menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) ); menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) );
menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) ); menu->changeItem( id - IdCut, SmallIconSet("edit-cut"), menu->text( id - IdCut) );
menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) ); menu->changeItem( id - IdCopy, SmallIconSet("edit-copy"), menu->text( id - IdCopy) );
menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) ); menu->changeItem( id - IdPaste, SmallIconSet("edit-paste"), menu->text( id - IdPaste) );
menu->changeItem( id - IdClear, SmallIconSet("editclear"), menu->text( id - IdClear) ); menu->changeItem( id - IdClear, SmallIconSet("edit-clear"), menu->text( id - IdClear) );
menu->insertSeparator(); menu->insertSeparator();
id = menu->insertItem( SmallIconSet( "spellcheck" ), i18n( "Check Spelling..." ), id = menu->insertItem( SmallIconSet( "spellcheck" ), i18n( "Check Spelling..." ),

@ -133,7 +133,7 @@ class TDEMainWindow;
* *
* Here is an example of enabling a "New [document]" action * Here is an example of enabling a "New [document]" action
* \code * \code
* TDEAction *newAct = new TDEAction(i18n("&New"), "filenew", * TDEAction *newAct = new TDEAction(i18n("&New"), "document-new",
* TDEStdAccel::shortcut(TDEStdAccel::New), * TDEStdAccel::shortcut(TDEStdAccel::New),
* this, TQT_SLOT(fileNew()), * this, TQT_SLOT(fileNew()),
* actionCollection(), "new"); * actionCollection(), "new");

@ -112,17 +112,17 @@ setAutoSaveSettings();
// First four buttons // First four buttons
pix = BarIcon("filenew"); pix = BarIcon("document-new");
itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()), itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()),
true, "Create.. (toggles upper button)", 50); true, "Create.. (toggles upper button)", 50);
pix = BarIcon("fileopen"); pix = BarIcon("document-open");
tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()),
false, "Open"); false, "Open");
pix = BarIcon("filefloppy"); pix = BarIcon("filefloppy");
tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()),
true, "Save (beep or delayed popup)"); true, "Save (beep or delayed popup)");
tb->setDelayedPopup(2, itemsMenu); tb->setDelayedPopup(2, itemsMenu);
pix = BarIcon("fileprint"); pix = BarIcon("document-print");
tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()), tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()),
true, "Print (enables/disables open)"); true, "Print (enables/disables open)");
@ -156,12 +156,12 @@ setAutoSaveSettings();
tb1 = new TDEToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators tb1 = new TDEToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators
pix = BarIcon("filenew"); pix = BarIcon("document-new");
tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)"); tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)");
tb1->setToggle(0); tb1->setToggle(0);
tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool))); tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool)));
pix = BarIcon("fileopen"); pix = BarIcon("document-open");
tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()),
true, "Open (starts progres in sb)"); true, "Open (starts progres in sb)");
@ -172,16 +172,16 @@ setAutoSaveSettings();
true, "Save file2 (autorepeat)"); true, "Save file2 (autorepeat)");
tb1->setAutoRepeat(2); tb1->setAutoRepeat(2);
pix = BarIcon("fileprint"); pix = BarIcon("document-print");
tb1->insertButton(pix, 3, itemsMenu, true, "Print (pops menu)"); tb1->insertButton(pix, 3, itemsMenu, true, "Print (pops menu)");
tb1->insertSeparator (); tb1->insertSeparator ();
/**** RADIO BUTTONS */ /**** RADIO BUTTONS */
pix = BarIcon("filenew"); pix = BarIcon("document-new");
tb1->insertButton(pix, 4, true, "Radiobutton1"); tb1->insertButton(pix, 4, true, "Radiobutton1");
tb1->setToggle(4); tb1->setToggle(4);
pix = BarIcon("fileopen"); pix = BarIcon("document-open");
tb1->insertButton(pix, 5, true, "Radiobutton2"); tb1->insertButton(pix, 5, true, "Radiobutton2");
tb1->setToggle(5); tb1->setToggle(5);
@ -189,7 +189,7 @@ setAutoSaveSettings();
tb1->insertButton(pix, 6, true, "Radiobutton3"); tb1->insertButton(pix, 6, true, "Radiobutton3");
tb1->setToggle(6); tb1->setToggle(6);
pix = BarIcon("fileprint"); pix = BarIcon("document-print");
tb1->insertButton(pix, 7, true, "Radiobutton4"); tb1->insertButton(pix, 7, true, "Radiobutton4");
tb1->setToggle(7); tb1->setToggle(7);

Loading…
Cancel
Save