From da6c5588f203a7b686b1dea7390e5b0eb630dcfc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:48 -0500 Subject: [PATCH] Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- konversation/src/dcctransferpanel.cpp | 4 ++-- konversation/src/identitydialog.cpp | 6 +++--- konversation/src/images.cpp | 8 ++++---- konversation/src/ircview.cpp | 6 +++--- konversation/src/konvisettingsdialog.cpp | 2 +- konversation/src/logfilereader.cpp | 4 ++-- konversation/src/nicklistview.cpp | 2 +- konversation/src/nicksonline.cpp | 2 +- konversation/src/queuetuner.cpp | 2 +- konversation/src/searchbar.cpp | 2 +- konversation/src/servergroupdialog.cpp | 4 ++-- konversation/src/topiclabel.cpp | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp index 30ab57b..b2a8dde 100644 --- a/konversation/src/dcctransferpanel.cpp +++ b/konversation/src/dcctransferpanel.cpp @@ -113,7 +113,7 @@ void DccTransferPanel::initGUI() m_buttonAccept = new TQPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc"); m_buttonAbort = new TQPushButton(icon("process-stop"), i18n("Abort"), buttonsBox, "abort_dcc"); - m_buttonClear = new TQPushButton(icon("editdelete"), i18n("Clear"), buttonsBox, "clear_dcc"); + m_buttonClear = new TQPushButton(icon("edit-delete"), i18n("Clear"), buttonsBox, "clear_dcc"); m_buttonOpen = new TQPushButton(icon("exec"), i18n("Open File"), buttonsBox, "open_dcc_file"); m_buttonDetail = new TQPushButton(icon("view_text"), i18n("Details"), buttonsBox, "detail_dcc"); m_buttonDetail->setToggleButton( true ); @@ -143,7 +143,7 @@ void DccTransferPanel::initGUI() m_popup->insertSeparator(); // ----- // FIXME: make it neat m_popup->insertItem(icon("edit-redo"), i18n("Resend"), Popup::Resend); - m_popup->insertItem(icon("editdelete"), i18n("&Clear"), Popup::Clear); + m_popup->insertItem(icon("edit-delete"), i18n("&Clear"), Popup::Clear); m_popup->insertSeparator(); // ----- m_popup->insertItem(icon("exec"), i18n("&Open File"), Popup::Open); m_popup->insertItem(icon("messagebox_info"), i18n("File &Information"), Popup::Info); diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp index e90049e..7174ce4 100644 --- a/konversation/src/identitydialog.cpp +++ b/konversation/src/identitydialog.cpp @@ -64,7 +64,7 @@ namespace Konversation connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newIdentity())); TQToolButton* copyBtn = new TQToolButton(mainWidget); - copyBtn->setIconSet(SmallIconSet("editcopy")); + copyBtn->setIconSet(SmallIconSet("edit-copy")); copyBtn->setTextLabel(i18n("Duplicate")); connect(copyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(copyIdentity())); @@ -74,7 +74,7 @@ namespace Konversation connect(m_editBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameIdentity())); m_delBtn = new TQToolButton(mainWidget); - m_delBtn->setIconSet(SmallIconSet("editdelete")); + m_delBtn->setIconSet(SmallIconSet("edit-delete")); m_delBtn->setTextLabel(i18n("Remove")); connect(m_delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteIdentity())); @@ -583,7 +583,7 @@ namespace Konversation } if(KMessageBox::warningContinueCancel(this, warningTxt, i18n("Delete Identity"), - KGuiItem(i18n("Delete"), "editdelete")) == KMessageBox::Continue) + KGuiItem(i18n("Delete"), "edit-delete")) == KMessageBox::Continue) { m_identityCBox->removeItem(current); m_identityList.remove(m_currentIdentity); diff --git a/konversation/src/images.cpp b/konversation/src/images.cpp index 3949857..dcf7cc0 100644 --- a/konversation/src/images.cpp +++ b/konversation/src/images.cpp @@ -31,8 +31,8 @@ Images::Images() initializeNickIcons(); initializeKimifaceIcons(); - m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",TDEIcon::Small); - m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",TDEIcon::Small).pixmap(TQIconSet::Small, false); + m_closeIcon = TDEGlobal::iconLoader()->loadIcon("window-close",TDEIcon::Small); + m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("window-close",TDEIcon::Small).pixmap(TQIconSet::Small, false); } Images::~Images() @@ -137,8 +137,8 @@ void Images::initializeNickIcons() void Images::updateIcons() { - m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",TDEIcon::Small); - m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",TDEIcon::Small).pixmap(TQIconSet::Small, false); + m_closeIcon = TDEGlobal::iconLoader()->loadIcon("window-close",TDEIcon::Small); + m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("window-close",TDEIcon::Small).pixmap(TQIconSet::Small, false); } TQIconSet Images::getLed(TQColor col,bool state) diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp index c407426..a504626 100644 --- a/konversation/src/ircview.cpp +++ b/konversation/src/ircview.cpp @@ -107,7 +107,7 @@ IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent) m_popup->setItemVisible(toggleMenuBarSeparator, false); copyUrlMenuSeparator = m_popup->insertSeparator(); m_popup->setItemVisible(copyUrlMenuSeparator, false); - m_popup->insertItem(SmallIconSet("editcopy"),i18n("&Copy"),Copy); + m_popup->insertItem(SmallIconSet("edit-copy"),i18n("&Copy"),Copy); m_popup->insertItem(i18n("Select All"),SelectAll); m_popup->insertItem(SmallIcon("edit-find"),i18n("Find Text..."),Search); @@ -255,9 +255,9 @@ void IRCView::highlightedSlot(const TQString& _link) else if (!link.isEmpty() && !m_copyUrlMenu) { m_popup->setItemVisible(copyUrlMenuSeparator, true); - m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy URL to Clipboard"), CopyUrl, 1); + m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy URL to Clipboard"), CopyUrl, 1); m_popup->insertItem(SmallIcon("bookmark"), i18n("Add to Bookmarks"), Bookmark, 2); - m_popup->insertItem(SmallIcon("filesaveas"), i18n("Save Link As..."), SaveAs, 3); + m_popup->insertItem(SmallIcon("document-save-as"), i18n("Save Link As..."), SaveAs, 3); m_copyUrlMenu = true; m_urlToCopy = link; } diff --git a/konversation/src/konvisettingsdialog.cpp b/konversation/src/konvisettingsdialog.cpp index 96b6248..19aeca4 100644 --- a/konversation/src/konvisettingsdialog.cpp +++ b/konversation/src/konvisettingsdialog.cpp @@ -141,7 +141,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) : m_confAliasWdg = new Alias_Config( this, "Alias" ); pagePath.clear(); pagePath << i18n("Behavior") << i18n("Command Aliases"); - addPage ( m_confAliasWdg, pagePath, "editcopy", i18n("Command Aliases") ); + addPage ( m_confAliasWdg, pagePath, "edit-copy", i18n("Command Aliases") ); m_indexToPageMapping.insert(lastAddedIndex(), m_confAliasWdg); connect(m_confAliasWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot())); diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp index 43c7ee8..e5cea7f 100644 --- a/konversation/src/logfilereader.cpp +++ b/konversation/src/logfilereader.cpp @@ -45,7 +45,7 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow TQDockArea* toolBarDock = new TQDockArea(Qt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock"); toolBar = new TDEToolBar(toolBarDock,"logfile_toolbar",true,true); - toolBar->insertButton("filesaveas",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(saveLog()),true,i18n("Save As...")); + toolBar->insertButton("document-save-as",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(saveLog()),true,i18n("Save As...")); new TQLabel(i18n("Show last:"),toolBar,"logfile_size_label"); sizeSpin = new TQSpinBox(10,1000,10,toolBar,"logfile_size_spinbox"); @@ -55,7 +55,7 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow sizeSpin->installEventFilter(this); toolBar->insertButton("reload",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(updateView()),true,i18n("Reload")); - toolBar->insertButton("editdelete",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(clearLog()),true,i18n("Clear Logfile")); + toolBar->insertButton("edit-delete",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(clearLog()),true,i18n("Clear Logfile")); IRCViewBox* ircBox = new IRCViewBox(this, 0); setTextView(ircBox->ircView()); diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp index 4e198e1..edf7f4b 100644 --- a/konversation/src/nicklistview.cpp +++ b/konversation/src/nicklistview.cpp @@ -293,7 +293,7 @@ void NickListView::insertAssociationSubMenu() addressbook->insertItem(i18n("Create New Contact..."), Konversation::AddressbookNew); if(existingAssociation) - addressbook->insertItem(SmallIcon("editdelete"), i18n("Delete Association"), Konversation::AddressbookDelete); + addressbook->insertItem(SmallIcon("edit-delete"), i18n("Delete Association"), Konversation::AddressbookDelete); if(!emailAddress) popup->setItemEnabled(Konversation::SendEmail, false); diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp index 496e178..a4ca415 100644 --- a/konversation/src/nicksonline.cpp +++ b/konversation/src/nicksonline.cpp @@ -885,7 +885,7 @@ void NicksOnline::slotNickListView_RightButtonClicked(TQListViewItem* item, cons m_popupMenu->insertItem(SmallIcon("contents"), i18n("Edit C&ontact..."), ciAddressbookEdit); m_popupMenu->insertSeparator(); m_popupMenu->insertItem(i18n("&Change Association..."), ciAddressbookChange); - m_popupMenu->insertItem(SmallIconSet("editdelete"), i18n("&Delete Association"), ciAddressbookDelete); + m_popupMenu->insertItem(SmallIconSet("edit-delete"), i18n("&Delete Association"), ciAddressbookDelete); m_popupMenu->insertSeparator(); m_popupMenu->insertItem(i18n("&Whois"), ciWhois); m_popupMenu->insertItem(i18n("Open &Query"), ciOpenQuery); diff --git a/konversation/src/queuetuner.cpp b/konversation/src/queuetuner.cpp index 15467e9..ea1dc4f 100644 --- a/konversation/src/queuetuner.cpp +++ b/konversation/src/queuetuner.cpp @@ -35,7 +35,7 @@ QueueTuner::QueueTuner(TQWidget* parent, ViewContainer *container) : QueueTunerBase(parent), m_server(0), m_timer(this, "qTuner"), m_vis(Preferences::self()->showQueueTunerItem()->value()) { - m_closeButton->setIconSet(kapp->iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, 16)); + m_closeButton->setIconSet(kapp->iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, 16)); connect(m_closeButton, TQT_SIGNAL(clicked()), TQT_SLOT(close())); connect(container, TQT_SIGNAL(frontServerChanging(Server*)), TQT_SLOT(setServer(Server*))); connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerFired())); diff --git a/konversation/src/searchbar.cpp b/konversation/src/searchbar.cpp index ea6dc86..2808ed3 100644 --- a/konversation/src/searchbar.cpp +++ b/konversation/src/searchbar.cpp @@ -46,7 +46,7 @@ SearchBar::SearchBar(TQWidget* parent) setFocusProxy(m_searchEdit); TDEIconLoader* iconLoader = kapp->iconLoader(); - m_closeButton->setIconSet(iconLoader->loadIconSet("fileclose", TDEIcon::Toolbar, 16)); + m_closeButton->setIconSet(iconLoader->loadIconSet("window-close", TDEIcon::Toolbar, 16)); m_findNextButton->setIconSet(iconLoader->loadIconSet("go-up", TDEIcon::Toolbar, 16)); m_findPreviousButton->setIconSet(iconLoader->loadIconSet("go-down", TDEIcon::Toolbar, 16)); m_statusPixLabel->hide(); diff --git a/konversation/src/servergroupdialog.cpp b/konversation/src/servergroupdialog.cpp index 63e86d4..0cc78ad 100644 --- a/konversation/src/servergroupdialog.cpp +++ b/konversation/src/servergroupdialog.cpp @@ -71,7 +71,7 @@ namespace Konversation TQWhatsThis::add(m_mainWidget->m_autoConnectCBox, i18n("Check here if you want Konversation to automatically connect to this network whenever you open Konversation.")); TQWhatsThis::add(m_mainWidget->m_serverLBox, i18n("This is a list of IRC Servers in the network. When connecting to the network, Konversation will attempt to connect to the top server first. If this fails, it will attempt the second server. If this fails, it will attempt the third, and so on. At least one server must be specified. Click a server to highlight it.")); - m_mainWidget->m_removeServerButton->setIconSet(SmallIconSet("editdelete")); + m_mainWidget->m_removeServerButton->setIconSet(SmallIconSet("edit-delete")); m_mainWidget->m_removeServerButton->setTextLabel(i18n("Delete")); m_mainWidget->m_upServerBtn->setIconSet(SmallIconSet("go-up")); m_mainWidget->m_downServerBtn->setIconSet(SmallIconSet("go-down")); @@ -84,7 +84,7 @@ namespace Konversation connect(m_mainWidget->m_downServerBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveServerDown())); TQWhatsThis::add(m_mainWidget->m_channelLBox, i18n("Optional. This is a list of the channels that will be automatically joined once Konversation has connected to a server. You may leave this blank if you wish to not automatically join any channels.")); - m_mainWidget->m_removeChannelButton->setIconSet(SmallIconSet("editdelete")); + m_mainWidget->m_removeChannelButton->setIconSet(SmallIconSet("edit-delete")); m_mainWidget->m_removeChannelButton->setTextLabel(i18n("Delete")); m_mainWidget->m_upChannelBtn->setIconSet(SmallIconSet("go-up")); m_mainWidget->m_downChannelBtn->setIconSet(SmallIconSet("go-down")); diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp index 67b3b92..773ac33 100644 --- a/konversation/src/topiclabel.cpp +++ b/konversation/src/topiclabel.cpp @@ -48,7 +48,7 @@ namespace Konversation mousePressed=false; m_popup = new TQPopupMenu(this,"topiclabel_context_menu"); - m_popup->insertItem(SmallIconSet("editcopy"),i18n("&Copy"),Copy); + m_popup->insertItem(SmallIconSet("edit-copy"),i18n("&Copy"),Copy); m_popup->insertItem(i18n("Select All"),SelectAll); setupChannelPopupMenu(); @@ -355,7 +355,7 @@ namespace Konversation } else if (!link.isEmpty() && !m_copyUrlMenu) { - m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy URL to Clipboard"), CopyUrl, 0); + m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy URL to Clipboard"), CopyUrl, 0); m_popup->insertItem(SmallIcon("bookmark"), i18n("Add to Bookmarks"), Bookmark, 1); m_copyUrlMenu = true; m_urlToCopy = link;