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

pull/1/head
Timothy Pearson 10 years ago
parent 22d1174898
commit da6c5588f2

@ -113,7 +113,7 @@ void DccTransferPanel::initGUI()
m_buttonAccept = new TQPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc"); 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_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_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 = new TQPushButton(icon("view_text"), i18n("Details"), buttonsBox, "detail_dcc");
m_buttonDetail->setToggleButton( true ); m_buttonDetail->setToggleButton( true );
@ -143,7 +143,7 @@ void DccTransferPanel::initGUI()
m_popup->insertSeparator(); // ----- m_popup->insertSeparator(); // -----
// FIXME: make it neat // FIXME: make it neat
m_popup->insertItem(icon("edit-redo"), i18n("Resend"), Popup::Resend); 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->insertSeparator(); // -----
m_popup->insertItem(icon("exec"), i18n("&Open File"), Popup::Open); m_popup->insertItem(icon("exec"), i18n("&Open File"), Popup::Open);
m_popup->insertItem(icon("messagebox_info"), i18n("File &Information"), Popup::Info); m_popup->insertItem(icon("messagebox_info"), i18n("File &Information"), Popup::Info);

@ -64,7 +64,7 @@ namespace Konversation
connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newIdentity())); connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newIdentity()));
TQToolButton* copyBtn = new TQToolButton(mainWidget); TQToolButton* copyBtn = new TQToolButton(mainWidget);
copyBtn->setIconSet(SmallIconSet("editcopy")); copyBtn->setIconSet(SmallIconSet("edit-copy"));
copyBtn->setTextLabel(i18n("Duplicate")); copyBtn->setTextLabel(i18n("Duplicate"));
connect(copyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(copyIdentity())); 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())); connect(m_editBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameIdentity()));
m_delBtn = new TQToolButton(mainWidget); m_delBtn = new TQToolButton(mainWidget);
m_delBtn->setIconSet(SmallIconSet("editdelete")); m_delBtn->setIconSet(SmallIconSet("edit-delete"));
m_delBtn->setTextLabel(i18n("Remove")); m_delBtn->setTextLabel(i18n("Remove"));
connect(m_delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteIdentity())); connect(m_delBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteIdentity()));
@ -583,7 +583,7 @@ namespace Konversation
} }
if(KMessageBox::warningContinueCancel(this, warningTxt, i18n("Delete Identity"), 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_identityCBox->removeItem(current);
m_identityList.remove(m_currentIdentity); m_identityList.remove(m_currentIdentity);

@ -31,8 +31,8 @@ Images::Images()
initializeNickIcons(); initializeNickIcons();
initializeKimifaceIcons(); initializeKimifaceIcons();
m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",TDEIcon::Small); m_closeIcon = TDEGlobal::iconLoader()->loadIcon("window-close",TDEIcon::Small);
m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",TDEIcon::Small).pixmap(TQIconSet::Small, false); m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("window-close",TDEIcon::Small).pixmap(TQIconSet::Small, false);
} }
Images::~Images() Images::~Images()
@ -137,8 +137,8 @@ void Images::initializeNickIcons()
void Images::updateIcons() void Images::updateIcons()
{ {
m_closeIcon = TDEGlobal::iconLoader()->loadIcon("fileclose",TDEIcon::Small); m_closeIcon = TDEGlobal::iconLoader()->loadIcon("window-close",TDEIcon::Small);
m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("fileclose",TDEIcon::Small).pixmap(TQIconSet::Small, false); m_disabledCloseIcon = TDEGlobal::iconLoader()->loadIconSet("window-close",TDEIcon::Small).pixmap(TQIconSet::Small, false);
} }
TQIconSet Images::getLed(TQColor col,bool state) TQIconSet Images::getLed(TQColor col,bool state)

@ -107,7 +107,7 @@ IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent)
m_popup->setItemVisible(toggleMenuBarSeparator, false); m_popup->setItemVisible(toggleMenuBarSeparator, false);
copyUrlMenuSeparator = m_popup->insertSeparator(); copyUrlMenuSeparator = m_popup->insertSeparator();
m_popup->setItemVisible(copyUrlMenuSeparator, false); 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(i18n("Select All"),SelectAll);
m_popup->insertItem(SmallIcon("edit-find"),i18n("Find Text..."),Search); 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) else if (!link.isEmpty() && !m_copyUrlMenu)
{ {
m_popup->setItemVisible(copyUrlMenuSeparator, true); 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("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_copyUrlMenu = true;
m_urlToCopy = link; m_urlToCopy = link;
} }

@ -141,7 +141,7 @@ KonviSettingsDialog::KonviSettingsDialog( TQWidget *parent) :
m_confAliasWdg = new Alias_Config( this, "Alias" ); m_confAliasWdg = new Alias_Config( this, "Alias" );
pagePath.clear(); pagePath.clear();
pagePath << i18n("Behavior") << i18n("Command Aliases"); 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); m_indexToPageMapping.insert(lastAddedIndex(), m_confAliasWdg);
connect(m_confAliasWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot())); connect(m_confAliasWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));

@ -45,7 +45,7 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow
TQDockArea* toolBarDock = new TQDockArea(Qt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock"); TQDockArea* toolBarDock = new TQDockArea(Qt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock");
toolBar = new TDEToolBar(toolBarDock,"logfile_toolbar",true,true); 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"); new TQLabel(i18n("Show last:"),toolBar,"logfile_size_label");
sizeSpin = new TQSpinBox(10,1000,10,toolBar,"logfile_size_spinbox"); 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); sizeSpin->installEventFilter(this);
toolBar->insertButton("reload",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(updateView()),true,i18n("Reload")); 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); IRCViewBox* ircBox = new IRCViewBox(this, 0);
setTextView(ircBox->ircView()); setTextView(ircBox->ircView());

@ -293,7 +293,7 @@ void NickListView::insertAssociationSubMenu()
addressbook->insertItem(i18n("Create New Contact..."), Konversation::AddressbookNew); addressbook->insertItem(i18n("Create New Contact..."), Konversation::AddressbookNew);
if(existingAssociation) if(existingAssociation)
addressbook->insertItem(SmallIcon("editdelete"), i18n("Delete Association"), Konversation::AddressbookDelete); addressbook->insertItem(SmallIcon("edit-delete"), i18n("Delete Association"), Konversation::AddressbookDelete);
if(!emailAddress) if(!emailAddress)
popup->setItemEnabled(Konversation::SendEmail, false); popup->setItemEnabled(Konversation::SendEmail, false);

@ -885,7 +885,7 @@ void NicksOnline::slotNickListView_RightButtonClicked(TQListViewItem* item, cons
m_popupMenu->insertItem(SmallIcon("contents"), i18n("Edit C&ontact..."), ciAddressbookEdit); m_popupMenu->insertItem(SmallIcon("contents"), i18n("Edit C&ontact..."), ciAddressbookEdit);
m_popupMenu->insertSeparator(); m_popupMenu->insertSeparator();
m_popupMenu->insertItem(i18n("&Change Association..."), ciAddressbookChange); 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->insertSeparator();
m_popupMenu->insertItem(i18n("&Whois"), ciWhois); m_popupMenu->insertItem(i18n("&Whois"), ciWhois);
m_popupMenu->insertItem(i18n("Open &Query"), ciOpenQuery); m_popupMenu->insertItem(i18n("Open &Query"), ciOpenQuery);

@ -35,7 +35,7 @@ QueueTuner::QueueTuner(TQWidget* parent, ViewContainer *container)
: QueueTunerBase(parent), m_server(0), m_timer(this, "qTuner"), : QueueTunerBase(parent), m_server(0), m_timer(this, "qTuner"),
m_vis(Preferences::self()->showQueueTunerItem()->value()) 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(m_closeButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
connect(container, TQT_SIGNAL(frontServerChanging(Server*)), TQT_SLOT(setServer(Server*))); connect(container, TQT_SIGNAL(frontServerChanging(Server*)), TQT_SLOT(setServer(Server*)));
connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerFired())); connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerFired()));

@ -46,7 +46,7 @@ SearchBar::SearchBar(TQWidget* parent)
setFocusProxy(m_searchEdit); setFocusProxy(m_searchEdit);
TDEIconLoader* iconLoader = kapp->iconLoader(); 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_findNextButton->setIconSet(iconLoader->loadIconSet("go-up", TDEIcon::Toolbar, 16));
m_findPreviousButton->setIconSet(iconLoader->loadIconSet("go-down", TDEIcon::Toolbar, 16)); m_findPreviousButton->setIconSet(iconLoader->loadIconSet("go-down", TDEIcon::Toolbar, 16));
m_statusPixLabel->hide(); m_statusPixLabel->hide();

@ -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_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.")); 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_removeServerButton->setTextLabel(i18n("Delete"));
m_mainWidget->m_upServerBtn->setIconSet(SmallIconSet("go-up")); m_mainWidget->m_upServerBtn->setIconSet(SmallIconSet("go-up"));
m_mainWidget->m_downServerBtn->setIconSet(SmallIconSet("go-down")); 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())); 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.")); 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_removeChannelButton->setTextLabel(i18n("Delete"));
m_mainWidget->m_upChannelBtn->setIconSet(SmallIconSet("go-up")); m_mainWidget->m_upChannelBtn->setIconSet(SmallIconSet("go-up"));
m_mainWidget->m_downChannelBtn->setIconSet(SmallIconSet("go-down")); m_mainWidget->m_downChannelBtn->setIconSet(SmallIconSet("go-down"));

@ -48,7 +48,7 @@ namespace Konversation
mousePressed=false; mousePressed=false;
m_popup = new TQPopupMenu(this,"topiclabel_context_menu"); 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); m_popup->insertItem(i18n("Select All"),SelectAll);
setupChannelPopupMenu(); setupChannelPopupMenu();
@ -355,7 +355,7 @@ namespace Konversation
} }
else if (!link.isEmpty() && !m_copyUrlMenu) 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_popup->insertItem(SmallIcon("bookmark"), i18n("Add to Bookmarks"), Bookmark, 1);
m_copyUrlMenu = true; m_copyUrlMenu = true;
m_urlToCopy = link; m_urlToCopy = link;

Loading…
Cancel
Save