From 064f8056e28239c0e08a6a5443447fbb2a7ecc9d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 00:14:55 -0500 Subject: Bring up, down, top, and bottom icons into XDG compliance --- kate/app/kateexternaltools.cpp | 4 ++-- kate/app/katemdi.cpp | 4 ++-- kcontrol/tdeio/kmanualproxydlg.cpp | 2 +- kicker/taskmanager/taskrmbmenu.cpp | 4 ++-- konqueror/konq_mainwindow.cc | 2 +- tdeioslave/info/info.cc | 2 +- tdeprint/tdeprintfax/conffilters.cpp | 4 ++-- tdeprint/tdeprintfax/tdeprintfax.cpp | 4 ++-- twin/useractions.cpp | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index e0057fb2c..f23ef3934 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -581,11 +581,11 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent, lo->addWidget( b, 5, 3 ); connect( b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSeparator()) ); - btnMoveUp = new TQPushButton( SmallIconSet("up"), "", this ); + btnMoveUp = new TQPushButton( SmallIconSet("go-up"), "", this ); lo->addWidget( btnMoveUp, 2, 4 ); connect( btnMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUp()) ); - btnMoveDwn = new TQPushButton( SmallIconSet("down"), "", this ); + btnMoveDwn = new TQPushButton( SmallIconSet("go-down"), "", this ); lo->addWidget( btnMoveDwn, 3, 4 ); connect( btnMoveDwn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDown()) ); diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index a6c657e2c..27035d48e 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -475,10 +475,10 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) p->insertItem(SmallIconSet("forward"), i18n("Right Sidebar"),1); if (position() != 2) - p->insertItem(SmallIconSet("up"), i18n("Top Sidebar"),2); + p->insertItem(SmallIconSet("go-up"), i18n("Top Sidebar"),2); if (position() != 3) - p->insertItem(SmallIconSet("down"), i18n("Bottom Sidebar"),3); + p->insertItem(SmallIconSet("go-down"), i18n("Bottom Sidebar"),3); connect(p, TQT_SIGNAL(activated(int)), this, TQT_SLOT(buttonPopupActivate(int))); diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp index 288fff879..01d2b584c 100644 --- a/kcontrol/tdeio/kmanualproxydlg.cpp +++ b/kcontrol/tdeio/kmanualproxydlg.cpp @@ -49,7 +49,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name ) mDlg = new ManualProxyDlgUI (this); setMainWidget( mDlg ); - mDlg->pbCopyDown->setPixmap( BarIcon("down", TDEIcon::SizeSmall) ); + mDlg->pbCopyDown->setPixmap( BarIcon("go-down", TDEIcon::SizeSmall) ); TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() ); mDlg->pbCopyDown->setSizePolicy( sizePolicy ); diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index f92719f47..08fe0785d 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -210,12 +210,12 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) menu->setCheckable(true); - id = menu->insertItem(SmallIconSet("up"), + id = menu->insertItem(SmallIconSet("go-up"), i18n("Keep &Above Others"), t, TQT_SLOT(toggleAlwaysOnTop())); menu->setItemChecked(id, t->isAlwaysOnTop()); - id = menu->insertItem(SmallIconSet("down"), + id = menu->insertItem(SmallIconSet("go-down"), i18n("Keep &Below Others"), t, TQT_SLOT(toggleKeptBelowOthers())); menu->setItemChecked(id, t->isKeptBelowOthers()); diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index a55ec9bfb..9a89cc87f 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -3825,7 +3825,7 @@ void KonqMainWindow::initActions() m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); // Go menu - m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" ); + m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" ); connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) ); diff --git a/tdeioslave/info/info.cc b/tdeioslave/info/info.cc index 6ef78adc4..83b41dae8 100644 --- a/tdeioslave/info/info.cc +++ b/tdeioslave/info/info.cc @@ -92,7 +92,7 @@ void InfoProtocol::get( const KURL& url ) // extract the path and node from url decodeURL( url ); - TQString path = TDEGlobal::iconLoader()->iconPath("up", TDEIcon::Toolbar, true); + TQString path = TDEGlobal::iconLoader()->iconPath("go-up", TDEIcon::Toolbar, true); int revindex = path.findRev('/'); path = path.left(revindex); diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp index 64ce6ee7d..372074a8a 100644 --- a/tdeprint/tdeprintfax/conffilters.cpp +++ b/tdeprint/tdeprintfax/conffilters.cpp @@ -54,9 +54,9 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) m_change = new TQPushButton(this); m_change->setIconSet(BarIconSet("filter")); m_up = new TQPushButton(this); - m_up->setIconSet(BarIconSet("up")); + m_up->setIconSet(BarIconSet("go-up")); m_down = new TQPushButton(this); - m_down->setIconSet(BarIconSet("down")); + m_down->setIconSet(BarIconSet("go-down")); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); connect(m_change, TQT_SIGNAL(clicked()), TQT_SLOT(slotChange())); connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index f896677b3..794ca51e4 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -70,12 +70,12 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) m_files = new TDEListBox(mainw); connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) ); m_upbtn = new KPushButton( mainw ); - m_upbtn->setIconSet( SmallIconSet( "up" ) ); + m_upbtn->setIconSet( SmallIconSet( "go-up" ) ); TQToolTip::add( m_upbtn, i18n( "Move up" ) ); connect( m_upbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) ); m_upbtn->setEnabled( false ); m_downbtn = new KPushButton( mainw ); - m_downbtn->setIconSet( SmallIconSet( "down" ) ); + m_downbtn->setIconSet( SmallIconSet( "go-down" ) ); TQToolTip::add( m_downbtn, i18n( "Move down" ) ); connect( m_downbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) ); m_downbtn->setEnabled( false ); diff --git a/twin/useractions.cpp b/twin/useractions.cpp index e78652918..fbf1be558 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -58,9 +58,9 @@ TQPopupMenu* Workspace::clientPopup() advanced_popup->setCheckable( TRUE ); advanced_popup->setFont(TDEGlobalSettings::menuFont()); connect( advanced_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) ); - advanced_popup->insertItem( SmallIconSet( "up" ), + advanced_popup->insertItem( SmallIconSet( "go-up" ), i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp ); - advanced_popup->insertItem( SmallIconSet( "down" ), + advanced_popup->insertItem( SmallIconSet( "go-down" ), i18n("Keep &Below Others")+'\t'+keys->shortcut("Window Below Other Windows").seq(0).toString(), Options::KeepBelowOp ); advanced_popup->insertItem( SmallIconSet( "window_fullscreen" ), i18n("&Fullscreen")+'\t'+keys->shortcut("Window Fullscreen").seq(0).toString(), Options::FullScreenOp ); -- cgit v1.2.1